Add Java agentless feature flag source

leoromanovsky · leoromanovsky · commit 23c0b229998f · 2026-07-08T21:01:51.000-04:00
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java
@@ -72,6 +72,7 @@
 import java.net.URL;
 import java.security.CodeSource;
 import java.util.EnumSet;
+import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.PatternSyntaxException;
@@ -135,7 +136,7 @@ private enum AgentFeature {
     APP_LOGS_COLLECTION(GeneralConfig.APP_LOGS_COLLECTION_ENABLED, false),
     LLMOBS(LlmObsConfig.LLMOBS_ENABLED, false),
     LLMOBS_AGENTLESS(LlmObsConfig.LLMOBS_AGENTLESS_ENABLED, false),
-    FEATURE_FLAGGING(FeatureFlaggingConfig.FLAGGING_PROVIDER_ENABLED, false);
+    FEATURE_FLAGGING(FeatureFlaggingConfig.FEATURE_FLAGS_ENABLED, false);
 
     private final String configKey;
     private final String systemProp;
@@ -282,9 +283,7 @@ public static void start(
     agentlessLogSubmissionEnabled = isFeatureEnabled(AgentFeature.AGENTLESS_LOG_SUBMISSION);
     appLogsCollectionEnabled = isFeatureEnabled(AgentFeature.APP_LOGS_COLLECTION);
     llmObsEnabled = isFeatureEnabled(AgentFeature.LLMOBS);
-    featureFlaggingEnabled =
-        isFeatureEnabled(AgentFeature.FEATURE_FLAGGING)
-            || isFeatureFlaggingCdnConfigurationSourceConfigured();
+    featureFlaggingEnabled = isFeatureFlaggingEnabled();
 
     // setup writers when llmobs is enabled to accomodate apm and llmobs
     if (llmObsEnabled) {
@@ -1633,10 +1632,36 @@ private static boolean isFeatureEnabled(AgentFeature feature) {
     }
   }
 
-  private static boolean isFeatureFlaggingCdnConfigurationSourceConfigured() {
+  private static boolean isFeatureFlaggingEnabled() {
+    final String enabled = getConfiguredValue(FeatureFlaggingConfig.FEATURE_FLAGS_ENABLED);
+    if ("false".equalsIgnoreCase(enabled) || "0".equals(enabled)) {
+      return false;
+    }
+    if ("true".equalsIgnoreCase(enabled) || "1".equals(enabled)) {
+      return true;
+    }
+
+    final String oldEnabled = getConfiguredValue(FeatureFlaggingConfig.FLAGGING_PROVIDER_ENABLED);
+    if ("false".equalsIgnoreCase(oldEnabled) || "0".equals(oldEnabled)) {
+      return false;
+    }
+    if ("true".equalsIgnoreCase(oldEnabled) || "1".equals(oldEnabled)) {
+      return true;
+    }
+
+    return isFeatureFlaggingConfigurationSourceAutoEnabled();
+  }
+
+  private static boolean isFeatureFlaggingConfigurationSourceAutoEnabled() {
     final String configurationSource =
-        getConfiguredValue(FeatureFlaggingConfig.FLAGGING_CONFIGURATION_SOURCE);
-    return configurationSource != null && "cdn".equalsIgnoreCase(configurationSource.trim());
+        getConfiguredValue(FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE);
+    if (configurationSource == null) {
+      return true;
+    }
+    final String normalized = configurationSource.trim().toLowerCase(Locale.ROOT);
+    return "agentless".equals(normalized)
+        || "remote_config".equals(normalized)
+        || "offline".equals(normalized);
   }
 
   private static String getConfiguredValue(final String configKey) {
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java b/dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java
@@ -49,7 +49,7 @@ public final class ConfigDefaults {
   static final boolean DEFAULT_INJECT_DATADOG_ATTRIBUTE = true;
   static final String DEFAULT_SITE = "datadoghq.com";
 
-  public static final String DEFAULT_FLAGGING_CONFIGURATION_SOURCE = "cdn";
+  public static final String DEFAULT_FLAGGING_CONFIGURATION_SOURCE = "agentless";
   public static final double DEFAULT_FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS = 30.0D;
   public static final double DEFAULT_FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS = 2.0D;
 
diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/FeatureFlaggingConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/FeatureFlaggingConfig.java
@@ -2,17 +2,19 @@
 
 public class FeatureFlaggingConfig {
 
+  public static final String FEATURE_FLAGS_ENABLED = "feature.flags.enabled";
   public static final String FLAGGING_PROVIDER_ENABLED = "experimental.flagging.provider.enabled";
 
-  public static final String FLAGGING_CONFIGURATION_SOURCE = "flagging.configuration.source";
-  public static final String FLAGGING_CONFIGURATION_SOURCE_BASE_URL =
-      "flagging.configuration.source.base.url";
-  public static final String FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS =
-      "flagging.configuration.source.poll.interval.seconds";
-  public static final String FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS =
-      "flagging.configuration.source.request.timeout.seconds";
-  public static final String FLAGGING_CONFIGURATION_SOURCE_EXTRA_HEADERS =
-      "flagging.configuration.source.extra.headers";
+  public static final String FEATURE_FLAGS_CONFIGURATION_SOURCE =
+      "feature.flags.configuration.source";
+  public static final String FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL =
+      "feature.flags.configuration.source.agentless.base.url";
+  public static final String FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS =
+      "feature.flags.configuration.source.agentless.poll.interval.seconds";
+  public static final String FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS =
+      "feature.flags.configuration.source.agentless.request.timeout.seconds";
+  public static final String FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_EXTRA_HEADERS =
+      "feature.flags.configuration.source.agentless.extra.headers";
 
   private FeatureFlaggingConfig() {}
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -364,11 +364,11 @@
 import static datadog.trace.api.config.DebuggerConfig.THIRD_PARTY_EXCLUDES;
 import static datadog.trace.api.config.DebuggerConfig.THIRD_PARTY_INCLUDES;
 import static datadog.trace.api.config.DebuggerConfig.THIRD_PARTY_SHADING_IDENTIFIERS;
-import static datadog.trace.api.config.FeatureFlaggingConfig.FLAGGING_CONFIGURATION_SOURCE;
-import static datadog.trace.api.config.FeatureFlaggingConfig.FLAGGING_CONFIGURATION_SOURCE_BASE_URL;
-import static datadog.trace.api.config.FeatureFlaggingConfig.FLAGGING_CONFIGURATION_SOURCE_EXTRA_HEADERS;
-import static datadog.trace.api.config.FeatureFlaggingConfig.FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS;
-import static datadog.trace.api.config.FeatureFlaggingConfig.FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS;
+import static datadog.trace.api.config.FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE;
+import static datadog.trace.api.config.FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL;
+import static datadog.trace.api.config.FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_EXTRA_HEADERS;
+import static datadog.trace.api.config.FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS;
+import static datadog.trace.api.config.FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS;
 import static datadog.trace.api.config.GeneralConfig.AGENTLESS_LOG_SUBMISSION_LEVEL;
 import static datadog.trace.api.config.GeneralConfig.AGENTLESS_LOG_SUBMISSION_QUEUE_SIZE;
 import static datadog.trace.api.config.GeneralConfig.AGENTLESS_LOG_SUBMISSION_URL;
@@ -2852,19 +2852,20 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
     flaggingConfigurationSource =
         normalizeFlaggingConfigurationSource(
             configProvider.getString(
-                FLAGGING_CONFIGURATION_SOURCE, DEFAULT_FLAGGING_CONFIGURATION_SOURCE));
+                FEATURE_FLAGS_CONFIGURATION_SOURCE, DEFAULT_FLAGGING_CONFIGURATION_SOURCE));
     flaggingConfigurationSourceBaseUrl =
-        configProvider.getStringNotEmpty(FLAGGING_CONFIGURATION_SOURCE_BASE_URL, null);
+        configProvider.getStringNotEmpty(
+            FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL, null);
     flaggingConfigurationSourcePollIntervalSeconds =
         configProvider.getDouble(
-            FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS,
+            FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS,
             DEFAULT_FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS);
     flaggingConfigurationSourceRequestTimeoutSeconds =
         configProvider.getDouble(
-            FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS,
+            FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS,
             DEFAULT_FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS);
     flaggingConfigurationSourceExtraHeaders =
-        configProvider.getMergedMap(FLAGGING_CONFIGURATION_SOURCE_EXTRA_HEADERS, '=');
+        configProvider.getMergedMap(FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_EXTRA_HEADERS, '=');
 
     dynamicInstrumentationEnabled =
         configProvider.getBoolean(
diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json
@@ -1497,62 +1497,70 @@
         "aliases": []
       }
     ],
-    "DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED": [
-      {
-        "version": "A",
-        "type": "boolean",
-        "default": "false",
-        "aliases": []
-      }
-    ],
-    "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED": [
-      {
-        "version": "B",
-        "type": "boolean",
-        "default": "true",
-        "aliases": []
-      }
-    ],
-    "DD_FLAGGING_CONFIGURATION_SOURCE": [
+    "DD_FEATURE_FLAGS_CONFIGURATION_SOURCE": [
       {
         "version": "A",
         "type": "string",
-        "default": "cdn",
+        "default": "agentless",
         "aliases": []
       }
     ],
-    "DD_FLAGGING_CONFIGURATION_SOURCE_BASE_URL": [
+    "DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL": [
       {
         "version": "A",
         "type": "string",
         "default": null,
         "aliases": []
       }
     ],
-    "DD_FLAGGING_CONFIGURATION_SOURCE_EXTRA_HEADERS": [
+    "DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_EXTRA_HEADERS": [
       {
         "version": "A",
         "type": "map",
         "default": null,
         "aliases": []
       }
     ],
-    "DD_FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS": [
+    "DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS": [
       {
         "version": "A",
         "type": "decimal",
         "default": "30",
         "aliases": []
       }
     ],
-    "DD_FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS": [
+    "DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS": [
       {
         "version": "A",
         "type": "decimal",
         "default": "2",
         "aliases": []
       }
     ],
+    "DD_FEATURE_FLAGS_ENABLED": [
+      {
+        "version": "A",
+        "type": "boolean",
+        "default": "true",
+        "aliases": ["DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED"]
+      }
+    ],
+    "DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED": [
+      {
+        "version": "A",
+        "type": "boolean",
+        "default": "false",
+        "aliases": []
+      }
+    ],
+    "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED": [
+      {
+        "version": "B",
+        "type": "boolean",
+        "default": "true",
+        "aliases": []
+      }
+    ],
     "DD_FORCE_CLEAR_TEXT_HTTP_FOR_INTAKE_CLIENT": [
       {
         "version": "A",
diff --git a/products/feature-flagging/feature-flagging-agent/src/main/java/com/datadog/featureflag/FeatureFlaggingSystem.java b/products/feature-flagging/feature-flagging-agent/src/main/java/com/datadog/featureflag/FeatureFlaggingSystem.java
@@ -8,7 +8,7 @@
 public class FeatureFlaggingSystem {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(FeatureFlaggingSystem.class);
-  private static final String SOURCE_CDN = "cdn";
+  private static final String SOURCE_AGENTLESS = "agentless";
   private static final String SOURCE_REMOTE_CONFIG = "remote_config";
   private static final String SOURCE_OFFLINE = "offline";
 
@@ -41,7 +41,7 @@ static ConfigurationSourceService createConfigurationSourceService(
         throw new IllegalStateException("Feature Flagging system started without RC");
       }
       return new RemoteConfigServiceImpl(sco, config);
-    } else if (SOURCE_CDN.equals(configurationSource)) {
+    } else if (SOURCE_AGENTLESS.equals(configurationSource)) {
       return new UfcHttpConfigService(config);
     } else if (SOURCE_OFFLINE.equals(configurationSource)) {
       LOGGER.debug(
diff --git a/products/feature-flagging/feature-flagging-agent/src/test/java/com/datadog/featureflag/FeatureFlaggingSystemTest.java b/products/feature-flagging/feature-flagging-agent/src/test/java/com/datadog/featureflag/FeatureFlaggingSystemTest.java
@@ -1,6 +1,6 @@
 package com.datadog.featureflag;
 
-import static datadog.trace.api.config.FeatureFlaggingConfig.FLAGGING_CONFIGURATION_SOURCE;
+import static datadog.trace.api.config.FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE;
 import static datadog.trace.api.config.RemoteConfigConfig.REMOTE_CONFIGURATION_ENABLED;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -26,7 +26,7 @@
 class FeatureFlaggingSystemTest {
 
   @Test
-  @WithConfig(key = FLAGGING_CONFIGURATION_SOURCE, value = "remote_config")
+  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "remote_config")
   @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "true")
   void testFeatureFlagSystemInitialization() {
     ConfigurationPoller poller = mock(ConfigurationPoller.class);
@@ -53,7 +53,7 @@ void testFeatureFlagSystemInitialization() {
   }
 
   @Test
-  @WithConfig(key = FLAGGING_CONFIGURATION_SOURCE, value = "remote_config")
+  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "remote_config")
   @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "false")
   void testThatRemoteConfigIsRequired() {
     SharedCommunicationObjects sharedCommunicationObjects = mock(SharedCommunicationObjects.class);
@@ -68,17 +68,17 @@ void testThatRemoteConfigIsRequired() {
   }
 
   @Test
-  @WithConfig(key = FLAGGING_CONFIGURATION_SOURCE, value = "cdn")
+  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "agentless")
   @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "false")
-  void cdnConfigurationSourceUsesHttpServiceWithoutRemoteConfig() {
+  void agentlessConfigurationSourceUsesHttpServiceWithoutRemoteConfig() {
     assertInstanceOf(
         UfcHttpConfigService.class,
         FeatureFlaggingSystem.createConfigurationSourceService(
             sharedCommunicationObjects(), Config.get()));
   }
 
   @Test
-  @WithConfig(key = FLAGGING_CONFIGURATION_SOURCE, value = "remote_config")
+  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "remote_config")
   @WithConfig(key = REMOTE_CONFIGURATION_ENABLED, value = "true")
   void explicitRemoteConfigUsesRemoteConfigService() {
     SharedCommunicationObjects sharedCommunicationObjects = sharedCommunicationObjects();
@@ -92,7 +92,7 @@ void explicitRemoteConfigUsesRemoteConfigService() {
   }
 
   @Test
-  @WithConfig(key = FLAGGING_CONFIGURATION_SOURCE, value = "invalid")
+  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "invalid")
   void invalidConfigurationSourceFailsBeforeStartingNetworkSource() {
     assertThrows(
         IllegalArgumentException.class,
@@ -102,7 +102,7 @@ void invalidConfigurationSourceFailsBeforeStartingNetworkSource() {
   }
 
   @Test
-  @WithConfig(key = FLAGGING_CONFIGURATION_SOURCE, value = "offline")
+  @WithConfig(key = FEATURE_FLAGS_CONFIGURATION_SOURCE, value = "offline")
   void offlineConfigurationSourceDoesNotStartNetworkSource() {
     assertNull(
         FeatureFlaggingSystem.createConfigurationSourceService(
diff --git a/products/feature-flagging/feature-flagging-api/README.md b/products/feature-flagging/feature-flagging-api/README.md
@@ -85,5 +85,5 @@ OTEL_EXPORTER_OTLP_PROTOCOL=grpc
 ## Requirements
 
 - Java 11+
-- Datadog Agent with Remote Configuration enabled
-- `DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED=true`
+- Feature Flags provider enabled with `DD_FEATURE_FLAGS_ENABLED=true`, or left unset
+  for the default `agentless` configuration source.
diff --git a/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/UfcHttpConfigServiceTest.java b/products/feature-flagging/feature-flagging-lib/src/test/java/com/datadog/featureflag/UfcHttpConfigServiceTest.java
@@ -49,19 +49,20 @@ void cleanup() {
 
   @Test
   void appendsMockConfigPathWhenConfiguredUrlIsRoot() {
-    final Config config = config("http://mock-cdn:8092", "datadoghq.com", "");
+    final Config config = config("http://mock-backend:8092", "datadoghq.com", "");
 
     assertEquals(
-        "http://mock-cdn:8092/mock/ufc/config", UfcHttpConfigService.endpoint(config).toString());
+        "http://mock-backend:8092/mock/ufc/config",
+        UfcHttpConfigService.endpoint(config).toString());
   }
 
   @Test
   void preservesConfiguredFullEndpointUrl() {
     final Config config =
-        config("http://mock-cdn:8092/mock/ufc/config?fixture=valid", "datadoghq.com", "");
+        config("http://mock-backend:8092/mock/ufc/config?fixture=valid", "datadoghq.com", "");
 
     assertEquals(
-        "http://mock-cdn:8092/mock/ufc/config?fixture=valid",
+        "http://mock-backend:8092/mock/ufc/config?fixture=valid",
         UfcHttpConfigService.endpoint(config).toString());
   }
 
