Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix agent's version-manifests #34245

Merged
merged 5 commits into from
Feb 21, 2025
Merged

Fix agent's version-manifests #34245

merged 5 commits into from
Feb 21, 2025

Conversation

chouquette
Copy link
Contributor

What does this PR do?

Fix incorrect version manifest being generated and packaged.

Motivation

The version-manifest.txt & version-manifest.json files we ship in our packages are broken since we started splitting build & packaging.
This is because omnibus will systematically generate those files based on the software that were build for the current project.
When packaging, we only have 2 softwares being built, and we end up overriding the manifests generated during the build jobs with incorrect ones.
This PR fixes this.

Describe how you validated your changes

Will be verified manually once the pipeline for this PR completes

Possible Drawbacks / Trade-offs

Additional Notes

@chouquette chouquette requested review from a team as code owners February 20, 2025 13:05
@github-actions github-actions bot added the short review PR is simple enough to be reviewed quickly label Feb 20, 2025
@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Feb 20, 2025

[Fast Unit Tests Report]

On pipeline 56427079 (CI Visibility). The following jobs did not run any unit tests:

Jobs:
  • tests_deb-arm64-py3
  • tests_deb-x64-py3
  • tests_flavor_dogstatsd_deb-x64
  • tests_flavor_heroku_deb-x64
  • tests_flavor_iot_deb-x64
  • tests_rpm-arm64-py3
  • tests_rpm-x64-py3
  • tests_windows-x64

If you modified Go files and expected unit tests to run in these jobs, please double check the job logs. If you think tests should have been executed reach out to #agent-devx-help

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Feb 20, 2025

Uncompressed package size comparison

Comparison with ancestor 5cb7c13670570d7824786f0d8b8db785a6a2f4cf

Diff per package
package diff status size ancestor threshold
datadog-agent-x86_64-rpm 0.04MB ⚠️ 878.43MB 878.39MB 0.50MB
datadog-agent-x86_64-suse 0.04MB ⚠️ 878.43MB 878.39MB 0.50MB
datadog-agent-aarch64-rpm 0.04MB ⚠️ 867.75MB 867.71MB 0.50MB
datadog-agent-amd64-deb 0.04MB ⚠️ 868.67MB 868.62MB 0.50MB
datadog-agent-arm64-deb 0.04MB ⚠️ 858.01MB 857.96MB 0.50MB
datadog-dogstatsd-amd64-deb 0.00MB 41.39MB 41.39MB 0.50MB
datadog-dogstatsd-x86_64-rpm 0.00MB 41.47MB 41.47MB 0.50MB
datadog-dogstatsd-x86_64-suse 0.00MB 41.47MB 41.47MB 0.50MB
datadog-dogstatsd-arm64-deb 0.00MB 39.65MB 39.65MB 0.50MB
datadog-iot-agent-amd64-deb 0.00MB 61.84MB 61.84MB 0.50MB
datadog-iot-agent-x86_64-rpm 0.00MB 61.91MB 61.91MB 0.50MB
datadog-iot-agent-x86_64-suse 0.00MB 61.91MB 61.91MB 0.50MB
datadog-iot-agent-arm64-deb 0.00MB 59.09MB 59.09MB 0.50MB
datadog-iot-agent-aarch64-rpm 0.00MB 59.16MB 59.16MB 0.50MB
datadog-heroku-agent-amd64-deb -0.02MB 445.87MB 445.88MB 0.50MB

Decision

⚠️ Warning

@chouquette
Copy link
Contributor Author

Verified with the pipeline's artifacts:

