Fix intake telemetry client URL for EU site (#6683)

nikita-tkachenko-datadog · web-flow · commit d57f54bf1a5e · 2024-02-15T17:36:26.000+01:00
diff --git a/telemetry/src/main/java/datadog/telemetry/TelemetryClient.java b/telemetry/src/main/java/datadog/telemetry/TelemetryClient.java
@@ -59,7 +59,7 @@ private static String buildIntakeTelemetryUrl(Config config) {
     String prefix = "";
     if (site.endsWith("datad0g.com")) {
       prefix = "all-http-intake.logs.";
-    } else if (site.endsWith("datadoghq.com")) {
+    } else if (site.endsWith("datadoghq.com") || site.endsWith("datadoghq.eu")) {
       prefix = "instrumentation-telemetry-intake.";
     }
     return "https://" + prefix + site + "/api/v2/apmtelemetry";
diff --git a/telemetry/src/test/groovy/datadog/telemetry/TelemetryClientTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/TelemetryClientTest.groovy
@@ -5,6 +5,29 @@ import spock.lang.Specification
 
 class TelemetryClientTest extends Specification {
 
+  def "Intake client uses correct URL for site #site"() {
+    setup:
+    def config = Stub(Config)
+    config.getApiKey() >> "dummy-key"
+    config.getAgentTimeout() >> 123
+    config.getSite() >> site
+
+    when:
+    def intakeClient = TelemetryClient.buildIntakeClient(config)
+
+    then:
+    intakeClient.getUrl().toString() == expectedUrl
+
+    where:
+    site                | expectedUrl
+    "datadoghq.com"     | "https://instrumentation-telemetry-intake.datadoghq.com/api/v2/apmtelemetry"
+    "us3.datadoghq.com" | "https://instrumentation-telemetry-intake.us3.datadoghq.com/api/v2/apmtelemetry"
+    "us5.datadoghq.com" | "https://instrumentation-telemetry-intake.us5.datadoghq.com/api/v2/apmtelemetry"
+    "ap1.datadoghq.com" | "https://instrumentation-telemetry-intake.ap1.datadoghq.com/api/v2/apmtelemetry"
+    "datadoghq.eu"      | "https://instrumentation-telemetry-intake.datadoghq.eu/api/v2/apmtelemetry"
+    "datad0g.com"       | "https://all-http-intake.logs.datad0g.com/api/v2/apmtelemetry"
+  }
+
   def "Intake client uses CI Visibility agentless URL if configured to do so"() {
     setup:
     def config = Stub(Config)

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ private static String buildIntakeTelemetryUrl(Config config) {`
`59`	`59`	`String prefix = "";`
`60`	`60`	`if (site.endsWith("datad0g.com")) {`
`61`	`61`	`prefix = "all-http-intake.logs.";`
`62`		`- } else if (site.endsWith("datadoghq.com")) {`
	`62`	`+ } else if (site.endsWith("datadoghq.com") \|\| site.endsWith("datadoghq.eu")) {`
`63`	`63`	`prefix = "instrumentation-telemetry-intake.";`
`64`	`64`	`}`
`65`	`65`	`return "https://" + prefix + site + "/api/v2/apmtelemetry";`