Merge branch 'main' into dependabot/github_actions/actions/upload-art…

…ifact-4.4.0

.circleci/README.md

@@ -11,12 +11,12 @@ This image is now built alongside other images in [agent-buildimages](https://gi
 Once you have created a new image by building a new version of agent-buildimages, you can test your modification with the associated invoke task:
 
 ```bash
-invoke -e pipeline.update-buildimages --image-tag v12345678-c0mm1t5
+invoke -e buildimages.update --tag v12345678-c0mm1t5
 ```
-This will update the configuration of circleci and gitlab to use the __test version__ of these images.
-Once your test is successful, you can either move the `_test_version` from files or invoke
+This will update the configuration of circleci and gitlab to use the __test__ version of these images.
+Once your test is successful, you can either move the `_test_only` from files or invoke
 ```bash
-invoke -e pipeline.update-buildimages --image-tag v12345678-c0mm1t5 --no-test-version
+invoke -e buildimages.update --tag v12345678-c0mm1t5 --no-test
 ```
 
 If everything is green, get a review and merge the PR.

.circleci/config.yml

@@ -15,7 +15,7 @@ experimental:
 templates:
   job_template: &job_template
     docker:
-      - image: gcr.io/datadoghq/agent-circleci-runner:v45979046-89a73a40
+      - image: gcr.io/datadoghq/agent-circleci-runner:v50263243-1a30c934
         environment:
           USE_SYSTEM_LIBS: "1"
     working_directory: /go/src/github.com/DataDog/datadog-agent
@@ -66,19 +66,6 @@ jobs:
           name: grab go deps
           command: |
             inv -e deps
-      - run:
-          name: build rtloader
-          command: |
-            inv rtloader.make --install-prefix=/go/src/github.com/DataDog/datadog-agent/dev
-            inv rtloader.install
-      - run:
-          name: lint rtloader
-          command: |
-            inv rtloader.format --raise-if-changed
-      - run:
-          name: test rtloader
-          command: |
-            inv rtloader.test
       - run:
           name: install go tooling
           command: |
@@ -91,19 +78,6 @@ jobs:
             - /go/src/github.com/DataDog/datadog-agent/dev
             - /usr/local/bin
 
-  unit_tests:
-    <<: *job_template
-    resource_class: xlarge
-    steps:
-      - restore_cache: *restore_source
-      - restore_cache: *restore_deps
-      - run:
-          name: run unit tests
-          no_output_timeout: 20m
-          command: inv -e test --rerun-fails=2 --python-runtimes 3 --coverage --race --profile --cpus 8 --build-stdlib --test-washer
-          environment:
-            GO_TEST_SKIP_FLAKE: "true"
-
   integration_tests:
     <<: *job_template
     resource_class: large
@@ -115,80 +89,6 @@ jobs:
           name: run integration tests
           command: inv -e integration-tests --race --remote-docker
 
-  go_linting:
-    <<: *job_template
-    resource_class: xlarge
-    steps:
-      - restore_cache: *restore_source
-      - restore_cache: *restore_deps
-      - run:
-          name: run go linters
-          no_output_timeout: 20m
-          command: inv -e linter.go
-
-  licenses_linting:
-    <<: *job_template
-    steps:
-      - restore_cache: *restore_source
-      - restore_cache: *restore_deps
-      - run:
-          name: run license linting
-          command: inv -e lint-licenses
-
-  copyrights_linting:
-    <<: *job_template
-    steps:
-      - restore_cache: *restore_source
-      - restore_cache: *restore_deps
-      - run:
-          name: run copyrights linting
-          command: inv -e linter.copyrights
-
-  filename_linting:
-    <<: *job_template
-    steps:
-      - restore_cache: *restore_source
-      - restore_cache: *restore_deps
-      - run:
-          name: run filename linting
-          command: inv -e linter.filenames
-
-  shell_linting:
-    <<: *job_template
-    steps:
-      - restore_cache: *restore_source
-      - restore_cache: *restore_deps
-      - run:
-          name: Install shellcheck
-          command: inv -e install-shellcheck
-      - run:
-          name: Print shellcheck version
-          command: shellcheck --version
-      - run:
-          name: Run shellcheck
-          #Excludes:
-          #SC2028: echo may not expand escape sequences. Use printf.
-          #SC2059: Don't use variables in the printf format string. Use printf "..%s.." "$foo".
-          command: shellcheck --severity=info -e SC2059 -e SC2028 --shell=bash ./cmd/**/*.sh ./omnibus/package-scripts/*/*
-
-  component_linting:
-    <<: *job_template
-    steps:
-      - restore_cache: *restore_source
-      - restore_cache: *restore_deps
-      - run:
-          name: run component linting
-          command: inv -e lint-components lint-fxutil-oneshot-test
-
-  codeowner_linting:
-    <<: *job_template
-    steps:
-      - restore_cache: *restore_source
-      - restore_cache: *restore_deps
-      - run:
-          name: run CODEOWNER linting
-          command: inv -e github.lint-codeowner
-
   docker_tests:
     <<: *job_template
     steps:
@@ -202,40 +102,6 @@ jobs:
           name: run docker image integration tests
           command: inv -e docker.integration-tests
 
-  build_binaries:
-    <<: *job_template
-    resource_class: large
-    steps:
-      - restore_cache: *restore_source
-      - restore_cache: *restore_deps
-      - run:
-          name: build dogstatsd
-          command: inv -e dogstatsd.build --static
-      - run:
-          name: build agent
-          command: inv -e agent.build --exclude-rtloader
-
-  build_iot_agent:
-    <<: *job_template
-    steps:
-      - restore_cache: *restore_source
-      - restore_cache: *restore_deps
-      - run:
-          name: build iot agent
-          command: inv -e agent.build --flavor iot
-      - run:
-          name: test iot agent
-          command: DD_HOSTNAME=test-circleci-hostname ./bin/agent/agent -c ./bin/agent/dist check cpu
-
-  documentation_generation:
-    <<: *job_template
-    steps:
-      - restore_cache: *restore_source
-      - restore_cache: *restore_deps
-      - run:
-          name: generate doxygen documentation
-          command: inv -e rtloader.generate-doc
-
 workflows:
   version: 2
   test_and_build:
@@ -244,46 +110,9 @@ workflows:
       - dependencies:
           requires:
             - checkout_code
-      - unit_tests:
-          requires:
-            - dependencies
       - integration_tests:
           requires:
             - dependencies
-      - go_linting:
-          requires:
-            - dependencies
-      - licenses_linting:
-          requires:
-            - dependencies
-      - copyrights_linting:
-          requires:
-            - dependencies
-      - filename_linting:
-          requires:
-            - dependencies
-      - shell_linting:
-          requires:
-            - dependencies
-      - component_linting:
-          requires:
-            - dependencies
-      - codeowner_linting:
-          requires:
-            - dependencies
       - docker_tests:
           requires:
             - dependencies
-      - documentation_generation:
-          requires:
-            - dependencies
-      - build_binaries:
-          requires:
-            - unit_tests
-            - integration_tests
-            - docker_tests
-      - build_iot_agent:
-          requires:
-            - unit_tests
-            - integration_tests
-            - docker_tests

.copyright-overrides.yml

@@ -365,6 +365,7 @@ github.com/signalfx/sapm-proto/*: Copyright 2019 Splunk, Inc.
 go.mongodb.org/atlas/mongodbatlas: Copyright 2022 MongoDB Inc
 github.com/go-jose/go-jose/v4: Copyright 2014 Square Inc.
 github.com/gocolly/colly: Copyright 2018 Adam Tauber
+github.com/puzpuzpuz/xsync/v3: Copyright (c) 2021 Andrey Pechkurov
 
 github.com/vibrantbyte/go-antpath/antpath: vibrantbyte <[email protected]>|suchao <[email protected]>
 github.com/vibrantbyte/go-antpath/extend: vibrantbyte <[email protected]>|suchao <[email protected]>
@@ -373,3 +374,7 @@ github.com/vibrantbyte/go-antpath/extend: vibrantbyte <[email protected]>|suchao
 github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp: Copyright 2024 gRPC authors.
 github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp/grpc_gcp: Copyright 2024 gRPC authors.
 github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp/multiendpoint: Copyright 2024 gRPC authors.
+
+github.com/NVIDIA/go-nvml/*: Copyright 2023 NVIDIA CORPORATION
+
+github.com/jonboulle/clockwork: Copyright 2014 Nell Boulle

.custom-gcl.yml

@@ -1,4 +1,4 @@
-version: v1.59.1
+version: v1.60.3
 
 name: golangci-lint
 

.ddqa/config.toml

@@ -48,7 +48,7 @@ jira_issue_type = "Task"
 jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "agent-delivery"
 github_labels = ["team/agent-delivery"]
-exclude_members = ["hithwen"]
+exclude_members = ["KSerrania"]
 
 [teams."Universal Service Monitoring"]
 jira_project = "USMON"
@@ -57,12 +57,20 @@ jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "universal-service-monitoring"
 github_labels = ["team/usm"]
 
-[teams."Network Device Monitoring"]
+[teams."Network Device Monitoring - Core"]
 jira_project = "NDMII"
 jira_issue_type = "Task"
 jira_statuses = ["To Do", "In Progress", "Done"]
-github_team = "network-device-monitoring"
-github_labels = ["team/network-device-monitoring"]
+github_team = "ndm-core"
+github_labels = ["team/ndm-core", "team/network-device-monitoring"]
+exclude_members = ["leeavital", "heyronhay"]
+
+[teams."Network Device Monitoring - Integrations"]
+jira_project = "NDINT"
+jira_issue_type = "Task"
+jira_statuses = ["To Do", "In Progress", "Done"]
+github_team = "ndm-integrations"
+github_labels = ["team/ndm-integrations"]
 exclude_members = ["leeavital", "heyronhay"]
 
 [teams."Network Performance Monitoring"]
@@ -203,12 +211,12 @@ jira_statuses = ["💼 To Do", "💡 In Progress", "✅ Done"]
 github_team = "container-app"
 github_labels = ["team/container-app"]
 
-[teams."APM Onboarding"]
-jira_project = "APMON"
-jira_issue_type = "Story"
+[teams."APM Injection Platform"]
+jira_project = "INPLAT"
+jira_issue_type = "Task"
 jira_statuses = ["Selected For Development", "In Progress", "Done"]
-github_team = "apm-onboarding"
-github_labels = ["team/apm-onboarding"]
+github_team = "injection-platform"
+github_labels = ["team/injection-platform"]
 
 [teams."Agent Release Management"]
 jira_project = "AGNTR"
@@ -219,7 +227,8 @@ github_labels = ["team/agent-release-management"]
 
 [teams."Dynamic Instrumentation"]
 jira_project = "DEBUG"
+jira_component = "datadog-agent"
 jira_issue_type = "Task"
 jira_statuses = ["To Do", "In Progress", "Done"]
 github_team = "debugger-go"
-github_labels = ["team/dynamic-instrumentation"]
+github_labels = ["team/dynamic-instrumentation"]

.gitattributes

@@ -10,7 +10,7 @@ go.sum -diff -merge linguist-generated=true
 pkg/security/probe/constantfetch/btfhub/constants.json -diff -merge linguist-generated=true
 pkg/security/seclwin/** -diff -merge linguist-generated=true
 # Fixtures should have LF line endings because they are checked against OCI packages built on Linux
-pkg/fleet/internal/fixtures/** text=auto eol=lf
+pkg/fleet/installer/fixtures/** text=auto eol=lf
 
 # Fix `git diff` when running on the below file formats.
 # Our windows build image uses MinGit which tries to use the astextplain diff algorithm (https://git-scm.com/docs/gitattributes#_setting_the_internal_diff_algorithm).
@@ -27,26 +27,25 @@ pkg/fleet/internal/fixtures/** text=auto eol=lf
 #	textconv = astextplain
 # ```
 
-
-*.doc	diff
-*.DOC	diff
-*.docx	diff
-*.DOCX	diff
-*.docm	diff
-*.DOCM	diff
-*.dot	diff
-*.DOT	diff
-*.dotx	diff
-*.DOTX	diff
-*.dotm	diff
-*.DOTM	diff
-*.pdf	diff
-*.PDF	diff
-*.rtf	diff
-*.RTF	diff
-*.ods	diff
-*.ODS	diff
-*.odf	diff
-*.ODF	diff
-*.odt	diff
-*.ODT	diff
+*.doc diff
+*.DOC diff
+*.docx diff
+*.DOCX diff
+*.docm diff
+*.DOCM diff
+*.dot diff
+*.DOT diff
+*.dotx diff
+*.DOTX diff
+*.dotm diff
+*.DOTM diff
+*.pdf diff
+*.PDF diff
+*.rtf diff
+*.RTF diff
+*.ods diff
+*.ODS diff
+*.odf diff
+*.ODF diff
+*.odt diff
+*.ODT diff