Merge branch 'main' into arbll/mirror-improvements

DataDog · Feb 7, 2025 · c3a3a89 · c3a3a89
2 parents 61227a1 + 909942b
commit c3a3a89
Show file tree

Hide file tree

Showing 664 changed files with 17,973 additions and 9,585 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,7 +15,7 @@ experimental:
 templates:
   job_template: &job_template
     docker:
-      - image: gcr.io/datadoghq/agent-circleci-runner:v53759313-14a41bca
+      - image: gcr.io/datadoghq/agent-circleci-runner:v54965839-ff6db30b
         environment:
           USE_SYSTEM_LIBS: "1"
     working_directory: /go/src/github.com/DataDog/datadog-agent

diff --git a/.ddqa/config.toml b/.ddqa/config.toml
@@ -10,15 +10,15 @@ github_team = "agent-metrics-logs"
 github_labels = ["team/agent-metrics-logs"]
 exclude_members = ["olivielpeau"]
 
-[teams."Agent Logs"]
+[teams."Agent Log Pipelines"]
 jira_project = "AGNTLOG"
 jira_issue_type = "Task"
 jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "agent-log-pipelines"
 github_labels = ["team/agent-log-pipelines"]
 exclude_members = [""]
 
-[teams."Agent Metrics"]
+[teams."Agent Metric Pipelines"]
 jira_project = "AGTMETRICS"
 jira_issue_type = "Task"
 jira_statuses = ["To Do", "In Progress", "Done"]
@@ -34,31 +34,21 @@ github_team = "agent-processing-and-routing"
 github_labels = ["team/agent-processing-and-routing"]
 exclude_members = []
 
-[teams."Agent Shared Components"]
-jira_project = "ASCII"
+[teams."Agent Runtimes"]
+jira_project = "AGENTRUN"
 jira_issue_type = "QA"
 jira_statuses = ["To Do", "In Progress", "Done"]
-github_team = "agent-shared-components"
-github_labels = ["team/agent-shared-components"]
-exclude_members = ["sgnn7", "truthbk", "cmourot"]
-
-# Those will be uncommented once the proper issue types are created in JIRA.
-#
-# [teams."Agent Runtimes"]
-# jira_project = "ARUN"
-# jira_issue_type = "QA"
-# jira_statuses = ["To Do", "In Progress", "Done"]
-# github_team = "agent-runtimes"
-# github_labels = ["team/agent-runtimes"]
-# exclude_members = ["sgnn7", "cmourot"]
-#
-# [teams."Agent Configuration"]
-# jira_project = "ACFG"
-# jira_issue_type = "QA"
-# jira_statuses = ["To Do", "In Progress", "Done"]
-# github_team = "agent-configuration"
-# github_labels = ["team/agent-configuration"]
-# exclude_members = ["sgnn7"]
+github_team = "agent-runtimes"
+github_labels = ["team/agent-runtimes"]
+exclude_members = ["sgnn7", "cmourot"]
+
+[teams."Agent Configuration"]
+jira_project = "AGENTCFG"
+jira_issue_type = "QA"
+jira_statuses = ["To Do", "In Progress", "Done"]
+github_team = "agent-configuration"
+github_labels = ["team/agent-configuration"]
+exclude_members = ["sgnn7"]
 
 [teams."Agent Developer Tools"]
 jira_project = "ADXT"

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -43,7 +43,7 @@
 /repository.datadog.yml                 @DataDog/agent-devx-infra
 /generate_tools.go                      @DataDog/agent-devx-infra
 /service.datadog.yaml                   @DataDog/agent-delivery
-/static-analysis.datadog.yml            @DataDog/software-integrity-and-trust @DataDog/sdlc-security @DataDog/agent-devx-infra
+/static-analysis.datadog.yml            @DataDog/sdlc-security @DataDog/agent-devx-infra
 
 /modules.yml                            @DataDog/agent-runtimes
 # if go.work changes then either .go-version or modules.yml changed too, so ASC might as well own it
