test: add unit test for new Intake enum

Author: daniel-mohedano

communication/src/main/java/datadog/communication/BackendApiFactory.java

@@ -5,7 +5,7 @@
 import datadog.communication.http.HttpRetryPolicy;
 import datadog.communication.http.OkHttpUtils;
 import datadog.trace.api.Config;
-import datadog.trace.api.intake.AgentlessIntake;
+import datadog.trace.api.intake.Intake;
 import datadog.trace.util.throwable.FatalAgentMisconfigurationError;
 import javax.annotation.Nullable;
 import okhttp3.HttpUrl;
@@ -25,7 +25,7 @@ public BackendApiFactory(Config config, SharedCommunicationObjects sharedCommuni
     this.sharedCommunicationObjects = sharedCommunicationObjects;
   }
 
-  public @Nullable BackendApi createBackendApi(AgentlessIntake intake) {
+  public @Nullable BackendApi createBackendApi(Intake intake) {
     HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0, true);
 
     if (intake.isAgentlessEnabled(config)) {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/CiVisibilityServices.java

@@ -34,7 +34,7 @@
 import datadog.trace.civisibility.source.LinesResolver;
 import datadog.trace.civisibility.source.index.*;
 import datadog.trace.civisibility.utils.ShellCommandExecutor;
-import datadog.trace.api.intake.AgentlessIntake;
+import datadog.trace.api.intake.Intake;
 import java.io.File;
 import java.lang.reflect.Type;
 import java.net.InetSocketAddress;
@@ -85,7 +85,7 @@ public class CiVisibilityServices {
     this.config = config;
     this.metricCollector = metricCollector;
     this.backendApi =
-        new BackendApiFactory(config, sco).createBackendApi(AgentlessIntake.API);
+        new BackendApiFactory(config, sco).createBackendApi(Intake.API);
     this.jvmInfoFactory = new CachingJvmInfoFactory(config, new JvmInfoFactoryImpl());
     this.gitClientFactory = buildGitClientFactory(config, metricCollector);
 

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/config/ConfigurationApiImplTest.groovy

@@ -11,7 +11,7 @@ import datadog.trace.api.civisibility.config.TestIdentifier
 import datadog.trace.api.civisibility.config.TestMetadata
 import datadog.trace.api.civisibility.telemetry.CiVisibilityMetricCollector
 import datadog.trace.civisibility.CiVisibilityTestUtils
-import datadog.trace.api.intake.AgentlessIntake
+import datadog.trace.api.intake.Intake
 import okhttp3.HttpUrl
 import okhttp3.OkHttpClient
 import org.apache.commons.io.IOUtils
@@ -273,7 +273,7 @@ class ConfigurationApiImplTest extends Specification {
   }
 
   private BackendApi givenIntakeApi(URI address, boolean responseCompression) {
-    HttpUrl intakeUrl = HttpUrl.get(String.format("%s/api/%s/", address.toString(), AgentlessIntake.API.getVersion()))
+    HttpUrl intakeUrl = HttpUrl.get(String.format("%s/api/%s/", address.toString(), Intake.API.getVersion()))
 
     String apiKey = "api-key"
     String traceId = "a-trace-id"

dd-java-agent/agent-logs-intake/src/main/java/datadog/trace/logging/intake/LogsWriterImpl.java

@@ -7,7 +7,7 @@
 import datadog.trace.api.Config;
 import datadog.trace.api.logging.intake.LogsWriter;
 import datadog.trace.util.AgentThreadFactory;
-import datadog.trace.api.intake.AgentlessIntake;
+import datadog.trace.api.intake.Intake;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -87,7 +87,7 @@ public void log(Map<String, Object> message) {
   }
 
   private void logPollingLoop() {
-    BackendApi backendApi = apiFactory.createBackendApi(AgentlessIntake.LOGS);
+    BackendApi backendApi = apiFactory.createBackendApi(Intake.LOGS);
     LogsDispatcher logsDispatcher = new LogsDispatcher(backendApi);
 
     while (!Thread.currentThread().isInterrupted()) {

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

@@ -644,7 +644,7 @@
 import datadog.trace.api.iast.IastContext;
 import datadog.trace.api.iast.IastDetectionMode;
 import datadog.trace.api.iast.telemetry.Verbosity;
-import datadog.trace.api.intake.AgentlessIntake;
+import datadog.trace.api.intake.Intake;
 import datadog.trace.api.naming.SpanNaming;
 import datadog.trace.api.profiling.ProfilingEnablement;
 import datadog.trace.api.rum.RumInjectorConfig;
@@ -4129,15 +4129,15 @@ private String getFinalDebuggerBaseUrl() {
 
   public String getFinalDebuggerSnapshotUrl() {
     if (isCiVisibilityFailedTestReplayEnabled() && isCiVisibilityAgentlessEnabled()) {
-      return AgentlessIntake.LOGS.getAgentlessUrl(this) + "logs";
+      return Intake.LOGS.getAgentlessUrl(this) + "logs";
     } else {
       return getFinalDebuggerBaseUrl() + "/debugger/v1/input";
     }
   }
 
   public String getFinalDebuggerSymDBUrl() {
     if (isCiVisibilityFailedTestReplayEnabled() && isCiVisibilityAgentlessEnabled()) {
-      return AgentlessIntake.LOGS.getAgentlessUrl(this) + "logs";
+      return Intake.LOGS.getAgentlessUrl(this) + "logs";
     } else {
       return getFinalDebuggerBaseUrl() + "/symdb/v1/input";
     }

…og/trace/api/intake/AgentlessIntake.java …ava/datadog/trace/api/intake/Intake.javainternal-api/src/main/java/datadog/trace/api/intake/AgentlessIntake.java renamed to internal-api/src/main/java/datadog/trace/api/intake/Intake.java internal-api/src/main/java/datadog/trace/api/intake/AgentlessIntake.java renamed to internal-api/src/main/java/datadog/trace/api/intake/Intake.java

@@ -3,7 +3,7 @@
 import datadog.trace.api.Config;
 import java.util.function.Function;
 
-public enum AgentlessIntake {
+public enum Intake {
   API("api", "v2", Config::isCiVisibilityAgentlessEnabled, Config::getCiVisibilityAgentlessUrl),
   LLMOBS_API("api", "v2", Config::isLlmObsAgentlessEnabled, Config::getLlMObsAgentlessUrl),
   LOGS(
@@ -17,7 +17,7 @@ public enum AgentlessIntake {
   public final Function<Config, Boolean> agentlessModeEnabled;
   public final Function<Config, String> customUrl;
 
-  AgentlessIntake(
+  Intake(
       String urlPrefix,
       String version,
       Function<Config, Boolean> agentlessModeEnabled,

internal-api/src/test/groovy/datadog/trace/api/intake/IntakeTest.groovy

@@ -0,0 +1,34 @@
+package datadog.trace.api.intake
+
+import datadog.trace.api.Config
+import datadog.trace.test.util.DDSpecification
+
+class IntakeTest extends DDSpecification {
+  def "intake URLs are generated correctly"() {
+    def config = Stub(Config)
+    config.getSite() >> "datadoghq.com"
+
+    when:
+    def apiUrl = Intake.API.getAgentlessUrl(config)
+    def llmObsUrl = Intake.LLMOBS_API.getAgentlessUrl(config)
+    def logsUrl = Intake.LOGS.getAgentlessUrl(config)
+
+    then:
+    apiUrl == "https://api.datadoghq.com/api/v2/"
+    llmObsUrl  == "https://api.datadoghq.com/api/v2/"
+    logsUrl == "https://http-intake.logs.datadoghq.com/api/v2/"
+
+    when:
+    config.getCiVisibilityAgentlessUrl() >> "agentless-civis"
+    config.getLlMObsAgentlessUrl() >> "agentless-llmobs"
+    config.getAgentlessLogSubmissionUrl() >> "agentless-log"
+    apiUrl = Intake.API.getAgentlessUrl(config)
+    llmObsUrl = Intake.LLMOBS_API.getAgentlessUrl(config)
+    logsUrl = Intake.LOGS.getAgentlessUrl(config)
+
+    then:
+    apiUrl == "agentless-civis/api/v2/"
+    llmObsUrl  == "agentless-llmobs/api/v2/"
+    logsUrl == "agentless-log/api/v2/"
+  }
+}