feat: refactor agentless intakes

Author: daniel-mohedano

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

@@ -5,8 +5,8 @@
 import datadog.communication.http.HttpRetryPolicy;
 import datadog.communication.http.OkHttpUtils;
 import datadog.trace.api.Config;
+import datadog.trace.api.intake.AgentlessIntake;
 import datadog.trace.util.throwable.FatalAgentMisconfigurationError;
-import java.util.function.Function;
 import javax.annotation.Nullable;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
@@ -25,11 +25,11 @@ public BackendApiFactory(Config config, SharedCommunicationObjects sharedCommuni
     this.sharedCommunicationObjects = sharedCommunicationObjects;
   }
 
-  public @Nullable BackendApi createBackendApi(Intake intake) {
+  public @Nullable BackendApi createBackendApi(AgentlessIntake intake) {
     HttpRetryPolicy.Factory retryPolicyFactory = new HttpRetryPolicy.Factory(5, 100, 2.0, true);
 
-    if (intake.agentlessModeEnabled.apply(config)) {
-      HttpUrl agentlessUrl = getAgentlessUrl(intake);
+    if (intake.isAgentlessEnabled(config)) {
+      HttpUrl agentlessUrl = HttpUrl.get(intake.getAgentlessUrl(config));
       String apiKey = config.getApiKey();
       if (apiKey == null || apiKey.isEmpty()) {
         throw new FatalAgentMisconfigurationError(
@@ -58,41 +58,4 @@ public BackendApiFactory(Config config, SharedCommunicationObjects sharedCommuni
             + "and agent does not support EVP proxy");
     return null;
   }
-
-  private HttpUrl getAgentlessUrl(Intake intake) {
-    String customUrl = intake.customUrl.apply(config);
-    if (customUrl != null && !customUrl.isEmpty()) {
-      return HttpUrl.get(String.format("%s/api/%s/", customUrl, intake.version));
-    } else {
-      String site = config.getSite();
-      return HttpUrl.get(
-          String.format("https://%s.%s/api/%s/", intake.urlPrefix, site, intake.version));
-    }
-  }
-
-  public enum Intake {
-    API("api", "v2", Config::isCiVisibilityAgentlessEnabled, Config::getCiVisibilityAgentlessUrl),
-    LLMOBS_API("api", "v2", Config::isLlmObsAgentlessEnabled, Config::getLlMObsAgentlessUrl),
-    LOGS(
-        "http-intake.logs",
-        "v2",
-        Config::isAgentlessLogSubmissionEnabled,
-        Config::getAgentlessLogSubmissionUrl);
-
-    public final String urlPrefix;
-    public final String version;
-    public final Function<Config, Boolean> agentlessModeEnabled;
-    public final Function<Config, String> customUrl;
-
-    Intake(
-        String urlPrefix,
-        String version,
-        Function<Config, Boolean> agentlessModeEnabled,
-        Function<Config, String> customUrl) {
-      this.urlPrefix = urlPrefix;
-      this.version = version;
-      this.agentlessModeEnabled = agentlessModeEnabled;
-      this.customUrl = customUrl;
-    }
-  }
 }

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

@@ -34,6 +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 java.io.File;
 import java.lang.reflect.Type;
 import java.net.InetSocketAddress;
@@ -84,7 +85,7 @@ public class CiVisibilityServices {
     this.config = config;
     this.metricCollector = metricCollector;
     this.backendApi =
-        new BackendApiFactory(config, sco).createBackendApi(BackendApiFactory.Intake.API);
+        new BackendApiFactory(config, sco).createBackendApi(AgentlessIntake.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

@@ -1,7 +1,6 @@
 package datadog.trace.civisibility.config
 
 import datadog.communication.BackendApi
-import datadog.communication.BackendApiFactory
 import datadog.communication.EvpProxyApi
 import datadog.communication.IntakeApi
 import datadog.communication.http.HttpRetryPolicy
@@ -12,6 +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 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(), BackendApiFactory.Intake.API.version))
+    HttpUrl intakeUrl = HttpUrl.get(String.format("%s/api/%s/", address.toString(), AgentlessIntake.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

@@ -4,10 +4,10 @@
 
 import datadog.communication.BackendApi;
 import datadog.communication.BackendApiFactory;
-import datadog.communication.BackendApiFactory.Intake;
 import datadog.trace.api.Config;
 import datadog.trace.api.logging.intake.LogsWriter;
 import datadog.trace.util.AgentThreadFactory;
+import datadog.trace.api.intake.AgentlessIntake;
 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(Intake.LOGS);
+    BackendApi backendApi = apiFactory.createBackendApi(AgentlessIntake.LOGS);
     LogsDispatcher logsDispatcher = new LogsDispatcher(backendApi);
 
     while (!Thread.currentThread().isInterrupted()) {

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

@@ -640,6 +640,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.naming.SpanNaming;
 import datadog.trace.api.profiling.ProfilingEnablement;
 import datadog.trace.api.rum.RumInjectorConfig;
@@ -4110,19 +4111,18 @@ private String getFinalDebuggerBaseUrl() {
 
   public String getFinalDebuggerSnapshotUrl() {
     if (isCiVisibilityFailedTestReplayEnabled() && isCiVisibilityAgentlessEnabled()) {
-      // Used in Failed Test Replay agentless
-      String agentlessUrl = getCiVisibilityAgentlessUrl();
-      if (Strings.isBlank(agentlessUrl)) {
-        agentlessUrl = "https://http-intake.logs." + getSite();
-      }
-      return agentlessUrl + "/api/v2/logs";
+      return AgentlessIntake.LOGS.getAgentlessUrl(this) + "logs";
     } else {
       return getFinalDebuggerBaseUrl() + "/debugger/v1/input";
     }
   }
 
   public String getFinalDebuggerSymDBUrl() {
-    return getFinalDebuggerBaseUrl() + "/symdb/v1/input";
+    if (isCiVisibilityFailedTestReplayEnabled() && isCiVisibilityAgentlessEnabled()) {
+      return AgentlessIntake.LOGS.getAgentlessUrl(this) + "logs";
+    } else {
+      return getFinalDebuggerBaseUrl() + "/symdb/v1/input";
+    }
   }
 
   public String getDynamicInstrumentationProbeFile() {

internal-api/src/main/java/datadog/trace/api/intake/AgentlessIntake.java

@@ -0,0 +1,52 @@
+package datadog.trace.api.intake;
+
+import datadog.trace.api.Config;
+import java.util.function.Function;
+
+public enum AgentlessIntake {
+  API("api", "v2", Config::isCiVisibilityAgentlessEnabled, Config::getCiVisibilityAgentlessUrl),
+  LLMOBS_API("api", "v2", Config::isLlmObsAgentlessEnabled, Config::getLlMObsAgentlessUrl),
+  LOGS(
+      "http-intake.logs",
+      "v2",
+      Config::isAgentlessLogSubmissionEnabled,
+      Config::getAgentlessLogSubmissionUrl);
+
+  public final String urlPrefix;
+  public final String version;
+  public final Function<Config, Boolean> agentlessModeEnabled;
+  public final Function<Config, String> customUrl;
+
+  AgentlessIntake(
+      String urlPrefix,
+      String version,
+      Function<Config, Boolean> agentlessModeEnabled,
+      Function<Config, String> customUrl) {
+    this.urlPrefix = urlPrefix;
+    this.version = version;
+    this.agentlessModeEnabled = agentlessModeEnabled;
+    this.customUrl = customUrl;
+  }
+
+  public String getUrlPrefix() {
+    return urlPrefix;
+  }
+
+  public String getVersion() {
+    return version;
+  }
+
+  public boolean isAgentlessEnabled(Config config) {
+    return agentlessModeEnabled.apply(config);
+  }
+
+  public String getAgentlessUrl(Config config) {
+    String custom = customUrl.apply(config);
+    if (custom != null && !custom.isEmpty()) {
+      return String.format("%s/api/%s/", custom, version);
+    } else {
+      String site = config.getSite();
+      return String.format("https://%s.%s/api/%s/", urlPrefix, site, version);
+    }
+  }
+}