Skip to content

Revert "feat(par): add default restricted shell paths with container-aware prefixing"#48460

Merged
chouetz merged 1 commit intomainfrom
revert-48236-matt-dz/par-restricted-shell-container-paths
Mar 27, 2026
Merged

Revert "feat(par): add default restricted shell paths with container-aware prefixing"#48460
chouetz merged 1 commit intomainfrom
revert-48236-matt-dz/par-restricted-shell-container-paths

Conversation

@aiuto
Copy link
Copy Markdown
Contributor

@aiuto aiuto commented Mar 27, 2026

Reverts #48236

The original PR is causing several windows tests to fail.

@aiuto aiuto added the changelog/no-changelog No changelog entry needed label Mar 27, 2026
@aiuto aiuto requested a review from a team as a code owner March 27, 2026 04:23
@aiuto aiuto added the qa/no-code-change No code change in Agent code requiring validation label Mar 27, 2026
@aiuto aiuto requested a review from ross-m-young March 27, 2026 04:23
@dd-octo-sts dd-octo-sts Bot added the internal Identify a non-fork PR label Mar 27, 2026
@aiuto aiuto requested review from clarkb7 and nathan-b March 27, 2026 04:24
@github-actions github-actions Bot added the medium review PR review might take time label Mar 27, 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: 5aec176392

ℹ️ 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".

Comment on lines 77 to 80
runner, err := interp.New(
interp.StdIO(nil, &stdout, &stderr),
interp.AllowedPaths(h.allowedPaths),
interp.ProcPath(resolveProcPath()),
cmdOpt,
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 Pass host proc mount to rshell interpreter

In containerized Agent deployments, runCommand now creates the interpreter without interp.ProcPath(...), so proc-backed builtins (for example process/network inspection commands) will read the container’s /proc instead of the host-mounted procfs. That produces incorrect results for the common DaemonSet/container case where host proc is exposed at /host/proc, and breaks host-level diagnostics unless every command is reworked manually.

Useful? React with 👍 / 👎.

}
}
config.BindEnvAndSetDefault(PARRestrictedShellAllowedPaths, defaultPaths)
config.BindEnvAndSetDefault(PARRestrictedShellAllowedPaths, []string{"/var/log"})
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Restore container-aware default rshell allowed path

The default for private_action_runner.restricted_shell_allowed_paths is now hardcoded to /var/log for all environments, which regresses containerized installs where host logs are mounted under /host/var/log. In that setup, default runCommand access no longer reaches host logs unless operators explicitly override config, so out-of-the-box behavior is broken for container deployments.

Useful? React with 👍 / 👎.

@aiuto
Copy link
Copy Markdown
Contributor Author

aiuto commented Mar 27, 2026

/trigger_ci --variable RUN_ALL_BUILDS=true --variable RUN_KITCHEN_TESTS=true --variable RUN_E2E_TESTS=on

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

Files inventory check summary

File checks results against ancestor e5ab089d:

Results for datadog-agent_7.79.0~devel.git.219.5aec176.pipeline.104695979-1_amd64.deb:

No change detected

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

Static quality checks

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

Successful checks

Info

Quality gate Change Size (prev → curr → max)
agent_deb_amd64 -6.93 KiB (0.00% reduction) 752.580 → 752.573 → 753.380
agent_deb_amd64_fips -2.93 KiB (0.00% reduction) 709.602 → 709.599 → 713.900
agent_rpm_amd64 -6.93 KiB (0.00% reduction) 752.564 → 752.557 → 753.350
agent_rpm_amd64_fips -2.93 KiB (0.00% reduction) 709.585 → 709.582 → 713.880
agent_suse_amd64 -6.93 KiB (0.00% reduction) 752.564 → 752.557 → 753.350
agent_suse_amd64_fips -2.93 KiB (0.00% reduction) 709.585 → 709.582 → 713.880
docker_agent_amd64 -2.93 KiB (0.00% reduction) 812.878 → 812.876 → 815.700
docker_agent_jmx_amd64 -2.93 KiB (0.00% reduction) 1003.794 → 1003.791 → 1006.580
22 successful checks with minimal change (< 2 KiB)
Quality gate Current Size
agent_heroku_amd64 313.309 MiB
agent_rpm_arm64 730.998 MiB
agent_rpm_arm64_fips 691.029 MiB
agent_suse_arm64 730.998 MiB
agent_suse_arm64_fips 691.029 MiB
docker_agent_arm64 816.087 MiB
docker_agent_jmx_arm64 995.781 MiB
docker_cluster_agent_amd64 203.942 MiB
docker_cluster_agent_arm64 218.420 MiB
docker_cws_instrumentation_amd64 7.142 MiB
docker_cws_instrumentation_arm64 6.689 MiB
docker_dogstatsd_amd64 39.238 MiB
docker_dogstatsd_arm64 37.445 MiB
dogstatsd_deb_amd64 29.881 MiB
dogstatsd_deb_arm64 28.034 MiB
dogstatsd_rpm_amd64 29.881 MiB
dogstatsd_suse_amd64 29.881 MiB
iot_agent_deb_amd64 43.281 MiB
iot_agent_deb_arm64 40.328 MiB
iot_agent_deb_armhf 41.076 MiB
iot_agent_rpm_amd64 43.282 MiB
iot_agent_suse_amd64 43.282 MiB
On-wire sizes (compressed)
Quality gate Change Size (prev → curr → max)
agent_deb_amd64 -29.01 KiB (0.02% reduction) 174.766 → 174.737 → 178.360
agent_deb_amd64_fips +34.16 KiB (0.02% increase) 165.298 → 165.332 → 172.790
agent_heroku_amd64 neutral 75.003 MiB → 79.970
agent_rpm_amd64 +16.62 KiB (0.01% increase) 177.534 → 177.550 → 181.830
agent_rpm_amd64_fips -27.46 KiB (0.02% reduction) 167.630 → 167.603 → 173.370
agent_rpm_arm64 +35.84 KiB (0.02% increase) 159.464 → 159.499 → 163.060
agent_rpm_arm64_fips -20.03 KiB (0.01% reduction) 151.390 → 151.371 → 156.170
agent_suse_amd64 +16.62 KiB (0.01% increase) 177.534 → 177.550 → 181.830
agent_suse_amd64_fips -27.46 KiB (0.02% reduction) 167.630 → 167.603 → 173.370
agent_suse_arm64 +35.84 KiB (0.02% increase) 159.464 → 159.499 → 163.060
agent_suse_arm64_fips -20.03 KiB (0.01% reduction) 151.390 → 151.371 → 156.170
docker_agent_amd64 +3.56 KiB (0.00% increase) 268.102 → 268.106 → 272.480
docker_agent_arm64 neutral 255.325 MiB → 261.060
docker_agent_jmx_amd64 neutral 336.753 MiB → 341.100
docker_agent_jmx_arm64 -11.51 KiB (0.00% reduction) 319.966 → 319.955 → 325.620
docker_cluster_agent_amd64 -4.18 KiB (0.01% reduction) 71.376 → 71.371 → 72.920
docker_cluster_agent_arm64 neutral 67.014 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.174 MiB → 15.820
docker_dogstatsd_arm64 -7.22 KiB (0.05% reduction) 14.494 → 14.487 → 14.830
dogstatsd_deb_amd64 neutral 7.893 MiB → 8.790
dogstatsd_deb_arm64 -2.11 KiB (0.03% reduction) 6.779 → 6.777 → 7.710
dogstatsd_rpm_amd64 neutral 7.904 MiB → 8.800
dogstatsd_suse_amd64 neutral 7.904 MiB → 8.800
iot_agent_deb_amd64 +3.05 KiB (0.03% increase) 11.398 → 11.401 → 12.040
iot_agent_deb_arm64 neutral 9.702 MiB → 10.450
iot_agent_deb_armhf neutral 9.941 MiB → 10.620
iot_agent_rpm_amd64 -3.34 KiB (0.03% reduction) 11.421 → 11.418 → 12.060
iot_agent_suse_amd64 -3.34 KiB (0.03% reduction) 11.421 → 11.418 → 12.060

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

cit-pr-commenter-54b7da Bot commented Mar 27, 2026

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 24717fc5-4bdd-41a8-999f-7e1b5bbf75f4

Baseline: c592740
Comparison: 50b7138
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.43 [-3.36, +2.50] 1 Logs

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
otlp_ingest_logs memory utilization +0.88 [+0.77, +0.99] 1 Logs
ddot_logs memory utilization +0.66 [+0.59, +0.73] 1 Logs
quality_gate_metrics_logs memory utilization +0.45 [+0.21, +0.69] 1 Logs bounds checks dashboard
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization +0.38 [+0.33, +0.43] 1 Logs
quality_gate_idle memory utilization +0.34 [+0.29, +0.39] 1 Logs bounds checks dashboard
ddot_metrics memory utilization +0.21 [+0.03, +0.38] 1 Logs
otlp_ingest_metrics memory utilization +0.19 [+0.03, +0.35] 1 Logs
ddot_metrics_sum_delta memory utilization +0.12 [-0.05, +0.29] 1 Logs
file_to_blackhole_100ms_latency egress throughput +0.09 [-0.01, +0.19] 1 Logs
file_to_blackhole_500ms_latency egress throughput +0.05 [-0.34, +0.43] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.03 [-0.44, +0.51] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.11, +0.11] 1 Logs
uds_dogstatsd_to_api_v3 ingress throughput -0.01 [-0.21, +0.18] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.03 [-0.24, +0.17] 1 Logs
file_to_blackhole_1000ms_latency egress throughput -0.08 [-0.51, +0.34] 1 Logs
quality_gate_idle_all_features memory utilization -0.12 [-0.16, -0.09] 1 Logs bounds checks dashboard
docker_containers_memory memory utilization -0.16 [-0.26, -0.07] 1 Logs
tcp_syslog_to_blackhole ingress throughput -0.18 [-0.33, -0.02] 1 Logs
quality_gate_logs % cpu utilization -0.21 [-1.83, +1.41] 1 Logs bounds checks dashboard
ddot_metrics_sum_cumulativetodelta_exporter memory utilization -0.28 [-0.50, -0.06] 1 Logs
docker_containers_cpu % cpu utilization -0.43 [-3.36, +2.50] 1 Logs
file_tree memory utilization -0.44 [-0.50, -0.38] 1 Logs
ddot_metrics_sum_cumulative memory utilization -0.55 [-0.69, -0.41] 1 Logs

