Add Battery Check for Mac by briantu · Pull Request #43986 · DataDog/datadog-agent

briantu · 2025-12-09T00:16:55Z

What does this PR do?

This PR is a continuation of #43789 but this time to collect battery metrics on MacOS devices.

Motivation

https://datadoghq.atlassian.net/browse/WINA-2068

Describe how you validated your changes

Standalone project on work mac laptop + unit tests
Built the agent

dda inv agent.build --build-exclude=systemd
cp /Users/brian.tu/go/src/github.com/DataDog/datadog-agent/bin/agent/dist/conf.d/battery.d/conf.yaml.example /Users/brian.tu/go/src/github.com/DataDog/datadog-agent/bin/agent/dist/conf.d/battery.d/conf.yaml
./bin/agent/agent check battery

Additional Notes

agent-platform-auto-pr · 2025-12-09T01:00:04Z

Static quality checks

✅ Please find below the results from static quality gates
Comparison made with ancestor c50397d

Successful checks

Info

	Quality gate	Delta	On disk size (MiB)	Delta	On wire size (MiB)
✅	agent_deb_amd64	$${+0}$$	$${705.48}$$ < $${706.32}$$	$${-0.01}$$	$${172.88}$$ < $${173.81}$$
✅	agent_deb_amd64_fips	$${+0}$$	$${700.82}$$ < $${701.16}$$	$${-0.05}$$	$${171.83}$$ < $${172.71}$$
✅	agent_heroku_amd64	$${+0}$$	$${327.27}$$ < $${327.69}$$	$${+0}$$	$${87.23}$$ < $${88.19}$$
✅	agent_msi	$${0}$$	$${568.86}$$ < $${982.08}$$	$${+0.04}$$	$${141.77}$$ < $${143.01}$$
✅	agent_rpm_amd64	$${+0}$$	$${705.47}$$ < $${706.31}$$	$${-0.06}$$	$${175.9}$$ < $${176.86}$$
✅	agent_rpm_amd64_fips	$${+0}$$	$${700.81}$$ < $${701.15}$$	$${+0.03}$$	$${174.0}$$ < $${174.95}$$
✅	agent_rpm_arm64	$${+0}$$	$${691.14}$$ < $${691.67}$$	$${+0.02}$$	$${159.73}$$ < $${160.7}$$
✅	agent_rpm_arm64_fips	$${-0}$$	$${687.36}$$ < $${687.54}$$	$${-0.01}$$	$${159.18}$$ < $${160.1}$$
✅	agent_suse_amd64	$${+0}$$	$${705.47}$$ < $${706.31}$$	$${-0.06}$$	$${175.9}$$ < $${176.86}$$
✅	agent_suse_amd64_fips	$${+0}$$	$${700.81}$$ < $${701.15}$$	$${+0.03}$$	$${174.0}$$ < $${174.95}$$
✅	agent_suse_arm64	$${+0}$$	$${691.14}$$ < $${691.67}$$	$${+0.02}$$	$${159.73}$$ < $${160.7}$$
✅	agent_suse_arm64_fips	$${-0}$$	$${687.36}$$ < $${687.54}$$	$${-0.01}$$	$${159.18}$$ < $${160.1}$$
✅	docker_agent_amd64	$${+0}$$	$${767.81}$$ < $${768.66}$$	$${+0}$$	$${260.63}$$ < $${261.52}$$
✅	docker_agent_arm64	$${+0}$$	$${777.76}$$ < $${778.35}$$	$${+0.01}$$	$${250.81}$$ < $${251.72}$$
✅	docker_agent_jmx_amd64	$${+0}$$	$${958.69}$$ < $${959.54}$$	$${-0}$$	$${329.27}$$ < $${330.15}$$
✅	docker_agent_jmx_arm64	$${+0}$$	$${957.36}$$ < $${957.95}$$	$${+0.01}$$	$${315.43}$$ < $${316.35}$$
✅	docker_cluster_agent_amd64	$${+0}$$	$${179.11}$$ < $${179.28}$$	$${+0}$$	$${63.24}$$ < $${63.96}$$
✅	docker_cluster_agent_arm64	$${+0}$$	$${196.58}$$ < $${196.79}$$	$${-0}$$	$${59.96}$$ < $${60.69}$$
✅	docker_cws_instrumentation_amd64	$${0}$$	$${7.07}$$ < $${7.12}$$	$${+0}$$	$${2.95}$$ < $${3.29}$$
✅	docker_cws_instrumentation_arm64	$${0}$$	$${6.69}$$ < $${6.92}$$	$${-0}$$	$${2.71}$$ < $${3.07}$$
✅	docker_dogstatsd_amd64	$${0}$$	$${38.66}$$ < $${39.3}$$	$${-0}$$	$${14.93}$$ < $${15.76}$$
✅	docker_dogstatsd_arm64	$${-0}$$	$${37.36}$$ < $${37.94}$$	$${-0}$$	$${14.38}$$ < $${14.83}$$
✅	dogstatsd_deb_amd64	$${0}$$	$${29.88}$$ < $${30.53}$$	$${-0}$$	$${7.88}$$ < $${8.75}$$
✅	dogstatsd_deb_arm64	$${0}$$	$${28.4}$$ < $${29.11}$$	$${+0}$$	$${6.82}$$ < $${7.71}$$
✅	dogstatsd_rpm_amd64	$${0}$$	$${29.88}$$ < $${30.53}$$	$${-0}$$	$${7.89}$$ < $${8.76}$$
✅	dogstatsd_suse_amd64	$${0}$$	$${29.88}$$ < $${30.53}$$	$${-0}$$	$${7.89}$$ < $${8.76}$$
✅	iot_agent_deb_amd64	$${+0}$$	$${42.62}$$ < $${43.19}$$	$${+0}$$	$${11.13}$$ < $${11.98}$$
✅	iot_agent_deb_arm64	$${0}$$	$${40.36}$$ < $${40.92}$$	$${+0}$$	$${9.58}$$ < $${10.45}$$
✅	iot_agent_deb_armhf	$${0}$$	$${40.26}$$ < $${40.86}$$	$${+0}$$	$${9.7}$$ < $${10.56}$$
✅	iot_agent_rpm_amd64	$${+0}$$	$${42.62}$$ < $${43.19}$$	$${-0}$$	$${11.14}$$ < $${12.0}$$
✅	iot_agent_suse_amd64	$${+0}$$	$${42.62}$$ < $${43.19}$$	$${-0}$$	$${11.14}$$ < $${12.0}$$

cit-pr-commenter · 2025-12-12T23:12:28Z

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: f1266160-6111-4b2f-b041-725ca3ce50ae

Baseline: c50397d
Comparison: 4203162
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	+2.19	[-0.81, +5.19]	1	Logs

Fine details of change detection per experiment

perf	experiment	goal	Δ mean %	Δ mean % CI	trials	links
➖	docker_containers_cpu	% cpu utilization	+2.19	[-0.81, +5.19]	1	Logs
➖	ddot_metrics_sum_cumulative	memory utilization	+0.68	[+0.51, +0.85]	1	Logs
➖	ddot_metrics_sum_cumulativetodelta_exporter	memory utilization	+0.62	[+0.39, +0.85]	1	Logs
➖	quality_gate_idle	memory utilization	+0.42	[+0.37, +0.46]	1	Logs bounds checks dashboard
➖	uds_dogstatsd_20mb_12k_contexts_20_senders	memory utilization	+0.24	[+0.19, +0.29]	1	Logs
➖	quality_gate_idle_all_features	memory utilization	+0.22	[+0.18, +0.25]	1	Logs bounds checks dashboard
➖	ddot_logs	memory utilization	+0.12	[+0.06, +0.18]	1	Logs
➖	ddot_metrics	memory utilization	+0.12	[-0.10, +0.33]	1	Logs
➖	file_to_blackhole_0ms_latency	egress throughput	+0.03	[-0.36, +0.43]	1	Logs
➖	file_to_blackhole_1000ms_latency	egress throughput	+0.03	[-0.38, +0.44]	1	Logs
➖	file_to_blackhole_100ms_latency	egress throughput	+0.03	[-0.03, +0.08]	1	Logs
➖	file_to_blackhole_500ms_latency	egress throughput	+0.01	[-0.36, +0.39]	1	Logs
➖	uds_dogstatsd_to_api	ingress throughput	+0.01	[-0.11, +0.13]	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.07, +0.07]	1	Logs
➖	file_tree	memory utilization	-0.02	[-0.08, +0.04]	1	Logs
➖	docker_containers_memory	memory utilization	-0.10	[-0.17, -0.03]	1	Logs
➖	quality_gate_logs	% cpu utilization	-0.12	[-1.57, +1.34]	1	Logs bounds checks dashboard
➖	ddot_metrics_sum_delta	memory utilization	-0.13	[-0.32, +0.06]	1	Logs
➖	otlp_ingest_metrics	memory utilization	-0.41	[-0.57, -0.26]	1	Logs
➖	otlp_ingest_logs	memory utilization	-0.67	[-0.78, -0.57]	1	Logs
➖	quality_gate_metrics_logs	memory utilization	-1.06	[-1.26, -0.85]	1	Logs bounds checks dashboard
➖	tcp_syslog_to_blackhole	ingress throughput	-1.42	[-1.51, -1.33]	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:

Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.
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.
Its configuration does not mark it "erratic".

