Skip to content

Apply the standard nomenclature to the stacktrace configs #8244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jandro996 merged 4 commits into from
Jan 20, 2025
Merged

Apply the standard nomenclature to the stacktrace configs #8244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
929c372
Apply the standard nomenclature to the stacktrace configs
jandro996 Jan 17, 2025
1506fd5
rename to add the DEPRECATED subfix
jandro996 Jan 17, 2025
02d36a5
Merge branch 'master' into alejandro.gonzalez/Standardize-stacktrace-…
jandro996 Jan 20, 2025
20a900c
Merge branch 'master' into alejandro.gonzalez/Standardize-stacktrace-…
jandro996 Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions dd-trace-api/src/main/java/datadog/trace/api/config/AppSecConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,15 @@ public final class AppSecConfig {

public static final String APPSEC_SCA_ENABLED = "appsec.sca.enabled";
public static final String APPSEC_RASP_ENABLED = "appsec.rasp.enabled";
public static final String APPSEC_STACK_TRACE_ENABLED = "appsec.stacktrace.enabled";
public static final String APPSEC_MAX_STACK_TRACES = "appsec.max.stacktraces";
public static final String APPSEC_MAX_STACK_TRACE_DEPTH = "appsec.max.stacktrace.depth";
public static final String APPSEC_STACK_TRACE_ENABLED = "appsec.stack-trace.enabled";
public static final String APPSEC_STACKTRACE_ENABLED_DEPRECATED =
"appsec.stacktrace.enabled"; // old non-standard as a fallback alias
public static final String APPSEC_MAX_STACK_TRACES = "appsec.max.stack-traces";
public static final String APPSEC_MAX_STACKTRACES_DEPRECATED =
"appsec.max.stacktraces"; // old non-standard as a fallback alias
public static final String APPSEC_MAX_STACK_TRACE_DEPTH = "appsec.max.stack-trace.depth";
public static final String APPSEC_MAX_STACKTRACE_DEPTH_DEPRECATED =
"appsec.max.stacktrace.depth"; // old non-standard as a fallback alias

public static final String APPSEC_STANDALONE_ENABLED = "experimental.appsec.standalone.enabled";

Expand Down
8 changes: 6 additions & 2 deletions dd-trace-api/src/main/java/datadog/trace/api/config/IastConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ public final class IastConfig {
public static final String IAST_REDACTION_ENABLED = "iast.redaction.enabled";
public static final String IAST_REDACTION_NAME_PATTERN = "iast.redaction.name.pattern";
public static final String IAST_REDACTION_VALUE_PATTERN = "iast.redaction.value.pattern";
public static final String IAST_STACKTRACE_LEAK_SUPPRESS = "iast.stacktrace-leak.suppress";
public static final String IAST_STACK_TRACE_LEAK_SUPPRESS = "iast.stack-trace-leak.suppress";
public static final String IAST_STACKTRACE_LEAK_SUPPRESS_DEPRECATED =
"iast.stacktrace-leak.suppress"; // old non-standard as a fallback alias
public static final String IAST_HARDCODED_SECRET_ENABLED = "iast.hardcoded-secret.enabled";
public static final String IAST_MAX_RANGE_COUNT = "iast.max-range-count";
public static final String IAST_TRUNCATION_MAX_VALUE_LENGTH = "iast.truncation.max.value.length";
Expand All @@ -26,7 +28,9 @@ public final class IastConfig {
public static final String IAST_SOURCE_MAPPING_MAX_SIZE = "iast.source-mapping.max-size";
public static final String IAST_EXPERIMENTAL_PROPAGATION_ENABLED =
"iast.experimental.propagation.enabled";
public static final String IAST_STACK_TRACE_ENABLED = "iast.stacktrace.enabled";
public static final String IAST_STACK_TRACE_ENABLED = "iast.stack-trace.enabled";
public static final String IAST_STACKTRACE_ENABLED_DEPRECATED =
"iast.stacktrace.enabled"; // old non-standard as a fallback alias
public static final String IAST_SECURITY_CONTROLS_CONFIGURATION =
"iast.security-controls.configuration";
public static final String IAST_DB_ROWS_TO_TAINT = "iast.db.rows-to-taint";
Expand Down
23 changes: 18 additions & 5 deletions internal-api/src/main/java/datadog/trace/api/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1284,12 +1284,20 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
appSecStandaloneEnabled = configProvider.getBoolean(APPSEC_STANDALONE_ENABLED, false);
appSecRaspEnabled = configProvider.getBoolean(APPSEC_RASP_ENABLED, DEFAULT_APPSEC_RASP_ENABLED);
appSecStackTraceEnabled =
configProvider.getBoolean(APPSEC_STACK_TRACE_ENABLED, DEFAULT_APPSEC_STACK_TRACE_ENABLED);
configProvider.getBoolean(
APPSEC_STACK_TRACE_ENABLED,
DEFAULT_APPSEC_STACK_TRACE_ENABLED,
APPSEC_STACKTRACE_ENABLED_DEPRECATED);
appSecMaxStackTraces =
configProvider.getInteger(APPSEC_MAX_STACK_TRACES, DEFAULT_APPSEC_MAX_STACK_TRACES);
configProvider.getInteger(
APPSEC_MAX_STACK_TRACES,
DEFAULT_APPSEC_MAX_STACK_TRACES,
APPSEC_MAX_STACKTRACES_DEPRECATED);
appSecMaxStackTraceDepth =
configProvider.getInteger(
APPSEC_MAX_STACK_TRACE_DEPTH, DEFAULT_APPSEC_MAX_STACK_TRACE_DEPTH);
APPSEC_MAX_STACK_TRACE_DEPTH,
DEFAULT_APPSEC_MAX_STACK_TRACE_DEPTH,
APPSEC_MAX_STACKTRACE_DEPTH_DEPRECATED);
apiSecurityEnabled =
configProvider.getBoolean(
API_SECURITY_ENABLED, DEFAULT_API_SECURITY_ENABLED, API_SECURITY_ENABLED_EXPERIMENTAL);
Expand Down Expand Up @@ -1330,7 +1338,9 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
iastMaxRangeCount = iastDetectionMode.getIastMaxRangeCount(configProvider);
iastStacktraceLeakSuppress =
configProvider.getBoolean(
IAST_STACKTRACE_LEAK_SUPPRESS, DEFAULT_IAST_STACKTRACE_LEAK_SUPPRESS);
IAST_STACK_TRACE_LEAK_SUPPRESS,
DEFAULT_IAST_STACKTRACE_LEAK_SUPPRESS,
IAST_STACKTRACE_LEAK_SUPPRESS_DEPRECATED);
iastHardcodedSecretEnabled =
configProvider.getBoolean(
IAST_HARDCODED_SECRET_ENABLED, DEFAULT_IAST_HARDCODED_SECRET_ENABLED);
Expand All @@ -1340,7 +1350,10 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
iastSourceMappingEnabled = configProvider.getBoolean(IAST_SOURCE_MAPPING_ENABLED, false);
iastSourceMappingMaxSize = configProvider.getInteger(IAST_SOURCE_MAPPING_MAX_SIZE, 1000);
iastStackTraceEnabled =
configProvider.getBoolean(IAST_STACK_TRACE_ENABLED, DEFAULT_IAST_STACK_TRACE_ENABLED);
configProvider.getBoolean(
IAST_STACK_TRACE_ENABLED,
DEFAULT_IAST_STACK_TRACE_ENABLED,
IAST_STACKTRACE_ENABLED_DEPRECATED);
iastExperimentalPropagationEnabled =
configProvider.getBoolean(IAST_EXPERIMENTAL_PROPAGATION_ENABLED, false);
iastSecurityControlsConfiguration =
Expand Down
Loading