Preserve Feature Flagging configuration source semantics

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

@@ -135,7 +135,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, true);
 
     private final String configKey;
     private final String systemProp;
@@ -282,7 +282,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);
+    featureFlaggingEnabled = isFeatureFlaggingEnabled();
 
     // setup writers when llmobs is enabled to accomodate apm and llmobs
     if (llmObsEnabled) {
@@ -1648,6 +1648,45 @@ private static boolean isFeatureEnabled(AgentFeature feature) {
     }
   }
 
+  private static boolean isFeatureFlaggingEnabled() {
+    final Boolean providerEnabled =
+        featureFlaggingBooleanSetting(FeatureFlaggingConfig.FEATURE_FLAGS_ENABLED);
+    final String configurationSource =
+        featureFlaggingSetting(FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE);
+    final Boolean legacyProviderEnabled =
+        featureFlaggingBooleanSetting(FeatureFlaggingConfig.EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED);
+
+    return !FeatureFlaggingConfig.CONFIGURATION_SOURCE_OFFLINE.equals(
+        FeatureFlaggingConfig.resolveConfigurationSource(
+            providerEnabled, configurationSource, legacyProviderEnabled));
+  }
+
+  @SuppressFBWarnings(
+      value = "NP_BOOLEAN_RETURN_NULL",
+      justification = "A null value preserves the distinction between absent and explicitly false")
+  private static Boolean featureFlaggingBooleanSetting(final String configKey) {
+    final String value = featureFlaggingSetting(configKey);
+    if (value == null) {
+      return null;
+    }
+    return Boolean.parseBoolean(value) || "1".equals(value);
+  }
+
+  private static String featureFlaggingSetting(final String configKey) {
+    final String systemProperty = propertyNameToSystemPropertyName(configKey);
+    String value = SystemProperties.get(systemProperty);
+    if (value == null) {
+      value = getStableConfig(FLEET, configKey);
+    }
+    if (value == null) {
+      value = ddGetEnv(systemProperty);
+    }
+    if (value == null) {
+      value = getStableConfig(LOCAL, configKey);
+    }
+    return value;
+  }
+
   /**
    * @see datadog.trace.api.ProductActivation#fromString(String)
    */

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

@@ -86,7 +86,6 @@
 import static datadog.trace.api.ConfigDefaults.DEFAULT_ELASTICSEARCH_BODY_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_ELASTICSEARCH_PARAMS_ENABLED;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_EXPERIMENTATAL_JEE_SPLIT_BY_DEPLOYMENT;
-import static datadog.trace.api.ConfigDefaults.DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_POLL_INTERVAL_SECONDS;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE_REQUEST_TIMEOUT_SECONDS;
 import static datadog.trace.api.ConfigDefaults.DEFAULT_GRPC_CLIENT_ERROR_STATUSES;
@@ -726,10 +725,15 @@
 import static datadog.trace.api.config.TracerConfig.WRITER_BAGGAGE_INJECT;
 import static datadog.trace.api.config.TracerConfig.WRITER_LINKS_INJECT;
 import static datadog.trace.api.config.TracerConfig.WRITER_TYPE;
+import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.CONFIGURATION_SOURCE_OFFLINE;
+import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED;
 import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE;
 import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL;
 import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS;
 import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS;
+import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.FEATURE_FLAGS_ENABLED;
+import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.isSupportedConfigurationSource;
+import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.resolveConfigurationSource;
 import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY;
 import static datadog.trace.bootstrap.instrumentation.api.WriterConstants.OTLP_WRITER_TYPE;
 import static datadog.trace.util.CollectionUtils.tryMakeImmutableList;
