Skip to content

[CONTINT-5064] Apply the scrubber to pod list in flares#45064

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 17 commits intomainfrom
triviajon/CONTINT-5064/scrub-secrets-k8s-flare
Jan 21, 2026
Merged

[CONTINT-5064] Apply the scrubber to pod list in flares#45064
gh-worker-dd-mergequeue-cf854d[bot] merged 17 commits intomainfrom
triviajon/CONTINT-5064/scrub-secrets-k8s-flare

Conversation

@triviajon
Copy link
Copy Markdown
Contributor

@triviajon triviajon commented Jan 13, 2026

What does this PR do?

Applies the orchestrator scrubber to pod lists in agent flares to prevent secret environment variables from being exposed. As a result, some additional changes were made:

  • The scrubber should not act on env vars that aren't using the value field. That indicates the field is populated used valueFrom, and should not be scrubbed.
  • Added a list of known "safe" DD_ env vars to not scrub. This is so that flares do not redact helpful, non-sensitive information. The scrubber only looks for exact matches, to err on the side of caution.
  • Moved the redact package from pkg/orchestrator/redact to pkg/redact to reflect that the orchestrator check is no longer the only part of the agent using it (though, I could be convinced otherwise)
  • Gated archive_k8s.go behind the orchestrator build tag. This is strictly because of artifact size/import problems that are introduced because of the need to decode the kubelet response.

Motivation

Addresses CONTINT-5064 and CONS-7961. Essentially scrubber currently being used on flares is not sufficient to properly scrub environment variables, so we want to also reuse the specialized pod scrubber.

Describe how you validated your changes

Deployed v7.74.1 of the agent to a local kind cluster configured to add the env-var AWS_SECRET_ACCESS_KEY= randomsecretsgohere to each agent container. Generating a flare using agent flare and examined the output of k8s/kubelet_pods.yaml:

...
      containers:
        - command:
            - agent
            - run
          env:
            - name: DD_API_KEY
              valueFrom:
                secretKeyRef:
                  key: api-key
                  name: datadog-agent
            - name: DD_REMOTE_CONFIGURATION_ENABLED
              value: "true"
            - name: DD_AUTH_TOKEN_FILE_PATH
              value: /etc/datadog-agent/auth/token
            - name: AWS_SECRET_ACCESS_KEY
              value: randomsecretsgohere
...

versus an agent built off of this branch:

...
      containers:
        - command:
            - agent
            - run
          env:
            - name: DD_API_KEY
              valueFrom:
                secretKeyRef:
                  key: api-key
                  name: datadog-agent
            - name: DD_REMOTE_CONFIGURATION_ENABLED
              value: "true"
            - name: DD_AUTH_TOKEN_FILE_PATH
              value: /etc/datadog-agent/auth/token
            - name: AWS_SECRET_ACCESS_KEY
              value: '********'
...

Additional Notes

@triviajon triviajon requested a review from a team as a code owner January 13, 2026 21:04
@triviajon triviajon requested a review from dustmop January 13, 2026 21:04
@github-actions github-actions bot added team/agent-configuration short review PR is simple enough to be reviewed quickly labels Jan 13, 2026
@triviajon triviajon marked this pull request as draft January 13, 2026 21:31
@agent-platform-auto-pr
Copy link
Copy Markdown
Contributor

agent-platform-auto-pr bot commented Jan 13, 2026

Static quality checks

✅ Please find below the results from static quality gates
Comparison made with ancestor d0217ec
📊 Static Quality Gates Dashboard

Successful checks

Info

Quality gate Change Size (prev → curr → max)
agent_deb_amd64 N/A N/A → 704.890 → 708.410
agent_deb_amd64_fips N/A N/A → 700.187 → 704.000
agent_heroku_amd64 N/A N/A → 327.162 → 329.530
agent_msi N/A N/A → 572.081 → 982.080
agent_rpm_amd64 N/A N/A → 704.876 → 708.380
agent_rpm_amd64_fips N/A N/A → 700.173 → 703.990
agent_rpm_arm64 N/A N/A → 686.209 → 693.520
agent_rpm_arm64_fips N/A N/A → 682.361 → 688.480
agent_suse_amd64 N/A N/A → 704.876 → 708.380
agent_suse_amd64_fips N/A N/A → 700.173 → 703.990
agent_suse_arm64 N/A N/A → 686.209 → 693.520
agent_suse_arm64_fips N/A N/A → 682.361 → 688.480
docker_agent_amd64 N/A N/A → 767.017 → 770.720
docker_agent_arm64 N/A N/A → 772.979 → 780.200
docker_agent_jmx_amd64 N/A N/A → 957.896 → 961.600
docker_agent_jmx_arm64 N/A N/A → 952.577 → 959.800
docker_cluster_agent_amd64 N/A N/A → 180.970 → 181.080
docker_cluster_agent_arm64 N/A N/A → 196.792 → 198.490
docker_cws_instrumentation_amd64 N/A N/A → 7.135 → 7.180
docker_cws_instrumentation_arm64 N/A N/A → 6.689 → 6.920
docker_dogstatsd_amd64 N/A N/A → 38.884 → 39.380
docker_dogstatsd_arm64 N/A N/A → 37.192 → 37.940
dogstatsd_deb_amd64 N/A N/A → 30.103 → 30.610
dogstatsd_deb_arm64 N/A N/A → 28.248 → 29.110
dogstatsd_rpm_amd64 N/A N/A → 30.103 → 30.610
dogstatsd_suse_amd64 N/A N/A → 30.103 → 30.610
iot_agent_deb_amd64 N/A N/A → 43.188 → 43.290
iot_agent_deb_arm64 N/A N/A → 40.293 → 40.920
iot_agent_deb_armhf N/A N/A → 40.886 → 41.030
iot_agent_rpm_amd64 N/A N/A → 43.189 → 43.290
iot_agent_suse_amd64 N/A N/A → 43.189 → 43.290
On-wire sizes (compressed)
Quality gate Change Size (prev → curr → max)
agent_deb_amd64 N/A N/A → 173.388 → 174.490
agent_deb_amd64_fips N/A N/A → 172.293 → 173.750
agent_heroku_amd64 N/A N/A → 87.169 → 88.450
agent_msi N/A N/A → 143.055 → 143.270
agent_rpm_amd64 N/A N/A → 176.456 → 177.660
agent_rpm_amd64_fips N/A N/A → 174.924 → 176.600
agent_rpm_arm64 N/A N/A → 159.466 → 161.260
agent_rpm_arm64_fips N/A N/A → 158.968 → 160.550
agent_suse_amd64 N/A N/A → 176.456 → 177.660
agent_suse_amd64_fips N/A N/A → 174.924 → 176.600
agent_suse_arm64 N/A N/A → 159.466 → 161.260
agent_suse_arm64_fips N/A N/A → 158.968 → 160.550
docker_agent_amd64 N/A N/A → 260.973 → 262.450
docker_agent_arm64 N/A N/A → 249.945 → 252.630
docker_agent_jmx_amd64 N/A N/A → 329.617 → 331.080
docker_agent_jmx_arm64 N/A N/A → 314.568 → 317.270
docker_cluster_agent_amd64 N/A N/A → 63.949 → 64.490
docker_cluster_agent_arm64 N/A N/A → 60.215 → 61.170
docker_cws_instrumentation_amd64 N/A N/A → 2.994 → 3.330
docker_cws_instrumentation_arm64 N/A N/A → 2.726 → 3.090
docker_dogstatsd_amd64 N/A N/A → 15.049 → 15.820
docker_dogstatsd_arm64 N/A N/A → 14.364 → 14.830
dogstatsd_deb_amd64 N/A N/A → 7.962 → 8.790
dogstatsd_deb_arm64 N/A N/A → 6.835 → 7.710
dogstatsd_rpm_amd64 N/A N/A → 7.974 → 8.800
dogstatsd_suse_amd64 N/A N/A → 7.974 → 8.800
iot_agent_deb_amd64 N/A N/A → 11.316 → 12.040
iot_agent_deb_arm64 N/A N/A → 9.672 → 10.450
iot_agent_deb_armhf N/A N/A → 9.869 → 10.620
iot_agent_rpm_amd64 N/A N/A → 11.333 → 12.060
iot_agent_suse_amd64 N/A N/A → 11.333 → 12.060

@cit-pr-commenter
Copy link
Copy Markdown

cit-pr-commenter bot commented Jan 13, 2026

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: d971b560-530f-4f90-a4c4-7684c04c58c5

Baseline: 980be34
Comparison: eabef67
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 +1.39 [-1.62, +4.40] 1 Logs

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
docker_containers_cpu % cpu utilization +1.39 [-1.62, +4.40] 1 Logs
quality_gate_logs % cpu utilization +1.15 [-0.33, +2.63] 1 Logs bounds checks dashboard
ddot_logs memory utilization +0.81 [+0.75, +0.87] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization +0.40 [+0.34, +0.45] 1 Logs
docker_containers_memory memory utilization +0.28 [+0.21, +0.35] 1 Logs
quality_gate_idle_all_features memory utilization +0.16 [+0.13, +0.20] 1 Logs bounds checks dashboard
ddot_metrics_sum_cumulative memory utilization +0.12 [-0.05, +0.29] 1 Logs
quality_gate_idle memory utilization +0.04 [-0.00, +0.09] 1 Logs bounds checks dashboard
otlp_ingest_metrics memory utilization +0.04 [-0.11, +0.19] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.03 [-0.50, +0.56] 1 Logs
file_tree memory utilization +0.03 [-0.03, +0.08] 1 Logs
uds_dogstatsd_to_api_v3 ingress throughput +0.00 [-0.12, +0.13] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput +0.00 [-0.09, +0.09] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.00 [-0.13, +0.12] 1 Logs
file_to_blackhole_1000ms_latency egress throughput -0.02 [-0.44, +0.40] 1 Logs
file_to_blackhole_500ms_latency egress throughput -0.02 [-0.40, +0.36] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.04 [-0.08, +0.01] 1 Logs
tcp_syslog_to_blackhole ingress throughput -0.13 [-0.27, +0.01] 1 Logs
ddot_metrics_sum_cumulativetodelta_exporter memory utilization -0.13 [-0.36, +0.10] 1 Logs
otlp_ingest_logs memory utilization -0.33 [-0.43, -0.24] 1 Logs
quality_gate_metrics_logs memory utilization -0.38 [-0.60, -0.17] 1 Logs bounds checks dashboard
ddot_metrics_sum_delta memory utilization -0.67 [-0.87, -0.47] 1 Logs
ddot_metrics memory utilization -1.00 [-1.21, -0.79] 1 Logs

Bounds Checks: ✅ Passed

perf experiment bounds_check_name replicates_passed links
docker_containers_cpu simple_check_run 10/10
docker_containers_memory memory_usage 10/10
docker_containers_memory simple_check_run 10/10
file_to_blackhole_0ms_latency lost_bytes 10/10
file_to_blackhole_0ms_latency memory_usage 10/10
file_to_blackhole_1000ms_latency lost_bytes 10/10
file_to_blackhole_1000ms_latency memory_usage 10/10
file_to_blackhole_100ms_latency lost_bytes 10/10
file_to_blackhole_100ms_latency memory_usage 10/10
file_to_blackhole_500ms_latency lost_bytes 10/10
file_to_blackhole_500ms_latency memory_usage 10/10
quality_gate_idle intake_connections 10/10 bounds checks dashboard
quality_gate_idle memory_usage 10/10 bounds checks dashboard
quality_gate_idle_all_features intake_connections 10/10 bounds checks dashboard
quality_gate_idle_all_features memory_usage 10/10 bounds checks dashboard
quality_gate_logs intake_connections 10/10 bounds checks dashboard
quality_gate_logs lost_bytes 10/10 bounds checks dashboard
quality_gate_logs memory_usage 10/10 bounds checks dashboard
quality_gate_metrics_logs cpu_usage 10/10 bounds checks dashboard
quality_gate_metrics_logs intake_connections 10/10 bounds checks dashboard
quality_gate_metrics_logs lost_bytes 10/10 bounds checks dashboard
quality_gate_metrics_logs memory_usage 10/10 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".

Replicate Execution Details

We run multiple replicates for each experiment/variant. However, we allow replicates to be automatically retried if there are any failures, up to 8 times, at which point the replicate is marked dead and we are unable to run analysis for the entire experiment. We call each of these attempts at running replicates a replicate execution. This section lists all replicate executions that failed due to the target crashing or being oom killed.

Note: In the below tables we bucket failures by experiment, variant, and failure type. For each of these buckets we list out the replicate indexes that failed with an annotation signifying how many times said replicate failed with the given failure mode. In the below example the baseline variant of the experiment named experiment_with_failures had two replicates that failed by oom kills. Replicate 0, which failed 8 executions, and replicate 1 which failed 6 executions, all with the same failure mode.

Experiment Variant Replicates Failure Logs Debug Dashboard
experiment_with_failures baseline 0 (x8) 1 (x6) Oom killed Debug Dashboard

The debug dashboard links will take you to a debugging dashboard specifically designed to investigate replicate execution failures.

❌ Retried Profiling Replicate Execution Failures (target internal profiling)

Note: Profiling replicas may still be executing. See the debug dashboard for up to date status.

Experiment Variant Replicates Failure Debug Dashboard
quality_gate_idle_all_features baseline 11 (x3) Oom killed Debug Dashboard
quality_gate_idle_all_features comparison 11 (x3) Oom killed Debug Dashboard

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 lost_bytes: 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 intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, 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_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.