@@ -94,6 +94,7 @@
 /.gitlab/binary_build/include.yml                    @DataDog/agent-devx-infra
 /.gitlab/binary_build/linux.yml                      @DataDog/agent-devx-infra @DataDog/agent-delivery
 /.gitlab/functional_test/include.yml                 @DataDog/agent-devx-infra
+/.gitlab/functional_test/static_quality_gate.yml     @DataDog/agent-delivery
 /.gitlab/install_script_testing/install_script_testing.yml          @DataDog/agent-delivery @DataDog/container-ecosystems
 /.gitlab/integration_test/dogstatsd.yml              @DataDog/agent-devx-infra @DataDog/agent-metric-pipelines
 /.gitlab/integration_test/include.yml                @DataDog/agent-devx-infra
@@ -435,7 +436,7 @@
 /pkg/config/setup/system_probe_cws_windows.go   @DataDog/windows-kernel-integrations @DataDog/agent-configuration
 /pkg/config/setup/security_agent.go             @DataDog/agent-security @DataDog/agent-configuration
 /pkg/config/remote/                     @DataDog/remote-config
-/pkg/config/remote/meta/                @DataDog/remote-config @DataDog/software-integrity-and-trust @DataDog/sdlc-security
+/pkg/config/remote/meta/                @DataDog/remote-config @DataDog/sdlc-security
 /pkg/containerlifecycle/                @Datadog/container-integrations
 /pkg/diagnose/                          @Datadog/container-platform
 /pkg/diagnose/connectivity/             @DataDog/agent-configuration
@@ -588,6 +589,8 @@
 /tasks/kernel_matrix_testing/           @DataDog/ebpf-platform
 /tasks/ebpf_verifier/                   @DataDog/ebpf-platform
 /tasks/trace_agent.py                   @DataDog/agent-apm
+/tasks/quality_gates.py                 @DataDog/agent-delivery
+/tasks/static_quality_gates/            @DataDog/agent-delivery
 /tasks/rtloader.py                      @DataDog/agent-metric-pipelines
 /tasks/security_agent.py                @DataDog/agent-security
 /tasks/sds.py                           @DataDog/agent-log-pipelines
@@ -650,6 +653,7 @@
 /test/new-e2e/tests/installer/script          @DataDog/fleet @DataDog/data-jobs-monitoring
 /test/new-e2e/tests/gpu                       @Datadog/ebpf-platform
 /test/otel/                                   @DataDog/opentelemetry @DataDog/opentelemetry-agent
+/test/static/                                 @DataDog/agent-delivery
 /test/system/                                 @DataDog/agent-runtimes
 /test/system/dogstatsd/                       @DataDog/agent-metric-pipelines
 /test/benchmarks/apm_scripts/                 @DataDog/agent-apm

diff --git a/.github/workflows/assess_permissions.yml b/.github/workflows/assess_permissions.yml
@@ -0,0 +1,41 @@
+---
+name: Assess Repository Permissions
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 5 2 * *' # At 5 UTC every 2nd day of the month (out of business hours for rate limiting)
+
+permissions: {}
+
+jobs:
+    assess_permission:
+        runs-on: ubuntu-latest
+        strategy:
+          matrix:
+            value: ['datadog-agent', 'datadog-agent-buildimages', 'datadog-agent-macos-build', 'omnibus-ruby', 'omnibus-software', 'agent-release-management']
+          fail-fast: false
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+              with:
+                sparse-checkout: 'tasks'
+                persist-credentials: false
+
+            - name: Install python
+              uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
+              with:
+                python-version-file: .python-version
+                cache: "pip"
+
+            - name: Install Python dependencies
+              run: |
+                python -m pip install --upgrade pip
+                pip install -r requirements.txt
+                pip install -r tasks/libs/requirements-github.txt
+
+            - name: Assess Repository Permissions
+              env:
+                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                SLACK_API_TOKEN: ${{ secrets.SLACK_API_TOKEN }}
+              run: inv -e github.check-permissions --repo ${{ matrix.value }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -170,49 +170,49 @@ variables:
   # To use images from datadog-agent-buildimages dev branches, set the corresponding
   # SUFFIX variable to _test_only
   DATADOG_AGENT_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BUILDIMAGES: v53759313-14a41bca
+  DATADOG_AGENT_BUILDIMAGES: v54965839-ff6db30b
   DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_WINBUILDIMAGES: v53759313-14a41bca
+  DATADOG_AGENT_WINBUILDIMAGES: v54965839-ff6db30b
   DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_ARMBUILDIMAGES: v53759313-14a41bca
+  DATADOG_AGENT_ARMBUILDIMAGES: v54965839-ff6db30b
   DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v53759313-14a41bca
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v54965839-ff6db30b
   DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v53759313-14a41bca
+  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v54965839-ff6db30b
   # New images to enable different version per image - not used yet
-  CI_IMAGE_BTF_GEN: v53759313-14a41bca
+  CI_IMAGE_BTF_GEN: v54965839-ff6db30b
   CI_IMAGE_BTF_GEN_SUFFIX: ""
-  CI_IMAGE_DEB_X64: v53759313-14a41bca
+  CI_IMAGE_DEB_X64: v54965839-ff6db30b
   CI_IMAGE_DEB_X64_SUFFIX: ""
-  CI_IMAGE_DEB_ARM64: v53759313-14a41bca
+  CI_IMAGE_DEB_ARM64: v54965839-ff6db30b
   CI_IMAGE_DEB_ARM64_SUFFIX: ""
-  CI_IMAGE_DEB_ARMHF: v53759313-14a41bca
+  CI_IMAGE_DEB_ARMHF: v54965839-ff6db30b
   CI_IMAGE_DEB_ARMHF_SUFFIX: ""
-  CI_IMAGE_DD_AGENT_TESTING: v53759313-14a41bca
+  CI_IMAGE_DD_AGENT_TESTING: v54965839-ff6db30b
   CI_IMAGE_DD_AGENT_TESTING_SUFFIX: ""
-  CI_IMAGE_DOCKER_X64: v53759313-14a41bca
+  CI_IMAGE_DOCKER_X64: v54965839-ff6db30b
   CI_IMAGE_DOCKER_X64_SUFFIX: ""
-  CI_IMAGE_DOCKER_ARM64: v53759313-14a41bca
+  CI_IMAGE_DOCKER_ARM64: v54965839-ff6db30b
   CI_IMAGE_DOCKER_ARM64_SUFFIX: ""
-  CI_IMAGE_GITLAB_AGENT_DEPLOY: v53759313-14a41bca
+  CI_IMAGE_GITLAB_AGENT_DEPLOY: v54965839-ff6db30b
   CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: ""
-  CI_IMAGE_LINUX_GLIBC_2_17_X64: v53759313-14a41bca
+  CI_IMAGE_LINUX_GLIBC_2_17_X64: v54965839-ff6db30b
   CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: ""
-  CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v53759313-14a41bca
+  CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v54965839-ff6db30b
   CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: ""
-  CI_IMAGE_SYSTEM_PROBE_X64: v53759313-14a41bca
+  CI_IMAGE_SYSTEM_PROBE_X64: v54965839-ff6db30b
   CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: ""
-  CI_IMAGE_SYSTEM_PROBE_ARM64: v53759313-14a41bca
+  CI_IMAGE_SYSTEM_PROBE_ARM64: v54965839-ff6db30b
   CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: ""
-  CI_IMAGE_RPM_X64: v53759313-14a41bca
+  CI_IMAGE_RPM_X64: v54965839-ff6db30b
   CI_IMAGE_RPM_X64_SUFFIX: ""
-  CI_IMAGE_RPM_ARM64: v53759313-14a41bca
+  CI_IMAGE_RPM_ARM64: v54965839-ff6db30b
   CI_IMAGE_RPM_ARM64_SUFFIX: ""
-  CI_IMAGE_RPM_ARMHF: v53759313-14a41bca
+  CI_IMAGE_RPM_ARMHF: v54965839-ff6db30b
   CI_IMAGE_RPM_ARMHF_SUFFIX: ""
-  CI_IMAGE_WIN_1809_X64: v53759313-14a41bca
+  CI_IMAGE_WIN_1809_X64: v54965839-ff6db30b
   CI_IMAGE_WIN_1809_X64_SUFFIX: ""
-  CI_IMAGE_WIN_LTSC2022_X64: v53759313-14a41bca
+  CI_IMAGE_WIN_LTSC2022_X64: v54965839-ff6db30b
   CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: ""
 
   DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
@@ -704,6 +704,7 @@ workflow:
         - omnibus/config/projects/agent.rb
         - omnibus/config/software/**/*
         - omnibus/config/templates/**/*
+        - release.json
       compare_to: main # TODO: use a variable, when this is supported https://gitlab.com/gitlab-org/gitlab/-/issues/369916
 
 .except_windows_installer_changes:

diff --git a/.gitlab/JOBOWNERS b/.gitlab/JOBOWNERS
@@ -140,6 +140,7 @@ docker_integration_tests      @DataDog/container-integrations
 
 # Functional test
 serverless_cold_start_performance-deb_x64      @DataDog/serverless
+static_quality_gates                           @DataDog/agent-delivery
 oracle*                                        @DataDog/database-monitoring
 
 # E2E
@@ -165,4 +166,4 @@ pull_test_dockers*                @DataDog/universal-service-monitoring
 single_machine_performance*       @DataDog/single-machine-performance
 
 # Dependency Security
-software_composition_analysis*    @DataDog/software-integrity-and-trust
+software_composition_analysis*    @DataDog/sdlc-security
diff --git a/.gitlab/binary_build/cluster_agent.yml b/.gitlab/binary_build/cluster_agent.yml
@@ -9,9 +9,15 @@
   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 --exclude '.git/*' --exclude '.github/*'
+  artifacts:
+    paths:
+      - $CLUSTER_AGENT_BINARIES_DIR/datadog-cluster-agent
+      - Dockerfiles/cluster-agent/datadog-cluster.yaml
+      - Dockerfiles/cluster-agent/security-agent-policies
+    exclude:
+      - Dockerfiles/cluster-agent/security-agent-policies/.git/**/*
+      - Dockerfiles/cluster-agent/security-agent-policies/.github/**/*
+
   variables:
     KUBERNETES_MEMORY_REQUEST: "8Gi"
     KUBERNETES_MEMORY_LIMIT: "8Gi"

diff --git a/.gitlab/binary_build/cws_instrumentation.yml b/.gitlab/binary_build/cws_instrumentation.yml
@@ -4,8 +4,10 @@
   needs: ["go_mod_tidy_check"]
   script:
     - inv check-go-version
-    - inv -e cws-instrumentation.build
-    - $S3_CP_CMD $CI_PROJECT_DIR/$CWS_INSTRUMENTATION_BINARIES_DIR/cws-instrumentation $S3_ARTIFACTS_URI/datadog-cws-instrumentation/cws-instrumentation.$ARCH
+    - inv -e cws-instrumentation.build --arch-suffix
+  artifacts:
+    paths:
+      - $CWS_INSTRUMENTATION_BINARIES_DIR/cws-instrumentation.$ARCH
 
 cws_instrumentation-build_amd64:
   extends: .cws_instrumentation-build_common

diff --git a/.gitlab/common/test_infra_version.yml b/.gitlab/common/test_infra_version.yml
@@ -5,5 +5,5 @@
 
 ---
 variables:
-  TEST_INFRA_DEFINITIONS_BUILDIMAGES: f92dca10d03c
+  TEST_INFRA_DEFINITIONS_BUILDIMAGES: 5ce0da569ade
   TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ''