Remove plugin import from containerd #32538

pgimalac · 2024-12-27T11:31:47Z

What does this PR do?

Remove the import to std plugin package in https://github.com/containerd/containerd.

See containerd/containerd#11202 for details.
This PR pins containerd version to the merge commit adding the build tag.

Motivation

On amd64, containerd imports plugin.
I believe the import partially disables dead code elimination and/or prevents shortening symbol names, so I expect seeing binary size reduction on amd64.

EDIT: the core agent alone is reduced from 218MB to 150MB, a 31% reduction !
Overall it reduces dogstatsd package by 20MB and the agent package by 186MB, see this comment for details.
It also reduces measured RSS by around 25MB in quality_gate_idle and 35MB in quality_gate_idle_all_features.

Describe how you validated your changes

The only code change is disabling containerd plugins, which we are not using.

Possible Drawbacks / Trade-offs

Additional Notes

Using the existing static_build tag would also work, but it is used by many other packages so I was worried of unexpected behavior changes if we used it.

For the record using containerd v2 should also fix the issue but it's not that easy to do.

cit-pr-commenter · 2024-12-27T11:43:28Z

Go Package Import Differences

Baseline: 41d6bc3
Comparison: bf229d3

binary	os	arch	change
agent	linux	amd64	+1, -2 +github.com/containerd/containerd/api/types/runc/options -github.com/containerd/containerd/runtime/v2/runc/options -plugin
agent	linux	arm64	+1, -1 +github.com/containerd/containerd/api/types/runc/options -github.com/containerd/containerd/runtime/v2/runc/options
agent	windows	amd64	+1, -1 +github.com/containerd/containerd/api/types/runc/options -github.com/containerd/containerd/runtime/v2/runc/options
dogstatsd	linux	amd64	+2, -2 +github.com/containerd/containerd/api/types/runc/options -github.com/containerd/containerd/runtime/v2/runc/options +github.com/containerd/continuity/devices -plugin
dogstatsd	linux	arm64	+2, -1 +github.com/containerd/containerd/api/types/runc/options -github.com/containerd/containerd/runtime/v2/runc/options +github.com/containerd/continuity/devices
process-agent	linux	amd64	+2, -2 +github.com/containerd/containerd/api/types/runc/options -github.com/containerd/containerd/runtime/v2/runc/options +github.com/containerd/continuity/devices -plugin
process-agent	linux	arm64	+2, -1 +github.com/containerd/containerd/api/types/runc/options -github.com/containerd/containerd/runtime/v2/runc/options +github.com/containerd/continuity/devices
process-agent	windows	amd64	+1, -1 +github.com/containerd/containerd/api/types/runc/options -github.com/containerd/containerd/runtime/v2/runc/options
security-agent	linux	amd64	+2, -2 +github.com/containerd/containerd/api/types/runc/options -github.com/containerd/containerd/runtime/v2/runc/options +github.com/containerd/continuity/devices -plugin
security-agent	linux	arm64	+2, -1 +github.com/containerd/containerd/api/types/runc/options -github.com/containerd/containerd/runtime/v2/runc/options +github.com/containerd/continuity/devices
security-agent	windows	amd64	+1, -1 +github.com/containerd/containerd/api/types/runc/options -github.com/containerd/containerd/runtime/v2/runc/options
system-probe	linux	amd64	+1, -1 +github.com/containerd/containerd/api/types/runc/options -github.com/containerd/containerd/runtime/v2/runc/options
system-probe	linux	arm64	+1, -1 +github.com/containerd/containerd/api/types/runc/options -github.com/containerd/containerd/runtime/v2/runc/options

agent-platform-auto-pr · 2024-12-27T12:00:17Z

Uncompressed package size comparison

Comparison with ancestor 41d6bc3b2371085793c3314084deb36b29af7641

Diff per package

package	diff	status	size	ancestor	threshold
datadog-agent-arm64-deb	0.03MB	⚠️	940.41MB	940.38MB	140.00MB
datadog-agent-aarch64-rpm	0.03MB	⚠️	949.71MB	949.68MB	140.00MB
datadog-dogstatsd-arm64-deb	0.01MB	⚠️	56.12MB	56.11MB	10.00MB
datadog-heroku-agent-amd64-deb	0.00MB	✅	506.12MB	506.12MB	70.00MB
datadog-iot-agent-amd64-deb	0.00MB	✅	113.78MB	113.78MB	10.00MB
datadog-iot-agent-x86_64-rpm	0.00MB	✅	113.85MB	113.85MB	10.00MB
datadog-iot-agent-x86_64-suse	0.00MB	✅	113.85MB	113.85MB	10.00MB
datadog-iot-agent-arm64-deb	0.00MB	✅	109.23MB	109.23MB	10.00MB
datadog-iot-agent-aarch64-rpm	0.00MB	✅	109.30MB	109.30MB	10.00MB
datadog-dogstatsd-amd64-deb	-20.40MB	✅	58.61MB	79.00MB	10.00MB
datadog-dogstatsd-x86_64-rpm	-20.40MB	✅	58.69MB	79.08MB	10.00MB
datadog-dogstatsd-x86_64-suse	-20.40MB	✅	58.69MB	79.08MB	10.00MB
datadog-agent-amd64-deb	-186.98MB	✅	1011.03MB	1198.01MB	140.00MB
datadog-agent-x86_64-rpm	-186.98MB	✅	1020.34MB	1207.33MB	140.00MB
datadog-agent-x86_64-suse	-186.98MB	✅	1020.34MB	1207.33MB	140.00MB

Decision

⚠️ Warning

cit-pr-commenter · 2024-12-27T12:29:16Z

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: fa167cdf-3510-41c4-b3db-b5aee051297c

Baseline: 41d6bc3
Comparison: bf229d3
Diff

Optimization Goals: ✅ Improvement(s) detected

perf	experiment	goal	Δ mean %	Δ mean % CI	trials	links
✅	quality_gate_idle_all_features	memory utilization	-5.01	[-5.10, -4.93]	1	Logs bounds checks dashboard
✅	file_tree	memory utilization	-5.63	[-5.75, -5.50]	1	Logs
✅	quality_gate_idle	memory utilization	-6.34	[-6.37, -6.30]	1	Logs bounds checks dashboard

Fine details of change detection per experiment

perf	experiment	goal	Δ mean %	Δ mean % CI	trials	links
➖	quality_gate_logs	% cpu utilization	+4.02	[+0.73, +7.30]	1	Logs
➖	uds_dogstatsd_to_api_cpu	% cpu utilization	+2.04	[+1.35, +2.73]	1	Logs
➖	tcp_syslog_to_blackhole	ingress throughput	+1.07	[+1.00, +1.14]	1	Logs
➖	file_to_blackhole_1000ms_latency	egress throughput	+0.45	[-0.34, +1.25]	1	Logs
➖	file_to_blackhole_0ms_latency_http2	egress throughput	+0.10	[-0.82, +1.02]	1	Logs
➖	file_to_blackhole_0ms_latency_http1	egress throughput	+0.08	[-0.81, +0.96]	1	Logs
➖	file_to_blackhole_0ms_latency	egress throughput	+0.03	[-0.83, +0.90]	1	Logs
➖	uds_dogstatsd_to_api	ingress throughput	+0.01	[-0.11, +0.13]	1	Logs
➖	tcp_dd_logs_filter_exclude	ingress throughput	+0.00	[-0.01, +0.02]	1	Logs
➖	file_to_blackhole_100ms_latency	egress throughput	-0.00	[-0.65, +0.65]	1	Logs
➖	file_to_blackhole_300ms_latency	egress throughput	-0.03	[-0.67, +0.61]	1	Logs
➖	file_to_blackhole_1000ms_latency_linear_load	egress throughput	-0.03	[-0.50, +0.43]	1	Logs
➖	file_to_blackhole_500ms_latency	egress throughput	-0.26	[-1.05, +0.52]	1	Logs
✅	quality_gate_idle_all_features	memory utilization	-5.01	[-5.10, -4.93]	1	Logs bounds checks dashboard
✅	file_tree	memory utilization	-5.63	[-5.75, -5.50]	1	Logs
✅	quality_gate_idle	memory utilization	-6.34	[-6.37, -6.30]	1	Logs bounds checks dashboard

Bounds Checks: ✅ Passed

perf	experiment	bounds_check_name	replicates_passed	links
✅	file_to_blackhole_0ms_latency	lost_bytes	10/10
✅	file_to_blackhole_0ms_latency	memory_usage	10/10
✅	file_to_blackhole_0ms_latency_http1	lost_bytes	10/10
✅	file_to_blackhole_0ms_latency_http1	memory_usage	10/10
✅	file_to_blackhole_0ms_latency_http2	lost_bytes	10/10
✅	file_to_blackhole_0ms_latency_http2	memory_usage	10/10
✅	file_to_blackhole_1000ms_latency	memory_usage	10/10
✅	file_to_blackhole_1000ms_latency_linear_load	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_300ms_latency	lost_bytes	10/10
✅	file_to_blackhole_300ms_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	memory_usage	10/10	bounds checks dashboard
✅	quality_gate_idle_all_features	memory_usage	10/10	bounds checks dashboard
✅	quality_gate_logs	lost_bytes	10/10
✅	quality_gate_logs	memory_usage	10/10

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_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
quality_gate_idle_all_features, bounds check memory_usage: 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.

go.mod

…/containerd-no-plugin

vboulineau

Minor comment, LGTM otherwise.

go.mod

pgimalac · 2025-01-06T16:19:41Z

/merge

dd-devflow · 2025-01-06T16:20:18Z

Devflow running: `/merge`

View all feedbacks in Devflow UI.

2025-01-06 16:20:18 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in main is 35m.

2025-01-06 16:54:50 UTC ℹ️ MergeQueue: This merge request was merged

chore: remove plugin import from containerd

837fda0

pgimalac added changelog/no-changelog [deprecated] team/agent-shared-components Deprecated. Use team/agent-configuration or team/agent-runtimes labels instead. qa/done QA done before merge and regressions are covered by tests labels Dec 27, 2024

github-actions bot added the short review PR is simple enough to be reviewed quickly label Dec 27, 2024

pgimalac requested review from a team December 27, 2024 12:48

pgimalac marked this pull request as ready for review December 27, 2024 12:49

pgimalac requested review from a team as code owners December 27, 2024 12:49

clamoriniere reviewed Dec 27, 2024

View reviewed changes

go.mod Outdated Show resolved Hide resolved

github-actions bot added medium review PR review might take time and removed short review PR is simple enough to be reviewed quickly labels Dec 27, 2024

This was referenced Dec 27, 2024

[V1] containerd makes binaries bigger due to importing std plugin containerd/containerd#11202

Closed

[release/1.7] Add a build tag to disable std plugin import (#11202) containerd/containerd#11203

Merged

pgimalac added 3 commits January 6, 2025 14:35

chore: remove replace directive, use merged commit

c7d288d

fix: licenses

bb75334

Merge branch 'main' of github.com:DataDog/datadog-agent into pgimalac…

5bc0deb

…/containerd-no-plugin

vboulineau approved these changes Jan 6, 2025

View reviewed changes

go.mod Show resolved Hide resolved

docs: explain why pinning a specific commit

bf229d3

KevinFairise2 approved these changes Jan 6, 2025

View reviewed changes

dd-mergequeue bot merged commit f20d554 into main Jan 6, 2025
221 checks passed

dd-mergequeue bot deleted the pgimalac/containerd-no-plugin branch January 6, 2025 16:54

github-actions bot added this to the 7.63.0 milestone Jan 6, 2025

scottopell mentioned this pull request Jan 7, 2025

Ratchet down the Quality Gate RSS limits to lock in recent improvements #32731

Merged

mwdd146980 pushed a commit that referenced this pull request Jan 10, 2025

Remove plugin import from containerd (#32538)

33313bf

paulcacheux mentioned this pull request Jan 12, 2025

build system-probe with containerd's no_dynamic_plugins #32885

Merged

pgimalac mentioned this pull request Feb 7, 2025

Remove lazy linker flag #33824

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove plugin import from containerd #32538

Remove plugin import from containerd #32538

pgimalac commented Dec 27, 2024 •

edited

Loading

cit-pr-commenter bot commented Dec 27, 2024 •

edited

Loading

agent-platform-auto-pr bot commented Dec 27, 2024 •

edited

Loading

cit-pr-commenter bot commented Dec 27, 2024 •

edited

Loading

Fine details of change detection per experiment

Bounds Checks: ✅ Passed

Explanation

vboulineau left a comment

pgimalac commented Jan 6, 2025

dd-devflow bot commented Jan 6, 2025 •

edited

Loading

Remove plugin import from containerd #32538

Remove plugin import from containerd #32538

Conversation

pgimalac commented Dec 27, 2024 • edited Loading

What does this PR do?

Motivation

Describe how you validated your changes

Possible Drawbacks / Trade-offs

Additional Notes

cit-pr-commenter bot commented Dec 27, 2024 • edited Loading

Go Package Import Differences

agent-platform-auto-pr bot commented Dec 27, 2024 • edited Loading

Uncompressed package size comparison

Decision

cit-pr-commenter bot commented Dec 27, 2024 • edited Loading

Regression Detector

Regression Detector Results

Optimization Goals: ✅ Improvement(s) detected

Fine details of change detection per experiment

Bounds Checks: ✅ Passed

Explanation

CI Pass/Fail Decision

vboulineau left a comment

Choose a reason for hiding this comment

pgimalac commented Jan 6, 2025

dd-devflow bot commented Jan 6, 2025 • edited Loading

Devflow running: /merge

pgimalac commented Dec 27, 2024 •

edited

Loading

cit-pr-commenter bot commented Dec 27, 2024 •

edited

Loading

agent-platform-auto-pr bot commented Dec 27, 2024 •

edited

Loading

cit-pr-commenter bot commented Dec 27, 2024 •

edited

Loading

dd-devflow bot commented Jan 6, 2025 •

edited

Loading

Devflow running: `/merge`