fix(ffe): use canonical feature flags kill switch

Author: leoromanovsky

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, true);
+    FEATURE_FLAGGING(FeatureFlaggingConfig.FEATURE_FLAGS_ENABLED, true);
 
     private final String configKey;
     private final String systemProp;
@@ -1650,7 +1650,7 @@ private static boolean isFeatureEnabled(AgentFeature feature) {
 
   private static boolean isFeatureFlaggingEnabled() {
     final Boolean providerEnabled =
-        featureFlaggingBooleanSetting(FeatureFlaggingConfig.FLAGGING_PROVIDER_ENABLED);
+        featureFlaggingBooleanSetting(FeatureFlaggingConfig.FEATURE_FLAGS_ENABLED);
     final String configurationSource =
         featureFlaggingSetting(FeatureFlaggingConfig.FEATURE_FLAGS_CONFIGURATION_SOURCE);
     final Boolean legacyProviderEnabled =

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

@@ -731,7 +731,7 @@
 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.FLAGGING_PROVIDER_ENABLED;
+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;
@@ -2857,7 +2857,7 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
             REMOTE_CONFIG_MAX_EXTRA_SERVICES, DEFAULT_REMOTE_CONFIG_MAX_EXTRA_SERVICES);
 
     final boolean configuredFeatureFlaggingProviderEnabled =
-        configProvider.getBoolean(FLAGGING_PROVIDER_ENABLED, true);
+        configProvider.getBoolean(FEATURE_FLAGS_ENABLED, true);
     final Boolean legacyFeatureFlaggingProviderEnabled =
         configProvider.getBoolean(EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED);
     final String configuredFeatureFlaggingConfigurationSource =
@@ -2873,7 +2873,7 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
       log.warn(
           "Setting {} is deprecated. Use {} and {} instead.",
           EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED,
-          FLAGGING_PROVIDER_ENABLED,
+          FEATURE_FLAGS_ENABLED,
           FEATURE_FLAGS_CONFIGURATION_SOURCE);
     }
     if (!isSupportedConfigurationSource(configuredFeatureFlaggingConfigurationSource)) {

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

@@ -61,7 +61,7 @@ import static datadog.trace.api.featureflag.config.FeatureFlaggingConfig.EXPERIM
 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.FLAGGING_PROVIDER_ENABLED
+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
@@ -3526,7 +3526,7 @@ class ConfigTest extends DDSpecification {
     setup:
     Properties properties = new Properties()
     if (providerEnabled != null) {
-      properties.setProperty(FLAGGING_PROVIDER_ENABLED, providerEnabled.toString())
+      properties.setProperty(FEATURE_FLAGS_ENABLED, providerEnabled.toString())
     }
     if (source != null) {
       properties.setProperty(FEATURE_FLAGS_CONFIGURATION_SOURCE, source)

metadata/supported-configurations.json

@@ -1497,7 +1497,7 @@
         "aliases": []
       }
     ],
-    "DD_FEATURE_FLAGGING_PROVIDER_ENABLED": [
+    "DD_FEATURE_FLAGS_ENABLED": [
       {
         "version": "A",
         "type": "boolean",
@@ -11995,6 +11995,6 @@
     ]
   },
   "deprecations": {
-    "DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED": "DD_FEATURE_FLAGGING_PROVIDER_ENABLED"
+    "DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED": "DD_FEATURE_FLAGS_ENABLED"
   }
 }

products/feature-flagging/feature-flagging-config/src/main/java/datadog/trace/api/featureflag/config/FeatureFlaggingConfig.java

@@ -6,13 +6,13 @@ public class FeatureFlaggingConfig {
   public static final String CONFIGURATION_SOURCE_OFFLINE = "offline";
   public static final String CONFIGURATION_SOURCE_REMOTE_CONFIG = "remote_config";
 
-  public static final String FLAGGING_PROVIDER_ENABLED = "feature.flagging.provider.enabled";
+  public static final String FEATURE_FLAGS_ENABLED = "feature.flags.enabled";
   public static final String EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED =
       "experimental.flagging.provider.enabled";
 
   /**
    * Opt-in gate for APM span enrichment with feature-flag evaluation metadata. DISTINCT from {@link
-   * #FLAGGING_PROVIDER_ENABLED} and OFF by default — enabling the provider does not enable span
+   * #FEATURE_FLAGS_ENABLED} and OFF by default — enabling the provider does not enable span
    * enrichment.
    */
   public static final String EXPERIMENTAL_SPAN_ENRICHMENT_ENABLED =