Skip to content

[CWS] add jwt as default sensitive word#48967

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit intomainfrom
safchain/scrubber-jwt
Apr 8, 2026
Merged

[CWS] add jwt as default sensitive word#48967
gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit intomainfrom
safchain/scrubber-jwt

Conversation

@safchain
Copy link
Copy Markdown
Contributor

@safchain safchain commented Apr 7, 2026

What does this PR do?

Motivation

Describe how you validated your changes

Additional Notes

@safchain safchain added this to the Triage milestone Apr 7, 2026
@safchain safchain requested a review from a team as a code owner April 7, 2026 17:17
@safchain safchain added changelog/no-changelog No changelog entry needed team/agent-security category/improvement qa/done QA done before merge and regressions are covered by tests labels Apr 7, 2026
@dd-octo-sts dd-octo-sts bot added the internal Identify a non-fork PR label Apr 7, 2026
@github-actions github-actions bot added the short review PR is simple enough to be reviewed quickly label Apr 7, 2026
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ef6db1b347

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".


var (
additionals = []string{"*token*"}
additionals = []string{"token", "jwt"}
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Keep wildcard token matching in default sensitive words

Changing additionals from *token* to token narrows scrubbing from substring matches to only the exact key --token (per CompileStringsToRegex, non-wildcard words must match immediately before the delimiter). This means keys that were previously scrubbed, such as --session_token, --id_token, or --mytoken, will now leak their values in CWS command-line data; this is a regression in sensitive-data redaction introduced by this commit while adding JWT support.

Useful? React with 👍 / 👎.

@agent-platform-auto-pr
Copy link
Copy Markdown
Contributor

agent-platform-auto-pr bot commented Apr 7, 2026

Files inventory check summary

File checks results against ancestor 21276c47:

Results for datadog-agent_7.79.0~devel.git.471.a2592ce.pipeline.106687606-1_amd64.deb:

No change detected

@agent-platform-auto-pr
Copy link
Copy Markdown
Contributor

agent-platform-auto-pr bot commented Apr 7, 2026

Static quality checks

✅ Please find below the results from static quality gates
Comparison made with ancestor 21276c4
📊 Static Quality Gates Dashboard
🔗 SQG Job

30 successful checks with minimal change (< 2 KiB)
Quality gate Current Size
agent_deb_amd64 753.303 MiB
agent_deb_amd64_fips 710.215 MiB
agent_heroku_amd64 313.462 MiB
agent_rpm_amd64 753.287 MiB
agent_rpm_amd64_fips 710.199 MiB
agent_rpm_arm64 731.662 MiB
agent_rpm_arm64_fips 691.626 MiB
agent_suse_amd64 753.287 MiB
agent_suse_amd64_fips 710.199 MiB
agent_suse_arm64 731.662 MiB
agent_suse_arm64_fips 691.626 MiB
docker_agent_amd64 813.575 MiB
docker_agent_arm64 816.752 MiB
docker_agent_jmx_amd64 1004.491 MiB
docker_agent_jmx_arm64 996.446 MiB
docker_cluster_agent_amd64 204.103 MiB
docker_cluster_agent_arm64 218.547 MiB
docker_cws_instrumentation_amd64 7.142 MiB
docker_cws_instrumentation_arm64 6.689 MiB
docker_dogstatsd_amd64 39.266 MiB
docker_dogstatsd_arm64 37.507 MiB
dogstatsd_deb_amd64 29.913 MiB
dogstatsd_deb_arm64 28.062 MiB
dogstatsd_rpm_amd64 29.913 MiB
dogstatsd_suse_amd64 29.913 MiB
iot_agent_deb_amd64 43.297 MiB
iot_agent_deb_arm64 40.344 MiB
iot_agent_deb_armhf 41.092 MiB
iot_agent_rpm_amd64 43.298 MiB
iot_agent_suse_amd64 43.298 MiB
On-wire sizes (compressed)
Quality gate Change Size (prev → curr → max)
agent_deb_amd64 +28.05 KiB (0.02% increase) 174.830 → 174.858 → 178.360
agent_deb_amd64_fips +7.77 KiB (0.00% increase) 165.397 → 165.405 → 172.790
agent_heroku_amd64 +5.4 KiB (0.01% increase) 75.036 → 75.042 → 79.970
agent_rpm_amd64 +28.75 KiB (0.02% increase) 177.600 → 177.628 → 181.830
agent_rpm_amd64_fips neutral 167.758 MiB → 173.370
agent_rpm_arm64 neutral 159.611 MiB → 163.060
agent_rpm_arm64_fips +11.97 KiB (0.01% increase) 151.475 → 151.487 → 156.170
agent_suse_amd64 +28.75 KiB (0.02% increase) 177.600 → 177.628 → 181.830
agent_suse_amd64_fips neutral 167.758 MiB → 173.370
agent_suse_arm64 neutral 159.611 MiB → 163.060
agent_suse_arm64_fips +11.97 KiB (0.01% increase) 151.475 → 151.487 → 156.170
docker_agent_amd64 neutral 268.257 MiB → 272.480
docker_agent_arm64 -4.88 KiB (0.00% reduction) 255.450 → 255.445 → 261.060
docker_agent_jmx_amd64 neutral 336.916 MiB → 341.100
docker_agent_jmx_arm64 +3.32 KiB (0.00% increase) 320.087 → 320.090 → 325.620
docker_cluster_agent_amd64 neutral 71.419 MiB → 72.920
docker_cluster_agent_arm64 neutral 67.043 MiB → 68.220
docker_cws_instrumentation_amd64 neutral 2.999 MiB → 3.330
docker_cws_instrumentation_arm64 neutral 2.729 MiB → 3.090
docker_dogstatsd_amd64 neutral 15.175 MiB → 15.820
docker_dogstatsd_arm64 neutral 14.496 MiB → 14.830
dogstatsd_deb_amd64 neutral 7.899 MiB → 8.790
dogstatsd_deb_arm64 +2.41 KiB (0.03% increase) 6.781 → 6.784 → 7.710
dogstatsd_rpm_amd64 neutral 7.910 MiB → 8.800
dogstatsd_suse_amd64 neutral 7.910 MiB → 8.800
iot_agent_deb_amd64 neutral 11.408 MiB → 13.040
iot_agent_deb_arm64 neutral 9.721 MiB → 11.450
iot_agent_deb_armhf neutral 9.945 MiB → 11.620
iot_agent_rpm_amd64 -4.5 KiB (0.04% reduction) 11.428 → 11.424 → 13.060
iot_agent_suse_amd64 -4.5 KiB (0.04% reduction) 11.428 → 11.424 → 13.060

@cit-pr-commenter-54b7da
Copy link
Copy Markdown

cit-pr-commenter-54b7da bot commented Apr 7, 2026

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 965789eb-06f5-445f-9a20-fb96aa58d984

Baseline: ce491d7
Comparison: 9faa6d0
Diff

Optimization Goals: ✅ No significant changes detected

Experiments ignored for regressions

Regressions in experiments with settings containing erratic: true are ignored.

perf experiment goal Δ mean % Δ mean % CI trials links
docker_containers_cpu % cpu utilization +0.96 [-2.06, +3.99] 1 Logs

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
quality_gate_logs % cpu utilization +1.63 [+0.01, +3.25] 1 Logs bounds checks dashboard
quality_gate_metrics_logs memory utilization +1.44 [+1.21, +1.67] 1 Logs bounds checks dashboard
docker_containers_cpu % cpu utilization +0.96 [-2.06, +3.99] 1 Logs
otlp_ingest_logs memory utilization +0.51 [+0.41, +0.62] 1 Logs
otlp_ingest_metrics memory utilization +0.46 [+0.30, +0.62] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization +0.43 [+0.36, +0.49] 1 Logs
quality_gate_idle_all_features memory utilization +0.25 [+0.21, +0.29] 1 Logs bounds checks dashboard
file_tree memory utilization +0.24 [+0.18, +0.30] 1 Logs
ddot_metrics_sum_delta memory utilization +0.19 [+0.02, +0.36] 1 Logs
quality_gate_idle memory utilization +0.04 [-0.01, +0.10] 1 Logs bounds checks dashboard
file_to_blackhole_1000ms_latency egress throughput +0.04 [-0.39, +0.48] 1 Logs
uds_dogstatsd_to_api ingress throughput +0.04 [-0.17, +0.24] 1 Logs
file_to_blackhole_500ms_latency egress throughput +0.01 [-0.39, +0.41] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.01 [-0.10, +0.09] 1 Logs
uds_dogstatsd_to_api_v3 ingress throughput -0.02 [-0.21, +0.18] 1 Logs
file_to_blackhole_0ms_latency egress throughput -0.04 [-0.61, +0.54] 1 Logs
ddot_logs memory utilization -0.05 [-0.11, +0.01] 1 Logs
ddot_metrics_sum_cumulative memory utilization -0.07 [-0.21, +0.07] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.08 [-0.19, +0.03] 1 Logs
docker_containers_memory memory utilization -0.12 [-0.21, -0.03] 1 Logs
ddot_metrics memory utilization -0.47 [-0.65, -0.28] 1 Logs
ddot_metrics_sum_cumulativetodelta_exporter memory utilization -0.49 [-0.72, -0.27] 1 Logs
tcp_syslog_to_blackhole ingress throughput -0.56 [-0.73, -0.39] 1 Logs

Bounds Checks: ❌ Failed

perf experiment bounds_check_name replicates_passed observed_value links
docker_containers_cpu simple_check_run 10/10 707 ≥ 26
docker_containers_memory memory_usage 10/10 275.64MiB ≤ 370MiB
docker_containers_memory simple_check_run 10/10 635 ≥ 26
file_to_blackhole_0ms_latency memory_usage 10/10 0.19GiB ≤ 1.20GiB
file_to_blackhole_0ms_latency missed_bytes 9/10 500MiB > 0MiB
file_to_blackhole_1000ms_latency memory_usage 10/10 0.23GiB ≤ 1.20GiB
file_to_blackhole_1000ms_latency missed_bytes 10/10 0B = 0B
file_to_blackhole_100ms_latency memory_usage 10/10 0.19GiB ≤ 1.20GiB
file_to_blackhole_100ms_latency missed_bytes 10/10 0B = 0B
file_to_blackhole_500ms_latency memory_usage 10/10 0.21GiB ≤ 1.20GiB
file_to_blackhole_500ms_latency missed_bytes 10/10 0B = 0B
quality_gate_idle intake_connections 10/10 3 = 3 bounds checks dashboard
quality_gate_idle memory_usage 10/10 173.90MiB ≤ 181MiB bounds checks dashboard
quality_gate_idle_all_features intake_connections 10/10 3 = 3 bounds checks dashboard
quality_gate_idle_all_features memory_usage 10/10 488.58MiB ≤ 550MiB bounds checks dashboard
quality_gate_logs intake_connections 10/10 4 ≤ 6 bounds checks dashboard
quality_gate_logs memory_usage 10/10 203.25MiB ≤ 220MiB bounds checks dashboard
quality_gate_logs missed_bytes 10/10 0B = 0B bounds checks dashboard
quality_gate_metrics_logs cpu_usage 10/10 445.98 ≤ 2000 bounds checks dashboard
quality_gate_metrics_logs intake_connections 10/10 3 ≤ 6 bounds checks dashboard
quality_gate_metrics_logs memory_usage 10/10 411.23MiB ≤ 475MiB bounds checks dashboard
quality_gate_metrics_logs missed_bytes 10/10 0B = 0B bounds checks dashboard

Explanation

Confidence level: 90.00%
Effect size tolerance: |Δ mean %| ≥ 5.00%

Performance changes are noted in the perf column of each table:

  • ✅ = significantly better comparison variant performance
  • ❌ = significantly worse comparison variant performance
  • ➖ = no significant change in performance

A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".

For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:

  1. Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.

  2. Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.

  3. Its configuration does not mark it "erratic".

CI Pass/Fail Decision

Passed. All Quality Gates passed.

  • quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check missed_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check missed_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.

@safchain safchain force-pushed the safchain/scrubber-jwt branch from ef6db1b to a2592ce Compare April 8, 2026 15:39
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d bot merged commit 9faa6d0 into main Apr 8, 2026
364 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d bot deleted the safchain/scrubber-jwt branch April 8, 2026 20:50
@github-actions github-actions bot modified the milestones: Triage, 7.79.0 Apr 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category/improvement changelog/no-changelog No changelog entry needed component/system-probe internal Identify a non-fork PR qa/done QA done before merge and regressions are covered by tests short review PR is simple enough to be reviewed quickly team/agent-security

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants