Skip to content

Commit 553bc3e

Browse files
jandro996devflow.devflow-routing-intake
andauthored
remove(appsec): delete dead DD_APPSEC_REPORTING_INBAND and DD_APPSEC_REPORT_TIMEOUT config keys (#11664)
remove(appsec): delete dead DD_APPSEC_REPORTING_INBAND and DD_APPSEC_REPORT_TIMEOUT config keys Both config keys were introduced in 2021 (reporting inband in #1d1fc13, report timeout in #2fd53d8) but the classes that consumed them (InbandReportServiceImpl and ReportServiceImpl) were subsequently removed. The getters isAppSecReportingInband(), getAppSecReportMinTimeout() and getAppSecReportMaxTimeout() are now dead code — no caller exists in the codebase. Remove the constants, defaults, fields, assignments and getters. Refs: APPSEC-68459 remove(appsec): delete dead DD_APPSEC_REPORTING_INBAND and DD_APPSEC_REPORT_TIMEOUT from supported-configurations metadata Follow-up to the previous commit removing these keys from Config.java. The metadata/supported-configurations.json entries for DD_APPSEC_REPORTING_INBAND and DD_APPSEC_REPORT_TIMEOUT were still advertising these config keys as supported, which caused GeneratedSupportedConfigurations to include them even though Config no longer reads them. Merge branch 'master' into alejandro.gonzalez/APPSEC-68459-remove-dead-appsec-config Merge branch 'master' into alejandro.gonzalez/APPSEC-68459-remove-dead-appsec-config Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>
1 parent 4cf4023 commit 553bc3e

4 files changed

Lines changed: 0 additions & 45 deletions

File tree

dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ public final class ConfigDefaults {
140140
static final boolean DEFAULT_APP_LOGS_COLLECTION_ENABLED = false;
141141

142142
static final String DEFAULT_APPSEC_ENABLED = "inactive";
143-
static final boolean DEFAULT_APPSEC_REPORTING_INBAND = false;
144143
static final int DEFAULT_APPSEC_TRACE_RATE_LIMIT = 100;
145144
static final boolean DEFAULT_APPSEC_WAF_METRICS = true;
146145
static final int DEFAULT_APPSEC_WAF_TIMEOUT = 100000; // 0.1 s

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
public final class AppSecConfig {
55

66
public static final String APPSEC_ENABLED = "appsec.enabled";
7-
public static final String APPSEC_REPORTING_INBAND = "appsec.reporting.inband";
87
public static final String APPSEC_RULES_FILE = "appsec.rules";
9-
public static final String APPSEC_REPORT_TIMEOUT_SEC = "appsec.report.timeout";
108
public static final String APPSEC_IP_ADDR_HEADER = "appsec.ipheader";
119
public static final String APPSEC_TRACE_RATE_LIMIT = "appsec.trace.rate.limit";
1210
public static final String APPSEC_WAF_METRICS = "appsec.waf.metrics";

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

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_MAX_FILE_CONTENT_COUNT;
1717
import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_MAX_STACK_TRACES;
1818
import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_MAX_STACK_TRACE_DEPTH;
19-
import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_REPORTING_INBAND;
2019
import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_SCA_MAX_TRACKED_DEPENDENCIES;
2120
import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_STACK_TRACE_ENABLED;
2221
import static datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_TRACE_RATE_LIMIT;
@@ -233,8 +232,6 @@
233232
import static datadog.trace.api.config.AppSecConfig.APPSEC_MAX_STACK_TRACE_DEPTH;
234233
import static datadog.trace.api.config.AppSecConfig.APPSEC_OBFUSCATION_PARAMETER_KEY_REGEXP;
235234
import static datadog.trace.api.config.AppSecConfig.APPSEC_OBFUSCATION_PARAMETER_VALUE_REGEXP;
236-
import static datadog.trace.api.config.AppSecConfig.APPSEC_REPORTING_INBAND;
237-
import static datadog.trace.api.config.AppSecConfig.APPSEC_REPORT_TIMEOUT_SEC;
238235
import static datadog.trace.api.config.AppSecConfig.APPSEC_RULES_FILE;
239236
import static datadog.trace.api.config.AppSecConfig.APPSEC_SCA_ENABLED;
240237
import static datadog.trace.api.config.AppSecConfig.APPSEC_SCA_MAX_TRACKED_DEPENDENCIES;
@@ -1071,10 +1068,7 @@ public static String getHostName() {
10711068

10721069
private final boolean clientIpEnabled;
10731070

1074-
private final boolean appSecReportingInband;
10751071
private final String appSecRulesFile;
1076-
private final int appSecReportMinTimeout;
1077-
private final int appSecReportMaxTimeout;
10781072
private final int appSecTraceRateLimit;
10791073
private final boolean appSecWafMetrics;
10801074
private final int appSecWafTimeout;
@@ -2463,14 +2457,8 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
24632457
DEFAULT_TELEMETRY_DEPENDENCY_RESOLUTION_QUEUE_SIZE);
24642458
clientIpEnabled = configProvider.getBoolean(CLIENT_IP_ENABLED, DEFAULT_CLIENT_IP_ENABLED);
24652459

2466-
appSecReportingInband =
2467-
configProvider.getBoolean(APPSEC_REPORTING_INBAND, DEFAULT_APPSEC_REPORTING_INBAND);
24682460
appSecRulesFile = configProvider.getString(APPSEC_RULES_FILE, null);
24692461

2470-
// Default AppSec report timeout min=5, max=60
2471-
appSecReportMaxTimeout = configProvider.getInteger(APPSEC_REPORT_TIMEOUT_SEC, 60);
2472-
appSecReportMinTimeout = Math.min(appSecReportMaxTimeout, 5);
2473-
24742462
appSecTraceRateLimit =
24752463
configProvider.getInteger(APPSEC_TRACE_RATE_LIMIT, DEFAULT_APPSEC_TRACE_RATE_LIMIT);
24762464

@@ -4098,18 +4086,6 @@ public ProductActivation getAppSecActivation() {
40984086
return instrumenterConfig.getAppSecActivation();
40994087
}
41004088

4101-
public boolean isAppSecReportingInband() {
4102-
return appSecReportingInband;
4103-
}
4104-
4105-
public int getAppSecReportMinTimeout() {
4106-
return appSecReportMinTimeout;
4107-
}
4108-
4109-
public int getAppSecReportMaxTimeout() {
4110-
return appSecReportMaxTimeout;
4111-
}
4112-
41134089
public int getAppSecTraceRateLimit() {
41144090
return appSecTraceRateLimit;
41154091
}
@@ -6570,8 +6546,6 @@ public String toString() {
65706546
+ grpcClientErrorStatuses
65716547
+ ", clientIpEnabled="
65726548
+ clientIpEnabled
6573-
+ ", appSecReportingInband="
6574-
+ appSecReportingInband
65756549
+ ", appSecRulesFile='"
65766550
+ appSecRulesFile
65776551
+ "'"

metadata/supported-configurations.json

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -361,22 +361,6 @@
361361
"aliases": []
362362
}
363363
],
364-
"DD_APPSEC_REPORTING_INBAND": [
365-
{
366-
"version": "A",
367-
"type": "boolean",
368-
"default": "false",
369-
"aliases": []
370-
}
371-
],
372-
"DD_APPSEC_REPORT_TIMEOUT": [
373-
{
374-
"version": "A",
375-
"type": "int",
376-
"default": "60",
377-
"aliases": []
378-
}
379-
],
380364
"DD_APPSEC_RULES": [
381365
{
382366
"version": "C",

0 commit comments

Comments
 (0)