{
  "manifest_format": 2,
  "software": {
    "datadog-agent-prepare": {
      "locked_version": "1.0.0",
      "locked_source": null,
      "source_type": "project_local",
      "described_version": "1.0.0",
      "license": "project_license",
      "dependencies": [

      ]
    },
    "libxcrypt": {
      "locked_version": "4.4.36",
      "locked_source": {
        "sha256": "e5e1f4caee0a01de2aee26e3138807d6d3ca2b8e67287966d1fefd65e1fd8943",
        "url": "https://github.com/besser82/libxcrypt/releases/download/v4.4.36/libxcrypt-4.4.36.tar.xz",
        "extract": "seven_zip",
        "ship_source_offer": true
      },
      "source_type": "url",
      "described_version": "4.4.36",
      "license": "LGPL-2.1",
      "dependencies": [

      ]
    },
    "config_guess": {
      "locked_version": "master",
      "locked_source": {
        "url": "https://github.com/chef-boneyard/config-mirror/archive/refs/heads/master.tar.gz",
        "sha256": "cc60204d0b512cfd86eca96c079b48494495c5b7937c873b708cce81ca52dc2d"
      },
      "source_type": "url",
      "described_version": "master",
      "license": "GPL-3.0 (with exception)",
      "dependencies": [

      ]
    },
    ....

with the changes.

Prior to this PR, this was the file content:

{
  "manifest_format": 2,
  "software": {
    "package-artifacts": {
      "locked_version": null,
      "locked_source": null,
      "source_type": "project_local",
      "described_version": null,
      "license": "Unspecified",
      "dependencies": [

      ]
    },
    "init-scripts-agent": {
      "locked_version": null,
      "locked_source": null,
      "source_type": "project_local",
      "described_version": null,
      "license": "Unspecified",
      "dependencies": [

      ]
    }
  },
  "build_version": "7.63.0",
  "build_git_revision": "2bbd8a37c4c26cbd5eba6307ca549cfef5dbd6eb",
  "license": "Apache-2.0"
}

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Feb 20, 2025

Static quality checks ✅

Please find below the results from static quality gates

Successful checks

Info

Result Quality gate On disk size On disk size limit On wire size On wire size limit
static_quality_gate_agent_deb_amd64 840.17MiB 847.49MiB 203.06MiB 212.33MiB
static_quality_gate_agent_deb_arm64 830.11MiB 836.66MiB 183.13MiB 192.5MiB
static_quality_gate_agent_rpm_amd64 840.15MiB 847.82MiB 206.18MiB 215.76MiB
static_quality_gate_agent_rpm_arm64 830.07MiB 836.66MiB 185.29MiB 194.24MiB
static_quality_gate_agent_suse_amd64 840.19MiB 847.82MiB 206.18MiB 215.76MiB
static_quality_gate_agent_suse_arm64 829.98MiB 836.66MiB 185.29MiB 194.24MiB
static_quality_gate_dogstatsd_deb_amd64 39.55MiB 49.7MiB 10.54MiB 20.6MiB
static_quality_gate_dogstatsd_deb_arm64 37.89MiB 48.1MiB 9.12MiB 19.1MiB
static_quality_gate_dogstatsd_rpm_amd64 39.55MiB 49.7MiB 10.56MiB 20.6MiB
static_quality_gate_dogstatsd_suse_amd64 39.55MiB 49.7MiB 10.56MiB 20.6MiB
static_quality_gate_iot_agent_deb_amd64 59.05MiB 69.0MiB 14.84MiB 24.8MiB
static_quality_gate_iot_agent_deb_arm64 56.42MiB 66.4MiB 12.8MiB 22.8MiB
static_quality_gate_iot_agent_rpm_amd64 59.05MiB 69.0MiB 14.86MiB 24.8MiB
static_quality_gate_iot_agent_rpm_arm64 56.43MiB 66.4MiB 12.82MiB 22.8MiB
static_quality_gate_iot_agent_suse_amd64 59.05MiB 69.0MiB 14.86MiB 24.8MiB
static_quality_gate_docker_agent_amd64 924.54MiB 931.7MiB 308.97MiB 318.67MiB
static_quality_gate_docker_agent_arm64 937.7MiB 944.08MiB 293.96MiB 303.0MiB
static_quality_gate_docker_agent_jmx_amd64 1.1GiB 1.1GiB 384.07MiB 393.75MiB
static_quality_gate_docker_agent_jmx_arm64 1.1GiB 1.1GiB 365.02MiB 373.71MiB
static_quality_gate_docker_dogstatsd_amd64 47.69MiB 57.88MiB 18.26MiB 28.29MiB
static_quality_gate_docker_dogstatsd_arm64 46.08MiB 56.27MiB 17.02MiB 27.06MiB
static_quality_gate_docker_cluster_agent_amd64 264.84MiB 274.78MiB 106.32MiB 116.28MiB
static_quality_gate_docker_cluster_agent_arm64 280.88MiB 290.82MiB 101.15MiB 111.12MiB

Copy link

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: e569e0d9-9e31-4f05-82ff-27746ff0f95d

Baseline: 5cb7c13
Comparison: 0997f8c
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
uds_dogstatsd_to_api_cpu % cpu utilization +1.68 [+0.76, +2.61] 1 Logs
file_tree memory utilization +0.79 [+0.73, +0.85] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput +0.64 [+0.18, +1.11] 1 Logs
quality_gate_idle_all_features memory utilization +0.14 [+0.09, +0.20] 1 Logs bounds checks dashboard
file_to_blackhole_500ms_latency egress throughput +0.13 [-0.66, +0.92] 1 Logs
quality_gate_idle memory utilization +0.10 [+0.07, +0.14] 1 Logs bounds checks dashboard
file_to_blackhole_300ms_latency egress throughput +0.01 [-0.61, +0.64] 1 Logs
uds_dogstatsd_to_api ingress throughput +0.01 [-0.28, +0.30] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.01 [-0.79, +0.81] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput +0.00 [-0.01, +0.02] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput -0.00 [-0.83, +0.83] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.00 [-0.65, +0.65] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput -0.01 [-0.83, +0.81] 1 Logs
file_to_blackhole_1000ms_latency egress throughput -0.27 [-1.03, +0.50] 1 Logs
tcp_syslog_to_blackhole ingress throughput -1.01 [-1.07, -0.95] 1 Logs
quality_gate_logs % cpu utilization -2.25 [-5.24, +0.74] 1 Logs

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 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
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:

  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_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, 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_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.

@chouquette chouquette added the qa/no-code-change No code change in Agent code requiring validation label Feb 20, 2025
@chouquette
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Feb 21, 2025

View all feedbacks in Devflow UI.
2025-02-21 08:43:11 UTC ℹ️ Start processing command /merge


2025-02-21 08:43:15 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in main is 34m.


2025-02-21 08:46:03 UTC 🚨 MergeQueue: This merge request is in error

Gitlab pipeline didn't start on its own and we were unable to create it... Please retry.

Error: POST https://gitlab.ddbuild.io/api/v4/projects/DataDog/datadog-agent/pipeline: 400 {message: {base: [Reference not found]}} (type: ErrorResponse, retryable: true)

@chouquette chouquette added the backport/7.64.x Automatically create a backport PR to 7.64.x label Feb 21, 2025
@chouquette
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Feb 21, 2025

View all feedbacks in Devflow UI.
2025-02-21 09:23:18 UTC ℹ️ Start processing command /merge


2025-02-21 09:23:21 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in main is 34m.


2025-02-21 09:53:29 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue dd-mergequeue bot merged commit 9330bf1 into main Feb 21, 2025
290 of 291 checks passed
@dd-mergequeue dd-mergequeue bot deleted the chouquette/version_manifest branch February 21, 2025 09:53
@github-actions github-actions bot added this to the 7.65.0 milestone Feb 21, 2025
agent-platform-auto-pr bot pushed a commit that referenced this pull request Feb 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/7.64.x Automatically create a backport PR to 7.64.x qa/no-code-change No code change in Agent code requiring validation short review PR is simple enough to be reviewed quickly team/agent-delivery
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants