Merge 679d9c4 into 74cdc87

.custom-gcl.yml

@@ -0,0 +1,7 @@
+version: v1.59.1
+
+name: golangci-lint
+
+plugins:
+  - module: 'github.com/DataDog/datadog-agent/pkg/linters/components/pkgconfigusage'
+    path: ./pkg/linters/components/pkgconfigusage

.ddqa/config.toml

@@ -42,7 +42,7 @@ github_team = "agent-devx-infra"
 github_labels = ["team/agent-devx-infra"]
 exclude_members = []
 
-[teams."Agent Build and Releases Experience"]
+[teams."Agent Delivery"]
 jira_project = "BARX"
 jira_issue_type = "Task"
 jira_statuses = ["To Do", "In Progress", "Done"]

.github/CODEOWNERS

@@ -19,6 +19,7 @@
 /.go-version                            @DataDog/agent-shared-components @DataDog/agent-delivery
 # Go linters and pre-commit config
 /.golangci.yml                          @DataDog/agent-devx-loops
+/.custom-gcl.yml                        @DataDog/agent-devx-loops
 /.pre-commit-config.yaml                @DataDog/agent-devx-loops
 
 /CHANGELOG.rst                          @DataDog/agent-delivery
@@ -298,7 +299,9 @@
 /pkg/gohai                              @DataDog/agent-shared-components
 /pkg/jmxfetch/                          @DataDog/agent-metrics-logs
 /pkg/metrics/                           @DataDog/agent-metrics-logs
+/pkg/metrics/metricsource.go            @DataDog/agent-metrics-logs @DataDog/agent-integrations
 /pkg/serializer/                        @DataDog/agent-processing-and-routing
+/pkg/serializer/internal/metrics/origin_mapping.go  @DataDog/agent-processing-and-routing @DataDog/agent-integrations
 /pkg/serverless/                        @DataDog/serverless
 /pkg/serverless/appsec/                 @DataDog/asm-go
 /pkg/status/                            @DataDog/agent-shared-components
@@ -398,7 +401,6 @@
 /pkg/proto/datadog/workloadmeta         @DataDog/container-platform
 /pkg/remoteconfig/                      @DataDog/remote-config
 /pkg/runtime/                           @DataDog/agent-shared-components
-/pkg/serializer/                        @DataDog/agent-processing-and-routing
 /pkg/tagset/                            @DataDog/agent-shared-components
 /pkg/util/                              @DataDog/agent-shared-components
 /pkg/util/aggregatingqueue              @DataDog/container-integrations @DataDog/container-platform
@@ -426,6 +428,8 @@
 /pkg/util/testutil/flake                @DataDog/agent-devx-loops
 /pkg/util/trie                          @DataDog/container-integrations
 /pkg/languagedetection                  @DataDog/processes @DataDog/universal-service-monitoring
+/pkg/linters/                           @DataDog/agent-devx-loops
+/pkg/linters/components/                @DataDog/agent-shared-components
 /pkg/logs/                              @DataDog/agent-metrics-logs
 /pkg/logs/launchers/windowsevent        @DataDog/agent-metrics-logs @DataDog/windows-agent
 /pkg/logs/tailers/windowsevent          @DataDog/agent-metrics-logs @DataDog/windows-agent

.github/workflows/codeql-analysis.yml

@@ -54,7 +54,7 @@ jobs:
 
       - name: Build DataDog agent
         run: |
-          invoke install-tools
+          invoke install-tools --no-custom-golangci-lint
           invoke deps
           invoke agent.build --build-exclude=systemd
 

.gitlab-ci.yml

@@ -590,7 +590,6 @@ workflow:
 .except_deploy:
   - <<: *if_deploy
     when: never
-  - when: on_success
 
 .except_no_tests_no_deploy:
   - if: $DEPLOY_AGENT == "false" && $DDR_WORKFLOW_ID == null && $RUN_E2E_TESTS == "off"

.gitlab/JOBOWNERS

@@ -158,6 +158,7 @@ upload_minimized_btfs*            @DataDog/ebpf-platform
 kmt_*                             @DataDog/ebpf-platform
 upload_secagent_tests*            @DataDog/ebpf-platform
 upload_sysprobe_tests*            @DataDog/ebpf-platform
