Skip to content

(fleet) remove ensurepip from embedded Python#52526

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit into
mainfrom
arbll/binary-size-offset
Jun 22, 2026
Merged

(fleet) remove ensurepip from embedded Python#52526
gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit into
mainfrom
arbll/binary-size-offset

Conversation

@arbll

@arbll arbll commented Jun 20, 2026

Copy link
Copy Markdown
Member

Summary

This PR removes the ensurepip module from the embedded Python during the omnibus finalize step.

ensurepip is the module Python uses to bootstrap pip into an environment that doesn't have it. The shipped package already includes a fully installed pip, so ensurepip is unused at runtime and can be dropped from the artifact.

Size impact

Reduces the on-disk package size by ~1.8 MB.

It is removed in omnibus/config/software/datadog-agent-finalize.rb alongside the other embedded-Python size reductions, using a version-independent glob so it keeps working across Python upgrades.

Removes the ensurepip module from the embedded Python during the omnibus
finalize step, reducing on-disk package size by ~1.8MB.
@arbll arbll added changelog/no-changelog No changelog entry needed qa/done QA done before merge and regressions are covered by tests labels Jun 20, 2026
@dd-octo-sts dd-octo-sts Bot added internal Identify a non-fork PR team/agent-build labels Jun 20, 2026
@github-actions github-actions Bot added the short review PR is simple enough to be reviewed quickly label Jun 20, 2026
@datadog-prod-us1-3

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

Copy link
Copy Markdown
Contributor

🎯 Code Coverage (details)
Patch Coverage: 100.00%
Overall Coverage: 51.04% (+0.12%)

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

@dd-octo-sts

dd-octo-sts Bot commented Jun 20, 2026

Copy link
Copy Markdown
Contributor

Files inventory check summary

File checks results against ancestor c5f7e689:

Results for datadog-agent_7.82.0~devel.git.199.1b37195.pipeline.120049882-1_amd64.deb:

Detected file changes:

4 Removed files:

  • opt/datadog-agent/embedded/lib/python3.13/ensurepip/_bundled/pip-26.1.2-py3-none-any.whl (1.73 MiB)
  • opt/datadog-agent/embedded/lib/python3.13/ensurepip/__init__.py (8.06 KiB)
  • opt/datadog-agent/embedded/lib/python3.13/ensurepip/_uninstall.py (808.0 B)
  • opt/datadog-agent/embedded/lib/python3.13/ensurepip/__main__.py (88.0 B)

@dd-octo-sts

dd-octo-sts Bot commented Jun 20, 2026

Copy link
Copy Markdown
Contributor

Static quality checks

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

Successful checks

Info

Quality gate Change Size (prev → curr → max)
agent_deb_amd64 -1.75 MiB (0.23% reduction, +19.50% of buffer) 749.238 → 747.490 → 758.200
agent_deb_amd64_fips -1.73 MiB (0.25% reduction, +37.16% of buffer) 705.190 → 703.462 → 709.840
agent_heroku_amd64 -1.75 MiB (0.56% reduction, +33.32% of buffer) 309.985 → 308.238 → 315.230
agent_rpm_amd64 -1.75 MiB (0.23% reduction, +19.53% of buffer) 749.221 → 747.474 → 758.170
agent_rpm_amd64_fips -1.73 MiB (0.25% reduction, +37.03% of buffer) 705.173 → 703.445 → 709.840
agent_rpm_arm64 -1.74 MiB (0.24% reduction, +36.10% of buffer) 724.846 → 723.108 → 729.660
agent_rpm_arm64_fips -1.74 MiB (0.25% reduction, +39.83% of buffer) 684.497 → 682.759 → 688.860
agent_suse_amd64 -1.75 MiB (0.23% reduction, +19.53% of buffer) 749.221 → 747.474 → 758.170
agent_suse_amd64_fips -1.73 MiB (0.25% reduction, +37.03% of buffer) 705.173 → 703.445 → 709.840
agent_suse_arm64 -1.74 MiB (0.24% reduction, +36.10% of buffer) 724.846 → 723.108 → 729.660
agent_suse_arm64_fips -1.74 MiB (0.25% reduction, +39.83% of buffer) 684.497 → 682.759 → 688.860
docker_agent_amd64 -1.75 MiB (0.22% reduction, +36.06% of buffer) 808.944 → 807.197 → 813.790
docker_agent_arm64 -1.74 MiB (0.21% reduction, +31.53% of buffer) 809.519 → 807.781 → 815.030
docker_agent_jmx_amd64 -1.75 MiB (0.17% reduction, +37.12% of buffer) 999.842 → 998.094 → 1004.550
docker_agent_jmx_arm64 -1.74 MiB (0.18% reduction, +30.81% of buffer) 989.069 → 987.331 → 994.710
18 successful checks with minimal change (< 2 KiB)
Quality gate Current Size
agent_msi 615.549 MiB
docker_cluster_agent_amd64 208.048 MiB
docker_cluster_agent_arm64 221.251 MiB
docker_cws_instrumentation_amd64 7.447 MiB
docker_cws_instrumentation_arm64 6.877 MiB
docker_dogstatsd_amd64 39.084 MiB
docker_dogstatsd_arm64 37.255 MiB
docker_host_profiler_amd64 304.990 MiB
docker_host_profiler_arm64 316.090 MiB
dogstatsd_deb_amd64 29.747 MiB
dogstatsd_deb_arm64 27.802 MiB
dogstatsd_rpm_amd64 29.747 MiB
dogstatsd_suse_amd64 29.747 MiB
iot_agent_deb_amd64 45.566 MiB
iot_agent_deb_arm64 42.292 MiB
iot_agent_deb_armhf 43.077 MiB
iot_agent_rpm_amd64 45.566 MiB
iot_agent_suse_amd64 45.565 MiB

@cit-pr-commenter-54b7da

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

Copy link
Copy Markdown

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 5ffae443-e62f-4290-9324-2ea142a56324

Baseline: d9c4bad
Comparison: dc694be
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
quality_gate_metrics_logs memory utilization +0.92 [+0.66, +1.17] 1 Logs bounds checks dashboard
quality_gate_idle memory utilization -0.15 [-0.20, -0.09] 1 Logs bounds checks dashboard
quality_gate_idle_all_features memory utilization -0.23 [-0.27, -0.19] 1 Logs bounds checks dashboard
quality_gate_logs % cpu utilization -2.08 [-3.13, -1.03] 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 145.76MiB ≤ 154MiB bounds checks dashboard
quality_gate_idle total_bytes_received 10/10 574.93KiB ≤ 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 478.05MiB ≤ 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.22MiB ≤ 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.82MiB ≤ 292MiB bounds checks dashboard
quality_gate_metrics_logs cpu_usage 10/10 339.92 ≤ 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 404.00MiB ≤ 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

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_all_features baseline 10 Oom killed Debug Dashboard
quality_gate_idle_all_features 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

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 total_bytes_received: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check missed_bytes: 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_idle, 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_idle_all_features, 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_metrics_logs, bounds check cpu_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 intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check total_bytes_received: 10/10 replicas passed. Gate passed.
  • quality_gate_metrics_logs, bounds check missed_bytes: 10/10 replicas passed. Gate passed.

@arbll arbll marked this pull request as ready for review June 22, 2026 09:19
@arbll arbll requested a review from a team as a code owner June 22, 2026 09:19
@github-actions github-actions Bot deleted a comment from chatgpt-codex-connector Bot Jun 22, 2026

@alopezz alopezz left a comment

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.

We should probably add this here instead:

rm -f $$INSTALLDIR/lib/python{version}/config-*/Makefile
find $$INSTALLDIR/lib/python{version} -name '*.exe' -delete

@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot merged commit dc694be into main Jun 22, 2026
516 of 529 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot deleted the arbll/binary-size-offset branch June 22, 2026 10:11
@github-actions github-actions Bot added this to the 7.82.0 milestone Jun 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog/no-changelog No changelog entry needed internal Identify a non-fork PR qa/done QA done before merge and regressions are covered by tests short review PR is simple enough to be reviewed quickly team/agent-build

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants