Merge branch '6.53.x' into celian/notif-acix-499

DataDog · Jan 9, 2025 · bfa09dd · bfa09dd
2 parents e5ba061 + 70ecd2b
commit bfa09dd
Show file tree

Hide file tree

Showing 54 changed files with 708 additions and 730 deletions.
diff --git a/.gitlab/deploy_containers/conditions.yml b/.gitlab/deploy_containers/conditions.yml
@@ -11,37 +11,37 @@
   - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/ && $FORCE_MANUAL != "true"
     when: on_success
     variables:
-      AGENT_REPOSITORY: agent-dev
+      AGENT_REPOSITORY: agent
       DSD_REPOSITORY: dogstatsd
-      IMG_REGISTRIES: public
+      IMG_REGISTRIES: dev
   - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/ && $FORCE_MANUAL == "true"
     when: manual
     allow_failure: true
     variables:
-      AGENT_REPOSITORY: agent-dev
+      AGENT_REPOSITORY: agent
       DSD_REPOSITORY: dogstatsd
-      IMG_REGISTRIES: public
+      IMG_REGISTRIES: dev
   - when: manual
     allow_failure: true
     variables:
-      AGENT_REPOSITORY: agent-dev
+      AGENT_REPOSITORY: agent
       DSD_REPOSITORY: dogstatsd
-      IMG_REGISTRIES: public
+      IMG_REGISTRIES: dev
 
 # Rule for job that are triggered on_success on RC pipelines
 .on_rc:
   - if: $FORCE_MANUAL == "true" && $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
     when: manual
     variables:
-      AGENT_REPOSITORY: agent-dev
+      AGENT_REPOSITORY: agent
       DSD_REPOSITORY: dogstatsd
-      IMG_REGISTRIES: public
+      IMG_REGISTRIES: dev
   - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
     when: on_success
     variables:
-      AGENT_REPOSITORY: agent-dev
+      AGENT_REPOSITORY: agent
       DSD_REPOSITORY: dogstatsd
-      IMG_REGISTRIES: public
+      IMG_REGISTRIES: dev
 
 # Rule for job that can be triggered manually on final build, deploy to prod repository on stable branch deploy, else to dev repository
 .on_final:

diff --git a/.gitlab/deploy_containers/deploy_containers_a6.yml b/.gitlab/deploy_containers/deploy_containers_a6.yml
@@ -23,11 +23,8 @@ include:
   before_script:
     - source /root/.bashrc
     - if [[ "$VERSION" == "" ]]; then export VERSION="$(inv agent.version --major-version 6 --url-safe --pipeline-id $PARENT_PIPELINE_ID)"; fi
-    - export IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
-    - export IMG_LINUX_SOURCES="${IMG_BASE_SRC}-6${JMX}-amd64,${IMG_BASE_SRC}-6${JMX}-arm64"
-    - export IMG_WINDOWS_SOURCES="${IMG_BASE_SRC}-6${JMX}-win1809${FLAVOR}-amd64,${IMG_BASE_SRC}-6${JMX}-winltsc2022${FLAVOR}-amd64"
-    - if [[ "$FLAVOR" == "-linux" ]]; then export IMG_SOURCES="${IMG_LINUX_SOURCES}"; elif [[ "$FLAVOR" == "-servercore" ]]; then export IMG_SOURCES="${IMG_WINDOWS_SOURCES}"; else export IMG_SOURCES="${IMG_LINUX_SOURCES},${IMG_WINDOWS_SOURCES}"; fi
-    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${FLAVOR}${JMX}"
+    - export IMG_SOURCES="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-6${JMX}-amd64,${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-6${JMX}-arm64"
+    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${JMX}"
 
 
 .deploy_containers-a6_external:
@@ -37,10 +34,6 @@ include:
       - JMX:
           - ""
           - "-jmx"
-        FLAVOR:
-          - ""
-          - "-servercore"
-          - "-linux"
 
 
 deploy_containers-a6:
@@ -68,15 +61,7 @@ deploy_containers_latest-a6:
   dependencies: []
   parallel:
     matrix:
-      - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-6"
-        IMG_SOURCES: "%BASE%-amd64,%BASE%-arm64,%BASE%-win1809-amd64,%BASE%-winltsc2022-amd64"
+      - IMG_SOURCES: ${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-6-amd64,${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-6-arm64
         IMG_DESTINATIONS: ${AGENT_REPOSITORY}:6,${AGENT_REPOSITORY}:latest-py2
-      - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-6-jmx"
-        IMG_SOURCES: "%BASE%-amd64,%BASE%-arm64,%BASE%-win1809-amd64,%BASE%-winltsc2022-amd64"
+      - IMG_SOURCES: ${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-6-jmx-amd64,${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-6-jmx-arm64
         IMG_DESTINATIONS: ${AGENT_REPOSITORY}:6-jmx,${AGENT_REPOSITORY}:latest-py2-jmx
-      - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-6"
-        IMG_SOURCES: "%BASE%-win1809-servercore-amd64,%BASE%-winltsc2022-servercore-amd64"
-        IMG_DESTINATIONS: ${AGENT_REPOSITORY}:6-servercore,${AGENT_REPOSITORY}:latest-py2-servercore
-      - IMG_VARIABLES: "BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-6-jmx"
-        IMG_SOURCES: "%BASE%-win1809-servercore-amd64,%BASE%-winltsc2022-servercore-amd64"
-        IMG_DESTINATIONS: ${AGENT_REPOSITORY}:6-servercore-jmx,${AGENT_REPOSITORY}:latest-py2-servercore-jmx
diff --git a/cmd/agent/common/path/go.mod b/cmd/agent/common/path/go.mod
@@ -10,14 +10,14 @@ replace (
 )
 
 require (
-	github.com/DataDog/datadog-agent/pkg/util/executable v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/util/log v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/util/winutil v0.53.1-rc.4
+	github.com/DataDog/datadog-agent/pkg/util/executable v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/util/log v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/util/winutil v0.53.1-rc.5
 	golang.org/x/sys v0.28.0
 )
 
 require (
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.1-rc.4 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.1-rc.5 // indirect
 	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect

diff --git a/comp/core/config/go.mod b/comp/core/config/go.mod
@@ -27,32 +27,32 @@ replace (
 )
 
 require (
-	github.com/DataDog/datadog-agent/cmd/agent/common/path v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/comp/core/secrets v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/config/env v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/config/model v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/config/setup v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/util/winutil v0.53.1-rc.4
+	github.com/DataDog/datadog-agent/cmd/agent/common/path v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/comp/core/secrets v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/config/env v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/config/model v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/config/setup v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/util/winutil v0.53.1-rc.5
 	github.com/DataDog/viper v1.13.0
 	github.com/stretchr/testify v1.9.0
 	go.uber.org/fx v1.18.2
 )
 
 require (
-	github.com/DataDog/datadog-agent/comp/core/flare/types v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/comp/core/telemetry v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/telemetry v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/executable v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/log v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/optional v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/system v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/system/socket v0.53.1-rc.4 // indirect
+	github.com/DataDog/datadog-agent/comp/core/flare/types v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/comp/core/telemetry v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/telemetry v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/executable v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/log v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/optional v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/system v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/system/socket v0.53.1-rc.5 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect

diff --git a/comp/core/hostname/hostnameinterface/go.mod b/comp/core/hostname/hostnameinterface/go.mod
@@ -5,7 +5,7 @@ go 1.21.9
 replace github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../../pkg/util/fxutil
 
 require (
-	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.4
+	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.5
 	github.com/stretchr/testify v1.9.0
 	go.uber.org/fx v1.18.2
 )

diff --git a/comp/core/log/go.mod b/comp/core/log/go.mod
@@ -33,34 +33,34 @@ replace (
 )
 
 require (
-	github.com/DataDog/datadog-agent/comp/core/config v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/config/env v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/config/logs v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/trace v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/util/log v0.53.1-rc.4
+	github.com/DataDog/datadog-agent/comp/core/config v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/config/env v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/config/logs v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/trace v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/util/log v0.53.1-rc.5
 	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // v2.6
 	github.com/stretchr/testify v1.9.0
 	go.uber.org/fx v1.18.2
 )
 
 require (
-	github.com/DataDog/datadog-agent/comp/core/secrets v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/config/model v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/config/setup v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/obfuscate v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/proto v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/executable v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/optional v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/system v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/system/socket v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/winutil v0.53.1-rc.4 // indirect
+	github.com/DataDog/datadog-agent/comp/core/secrets v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/config/model v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/config/setup v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/obfuscate v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/proto v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/executable v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/optional v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/system v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/system/socket v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/winutil v0.53.1-rc.5 // indirect
 	github.com/DataDog/datadog-go/v5 v5.5.0 // indirect
 	github.com/DataDog/go-sqllexer v0.0.9 // indirect
 	github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect

diff --git a/comp/core/secrets/go.mod b/comp/core/secrets/go.mod
@@ -14,12 +14,12 @@ replace (
 )
 
 require (
-	github.com/DataDog/datadog-agent/comp/core/flare/types v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/telemetry v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/util/log v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/util/winutil v0.53.1-rc.4
+	github.com/DataDog/datadog-agent/comp/core/flare/types v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/telemetry v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/util/log v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/util/winutil v0.53.1-rc.5
 	github.com/benbjohnson/clock v1.3.0
 	github.com/stretchr/testify v1.9.0
 	go.uber.org/fx v1.18.2
@@ -29,7 +29,7 @@ require (
 )
 
 require (
-	github.com/DataDog/datadog-agent/comp/core/telemetry v0.53.1-rc.4 // indirect
+	github.com/DataDog/datadog-agent/comp/core/telemetry v0.53.1-rc.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect

diff --git a/comp/core/status/statusimpl/go.mod b/comp/core/status/statusimpl/go.mod
@@ -31,33 +31,33 @@ replace (
 )
 
 require (
-	github.com/DataDog/datadog-agent/comp/core/config v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/comp/core/flare/types v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/comp/core/status v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/config/setup v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/util/flavor v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.4
-	github.com/DataDog/datadog-agent/pkg/version v0.53.1-rc.4
+	github.com/DataDog/datadog-agent/comp/core/config v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/comp/core/flare/types v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/comp/core/status v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/config/setup v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/util/flavor v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.5
+	github.com/DataDog/datadog-agent/pkg/version v0.53.1-rc.5
 	github.com/stretchr/testify v1.9.0
 	go.uber.org/fx v1.18.2
 	golang.org/x/text v0.21.0
 )
 
 require (
-	github.com/DataDog/datadog-agent/comp/core/secrets v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/config/env v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/config/model v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/executable v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/log v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/optional v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/system v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/system/socket v0.53.1-rc.4 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/winutil v0.53.1-rc.4 // indirect
+	github.com/DataDog/datadog-agent/comp/core/secrets v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/config/env v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/config/model v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/executable v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/filesystem v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/log v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/optional v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/pointer v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/system v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/system/socket v0.53.1-rc.5 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/winutil v0.53.1-rc.5 // indirect
 	github.com/DataDog/viper v1.13.0 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect

diff --git a/comp/core/telemetry/go.mod b/comp/core/telemetry/go.mod
@@ -5,7 +5,7 @@ go 1.21.9
 replace github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../pkg/util/fxutil
 
 require (
-	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.4
+	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.5
 	github.com/prometheus/client_golang v1.17.0
 	github.com/prometheus/client_model v0.5.0
 	github.com/stretchr/testify v1.9.0