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

DCA: don't upload security-agent-policies git/github folders to S3 #33653

Merged
merged 2 commits into from
Feb 3, 2025

Conversation

chouquette
Copy link
Contributor

@chouquette chouquette commented Feb 3, 2025

What does this PR do?

We don't need those to build the DCA docker image

Motivation

Don't include unneeded files in the build context which should speed up the build a bit

Describe how you validated your changes

Possible Drawbacks / Trade-offs

Additional Notes

@chouquette chouquette added changelog/no-changelog qa/no-code-change No code change in Agent code requiring validation team/agent-delivery labels Feb 3, 2025
@chouquette chouquette requested review from a team as code owners February 3, 2025 07:32
@chouquette chouquette changed the title DCA: don't upload security-agent-policies git/github folder to S3 DCA: don't upload security-agent-policies git/github folders to S3 Feb 3, 2025
@github-actions github-actions bot added the short review PR is simple enough to be reviewed quickly label Feb 3, 2025
@agent-platform-auto-pr
Copy link
Contributor

Gitlab CI Configuration Changes

Modified Jobs

.cluster_agent-build_common
  .cluster_agent-build_common:
    before_script:
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache.tar.xz
    needs:
    - go_mod_tidy_check
    - go_deps
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - if: $CI_COMMIT_TAG != null
    - if: $RELEASE_VERSION_7 != ""
    script:
    - inv check-go-version
    - inv -e cluster-agent.build --release-version "$RELEASE_VERSION_7"
    - $S3_CP_CMD $CI_PROJECT_DIR/$CLUSTER_AGENT_BINARIES_DIR/datadog-cluster-agent $S3_ARTIFACTS_URI/datadog-cluster-agent.$ARCH
    - $S3_CP_CMD $CI_PROJECT_DIR/Dockerfiles/cluster-agent/datadog-cluster.yaml $S3_ARTIFACTS_URI/datadog-cluster.yaml
    - $S3_CP_CMD $CI_PROJECT_DIR/Dockerfiles/cluster-agent/security-agent-policies $S3_ARTIFACTS_URI/security-agent-policies
-     --recursive
+     --recursive --exclude '.git/*' --exclude '.github/*'
    stage: binary_build
    variables:
      KUBERNETES_CPU_REQUEST: 6
      KUBERNETES_MEMORY_LIMIT: 8Gi
      KUBERNETES_MEMORY_REQUEST: 8Gi
cluster_agent-build_amd64
  cluster_agent-build_amd64:
    before_script:
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache.tar.xz
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - go_mod_tidy_check
    - go_deps
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - if: $CI_COMMIT_TAG != null
    - if: $RELEASE_VERSION_7 != ""
    script:
    - inv check-go-version
    - inv -e cluster-agent.build --release-version "$RELEASE_VERSION_7"
    - $S3_CP_CMD $CI_PROJECT_DIR/$CLUSTER_AGENT_BINARIES_DIR/datadog-cluster-agent $S3_ARTIFACTS_URI/datadog-cluster-agent.$ARCH
    - $S3_CP_CMD $CI_PROJECT_DIR/Dockerfiles/cluster-agent/datadog-cluster.yaml $S3_ARTIFACTS_URI/datadog-cluster.yaml
    - $S3_CP_CMD $CI_PROJECT_DIR/Dockerfiles/cluster-agent/security-agent-policies $S3_ARTIFACTS_URI/security-agent-policies
-     --recursive
+     --recursive --exclude '.git/*' --exclude '.github/*'
    stage: binary_build
    tags:
    - arch:amd64
    variables:
      ARCH: amd64
      KUBERNETES_CPU_REQUEST: 6
      KUBERNETES_MEMORY_LIMIT: 8Gi
      KUBERNETES_MEMORY_REQUEST: 8Gi
cluster_agent-build_arm64
  cluster_agent-build_arm64:
    before_script:
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache.tar.xz
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_arm64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - go_mod_tidy_check
    - go_deps
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - if: $CI_COMMIT_TAG != null
    - if: $RELEASE_VERSION_7 != ""
    script:
    - inv check-go-version
    - inv -e cluster-agent.build --release-version "$RELEASE_VERSION_7"
    - $S3_CP_CMD $CI_PROJECT_DIR/$CLUSTER_AGENT_BINARIES_DIR/datadog-cluster-agent $S3_ARTIFACTS_URI/datadog-cluster-agent.$ARCH
    - $S3_CP_CMD $CI_PROJECT_DIR/Dockerfiles/cluster-agent/datadog-cluster.yaml $S3_ARTIFACTS_URI/datadog-cluster.yaml
    - $S3_CP_CMD $CI_PROJECT_DIR/Dockerfiles/cluster-agent/security-agent-policies $S3_ARTIFACTS_URI/security-agent-policies
