[AGENTRUN-1124] Replace gopsutil fork with upstream where possible#47700
[AGENTRUN-1124] Replace gopsutil fork with upstream where possible#47700gh-worker-dd-mergequeue-cf854d[bot] merged 2 commits intomainfrom
Conversation
Go Package Import DifferencesBaseline: 2d4c8db
|
| // difference between methods for collecting macOS platform, kernel version | ||
| // between shirou and Datadog psutil | ||
| "github.com/DataDog/gopsutil/host" | ||
| "github.com/shirou/gopsutil/v4/cpu" | ||
| "github.com/shirou/gopsutil/v4/host" |
There was a problem hiding this comment.
This has a side effect: the PlatformFamily field changes from "darwin" to either "Standalone Workstation" or "Server", but the Platform field is still "darwin", so it seems like an improvement to me, but I can change to keep the same values as previously
There was a problem hiding this comment.
SGTM. In the processes pipeline we don't actually process either the PlatformFamily or Platform field in our backend. We only use name.
https://github.com/search?q=repo%3ADataDog%2Fdd-go+OS.family&type=code
dbeb0be to
470f021
Compare
Files inventory check summaryFile checks results against ancestor 2d4c8db1: Results for datadog-agent_7.78.0~devel.git.498.470f021.pipeline.101814285-1_amd64.deb:No change detected |
Static quality checks✅ Please find below the results from static quality gates Successful checksInfo
3 successful checks with minimal change (< 2 KiB)
On-wire sizes (compressed)
|
Regression DetectorRegression Detector ResultsMetrics dashboard Baseline: f833cb1 Optimization Goals: ✅ No significant changes detected
|
| perf | experiment | goal | Δ mean % | Δ mean % CI | trials | links |
|---|---|---|---|---|---|---|
| ➖ | docker_containers_cpu | % cpu utilization | +4.87 | [+1.77, +7.97] | 1 | Logs |
Fine details of change detection per experiment
| perf | experiment | goal | Δ mean % | Δ mean % CI | trials | links |
|---|---|---|---|---|---|---|
| ➖ | docker_containers_cpu | % cpu utilization | +4.87 | [+1.77, +7.97] | 1 | Logs |
| ➖ | ddot_metrics_sum_cumulative | memory utilization | +0.58 | [+0.44, +0.72] | 1 | Logs |
| ➖ | otlp_ingest_logs | memory utilization | +0.45 | [+0.35, +0.54] | 1 | Logs |
| ➖ | ddot_logs | memory utilization | +0.34 | [+0.27, +0.40] | 1 | Logs |
| ➖ | uds_dogstatsd_20mb_12k_contexts_20_senders | memory utilization | +0.21 | [+0.15, +0.27] | 1 | Logs |
| ➖ | ddot_metrics | memory utilization | +0.09 | [-0.08, +0.27] | 1 | Logs |
| ➖ | file_to_blackhole_500ms_latency | egress throughput | +0.08 | [-0.32, +0.48] | 1 | Logs |
| ➖ | file_to_blackhole_100ms_latency | egress throughput | +0.04 | [-0.06, +0.13] | 1 | Logs |
| ➖ | quality_gate_idle_all_features | memory utilization | +0.03 | [-0.01, +0.07] | 1 | Logs bounds checks dashboard |
| ➖ | quality_gate_metrics_logs | memory utilization | +0.03 | [-0.20, +0.27] | 1 | Logs bounds checks dashboard |
| ➖ | docker_containers_memory | memory utilization | +0.02 | [-0.05, +0.10] | 1 | Logs |
| ➖ | uds_dogstatsd_to_api | ingress throughput | +0.02 | [-0.18, +0.22] | 1 | Logs |
| ➖ | ddot_metrics_sum_delta | memory utilization | +0.01 | [-0.16, +0.18] | 1 | Logs |
| ➖ | tcp_dd_logs_filter_exclude | ingress throughput | -0.00 | [-0.10, +0.09] | 1 | Logs |
| ➖ | file_to_blackhole_1000ms_latency | egress throughput | -0.01 | [-0.44, +0.42] | 1 | Logs |
| ➖ | uds_dogstatsd_to_api_v3 | ingress throughput | -0.02 | [-0.23, +0.20] | 1 | Logs |
| ➖ | file_to_blackhole_0ms_latency | egress throughput | -0.03 | [-0.55, +0.49] | 1 | Logs |
| ➖ | quality_gate_idle | memory utilization | -0.24 | [-0.29, -0.19] | 1 | Logs bounds checks dashboard |
| ➖ | file_tree | memory utilization | -0.43 | [-0.48, -0.37] | 1 | Logs |
| ➖ | otlp_ingest_metrics | memory utilization | -0.48 | [-0.64, -0.32] | 1 | Logs |
| ➖ | ddot_metrics_sum_cumulativetodelta_exporter | memory utilization | -0.49 | [-0.71, -0.27] | 1 | Logs |
| ➖ | tcp_syslog_to_blackhole | ingress throughput | -1.38 | [-1.54, -1.22] | 1 | Logs |
| ➖ | quality_gate_logs | % cpu utilization | -4.54 | [-6.20, -2.87] | 1 | Logs bounds checks dashboard |
Bounds Checks: ✅ Passed
| perf | experiment | bounds_check_name | replicates_passed | observed_value | links |
|---|---|---|---|---|---|
| ✅ | docker_containers_cpu | simple_check_run | 10/10 | 688 ≥ 26 | |
| ✅ | docker_containers_memory | memory_usage | 10/10 | 274.70MiB ≤ 370MiB | |
| ✅ | docker_containers_memory | simple_check_run | 10/10 | 712 ≥ 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 | 172.89MiB ≤ 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 | 490.83MiB ≤ 550MiB | bounds checks dashboard |
| ✅ | quality_gate_logs | intake_connections | 10/10 | 4 ≤ 6 | bounds checks dashboard |
| ✅ | quality_gate_logs | memory_usage | 10/10 | 202.21MiB ≤ 220MiB | bounds checks dashboard |
| ✅ | quality_gate_logs | missed_bytes | 10/10 | 0B = 0B | bounds checks dashboard |
| ✅ | quality_gate_metrics_logs | cpu_usage | 10/10 | 408.07 ≤ 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 | 391.26MiB ≤ 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:
-
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 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_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_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_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.
bitomaxsp
left a comment
There was a problem hiding this comment.
Overall looks good, but I can't assess if affected like PlatformFamily is critical or not.
| // difference between methods for collecting macOS platform, kernel version | ||
| // between shirou and Datadog psutil | ||
| "github.com/DataDog/gopsutil/host" | ||
| "github.com/shirou/gopsutil/v4/cpu" | ||
| "github.com/shirou/gopsutil/v4/host" |
There was a problem hiding this comment.
SGTM. In the processes pipeline we don't actually process either the PlatformFamily or Platform field in our backend. We only use name.
https://github.com/search?q=repo%3ADataDog%2Fdd-go+OS.family&type=code
|
/merge |
|
View all feedbacks in Devflow UI.
The expected merge time in
|
What does this PR do?
Replace the gopsutil fork with upstream where possible, and isolate the remaining uses.
See below for the impact of some of the changes.
The fork is now only used on Darwin for live process collection, I'll look into that in a follow-up.
Motivation
Remove the fork as much as possible.
Describe how you validated your changes
CI
Additional Notes
Changes with behavioral impact:
host.PlatformInformation()on Darwin:PlatformFamilychanges from always "darwin" to either "Standalone Workstation" or "Server".host.PlatformInformation()on Windows: version field previously returned "10.0.19041 Build 19041" (WMI). Now callsKernelVersion()instead, returning "10.0.19041.x Build 19041.x" (RtlGetVersion, same format, adds UBR patch revision).host.BootTime()on Linux (test only): upstream uses/proc/uptimefloat arithmetic in Docker/LXC containers instead of the integer btime from/proc/stat, so the test assertion is relaxed to within 1 second.No behavior changes:
host.BootTime()on Windows: different underlying API (GetTickCount64vsWMI), same result.host.KernelVersion()on Linux:uname()syscall vs/proc/sys/kernel/osrelease, same value.host.PlatformInformation()on Linux: upstream v4 respectsHOST_ETCidentically to the fork, same results for all supported distros.host.Info()on Linux: same fields and values, stale comment about missing containerized environment support removed.process.MemoryMaps(): struct literal replaced withNewProcess(), same behavior.