Bounds Checks: ✅ Passed

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 271.40MiB ≤ 370MiB
docker_containers_memory simple_check_run 10/10 686 ≥ 26
file_to_blackhole_0ms_latency memory_usage 10/10 0.19GiB ≤ 1.20GiB
file_to_blackhole_0ms_latency missed_bytes 10/10 0B = 0B
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.59MiB ≤ 175MiB 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 496.07MiB ≤ 550MiB bounds checks dashboard
quality_gate_logs intake_connections 10/10 3 ≤ 6 bounds checks dashboard
quality_gate_logs memory_usage 10/10 205.51MiB ≤ 220MiB bounds checks dashboard
quality_gate_logs missed_bytes 10/10 0B = 0B bounds checks dashboard
quality_gate_metrics_logs cpu_usage 10/10 368.40 ≤ 2000 bounds checks dashboard
quality_gate_metrics_logs intake_connections 10/10 4 ≤ 6 bounds checks dashboard
quality_gate_metrics_logs memory_usage 10/10 403.89MiB ≤ 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 memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, 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.
  • 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 intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check missed_bytes: 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.

@chouetz chouetz merged commit 50b7138 into main Mar 27, 2026
272 of 276 checks passed
@chouetz chouetz deleted the revert-48236-matt-dz/par-restricted-shell-container-paths branch March 27, 2026 08:01
@github-actions github-actions Bot added this to the 7.79.0 milestone Mar 27, 2026
gh-worker-dd-mergequeue-cf854d Bot pushed a commit that referenced this pull request Mar 27, 2026
…ntainer-aware prefixing"" (#48462)

Reverts #48460

Revert + this test fix:

All tests pass. Here's a summary of the fix:

  Root cause: Both filepath.Join calls used OS path separators. On Windows, filepath.Join("/host", "/var/log") produces \host\var\log, breaking tests that expected Linux-style paths. Similarly,
  filepath.Join("/host", "/proc") produced \host\proc which didn't match the mock key /host/proc, causing resolveProcPath to fall back to /proc.

  Fix: Replaced filepath.Join with path.Join (POSIX package) in three files:
  - pkg/config/setup/privateactionrunner.go — container path prefix joining
  - pkg/config/setup/privateactionrunner_test.go — test assertion using same join
  - pkg/privateactionrunner/bundles/remoteaction/rshell/run_command.go — resolveProcPath

  These are Linux container paths (/host/...) that must always use forward slashes regardless of the host OS.

Co-authored-by: alexandre.yang <alexandre.yang@datadoghq.com>
AlexandreYang added a commit that referenced this pull request Mar 27, 2026
…ntainer-aware prefixing"" (#48462)

Reverts #48460

Revert + this test fix:

All tests pass. Here's a summary of the fix:

  Root cause: Both filepath.Join calls used OS path separators. On Windows, filepath.Join("/host", "/var/log") produces \host\var\log, breaking tests that expected Linux-style paths. Similarly,
  filepath.Join("/host", "/proc") produced \host\proc which didn't match the mock key /host/proc, causing resolveProcPath to fall back to /proc.

  Fix: Replaced filepath.Join with path.Join (POSIX package) in three files:
  - pkg/config/setup/privateactionrunner.go — container path prefix joining
  - pkg/config/setup/privateactionrunner_test.go — test assertion using same join
  - pkg/privateactionrunner/bundles/remoteaction/rshell/run_command.go — resolveProcPath

  These are Linux container paths (/host/...) that must always use forward slashes regardless of the host OS.

Co-authored-by: alexandre.yang <alexandre.yang@datadoghq.com>
AlexandreYang added a commit that referenced this pull request Mar 27, 2026
…ntainer-aware prefixing"" (#48462)

Reverts #48460

Revert + this test fix:

All tests pass. Here's a summary of the fix:

  Root cause: Both filepath.Join calls used OS path separators. On Windows, filepath.Join("/host", "/var/log") produces \host\var\log, breaking tests that expected Linux-style paths. Similarly,
  filepath.Join("/host", "/proc") produced \host\proc which didn't match the mock key /host/proc, causing resolveProcPath to fall back to /proc.

  Fix: Replaced filepath.Join with path.Join (POSIX package) in three files:
  - pkg/config/setup/privateactionrunner.go — container path prefix joining
  - pkg/config/setup/privateactionrunner_test.go — test assertion using same join
  - pkg/privateactionrunner/bundles/remoteaction/rshell/run_command.go — resolveProcPath

  These are Linux container paths (/host/...) that must always use forward slashes regardless of the host OS.

Co-authored-by: alexandre.yang <alexandre.yang@datadoghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog/no-changelog No changelog entry needed internal Identify a non-fork PR medium review PR review might take time qa/no-code-change No code change in Agent code requiring validation team/action-platform

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants