Allow for heroku variant build.

[aiuto]

• Create agent "flavor" flags (none, fips, heroku)
• These can be used from the command line to install different pieces of the agent as needed.
• Use the distinction to install the correct set of OSS licenses.
• Fix license file for libpopt

Notes

Changing for heroku will invalidate the cache, but I can live with that

• it is a smaller build than the rest, an already a distinct pipelin
• for now, we are only using it for the packaging layers. My plan is to adopt Flagsets to be able to limit the scope of the flavor flag so that it will not reach outside of //packages/...

Testing

• Run tests and grab the .deb files
  • datadog-agent_7.75.0~devel.git.184.f795fc1.pipeline.85441522-1_arm64.deb
  • datadog-heroku-agent_7.75.0~devel.git.184.f795fc1.pipeline.85441522-1_amd64.deb
• unpack them both
• diff em

$ diff -r heroku/opt/datadog-agent/LICENSES plain/opt/datadog-agent/LICENSES
Only in plain/opt/datadog-agent/LICENSES: LICENSE-agent-data-plane-3rdparty.csv
Only in plain/opt/datadog-agent/LICENSES: LICENSES
Only in plain/opt/datadog-agent/LICENSES: attr-LGPL-2.1
Only in plain/opt/datadog-agent/LICENSES: dbus-AFL-2.1.txt
Only in plain/opt/datadog-agent/LICENSES: libgcrypt-COPYING.LIB
Only in plain/opt/datadog-agent/LICENSES: libkrb5-NOTICE
Only in plain/opt/datadog-agent/LICENSES: libselinux-LICENSE
Only in plain/opt/datadog-agent/LICENSES: lua-license.html
Only in plain/opt/datadog-agent/LICENSES: openscap-COPYING
Only in plain/opt/datadog-agent/LICENSES: popt-COPYING
Only in plain/opt/datadog-agent/LICENSES: rpm-COPYING
Only in plain/opt/datadog-agent/LICENSES: secret-generic-connector-LICENSE
Only in plain/opt/datadog-agent/LICENSES: util-linux-COPYING
Only in plain/opt/datadog-agent/LICENSES: xmlsec-Copyright
Only in plain/opt/datadog-agent/LICENSES: zstd-LICENSE

This is what we expect. All the openscap pieces are not in the heroku build

The important one is popt-COPYING. Since it was removed from //deps:all_deps we would not expect it, but now it is included through the flavor specific change to //compliance:all_agent_deps.

A smaller, but targeted test also shows the inclusion of popt-COPYING.

$ bazelisk run -- //packages/install_dir:install --destdir=/tmp/xdefault
$ bazelisk run --//packages/agent:flavor=heroku -- //packages/install_dir:install --destdir=/tmp/xhero
$ diff -r /tmp/xhero/  /tmp/xdefault/
Only in /tmp/xdefault/LICENSES: popt-COPYING

Next steps

• create //deps/openscap to being the openscap build
  • collect all scap deps under there and move them out of //deps:all_deps
  • point non-heroku compliance at //deps/openscap:all_deps instead of popt
• try this out with the Flagsets feature.

[agent-platform-auto-pr[bot]]

Static quality checks

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

Successful checks

Info

	Quality gate	Delta	On disk size (MiB)	Delta	On wire size (MiB)
✅	agent_deb_amd64	$${+0}$$	$${705.42}$$ < $${707.13}$$	$${+0}$$	$${172.99}$$ < $${174.16}$$
✅	agent_deb_amd64_fips	$${+0}$$	$${701.64}$$ < $${702.86}$$	$${-0}$$	$${172.27}$$ < $${173.5}$$
✅	agent_heroku_amd64	$${-0}$$	$${327.72}$$ < $${327.92}$$	$${+0.01}$$	$${87.16}$$ < $${88.21}$$
✅	agent_msi	$${+0}$$	$${571.12}$$ < $${982.08}$$	$${+0.02}$$	$${142.68}$$ < $${143.49}$$
✅	agent_rpm_amd64	$${+0}$$	$${705.4}$$ < $${707.12}$$	$${-0}$$	$${176.1}$$ < $${177.29}$$
✅	agent_rpm_amd64_fips	$${+0}$$	$${701.63}$$ < $${702.85}$$	$${-0.01}$$	$${175.1}$$ < $${176.32}$$
✅	agent_rpm_arm64	$${+0}$$	$${687.27}$$ < $${691.67}$$	$${-0.05}$$	$${159.05}$$ < $${160.7}$$
✅	agent_rpm_arm64_fips	$${+0}$$	$${684.33}$$ < $${687.54}$$	$${+0.01}$$	$${158.79}$$ < $${160.11}$$
✅	agent_suse_amd64	$${+0}$$	$${705.4}$$ < $${707.12}$$	$${-0}$$	$${176.1}$$ < $${177.29}$$
✅	agent_suse_amd64_fips	$${+0}$$	$${701.63}$$ < $${702.85}$$	$${-0.01}$$	$${175.1}$$ < $${176.32}$$
✅	agent_suse_arm64	$${+0}$$	$${687.27}$$ < $${691.67}$$	$${-0.05}$$	$${159.05}$$ < $${160.7}$$
✅	agent_suse_arm64_fips	$${+0}$$	$${684.33}$$ < $${687.54}$$	$${+0.01}$$	$${158.79}$$ < $${160.11}$$
✅	docker_agent_amd64	$${+0}$$	$${767.2}$$ < $${769.38}$$	$${+0.02}$$	$${260.53}$$ < $${262.06}$$
✅	docker_agent_arm64	$${+0}$$	$${773.64}$$ < $${778.35}$$	$${-0}$$	$${249.61}$$ < $${251.72}$$
✅	docker_agent_jmx_amd64	$${+0}$$	$${958.08}$$ < $${960.26}$$	$${+0.03}$$	$${329.17}$$ < $${330.69}$$
✅	docker_agent_jmx_arm64	$${+0}$$	$${953.24}$$ < $${957.95}$$	$${-0.01}$$	$${314.23}$$ < $${316.35}$$
✅	docker_cluster_agent_amd64	$${-0}$$	$${180.33}$$ < $${181.08}$$	$${+0}$$	$${63.71}$$ < $${64.49}$$
✅	docker_cluster_agent_arm64	$${+0}$$	$${196.19}$$ < $${198.49}$$	$${+0}$$	$${60.0}$$ < $${61.17}$$
✅	docker_cws_instrumentation_amd64	$${0}$$	$${7.13}$$ < $${7.18}$$	$${+0}$$	$${2.99}$$ < $${3.33}$$
✅	docker_cws_instrumentation_arm64	$${0}$$	$${6.69}$$ < $${6.92}$$	$${+0}$$	$${2.73}$$ < $${3.09}$$
✅	docker_dogstatsd_amd64	$${+0}$$	$${38.76}$$ < $${39.38}$$	$${+0}$$	$${15.0}$$ < $${15.82}$$
✅	docker_dogstatsd_arm64	$${0}$$	$${37.06}$$ < $${37.94}$$	$${+0}$$	$${14.33}$$ < $${14.83}$$
✅	dogstatsd_deb_amd64	$${0}$$	$${29.98}$$ < $${30.61}$$	$${-0}$$	$${7.93}$$ < $${8.79}$$
✅	dogstatsd_deb_arm64	$${0}$$	$${28.14}$$ < $${29.11}$$	$${+0}$$	$${6.81}$$ < $${7.71}$$
✅	dogstatsd_rpm_amd64	$${0}$$	$${29.98}$$ < $${30.61}$$	$${+0}$$	$${7.94}$$ < $${8.8}$$
✅	dogstatsd_suse_amd64	$${0}$$	$${29.98}$$ < $${30.61}$$	$${+0}$$	$${7.94}$$ < $${8.8}$$
✅	iot_agent_deb_amd64	$${0}$$	$${42.92}$$ < $${43.29}$$	$${+0}$$	$${11.23}$$ < $${12.04}$$
✅	iot_agent_deb_arm64	$${0}$$	$${40.05}$$ < $${40.92}$$	$${-0}$$	$${9.61}$$ < $${10.45}$$
✅	iot_agent_deb_armhf	$${0}$$	$${40.63}$$ < $${41.03}$$	$${+0}$$	$${9.8}$$ < $${10.62}$$
✅	iot_agent_rpm_amd64	$${0}$$	$${42.92}$$ < $${43.29}$$	$${+0}$$	$${11.25}$$ < $${12.06}$$
✅	iot_agent_suse_amd64	$${0}$$	$${42.92}$$ < $${43.29}$$	$${+0}$$	$${11.25}$$ < $${12.06}$$

[cit-pr-commenter[bot]]

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: dd252159-324c-4cef-82d4-78d559485904

Baseline: ced40f92aab0414582b56a0f0f1a6b4cd81af992 Comparison: d6dbb2a89187d4b1fd8c3864946559415a078386 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.61	[-5.59, +0.36]	1	Logs

Fine details of change detection per experiment

perf	experiment	goal	Δ mean %	Δ mean % CI	trials	links
➖	quality_gate_metrics_logs	memory utilization	+0.86	[+0.65, +1.06]	1	Logs bounds checks dashboard
➖	file_tree	memory utilization	+0.34	[+0.28, +0.40]	1	Logs
➖	uds_dogstatsd_20mb_12k_contexts_20_senders	memory utilization	+0.32	[+0.26, +0.37]	1	Logs
➖	quality_gate_idle_all_features	memory utilization	+0.17	[+0.13, +0.20]	1	Logs bounds checks dashboard
➖	ddot_metrics_sum_cumulativetodelta_exporter	memory utilization	+0.15	[-0.08, +0.37]	1	Logs
➖	quality_gate_idle	memory utilization	+0.12	[+0.07, +0.17]	1	Logs bounds checks dashboard
➖	file_to_blackhole_500ms_latency	egress throughput	+0.08	[-0.30, +0.45]	1	Logs
➖	docker_containers_memory	memory utilization	+0.08	[+0.00, +0.15]	1	Logs
➖	file_to_blackhole_100ms_latency	egress throughput	+0.04	[-0.00, +0.09]	1	Logs
➖	file_to_blackhole_0ms_latency	egress throughput	+0.04	[-0.35, +0.42]	1	Logs
➖	file_to_blackhole_1000ms_latency	egress throughput	+0.03	[-0.38, +0.45]	1	Logs
➖	otlp_ingest_logs	memory utilization	+0.01	[-0.09, +0.11]	1	Logs
➖	uds_dogstatsd_to_api	ingress throughput	-0.00	[-0.13, +0.13]	1	Logs
➖	uds_dogstatsd_to_api_v3	ingress throughput	-0.01	[-0.14, +0.12]	1	Logs
➖	tcp_dd_logs_filter_exclude	ingress throughput	-0.01	[-0.08, +0.06]	1	Logs
➖	otlp_ingest_metrics	memory utilization	-0.08	[-0.23, +0.07]	1	Logs
➖	ddot_metrics_sum_cumulative	memory utilization	-0.10	[-0.27, +0.06]	1	Logs
➖	ddot_metrics_sum_delta	memory utilization	-0.12	[-0.34, +0.09]	1	Logs
➖	ddot_logs	memory utilization	-0.21	[-0.27, -0.14]	1	Logs
➖	ddot_metrics	memory utilization	-0.82	[-1.05, -0.59]	1	Logs
➖	quality_gate_logs	% cpu utilization	-1.53	[-2.99, -0.08]	1	Logs bounds checks dashboard
➖	tcp_syslog_to_blackhole	ingress throughput	-1.83	[-1.92, -1.74]	1	Logs
➖	docker_containers_cpu	% cpu utilization	-2.61	[-5.59, +0.36]	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:

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_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.
• quality_gate_metrics_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
• quality_gate_logs, bounds check lost_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 memory_usage: 10/10 replicas passed. Gate passed.
• quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.

[aiuto]

After the week of discussion, I think this is better than https://github.com/DataDog/datadog-agent/pull/44033

[aiuto]

/merge

[dd-devflow-routing-codex[bot]]

View all feedbacks in Devflow UI.

2025-12-18 15:14:16 UTC :information_source: Start processing command /merge

---

2025-12-18 15:14:26 UTC :information_source: MergeQueue: waiting for PR to be ready

This pull request is not mergeable according to GitHub. Common reasons include pending required checks, missing approvals, or merge conflicts — but it could also be blocked by other repository rules or settings. It will be added to the queue as soon as checks pass and/or get approvals. Note: if you pushed new commits since the last approval, you may need additional approval. You can remove it from the waiting list with /remove command.

---

2025-12-18 16:58:18 UTC :information_source: MergeQueue: merge request added to the queue

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

---

2025-12-18 18:36:18 UTC :information_source: MergeQueue: This merge request was merged