@@ -1221,6 +1225,7 @@ public static String getHostName() {
 
   private final int remoteConfigMaxExtraServices;
 
+  private final boolean featureFlaggingProviderEnabled;
   private final String featureFlaggingConfigurationSource;
   private final String featureFlaggingConfigurationSourceAgentlessBaseUrl;
   private final int featureFlaggingConfigurationSourcePollIntervalSeconds;
@@ -2851,10 +2856,34 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
         configProvider.getInteger(
             REMOTE_CONFIG_MAX_EXTRA_SERVICES, DEFAULT_REMOTE_CONFIG_MAX_EXTRA_SERVICES);
 
-    featureFlaggingConfigurationSource =
-        normalizeFeatureFlaggingConfigurationSource(
-            configProvider.getString(
-                FEATURE_FLAGS_CONFIGURATION_SOURCE, DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE));
+    final boolean configuredFeatureFlaggingProviderEnabled =
+        configProvider.getBoolean(FEATURE_FLAGS_ENABLED, true);
+    final Boolean legacyFeatureFlaggingProviderEnabled =
+        configProvider.getBoolean(EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED);
+    final String configuredFeatureFlaggingConfigurationSource =
+        configProvider.isSet(FEATURE_FLAGS_CONFIGURATION_SOURCE)
+            ? configProvider.getString(FEATURE_FLAGS_CONFIGURATION_SOURCE)
+            : null;
+    final String resolvedFeatureFlaggingConfigurationSource =
+        resolveConfigurationSource(
+            configuredFeatureFlaggingProviderEnabled,
+            configuredFeatureFlaggingConfigurationSource,
+            legacyFeatureFlaggingProviderEnabled);
+    if (legacyFeatureFlaggingProviderEnabled != null) {
+      log.warn(
+          "Setting {} is deprecated. Use {} and {} instead.",
+          EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED,
+          FEATURE_FLAGS_ENABLED,
+          FEATURE_FLAGS_CONFIGURATION_SOURCE);
+    }
+    if (!isSupportedConfigurationSource(configuredFeatureFlaggingConfigurationSource)) {
+      log.warn(
+          "Unsupported Feature Flagging configuration source: {}. Disabling Feature Flagging",
+          configuredFeatureFlaggingConfigurationSource);
+    }
+    featureFlaggingProviderEnabled =
+        !CONFIGURATION_SOURCE_OFFLINE.equals(resolvedFeatureFlaggingConfigurationSource);
+    featureFlaggingConfigurationSource = resolvedFeatureFlaggingConfigurationSource;
     featureFlaggingConfigurationSourceAgentlessBaseUrl =
         configProvider.getStringNotEmpty(
             FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_BASE_URL, null);
@@ -3797,28 +3826,6 @@ public boolean isInferredProxyPropagationEnabled() {
     return traceInferredProxyEnabled;
   }
 
-  private static String normalizeFeatureFlaggingConfigurationSource(final String source) {
-    if (source == null) {
-      return DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE;
-    }
-    final String normalized = source.trim().toLowerCase(Locale.ROOT);
-    if (normalized.isEmpty()) {
-      return DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE;
-    }
-    switch (normalized) {
-      case "agentless":
-      case "remote_config":
-      case "offline":
-        return normalized;
-      default:
-        log.warn(
-            "Unsupported Feature Flagging configuration source: {}. Defaulting to {}",
-            source,
-            DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE);
-        return DEFAULT_FEATURE_FLAGGING_CONFIGURATION_SOURCE;
-    }
-  }
-
   public boolean isBaggageExtract() {
     return tracePropagationStylesToExtract.contains(TracePropagationStyle.BAGGAGE);
   }
@@ -4736,6 +4743,10 @@ public int getRemoteConfigMaxExtraServices() {
     return remoteConfigMaxExtraServices;
   }
 
+  public boolean isFeatureFlaggingProviderEnabled() {
+    return featureFlaggingProviderEnabled;
+  }
+
   public String getFeatureFlaggingConfigurationSource() {
     return featureFlaggingConfigurationSource;
   }
@@ -6584,6 +6595,8 @@ public String toString() {
         + remoteConfigMaxPayloadSize
         + ", remoteConfigIntegrityCheckEnabled="
         + remoteConfigIntegrityCheckEnabled
+        + ", featureFlaggingProviderEnabled="
+        + featureFlaggingProviderEnabled
         + ", featureFlaggingConfigurationSource="
         + featureFlaggingConfigurationSource
         + ", featureFlaggingConfigurationSourceAgentlessBaseUrl="

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

@@ -57,9 +57,11 @@ import static datadog.trace.api.config.GeneralConfig.TAGS
 import static datadog.trace.api.config.GeneralConfig.TRACER_METRICS_IGNORED_RESOURCES
 import static datadog.trace.api.config.GeneralConfig.TRACE_OTEL_SEMANTICS_ENABLED
 import static datadog.trace.api.config.GeneralConfig.VERSION
+import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED
 import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE
 import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS
 import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS
+import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.FEATURE_FLAGS_ENABLED
 import static datadog.trace.api.config.JmxFetchConfig.JMX_FETCH_CHECK_PERIOD
 import static datadog.trace.api.config.JmxFetchConfig.JMX_FETCH_ENABLED
 import static datadog.trace.api.config.JmxFetchConfig.JMX_FETCH_METRICS_CONFIGS
@@ -3517,7 +3519,39 @@ class ConfigTest extends DDSpecification {
     ""                  | "agentless"
     "   "               | "agentless"
     " ReMoTe_ConFiG "   | "remote_config"
-    "not-a-real-source" | "agentless"
+    "not-a-real-source" | "offline"
+  }
+
+  def "feature flag configuration applies migration precedence"() {
+    setup:
+    Properties properties = new Properties()
+    if (providerEnabled != null) {
+      properties.setProperty(FEATURE_FLAGS_ENABLED, providerEnabled.toString())
+    }
+    if (source != null) {
+      properties.setProperty(FEATURE_FLAGS_CONFIGURATION_SOURCE, source)
+    }
+    if (legacyProviderEnabled != null) {
+      properties.setProperty(EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED, legacyProviderEnabled.toString())
+    }
+
+    when:
+    def config = new Config(ConfigProvider.withPropertiesOverride(properties))
+
+    then:
+    config.featureFlaggingProviderEnabled == expectedEnabled
+    config.featureFlaggingConfigurationSource == expectedSource
+
+    where:
+    providerEnabled | source          | legacyProviderEnabled | expectedEnabled | expectedSource
+    null            | null            | null                  | true            | "agentless"
+    null            | null            | true                  | true            | "remote_config"
+    null            | null            | false                 | false           | "offline"
+    null            | "agentless"     | true                  | true            | "agentless"
+    null            | "remote_config" | false                 | true            | "remote_config"
+    false           | "agentless"     | true                  | false           | "offline"
+    true            | null            | false                 | false           | "offline"
+    null            | "offline"       | null                  | false           | "offline"
   }
 
   def "agentless feature flag timing falls back for non-positive values"() {

metadata/supported-configurations.json

@@ -1497,6 +1497,14 @@
         "aliases": []
       }
     ],
+    "DD_FEATURE_FLAGS_ENABLED": [
+      {
+        "version": "A",
+        "type": "boolean",
+        "default": "true",
+        "aliases": []
+      }
+    ],
     "DD_FEATURE_FLAGS_CONFIGURATION_SOURCE": [
       {
         "version": "A",
@@ -11986,5 +11994,7 @@
       }
     ]
   },
-  "deprecations": {}
+  "deprecations": {
+    "DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED": "DD_FEATURE_FLAGS_ENABLED"
+  }
 }

products/feature-flagging/feature-flagging-agent/build.gradle.kts

@@ -17,6 +17,7 @@ dependencies {
   api(libs.slf4j)
   api(project(":products:feature-flagging:feature-flagging-lib"))
   api(project(":internal-api"))
+  compileOnly(project(":products:feature-flagging:feature-flagging-config"))
 
   testImplementation(libs.bundles.junit5)
   testImplementation(libs.bundles.mockito)