-     --recursive
+     --recursive --exclude '.git/*' --exclude '.github/*'
    stage: binary_build
    tags:
    - arch:arm64
    variables:
      ARCH: arm64
      KUBERNETES_CPU_REQUEST: 6
      KUBERNETES_MEMORY_LIMIT: 8Gi
      KUBERNETES_MEMORY_REQUEST: 8Gi

Changes Summary

Removed Modified Added Renamed
0 3 0 0

ℹ️ Diff available in the job log.

@agent-platform-auto-pr
Copy link
Contributor

Uncompressed package size comparison

Comparison with ancestor fb05305b0661ed34fcf9d2313526eb8eeb872987

Diff per package
package diff status size ancestor threshold
datadog-agent-amd64-deb 0.00MB 877.18MB 877.18MB 0.50MB
datadog-agent-x86_64-rpm 0.00MB 886.92MB 886.92MB 0.50MB
datadog-agent-x86_64-suse 0.00MB 886.92MB 886.92MB 0.50MB
datadog-agent-arm64-deb 0.00MB 864.97MB 864.97MB 0.50MB
datadog-agent-aarch64-rpm 0.00MB 874.69MB 874.69MB 0.50MB
datadog-dogstatsd-amd64-deb 0.00MB 59.02MB 59.02MB 0.50MB
datadog-dogstatsd-x86_64-rpm 0.00MB 59.10MB 59.10MB 0.50MB
datadog-dogstatsd-x86_64-suse 0.00MB 59.10MB 59.10MB 0.50MB
datadog-dogstatsd-arm64-deb 0.00MB 56.51MB 56.51MB 0.50MB
datadog-heroku-agent-amd64-deb 0.00MB 456.45MB 456.45MB 0.50MB
datadog-iot-agent-amd64-deb 0.00MB 93.84MB 93.84MB 0.50MB
datadog-iot-agent-x86_64-rpm 0.00MB 93.91MB 93.91MB 0.50MB
datadog-iot-agent-x86_64-suse 0.00MB 93.91MB 93.91MB 0.50MB
datadog-iot-agent-arm64-deb 0.00MB 89.89MB 89.89MB 0.50MB
datadog-iot-agent-aarch64-rpm 0.00MB 89.96MB 89.96MB 0.50MB

Decision

✅ Passed

@agent-platform-auto-pr
Copy link
Contributor

[Fast Unit Tests Report]

On pipeline 54678250 (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

Copy link

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 48acd3be-2a58-4f7c-9025-378636e8a8d5

Baseline: fb05305
Comparison: 056dbee
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
tcp_syslog_to_blackhole ingress throughput +1.19 [+1.11, +1.26] 1 Logs
quality_gate_idle_all_features memory utilization +0.89 [+0.81, +0.96] 1 Logs bounds checks dashboard
quality_gate_idle memory utilization +0.08 [+0.02, +0.14] 1 Logs bounds checks dashboard
file_tree memory utilization +0.03 [-0.04, +0.09] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.02 [-0.86, +0.91] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput +0.02 [-0.86, +0.90] 1 Logs
uds_dogstatsd_to_api ingress throughput +0.01 [-0.28, +0.30] 1 Logs
file_to_blackhole_300ms_latency egress throughput +0.00 [-0.64, +0.64] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.01, +0.01] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.00 [-0.63, +0.63] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput -0.07 [-0.93, +0.80] 1 Logs
file_to_blackhole_500ms_latency egress throughput -0.10 [-0.88, +0.69] 1 Logs
file_to_blackhole_1000ms_latency egress throughput -0.35 [-1.13, +0.43] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput -0.44 [-0.91, +0.02] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization -0.57 [-1.45, +0.30] 1 Logs
quality_gate_logs % cpu utilization -2.03 [-5.07, +1.01] 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_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_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_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.

@chouquette
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Feb 3, 2025

Devflow running: /merge

View all feedbacks in Devflow UI.


2025-02-03 08:36:28 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in main is 27m.


2025-02-03 09:02:38 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue dd-mergequeue bot merged commit 2d763d6 into main Feb 3, 2025
263 of 265 checks passed
@dd-mergequeue dd-mergequeue bot deleted the chouquette/dca_exclude_git branch February 3, 2025 09:02
@github-actions github-actions bot added this to the 7.64.0 milestone Feb 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog 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.

2 participants