Merge branch 'main' into gabedos/investigate-corev1-kubelet-collector

.circleci/config.yml

@@ -15,7 +15,7 @@ experimental:
 templates:
   job_template: &job_template
     docker:
-      - image: gcr.io/datadoghq/agent-circleci-runner:v50094600-7b86dd80
+      - image: gcr.io/datadoghq/agent-circleci-runner:v50263243-1a30c934
         environment:
           USE_SYSTEM_LIBS: "1"
     working_directory: /go/src/github.com/DataDog/datadog-agent

.custom-gcl.yml

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

.github/CODEOWNERS

@@ -330,6 +330,9 @@
 # Additional notification to  @iglendd about Agent Telemetry changes for optional approval and governance acknowledgement
 /comp/core/agenttelemetry               @DataDog/agent-shared-components @iglendd
 
+# trace-agent logging implementation should also notify agent-apm
+/comp/core/log/impl-trace @DataDog/agent-apm
+
 # pkg
 /pkg/                                   @DataDog/agent-shared-components
 /pkg/api/                               @DataDog/agent-shared-components

.gitlab-ci.yml

@@ -157,6 +157,8 @@ variables:
   ## build to succeed with S3 caching disabled.
   S3_OMNIBUS_CACHE_BUCKET: dd-ci-datadog-agent-omnibus-cache-build-stable
   USE_S3_CACHING: --omnibus-s3-cache
+  # This value is not used on windows, a specific value is provided to
+  # our build containers in the windows build jobs
   OMNIBUS_GIT_CACHE_DIR: /tmp/omnibus-git-cache
   ## comment out the line below to disable integration wheels cache
   INTEGRATION_WHEELS_CACHE_BUCKET: dd-agent-omnibus
@@ -173,49 +175,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: v50094600-7b86dd80
+  DATADOG_AGENT_BUILDIMAGES: v50263243-1a30c934
   DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_WINBUILDIMAGES: v50094600-7b86dd80
+  DATADOG_AGENT_WINBUILDIMAGES: v50263243-1a30c934
   DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_ARMBUILDIMAGES: v50094600-7b86dd80
+  DATADOG_AGENT_ARMBUILDIMAGES: v50263243-1a30c934
   DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v50094600-7b86dd80
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v50263243-1a30c934
   DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v50094600-7b86dd80
+  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v50263243-1a30c934
   # New images to enable different version per image - not used yet
-  CI_IMAGE_BTF_GEN: v50094600-7b86dd80
+  CI_IMAGE_BTF_GEN: v50263243-1a30c934
   CI_IMAGE_BTF_GEN_SUFFIX: ""
-  CI_IMAGE_DEB_X64: v50094600-7b86dd80
+  CI_IMAGE_DEB_X64: v50263243-1a30c934
   CI_IMAGE_DEB_X64_SUFFIX: ""
-  CI_IMAGE_DEB_ARM64: v50094600-7b86dd80
+  CI_IMAGE_DEB_ARM64: v50263243-1a30c934
   CI_IMAGE_DEB_ARM64_SUFFIX: ""
-  CI_IMAGE_DEB_ARMHF: v50094600-7b86dd80
+  CI_IMAGE_DEB_ARMHF: v50263243-1a30c934
   CI_IMAGE_DEB_ARMHF_SUFFIX: ""
-  CI_IMAGE_DD_AGENT_TESTING: v50094600-7b86dd80
+  CI_IMAGE_DD_AGENT_TESTING: v50263243-1a30c934
   CI_IMAGE_DD_AGENT_TESTING_SUFFIX: ""
-  CI_IMAGE_DOCKER_X64: v50094600-7b86dd80
+  CI_IMAGE_DOCKER_X64: v50263243-1a30c934
   CI_IMAGE_DOCKER_X64_SUFFIX: ""
-  CI_IMAGE_DOCKER_ARM64: v50094600-7b86dd80
+  CI_IMAGE_DOCKER_ARM64: v50263243-1a30c934
   CI_IMAGE_DOCKER_ARM64_SUFFIX: ""
-  CI_IMAGE_GITLAB_AGENT_DEPLOY: v50094600-7b86dd80
+  CI_IMAGE_GITLAB_AGENT_DEPLOY: v50263243-1a30c934
   CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: ""
-  CI_IMAGE_LINUX_GLIBC_2_17_X64: v50094600-7b86dd80
+  CI_IMAGE_LINUX_GLIBC_2_17_X64: v50263243-1a30c934
   CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: ""
-  CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v50094600-7b86dd80
+  CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v50263243-1a30c934
   CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: ""
-  CI_IMAGE_SYSTEM_PROBE_X64: v50094600-7b86dd80
+  CI_IMAGE_SYSTEM_PROBE_X64: v50263243-1a30c934
   CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: ""
-  CI_IMAGE_SYSTEM_PROBE_ARM64: v50094600-7b86dd80
+  CI_IMAGE_SYSTEM_PROBE_ARM64: v50263243-1a30c934
   CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: ""
-  CI_IMAGE_RPM_X64: v50094600-7b86dd80
+  CI_IMAGE_RPM_X64: v50263243-1a30c934
   CI_IMAGE_RPM_X64_SUFFIX: ""
-  CI_IMAGE_RPM_ARM64: v50094600-7b86dd80
+  CI_IMAGE_RPM_ARM64: v50263243-1a30c934
   CI_IMAGE_RPM_ARM64_SUFFIX: ""
-  CI_IMAGE_RPM_ARMHF: v50094600-7b86dd80
+  CI_IMAGE_RPM_ARMHF: v50263243-1a30c934
   CI_IMAGE_RPM_ARMHF_SUFFIX: ""
-  CI_IMAGE_WIN_1809_X64: v50094600-7b86dd80
+  CI_IMAGE_WIN_1809_X64: v50263243-1a30c934
   CI_IMAGE_WIN_1809_X64_SUFFIX: ""
-  CI_IMAGE_WIN_LTSC2022_X64: v50094600-7b86dd80
+  CI_IMAGE_WIN_LTSC2022_X64: v50263243-1a30c934
   CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: ""
 
   DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded

.gitlab/.ci-linters.yml

@@ -51,7 +51,6 @@ needs-rules:
 job-owners:
   allowed-jobs:
     - benchmark
-    - bootstrapper_build
     - build_dogstatsd-binary_arm64
     - build_dogstatsd-binary_x64
     - build_dogstatsd_static-binary_arm64
@@ -79,6 +78,7 @@ job-owners:
     - installer-amd64-oci
     - installer-arm64
     - installer-arm64-oci
+    - installer-install-scripts
     - integration_tests_otel
     - invoke_unit_tests
     - kitchen_cleanup_azure-a7

.gitlab/container_build/docker_linux.yml

@@ -154,7 +154,7 @@ docker_build_fips_agent7_jmx:
     IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
     BUILD_CONTEXT: Dockerfiles/agent
     TAG_SUFFIX: -7-fips-jmx
-    BUILD_ARG: --target test --build-arg DD_AGENT_ARTIFACT=datadog-fips-agent-7*-amd64.tar.xz
+    BUILD_ARG: --target test --build-arg WITH_JMX=true --build-arg DD_AGENT_ARTIFACT=datadog-fips-agent-7*-amd64.tar.xz
 
 docker_build_fips_agent7_arm64_jmx:
   extends: [.docker_build_job_definition_arm64, .docker_build_artifact]
@@ -167,7 +167,7 @@ docker_build_fips_agent7_arm64_jmx:
     IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
     BUILD_CONTEXT: Dockerfiles/agent
     TAG_SUFFIX: -7-fips-jmx
-    BUILD_ARG: --target test --build-arg DD_AGENT_ARTIFACT=datadog-fips-agent-7*-arm64.tar.xz
+    BUILD_ARG: --target test --build-arg WITH_JMX=true --build-arg DD_AGENT_ARTIFACT=datadog-fips-agent-7*-arm64.tar.xz
 
 # build agent7 UA image
 docker_build_ot_agent7:

.gitlab/deploy_packages/deploy_common.yml

@@ -111,14 +111,14 @@
     ARTIFACTS_PREFIX: suse_
     OMNIBUS_PACKAGE_DIR: $OMNIBUS_PACKAGE_DIR_SUSE
 
-deploy_installer_boostrapper:
+deploy_installer_install_scripts:
   rules:
     !reference [.on_deploy_installer]
   image: registry.ddbuild.io/ci/datadog-agent-buildimages/gitlab_agent_deploy$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
   stage: deploy_packages
-  needs: ["bootstrapper_build"]
+  needs: ["installer-install-scripts"]
   tags: ["arch:amd64"]
   before_script:
     - ls $OMNIBUS_PACKAGE_DIR
   script:
-    - $S3_CP_CMD --recursive --exclude "*" --include "bootstrapper-*" "$OMNIBUS_PACKAGE_DIR" "${S3_RELEASE_INSTALLER_ARTIFACTS_URI}/bootstrapper/"
+    - $S3_CP_CMD --recursive --exclude "*" --include "install-*.sh" "$OMNIBUS_PACKAGE_DIR" "${S3_RELEASE_INSTALLER_ARTIFACTS_URI}/scripts/"