+notify_ebpf_complexity_changes    @DataDog/ebpf-platform
 pull_test_dockers*                @DataDog/universal-service-monitoring
 
 # Single machine performance

.gitlab/dev_container_deploy/e2e.yml

@@ -21,7 +21,8 @@ qa_agent_ot:
   extends: .docker_publish_job_definition
   stage: dev_container_deploy
   rules:
-    - !reference [.on_container_or_e2e_changes]
+    - !reference [.on_otel_or_e2e_changes]
+    - !reference [.manual]
   needs:
     - docker_build_ot_agent7
     - docker_build_ot_agent7_arm64

.gitlab/e2e/e2e.yml

@@ -414,6 +414,7 @@ new-e2e-otel:
     - !reference [.needs_new_e2e_template]
     - qa_dca
     - qa_agent
+    - qa_agent_ot
   variables:
     TARGETS: ./tests/otel
     TEAM: otel

.gitlab/kernel_matrix_testing/common.yml

@@ -274,11 +274,12 @@ notify_ebpf_complexity_changes:
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/test-infra-definitions/runner$TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX:$TEST_INFRA_DEFINITIONS_BUILDIMAGES
   tags: ["arch:amd64"]
   rules:
-    - !reference [.on_system_probe_or_e2e_changes_or_manual]
-    - !reference [.on_security_agent_changes_or_manual]
     - !reference [.except_mergequeue]
     - !reference [.except_main_or_release_branch]
     - !reference [.except_no_tests_no_deploy]
+    - !reference [.except_deploy]
+    - !reference [.on_system_probe_or_e2e_changes_or_manual]
+    - !reference [.on_security_agent_changes_or_manual]
   needs:
     # We need to specify the jobs that generate complexity explicitly, else we hit the limit of "needs"
     # Important: the list of platforms should match the one in .define_if_collect_complexity

.gitlab/kitchen_testing/new-e2e_testing/docker.yml

@@ -0,0 +1,15 @@
+new-e2e-agent-platform-install-script-docker:
+  stage: kitchen_testing
+  extends:
+    - .new_e2e_template
+    - .new_e2e_template_needs_deb_x64
+    - .new-e2e_agent_a7
+    - .new-e2e_install_script
+  rules: !reference [.on_default_new_e2e_tests]
+  variables:
+    E2E_ARCH: x86_64
+    E2E_PLATFORM: "docker"
+    E2E_OSVERS: "none"
+    E2E_BRANCH_OSVERS: none
+    E2E_CWS_SUPPORTED_OSVERS: "none"
+    FLAVOR: "datadog-agent"

.gitlab/kitchen_testing/new-e2e_testing/include.yml

@@ -9,3 +9,4 @@ include:
   - .gitlab/kitchen_testing/new-e2e_testing/centos.yml
   - .gitlab/kitchen_testing/new-e2e_testing/suse.yml
   - .gitlab/kitchen_testing/new-e2e_testing/windows.yml
+  - .gitlab/kitchen_testing/new-e2e_testing/docker.yml

.gitlab/kitchen_testing/new-e2e_testing/windows.yml

@@ -165,7 +165,6 @@ new-e2e-windows-agent-msi-upgrade-windows-server-a7-x86_64:
     - !reference [.except_main_or_release_branch]
     - !reference [.except_windows_installer_changes]
     - !reference [.on_default_new_e2e_tests]
-    # must be last since it ends with when: on_success
     - !reference [.except_deploy]
   variables:
     E2E_MSI_TEST: TestUpgrade

.gitlab/source_test/golang_deps_diff.yml

@@ -28,7 +28,8 @@ golang_deps_commenter:
   image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/pr-commenter:2
   tags: ["arch:amd64"]
   rules: # this should only run on dev branches
-    - !reference [ .except_main_or_release_branch ]
+    - !reference [.except_main_or_release_branch]
+    - !reference [.except_deploy]
     - when: on_success
   needs: ["golang_deps_diff"]
   script: # ignore error message about no PR, because it happens for dev branches without PRs