Merge branch 'main' into len.gamburg/agent-tel-extend-histogr

.copyright-overrides.yml

@@ -378,3 +378,15 @@ github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp/multiendpoint: Copyright 2024
 github.com/NVIDIA/go-nvml/*: Copyright 2023 NVIDIA CORPORATION
 
 github.com/jonboulle/clockwork: Copyright 2014 Nell Boulle
+
+github.com/nozzle/throttler: Copyright 2018 Derek Perkins
+github.com/openvex/discovery/*: Copyright 2023 The OpenVEX Authors
+github.com/sassoftware/relic/*: Copyright (c) SAS Institute Inc.
+github.com/transparency-dev/merkle: Copyright 2017 Google LLC. All Rights Reserved.
+github.com/transparency-dev/merkle/compact: Copyright 2019 Google LLC. All Rights Reserved.
+github.com/transparency-dev/merkle/proof:
+- Copyright 2017 Google LLC. All Rights Reserved.
+- Copyright 2022 Google LLC. All Rights Reserved.
+github.com/transparency-dev/merkle/rfc6962: Copyright 2016 Google LLC. All Rights Reserved.
+
+gopkg.in/go-jose/go-jose.v2: Copyright 2014 Square Inc.

.gitlab/.ci-linters.yml

@@ -42,6 +42,7 @@ needs-rules:
     - tests_windows_sysprobe_x64
     - trigger_auto_staging_release
     - trigger_manual_prod_release
+    - generate_windows_gitlab_runner_bump_pr
 
 # Lists jobs that are allowed to not be within JOBOWNERS
 job-owners:

.gitlab/JOBOWNERS

@@ -127,6 +127,7 @@ deploy_containers-cws-instrumentation* @DataDog/agent-security
 # Trigger release
 trigger_manual_prod_release            @DataDog/agent-delivery
 trigger_auto_staging_release           @DataDog/agent-delivery
+generate_windows_gitlab_runner_bump_pr @DataDog/agent-delivery
 
 # Integration test
 integration_tests_windows*    @DataDog/windows-agent

.gitlab/notify/notify.yml

@@ -28,8 +28,23 @@ notify:
     - GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $GITLAB_TOKEN read_api) || exit $?; export GITLAB_TOKEN
     - DD_API_KEY=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_API_KEY_ORG2 token) || exit $?; export DD_API_KEY
     - python3 -m pip install -r requirements.txt -r tasks/libs/requirements-notifications.txt
-    - invoke -e notify.send-message -p $CI_PIPELINE_ID
-    - invoke -e notify.check-consistent-failures -p $CI_PIPELINE_ID
+    - |
+      # Do not send notifications if this is a child pipeline of another repo
+      # The triggering repo should already have its own notification system
+      if [ "$CI_PIPELINE_SOURCE" != "pipeline" ]; then
+        if [ "$DEPLOY_AGENT" = "true" ]; then
+          invoke -e notify.send-message --notification-type "deploy"
+        elif [ "$CI_PIPELINE_SOURCE" != "push" ]; then
+          invoke -e notify.send-message --notification-type "trigger"
+        else
+          invoke -e notify.send-message --notification-type "merge"
+        fi
+        if [ "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" ]; then
+          invoke notify.check-consistent-failures
+        fi
+      else
+        echo "This pipeline was triggered by another repository, skipping notification."
+      fi
 
 send_pipeline_stats:
   stage: notify

.gitlab/trigger_release/trigger_release.yml

@@ -55,3 +55,33 @@ trigger_manual_prod_release:
     - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+){0,1}$/
       when: never
     - !reference [.on_deploy_stable_or_beta_manual_auto_on_stable]
+
+include:
+  - https://gitlab-templates.ddbuild.io/slack-notifier/v3-sdm/template.yml
+
+.setup_github_app_agent_platform_auto_pr:
+  # GitHub App rate-limits are per-app. Since we are rarely calling the job, we are only using the instance 2
+  - |
+    GITHUB_KEY_B64=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $MACOS_GITHUB_APP_2 key_b64) || exit $?; export GITHUB_KEY_B64
+    GITHUB_APP_ID=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $MACOS_GITHUB_APP_2 app_id) || exit $?; export GITHUB_APP_ID
+    GITHUB_INSTALLATION_ID=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $MACOS_GITHUB_APP_2 installation_id) || exit $?; export GITHUB_INSTALLATION_ID
+    echo "Using GitHub App instance 2"
+
+generate_windows_gitlab_runner_bump_pr:
+  stage: trigger_release
+  extends: .slack-notifier-base
+  needs: ["trigger_auto_staging_release"]
+  tags: ["arch:amd64"]
+  rules:
+    - if: $DDR == "true"
+      when: never
+    - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-v[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+){0,1}$/
+      when: never
+    - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
+
+  script: 
+    # We are using the agent platform auto PR github app to access the buildenv repository (already used for macOS builds)
+    - !reference [.setup_github_app_agent_platform_auto_pr]
+    - python3 -m pip install -r requirements.txt -r tasks/libs/requirements-notifications.txt
+    - $S3_CP_CMD $S3_ARTIFACTS_URI/agent-version.cache .
+    - inv -e github.update-windows-runner-version