Skip to content

Commit

Permalink
fix(internal): fix telemetry URL for EU (#10021)
Browse files Browse the repository at this point in the history
Backport 513f7e5 from #10021 to 2.10.

This PR fixes incorrect URL for telemetry intake in EU that was causing
missing telemetry data and SSL error log messages.
  • Loading branch information
vitor-de-araujo committed Aug 2, 2024
1 parent e3f9004 commit 7ac67ca
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ddtrace/internal/telemetry/writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def _get_agentless_telemetry_url(site: str):
if site == "datad0g.com":
return "https://all-http-intake.logs.datad0g.com"
if site == "datadoghq.eu":
return "https://instrumentation-telemetry-intake.eu1.datadoghq.com"
return "https://instrumentation-telemetry-intake.datadoghq.eu"
return f"https://instrumentation-telemetry-intake.{site}/"


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
fixes:
- |
CI Visibility: fixes incorrect URL for telemetry intake in EU that was causing missing telemetry data and SSL error log messages.
4 changes: 1 addition & 3 deletions tests/telemetry/test_writer.py
Original file line number Diff line number Diff line change
Expand Up @@ -648,9 +648,7 @@ def test_telemetry_writer_agentless_setup_eu():
assert new_telemetry_writer._client._is_agentless is True
assert new_telemetry_writer._client._is_disabled is False
assert new_telemetry_writer._client._endpoint == "api/v2/apmtelemetry"
assert (
new_telemetry_writer._client._telemetry_url == "https://instrumentation-telemetry-intake.eu1.datadoghq.com"
)
assert new_telemetry_writer._client._telemetry_url == "https://instrumentation-telemetry-intake.datadoghq.eu"
assert new_telemetry_writer._client._headers["dd-api-key"] == "foobarkey"


Expand Down

0 comments on commit 7ac67ca

Please sign in to comment.