CI Pass/Fail Decision

✅ Passed. All Quality Gates 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_logs, bounds check lost_bytes: 10/10 replicas passed. Gate 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_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_metrics_logs, bounds check intake_connections: 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 memory_usage: 10/10 replicas passed. Gate passed.
quality_gate_metrics_logs, bounds check cpu_usage: 10/10 replicas passed. Gate passed.

briantu · 2025-12-17T15:33:47Z

/merge

dd-devflow-routing-codex · 2025-12-17T15:33:51Z

View all feedbacks in Devflow UI.

2025-12-17 15:33:51 UTC ℹ️ Start processing command /merge

2025-12-17 15:33:57 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in main is approximately 1h (p90).

2025-12-17 15:55:52 UTC ℹ️ MergeQueue: This merge request was merged

This reverts commit a539002.

Reverts #43986 Causing #incident-47253

### What does this PR do? Original PR (#43986) for adding the battery check was reverted (#44359) due to #incident-47253. The error was: ```2025-12-17T16:18:24.181035Z 01O Error: 2025-12-17T16:18:24.181036Z 01O 2025-12-17T16:18:24.181036Z 01O # github.com/DataDog/datadog-agent/pkg/collector/corechecks/system/battery 2025-12-17T16:18:24.181037Z 01O battery_darwin.m:12:61: error: 'kIOMainPortDefault' is only available on macOS 12.0 or newer [-Werror,-Wunguarded-availability-new] 2025-12-17T16:18:24.181057Z 01O /Applications/Xcode-16.2.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Headers/IOKitLib.h:112:19: note: 'kIOMainPortDefault' has been marked as being introduced in macOS 12.0 here, but the deployment target is macOS 11.0.0 ``` This PR includes the fix that caused the incident. - kIOMainPortDefault was introduced in macOS 12.0, use kIOMasterPortDefault for older versions ### Motivation https://datadoghq.atlassian.net/browse/WINA-2068 ### Describe how you validated your changes Ran full pipeline with the fix: https://gitlab.ddbuild.io/DataDog/datadog-agent/-/pipelines/87391310/ ### Additional Notes Co-authored-by: mrafi97 <[email protected]> Co-authored-by: brian.tu <[email protected]>

mrafi97 and others added 10 commits December 2, 2025 09:42

adding battery check

9fbf342

updating check config and run

6104e91

organizing check files

acbf05e

adding voltage and charge rate

d7e6b71

Adding changelog

a3427f7

fixing lint errors

4299d65

editing a comment

12da48f

adjusting buffer allocation and adding metric

37220e1

fixing error handling and rounding

73889d7

Add battery check for mac

ef2a1b4

briantu requested a review from a team as a code owner December 9, 2025 00:16

briantu requested review from jose-manuel-almaza and mrafi97 December 9, 2025 00:16

briantu added qa/done QA done before merge and regressions are covered by tests ask-review Ask in slack required teams to review this PR labels Dec 9, 2025

iglendd reviewed Dec 9, 2025

View reviewed changes

Comment thread pkg/collector/corechecks/system/battery/battery_darwin.h Outdated

Comment thread pkg/collector/corechecks/system/battery/battery_darwin.go Outdated

github-actions Bot added the medium review PR review might take time label Dec 9, 2025

guohdd reviewed Dec 9, 2025

View reviewed changes

Comment thread pkg/collector/corechecks/system/battery/battery_darwin.h Outdated

Comment thread pkg/collector/corechecks/system/battery/battery_darwin_test.go Outdated

Refactor code

0fb9ef9

briantu requested a review from a team as a code owner December 9, 2025 17:03

Release note

0da1a00

briantu requested a review from a team as a code owner December 9, 2025 17:18

Fix nix

456f127

briantu requested review from guohdd and iglendd December 9, 2025 18:53

cswatt approved these changes Dec 9, 2025

View reviewed changes

iglendd reviewed Dec 9, 2025

View reviewed changes

Comment thread pkg/collector/corechecks/system/battery/battery_darwin.go Outdated

Comment thread pkg/collector/corechecks/system/battery/battery_darwin.go Outdated

Base automatically changed from mrafi/battery-check to main December 12, 2025 17:56

dd-mergequeue Bot requested a review from a team as a code owner December 12, 2025 17:56

briantu added 2 commits December 12, 2025 14:36

Merge branch 'main' into brian.tu/battery-check-mac

cc6cf02

Make mac props optional

e6c0466

github-actions Bot added team/windows-products long review PR is complex, plan time to review it and removed medium review PR review might take time labels Dec 12, 2025

briantu requested a review from iglendd December 12, 2025 21:58

briantu added 2 commits December 12, 2025 17:16

Test getBatteryInfo

16d013a

Fix nix

0c969c9

julien-lebot reviewed Dec 15, 2025

View reviewed changes

Comment thread pkg/collector/corechecks/system/battery/battery.go Outdated

hush-hush approved these changes Dec 16, 2025

View reviewed changes

Use option.Option[T]

4203162

briantu force-pushed the brian.tu/battery-check-mac branch from c7d8fc4 to 4203162 Compare December 16, 2025 16:59

julien-lebot approved these changes Dec 16, 2025

View reviewed changes

jeremy-hanna approved these changes Dec 16, 2025

View reviewed changes

dd-mergequeue Bot merged commit a539002 into main Dec 17, 2025
293 checks passed

dd-mergequeue Bot deleted the brian.tu/battery-check-mac branch December 17, 2025 15:55

github-actions Bot added this to the 7.75.0 milestone Dec 17, 2025

pducolin added a commit that referenced this pull request Dec 17, 2025

Revert "Add Battery Check for Mac (#43986)"

fcf0af5

This reverts commit a539002.

pducolin mentioned this pull request Dec 17, 2025

Revert "Add Battery Check for Mac" #44359

Merged

pducolin added a commit that referenced this pull request Dec 17, 2025

Revert "Add Battery Check for Mac" (#44359)

ac61bc8

Reverts #43986 Causing #incident-47253

briantu mentioned this pull request Dec 17, 2025

Add Battery Check for Mac #44371

Merged

KevinFairise2 restored the brian.tu/battery-check-mac branch January 16, 2026 09:26

gh-worker-devtools-f43747 Bot deleted the brian.tu/battery-check-mac branch June 18, 2026 03:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add Battery Check for Mac#43986

Add Battery Check for Mac#43986
dd-mergequeue[bot] merged 18 commits into
mainfrom
brian.tu/battery-check-mac

briantu commented Dec 9, 2025 •

edited

Loading

Uh oh!

agent-platform-auto-pr Bot commented Dec 9, 2025 •

edited

Loading

Info

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cit-pr-commenter Bot commented Dec 12, 2025 •

edited

Loading

Experiments ignored for regressions

Fine details of change detection per experiment

Bounds Checks: ✅ Passed

Explanation

Uh oh!

Uh oh!

briantu commented Dec 17, 2025

Uh oh!

dd-devflow-routing-codex Bot commented Dec 17, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Conversation

briantu commented Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Motivation

Describe how you validated your changes

Additional Notes

Uh oh!

agent-platform-auto-pr Bot commented Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Static quality checks

Info

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cit-pr-commenter Bot commented Dec 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Regression Detector

Regression Detector Results

Optimization Goals: ✅ No significant changes detected

Experiments ignored for regressions

Fine details of change detection per experiment

Bounds Checks: ✅ Passed

Explanation

CI Pass/Fail Decision

Uh oh!

Uh oh!

briantu commented Dec 17, 2025

Uh oh!

dd-devflow-routing-codex Bot commented Dec 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

briantu commented Dec 9, 2025 •

edited

Loading

agent-platform-auto-pr Bot commented Dec 9, 2025 •

edited

Loading

cit-pr-commenter Bot commented Dec 12, 2025 •

edited

Loading

dd-devflow-routing-codex Bot commented Dec 17, 2025 •

edited

Loading