Skip to content

Pedro.cordeiro/macos restart agent#52813

Draft
PedroCordeiroDataDog wants to merge 15 commits into
mainfrom
pedro.cordeiro/macos-restart-agent
Draft

Pedro.cordeiro/macos restart agent#52813
PedroCordeiroDataDog wants to merge 15 commits into
mainfrom
pedro.cordeiro/macos-restart-agent

Conversation

@PedroCordeiroDataDog

@PedroCordeiroDataDog PedroCordeiroDataDog commented Jun 25, 2026

Copy link
Copy Markdown

What does this PR do?

Adds support for restarting the Datadog Agent from the macOS GUI by routing the restart request through system-probe, which runs as root.

  • Adds a POST /agent-restart endpoint to the system-probe HTTP API (cmd/system-probe/api/agentrestart_darwin.go) that calls launchctl kickstart -k for both com.datadoghq.agent and com.datadoghq.sysprobe.
  • The GUI (comp/core/gui/impl/platform_darwin.go) POSTs to that endpoint over the system-probe Unix socket, authenticated with the IPC Bearer token.
  • The response is flushed before the restarts are triggered to prevent self-termination of system-probe while serving the request.

Only restart is implemented; stop is out of scope.

Motivation

The GUI process does not have root privileges and cannot call launchctl kickstart against system-domain services directly. Routing through system-probe (already running as root) avoids the need for privilege escalation via osascript, which fails in daemon contexts without a GUI window server session.

Jira: WINA-2692

Describe how you validated your changes

  • Built system-probe with dda inv system-probe.build and the Agent with dda inv agent.build --build-exclude=systemd, restarted both services manually; both com.datadoghq.agent and com.datadoghq.sysprobe restarted successfully via the GUI button.
  • Unit tests added for cmd/system-probe/api and comp/core/gui/impl and all pass (dda inv test).

Additional Notes

  • The POST /agent-restart endpoint returns 501 on non-macOS platforms via a build-tag-guarded stub (agentrestart_others.go).
  • The IPC Bearer token middleware prevents unauthorized callers from triggering restarts via the socket.
  • Non-darwin platform files (platform_nix.go, platform_windows.go) include no-op stubs for setRestartAuthToken and setSysprobeSocketPath so gui.go compiles on all platforms.

@github-actions

github-actions Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

All contributors have signed the CLA ✍️ ✅
Posted by the CLA Assistant Lite bot.

@github-actions

Copy link
Copy Markdown
Contributor

@codex review

@dd-octo-sts dd-octo-sts Bot added internal Identify a non-fork PR team/agent-configuration labels Jun 25, 2026
@github-actions github-actions Bot added the short review PR is simple enough to be reviewed quickly label Jun 25, 2026

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

Copy link
Copy Markdown

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: 24eebaa728

ℹ️ 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 thread comp/core/gui/impl/platform_darwin.go Outdated