.gitlab/functional_test/regression_detector.yml

@@ -22,7 +22,7 @@ single-machine-performance-regression_detector:
       - outputs/decision_record.md # for posterity, this is appended to final PR comment
     when: always
   variables:
-    SMP_VERSION: 0.18.2
+    SMP_VERSION: 0.19.3
   # See 'decision_record.md' for the determination of whether this job passes or fails.
   allow_failure: false
   script:

.gitlab/notify/notify.yml

@@ -86,7 +86,7 @@ notify_github:
     - messagefile="$(mktemp)"
     - echo "Use this command from [test-infra-definitions](https://github.com/DataDog/test-infra-definitions) to manually test this PR changes on a VM:" >> "$messagefile"
     - echo '```sh' >> "$messagefile"
-    - echo "inv create-vm --pipeline-id=$CI_PIPELINE_ID --os-family=ubuntu" >> "$messagefile"
+    - echo "inv aws.create-vm --pipeline-id=$CI_PIPELINE_ID --os-family=ubuntu" >> "$messagefile"
     - echo '```' >> "$messagefile"
     - 'echo "Note: This applies to commit **$CI_COMMIT_SHORT_SHA**" >> "$messagefile"'
     - inv -e github.pr-commenter --title "Test changes on VM" --body "$(cat "$messagefile")" --echo

.gitlab/package_build/installer.yml

@@ -84,9 +84,9 @@ datadog-agent-oci-arm64-a7:
     - export RELEASE_VERSION=$RELEASE_VERSION_7
 
 #
-# The bootstrapper program
+# The installer install scripts (install-djm.sh, ...)
 #
-bootstrapper_build:
+installer-install-scripts:
   rules:
     - !reference [.except_mergequeue]
     - when: on_success
@@ -102,11 +102,8 @@ bootstrapper_build:
   script:
     - !reference [.retrieve_linux_go_deps]
     - echo "About to build for $RELEASE_VERSION"
-    - GOOS=linux GOARCH=amd64 inv -e installer.build --bootstrapper --rebuild --no-cgo --output-bin=$OMNIBUS_PACKAGE_DIR/bootstrapper-linux-amd64
-    - GOOS=linux GOARCH=arm64 inv -e installer.build --bootstrapper --rebuild --no-cgo --output-bin=$OMNIBUS_PACKAGE_DIR/bootstrapper-linux-arm64
-    - GOOS=windows GOARCH=amd64 inv -e installer.build --bootstrapper --rebuild --no-cgo --output-bin=$OMNIBUS_PACKAGE_DIR/bootstrapper-windows-amd64.exe
-    - GOOS=darwin GOARCH=amd64 inv -e installer.build --bootstrapper --rebuild --no-cgo --output-bin=$OMNIBUS_PACKAGE_DIR/bootstrapper-darwin-amd64
-    - GOOS=darwin GOARCH=arm64 inv -e installer.build --bootstrapper --rebuild --no-cgo --output-bin=$OMNIBUS_PACKAGE_DIR/bootstrapper-darwin-arm64
+    - mkdir -p $OMNIBUS_PACKAGE_DIR
+    - inv -e installer.build-linux-script && mv ./bin/installer/setup.sh $OMNIBUS_PACKAGE_DIR/install-djm.sh
     - ls -la $OMNIBUS_PACKAGE_DIR
   artifacts:
     expire_in: 2 weeks

.gitlab/package_build/windows.yml

@@ -36,6 +36,7 @@
       -e BUNDLE_MIRROR__RUBYGEMS__ORG=${BUNDLE_MIRROR__RUBYGEMS__ORG}
       -e PIP_INDEX_URL=${PIP_INDEX_URL}
       -e API_KEY_ORG2=${API_KEY_ORG2}
+      -e OMNIBUS_GIT_CACHE_DIR=${Env:TEMP}/${CI_PIPELINE_ID}/omnibus-git-cache
       registry.ddbuild.io/ci/datadog-agent-buildimages/windows_1809_${ARCH}${Env:DATADOG_AGENT_WINBUILDIMAGES_SUFFIX}:${Env:DATADOG_AGENT_WINBUILDIMAGES}
       c:\mnt\tasks\winbuildscripts\buildwin.bat
     - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }

.go-version

@@ -1 +1 @@
-1.22.8
+1.23.3

.wwhrd.yml

@@ -45,4 +45,4 @@ exceptions:
 
 additional:
   # list here paths to additional licenses
-  golang/go: "raw.githubusercontent.com/golang/go/go1.22.8/LICENSE"
+  golang/go: "raw.githubusercontent.com/golang/go/go1.23.3/LICENSE"