Rename request body sampling env var (#11162)

chore(appsec): rename request body sampling env var

Merge branch 'master' into malvarez/appsec-rename-body-var

Merge branch 'master' into malvarez/appsec-rename-body-var

Merge branch 'master' into malvarez/appsec-rename-body-var

Update aliases as per feature parity

Merge branch 'master' into malvarez/appsec-rename-body-var

Co-authored-by: manuel.alvarezalvarez <manuel.alvarezalvarez@datadoghq.com>

Author: manuel-alvarez-alvarez

dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/api/security/ApiSecurityDownstreamSamplerTest.groovy

@@ -1,6 +1,11 @@
 package com.datadog.appsec.api.security
 
+import static datadog.trace.api.config.AppSecConfig.API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE
+import static datadog.trace.api.config.AppSecConfig.API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE
+import static datadog.trace.api.config.AppSecConfig.API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE
+
 import com.datadog.appsec.gateway.AppSecRequestContext
+import datadog.trace.api.Config
 import datadog.trace.test.util.DDSpecification
 
 class ApiSecurityDownstreamSamplerTest extends DDSpecification {
@@ -43,4 +48,22 @@ class ApiSecurityDownstreamSamplerTest extends DDSpecification {
     where:
     rate << [-1.0, 0.0, 0.1, 0.25, 0.5, 0.75, 0.9, 1.0, 2.0]
   }
+
+  void 'test config aliases'() {
+    setup:
+    injectSysConfig(env, "0.25")
+
+    when:
+    final value = Config.get().getApiSecurityDownstreamRequestBodyAnalysisSampleRate()
+
+    then:
+    value == 0.25
+
+    where:
+    env << [
+      API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE,
+      API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE,
+      API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE,
+    ]
+  }
 }

dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java

@@ -30,6 +30,8 @@ public final class AppSecConfig {
       "api-security.endpoint.collection.enabled";
   public static final String API_SECURITY_ENDPOINT_COLLECTION_MESSAGE_LIMIT =
       "api-security.endpoint.collection.message.limit";
+  public static final String API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE =
+      "api-security.downstream.body.analysis.sample_rate";
   public static final String API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE =
       "api-security.downstream.request.analysis.sample_rate";
   public static final String API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE =

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

@@ -214,6 +214,7 @@
 import static datadog.trace.api.config.AIGuardConfig.DEFAULT_AI_GUARD_MAX_CONTENT_SIZE;
 import static datadog.trace.api.config.AIGuardConfig.DEFAULT_AI_GUARD_MAX_MESSAGES_LENGTH;
 import static datadog.trace.api.config.AIGuardConfig.DEFAULT_AI_GUARD_TIMEOUT;
+import static datadog.trace.api.config.AppSecConfig.API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE;
 import static datadog.trace.api.config.AppSecConfig.API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE;
 import static datadog.trace.api.config.AppSecConfig.API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE;
 import static datadog.trace.api.config.AppSecConfig.API_SECURITY_ENABLED;
@@ -2556,9 +2557,10 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
             DEFAULT_API_SECURITY_MAX_DOWNSTREAM_REQUEST_BODY_ANALYSIS);
     apiSecurityDownstreamRequestBodyAnalysisSampleRate =
         configProvider.getDouble(
-            API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE,
+            API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE,
             DEFAULT_API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE,
-            API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE);
+            API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE,
+            API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE);
 
     // Trace Resource Renaming (Endpoint Inference) configuration
     // Default: enabled if AppSec is enabled, otherwise disabled

metadata/supported-configurations.json

@@ -129,6 +129,14 @@
         "aliases": []
       }
     ],
+    "DD_API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE": [
+      {
+        "version": "A",
+        "type": "decimal",
+        "default": "0.5",
+        "aliases": []
+      }
+    ],
     "DD_API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE": [
       {
         "version": "A",