func restart() error {
return errors.New("restarting the agent is not implemented on non-windows platforms")
return exec.Command("/bin/launchctl", "kickstart", "-k", "system/com.datadoghq.agent").Start()

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 Surface launchctl failures before reporting success

In the packaged macOS Agent this endpoint is served from the daemon launched as _dd-agent (packages/macos/app/launchd.plist.example.in:28-29), while launchctl(1) documents system/... targets as needing root privileges for modifications. Because Start() only proves /bin/launchctl was spawned, a normal install can have the child exit with EPERM (or another launchctl error) while the handler still returns Success, leaving the Agent running with unapplied config; please propagate the child exit status or route this through a privileged helper/keep the button disabled.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I can only run on private repositories.

Comment thread comp/core/gui/impl/platform_darwin.go
@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 Jun 25, 2026
@datadog-prod-us1-3

datadog-prod-us1-3 Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

🎯 Code Coverage (details)
Patch Coverage: 55.56%
Overall Coverage: 51.09% (+0.00%)

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: be3f308 | Docs | Datadog PR Page | Give us feedback!

@dd-octo-sts

dd-octo-sts Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

Files inventory check summary

File checks results against ancestor ffc84c45:

Results for datadog-agent_7.82.0~devel.git.425.be3f308.pipeline.121381436-1_amd64.deb:

No change detected

@dd-octo-sts

dd-octo-sts Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

Static quality checks

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

Successful checks

Info

Quality gate Change Size (prev → curr → max)
agent_deb_amd64 +4.44 KiB (0.00% increase, -0.04% of buffer) 747.947 → 747.952 → 758.200
agent_msi +5.0 KiB (0.00% increase, -0.04% of buffer) 617.204 → 617.209 → 630.600
agent_rpm_amd64 +4.44 KiB (0.00% increase, -0.04% of buffer) 747.931 → 747.935 → 758.170
agent_rpm_arm64 +4.08 KiB (0.00% increase, -0.06% of buffer) 723.494 → 723.498 → 729.660
agent_rpm_arm64_fips +4.08 KiB (0.00% increase, -0.07% of buffer) 683.043 → 683.047 → 688.860
agent_suse_amd64 +4.44 KiB (0.00% increase, -0.04% of buffer) 747.931 → 747.935 → 758.170
agent_suse_arm64 +4.08 KiB (0.00% increase, -0.06% of buffer) 723.494 → 723.498 → 729.660
agent_suse_arm64_fips +4.08 KiB (0.00% increase, -0.07% of buffer) 683.043 → 683.047 → 688.860
docker_agent_amd64 +4.44 KiB (0.00% increase, -0.06% of buffer) 806.769 → 806.774 → 813.790
docker_agent_arm64 +4.08 KiB (0.00% increase, -0.05% of buffer) 807.349 → 807.353 → 815.030
docker_agent_jmx_amd64 +4.44 KiB (0.00% increase, -0.06% of buffer) 997.667 → 997.671 → 1004.550
docker_agent_jmx_arm64 +4.08 KiB (0.00% increase, -0.05% of buffer) 986.898 → 986.902 → 994.710
21 successful checks with minimal change (< 2 KiB)
Quality gate Current Size
agent_deb_amd64_fips 703.890 MiB
agent_heroku_amd64 308.744 MiB
agent_rpm_amd64_fips 703.873 MiB
agent_suse_amd64_fips 703.873 MiB
docker_cluster_agent_amd64 208.159 MiB
docker_cluster_agent_arm64 221.378 MiB
docker_cws_instrumentation_amd64 7.447 MiB
docker_cws_instrumentation_arm64 6.877 MiB
docker_dogstatsd_amd64 39.024 MiB
docker_dogstatsd_arm64 37.180 MiB
docker_host_profiler_amd64 305.035 MiB
docker_host_profiler_arm64 316.120 MiB
dogstatsd_deb_amd64 29.763 MiB
dogstatsd_deb_arm64 27.822 MiB
dogstatsd_rpm_amd64 29.763 MiB
dogstatsd_suse_amd64 29.763 MiB
iot_agent_deb_amd64 45.695 MiB
iot_agent_deb_arm64 42.414 MiB
iot_agent_deb_armhf 43.203 MiB
iot_agent_rpm_amd64 45.696 MiB
iot_agent_suse_amd64 45.695 MiB

@cit-pr-commenter-54b7da

cit-pr-commenter-54b7da Bot commented Jun 25, 2026

Copy link
Copy Markdown

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 718da051-c111-485d-be86-4fa93722382b

Baseline: ffc84c4
Comparison: be3f308
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
quality_gate_idle memory utilization +0.42 [+0.37, +0.48] 1 Logs bounds checks dashboard
quality_gate_metrics_logs memory utilization +0.26 [+0.01, +0.51] 1 Logs bounds checks dashboard
quality_gate_idle_all_features memory utilization -0.03 [-0.07, +0.00] 1 Logs bounds checks dashboard
quality_gate_security_mean_fs_load memory utilization -0.04 [-0.07, -0.00] 1 Logs bounds checks dashboard
quality_gate_security_idle memory utilization -0.21 [-0.27, -0.15] 1 Logs bounds checks dashboard
quality_gate_security_no_fs_load memory utilization -0.33 [-0.43, -0.23] 1 Logs bounds checks dashboard
quality_gate_logs % cpu utilization -2.16 [-3.22, -1.10] 1 Logs bounds checks dashboard

Bounds Checks: ✅ Passed

perf experiment bounds_check_name replicates_passed observed_value links
quality_gate_idle intake_connections 10/10 3 ≤ 4 bounds checks dashboard
quality_gate_idle memory_usage 10/10 147.83MiB ≤ 154MiB bounds checks dashboard
quality_gate_idle total_bytes_received 10/10 578.12KiB ≤ 819.20KiB bounds checks dashboard
quality_gate_idle_all_features intake_connections 10/10 3 ≤ 4 bounds checks dashboard
quality_gate_idle_all_features memory_usage 10/10 479.94MiB ≤ 495MiB bounds checks dashboard
quality_gate_idle_all_features total_bytes_received 10/10 0.89MiB ≤ 1.25MiB bounds checks dashboard
quality_gate_logs intake_connections 10/10 4 ≤ 6 bounds checks dashboard
quality_gate_logs memory_usage 10/10 183.31MiB ≤ 195MiB bounds checks dashboard
quality_gate_logs missed_bytes 10/10 0B = 0B bounds checks dashboard
quality_gate_logs total_bytes_received 10/10 263.83MiB ≤ 292MiB bounds checks dashboard
quality_gate_metrics_logs cpu_usage 10/10 353.33 ≤ 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 399.29MiB ≤ 430MiB bounds checks dashboard
quality_gate_metrics_logs missed_bytes 10/10 0B = 0B bounds checks dashboard
quality_gate_metrics_logs total_bytes_received 10/10 0.86GiB ≤ 1.04GiB bounds checks dashboard
quality_gate_security_idle cpu_usage 10/10 27.57 ≤ 40 bounds checks dashboard
quality_gate_security_idle memory_usage 10/10 299.46MiB ≤ 330MiB bounds checks dashboard
quality_gate_security_mean_fs_load cpu_usage 10/10 60.68 ≤ 80 bounds checks dashboard
quality_gate_security_mean_fs_load memory_usage 10/10 273.00MiB ≤ 310MiB bounds checks dashboard
quality_gate_security_no_fs_load cpu_usage 10/10 23.47 ≤ 40 bounds checks dashboard
quality_gate_security_no_fs_load memory_usage 10/10 285.43MiB ≤ 320MiB 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 (ddprof)

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 baseline 10 Oom killed Debug Dashboard
quality_gate_idle comparison 10 Oom killed Debug Dashboard
quality_gate_idle_all_features baseline 10 Oom killed Debug Dashboard
quality_gate_idle_all_features comparison 10 Oom killed Debug Dashboard
quality_gate_logs baseline 10 Oom killed Debug Dashboard
quality_gate_logs comparison 10 Oom killed Debug Dashboard
quality_gate_metrics_logs baseline 10 Oom killed Debug Dashboard
quality_gate_metrics_logs comparison 10 Oom killed Debug Dashboard
quality_gate_security_idle baseline 10 Oom killed Debug Dashboard
quality_gate_security_idle comparison 10 Oom killed Debug Dashboard
quality_gate_security_no_fs_load baseline 10 Oom killed Debug Dashboard
quality_gate_security_no_fs_load comparison 10 Oom killed Debug Dashboard

CI Pass/Fail Decision

Passed. All Quality Gates 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_metrics_logs, bounds check total_bytes_received: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check total_bytes_received: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_idle, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_no_fs_load, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_no_fs_load, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_mean_fs_load, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_security_mean_fs_load, bounds check cpu_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check total_bytes_received: 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_logs, 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_idle, bounds check total_bytes_received: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.

@PedroCordeiroDataDog

Copy link
Copy Markdown
Author

@codex review

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

Copy link
Copy Markdown

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: b11bcff94a

ℹ️ 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 thread comp/core/gui/impl/gui.go Outdated
Comment thread cmd/system-probe/api/agentrestart_darwin.go Outdated
@PedroCordeiroDataDog

Copy link
Copy Markdown
Author

@codex review

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

Copy link
Copy Markdown

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: fc0a14c79d

ℹ️ 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 thread comp/core/gui/impl/platform_darwin.go
Comment thread cmd/system-probe/api/agentrestart_darwin_test.go
@PedroCordeiroDataDog

Copy link
Copy Markdown
Author

I have read the CLA Document and I hereby sign the CLA

@PedroCordeiroDataDog

Copy link
Copy Markdown
Author

@codex review

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

Copy link
Copy Markdown

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: be3f308578

ℹ️ 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 thread comp/core/gui/impl/gui.go
sessionExpiration := deps.Config.GetDuration("GUI_session_expiration")
g.auth = newAuthenticator(authToken, sessionExpiration)
setGetAuthToken(deps.Ipc.GetAuthToken)
socketPath := deps.Config.GetString("system_probe_config.sysprobe_socket")

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 Use the system-probe config for the socket path

In macOS deployments where system-probe.yaml or DD_SYSPROBE_SOCKET overrides the system-probe socket, this reads the core Agent config instead of the system-probe config component. That setting is bound on the system-probe config side, so the GUI can fall back to the default path and restart() posts to the wrong Unix socket, making restart fail even though system-probe is running on the configured socket. Please source this from the sysprobe config component.

Useful? React with 👍 / 👎.

Comment on lines +33 to +35
w.WriteHeader(http.StatusOK)
if f, ok := w.(http.Flusher); ok {
f.Flush()

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 Report launchctl failures before returning success

When launchctl kickstart fails, for example because the service label is not bootstrapped, this sends and flushes a 200 before either restart is attempted; the later failures are only logged. The GUI treats the 200 response from /agent-restart as Success, so users can be told the restart worked even though neither service was restarted. Please perform the agent restart before the OK response, and only defer the self-terminating sysprobe restart, or otherwise surface failures before returning success.

Useful? React with 👍 / 👎.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant