Use common method to determine telemetry intake url (#9786)

* Use common method to determine intake url

* fix tests

Author: amarziali

internal-api/src/main/java/datadog/trace/api/Config.java

@@ -4737,6 +4737,17 @@ public Map<String, String> getMergedCrashTrackingTags() {
     return Collections.unmodifiableMap(result);
   }
 
+  public String getDefaultTelemetryUrl() {
+    String site = getSite();
+    String prefix = "";
+    if (site.endsWith("datad0g.com")) {
+      prefix = "all-http-intake.logs.";
+    } else if (site.endsWith("datadoghq.com") || site.endsWith("datadoghq.eu")) {
+      prefix = "instrumentation-telemetry-intake.";
+    }
+    return "https://" + prefix + site + "/api/v2/apmtelemetry";
+  }
+
   /**
    * Returns the sample rate for the specified instrumentation or {@link
    * ConfigDefaults#DEFAULT_ANALYTICS_SAMPLE_RATE} if none specified.
@@ -4928,7 +4939,7 @@ public String getFinalLLMObsUrl() {
   public String getFinalCrashTrackingTelemetryUrl() {
     if (crashTrackingAgentless) {
       // when agentless crashTracking is turned on we send directly to our intake
-      return "https://all-http-intake.logs." + site + "/api/v2/apmtelemetry";
+      return getDefaultTelemetryUrl();
     } else {
       // when agentless are not set we send to the dd trace agent running locally
       return "http://" + agentHost + ":" + agentPort + "/telemetry/proxy/api/v2/apmtelemetry";

internal-api/src/test/groovy/datadog/trace/api/ConfigTest.groovy

@@ -2793,4 +2793,24 @@ class ConfigTest extends DDSpecification {
     then:
     config.tracePropagationBehaviorExtract == TracePropagationBehaviorExtract.CONTINUE
   }
+
+  def "Intake client uses correct URL for site #site"() {
+    setup:
+    def config = Spy(Config.get())
+
+    when:
+    config.getSite() >> site
+
+    then:
+    config.getDefaultTelemetryUrl()
+
+    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"
+  }
 }

telemetry/src/main/java/datadog/telemetry/TelemetryClient.java

@@ -58,15 +58,7 @@ private static String buildIntakeTelemetryUrl(Config config) {
         return agentlessUrl + "/api/v2/apmtelemetry";
       }
     }
-
-    String site = config.getSite();
-    String prefix = "";
-    if (site.endsWith("datad0g.com")) {
-      prefix = "all-http-intake.logs.";
-    } else if (site.endsWith("datadoghq.com") || site.endsWith("datadoghq.eu")) {
-      prefix = "instrumentation-telemetry-intake.";
-    }
-    return "https://" + prefix + site + "/api/v2/apmtelemetry";
+    return config.getDefaultTelemetryUrl();
   }
 
   private static final Logger log = LoggerFactory.getLogger(TelemetryClient.class);

telemetry/src/test/groovy/datadog/telemetry/TelemetryClientTest.groovy

@@ -9,32 +9,9 @@ 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, HttpRetryPolicy.Factory.NEVER_RETRY)
-
-    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)
+    def config = Spy(Config.get())
     config.getApiKey() >> "dummy-key"
     config.getAgentTimeout() >> 123
     config.getSite() >> "datad0g.com"