@github-actions github-actions bot added medium review PR review might take time and removed short review PR is simple enough to be reviewed quickly labels Jan 14, 2026
@triviajon triviajon force-pushed the triviajon/CONTINT-5064/scrub-secrets-k8s-flare branch from 4268e2b to 6e55d72 Compare January 14, 2026 16:22
@triviajon triviajon force-pushed the triviajon/CONTINT-5064/scrub-secrets-k8s-flare branch from 6e55d72 to 7dba60e Compare January 14, 2026 16:27
@github-actions github-actions bot added long review PR is complex, plan time to review it and removed medium review PR review might take time labels Jan 14, 2026
@triviajon triviajon added team/container-integrations qa/done QA done before merge and regressions are covered by tests and removed team/agent-configuration labels Jan 14, 2026
@agent-platform-auto-pr
Copy link
Copy Markdown
Contributor

agent-platform-auto-pr bot commented Jan 14, 2026

Go Package Import Differences

Baseline: d0217ec
Comparison: eabef67

binaryosarchchange
agentlinuxamd64
+1, -1
-github.com/DataDog/datadog-agent/pkg/orchestrator/redact
+github.com/DataDog/datadog-agent/pkg/redact
agentlinuxarm64
+1, -1
-github.com/DataDog/datadog-agent/pkg/orchestrator/redact
+github.com/DataDog/datadog-agent/pkg/redact
agentwindowsamd64
+1, -1
-github.com/DataDog/datadog-agent/pkg/orchestrator/redact
+github.com/DataDog/datadog-agent/pkg/redact
agentdarwinamd64
+1, -1
-github.com/DataDog/datadog-agent/pkg/orchestrator/redact
+github.com/DataDog/datadog-agent/pkg/redact
agentdarwinarm64
+1, -1
-github.com/DataDog/datadog-agent/pkg/orchestrator/redact
+github.com/DataDog/datadog-agent/pkg/redact
cluster-agentlinuxamd64
+1, -1
-github.com/DataDog/datadog-agent/pkg/orchestrator/redact
+github.com/DataDog/datadog-agent/pkg/redact
cluster-agentlinuxarm64
+1, -1
-github.com/DataDog/datadog-agent/pkg/orchestrator/redact
+github.com/DataDog/datadog-agent/pkg/redact

@triviajon triviajon marked this pull request as ready for review January 15, 2026 16:09
@triviajon triviajon requested review from a team as code owners January 15, 2026 16:09
Copy link
Copy Markdown
Contributor

@jeremy-hanna jeremy-hanna left a comment

Choose a reason for hiding this comment

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

👍 for agent runtime files

@triviajon triviajon added this to the 7.76.0 milestone Jan 15, 2026
@L3n41c
Copy link
Copy Markdown
Member

L3n41c commented Jan 15, 2026

@codex review

@chatgpt-codex-connector
Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Nice work!

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Copy link
Copy Markdown
Contributor

@lavigne958 lavigne958 left a comment

Choose a reason for hiding this comment

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

all good, just left a quick question, and waitting for the current requested changes to be fixed

Copy link
Copy Markdown
Contributor

@dustmop dustmop left a comment

Choose a reason for hiding this comment

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

LGTM for agent-configuration owned files

@triviajon
Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351
Copy link
Copy Markdown

gh-worker-devflow-routing-ef8351 bot commented Jan 21, 2026

View all feedbacks in Devflow UI.

2026-01-21 13:52:28 UTC ℹ️ Start processing command /merge
Use /merge -c to cancel this operation!


2026-01-21 13:52:35 UTC ℹ️ MergeQueue: waiting for PR to be ready

This pull request is not mergeable according to GitHub. Common reasons include pending required checks, missing approvals, or merge conflicts — but it could also be blocked by other repository rules or settings.
It will be added to the queue as soon as checks pass and/or get approvals. View in MergeQueue UI.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

Use /merge -c to cancel this operation!


2026-01-21 15:16:51 UTC ℹ️ MergeQueue: merge request added to the queue

The expected merge time in main is approximately 60m (p90).

Use /merge -c to cancel this operation!


⏳ Processing

@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d bot merged commit 8dd52d6 into main Jan 21, 2026
320 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d bot deleted the triviajon/CONTINT-5064/scrub-secrets-k8s-flare branch January 21, 2026 16:01
@github-actions github-actions bot locked and limited conversation to collaborators Jan 21, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

long review PR is complex, plan time to review it qa/done QA done before merge and regressions are covered by tests team/container-integrations

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants