Skip to content

Commit 54af2dd

Browse files
chore(appsec): rename request body sampling env var
1 parent 081af53 commit 54af2dd

4 files changed

Lines changed: 37 additions & 2 deletions

File tree

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
package com.datadog.appsec.api.security
22

3+
import static datadog.trace.api.config.AppSecConfig.API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE
4+
import static datadog.trace.api.config.AppSecConfig.API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE
5+
import static datadog.trace.api.config.AppSecConfig.API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE
6+
37
import com.datadog.appsec.gateway.AppSecRequestContext
8+
import datadog.trace.api.Config
49
import datadog.trace.test.util.DDSpecification
510

611
class ApiSecurityDownstreamSamplerTest extends DDSpecification {
@@ -43,4 +48,22 @@ class ApiSecurityDownstreamSamplerTest extends DDSpecification {
4348
where:
4449
rate << [-1.0, 0.0, 0.1, 0.25, 0.5, 0.75, 0.9, 1.0, 2.0]
4550
}
51+
52+
void 'test config aliases'() {
53+
setup:
54+
injectSysConfig(env, "0.25")
55+
56+
when:
57+
final value = Config.get().getApiSecurityDownstreamRequestBodyAnalysisSampleRate()
58+
59+
then:
60+
value == 0.25
61+
62+
where:
63+
env << [
64+
API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE,
65+
API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE,
66+
API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE,
67+
]
68+
}
4669
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ public final class AppSecConfig {
3232
"api-security.endpoint.collection.enabled";
3333
public static final String API_SECURITY_ENDPOINT_COLLECTION_MESSAGE_LIMIT =
3434
"api-security.endpoint.collection.message.limit";
35+
public static final String API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE =
36+
"api-security.downstream.body.analysis.sample_rate";
3537
public static final String API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE =
3638
"api-security.downstream.request.analysis.sample_rate";
3739
public static final String API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE =

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@
203203
import static datadog.trace.api.config.AIGuardConfig.DEFAULT_AI_GUARD_MAX_CONTENT_SIZE;
204204
import static datadog.trace.api.config.AIGuardConfig.DEFAULT_AI_GUARD_MAX_MESSAGES_LENGTH;
205205
import static datadog.trace.api.config.AIGuardConfig.DEFAULT_AI_GUARD_TIMEOUT;
206+
import static datadog.trace.api.config.AppSecConfig.API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE;
206207
import static datadog.trace.api.config.AppSecConfig.API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE;
207208
import static datadog.trace.api.config.AppSecConfig.API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE;
208209
import static datadog.trace.api.config.AppSecConfig.API_SECURITY_ENABLED;
@@ -2330,9 +2331,10 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
23302331
DEFAULT_API_SECURITY_MAX_DOWNSTREAM_REQUEST_BODY_ANALYSIS);
23312332
apiSecurityDownstreamRequestBodyAnalysisSampleRate =
23322333
configProvider.getDouble(
2333-
API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE,
2334+
API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE,
23342335
DEFAULT_API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE,
2335-
API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE);
2336+
API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE,
2337+
API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE);
23362338

23372339
// Trace Resource Renaming (Endpoint Inference) configuration
23382340
// Default: enabled if AppSec is enabled, otherwise disabled

metadata/supported-configurations.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,14 @@
129129
"aliases": []
130130
}
131131
],
132+
"DD_API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE": [
133+
{
134+
"version": "A",
135+
"type": "decimal",
136+
"default": "0.5",
137+
"aliases": ["DD_API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE", "DD_API_SECURITY_DOWNSTREAM_REQUEST_BODY_ANALYSIS_SAMPLE_RATE"]
138+
}
139+
],
132140
"DD_API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE": [
133141
{
134142
"version": "A",

0 commit comments

Comments
 (0)