[mq] working branch - merge 884e85f on top of main at 4850a5c

{"baseBranch":"main","baseCommit":"4850a5c40ee23c918e0af7aeafeb9442cabc685e","createdAt":"2025-01-03T09:56:41.707458Z","headSha":"884e85f2cd86282d9d4b33c7e7b72deb22517d34","id":"7fcee3a5-f06f-4556-b3b9-7a8b74495414","priority":"200","pullRequestNumber":"1338","queuedAt":"2025-01-03T10:04:51.245007Z","status":"STATUS_QUEUED"}

go.mod

@@ -4,7 +4,7 @@ go 1.22.5
 
 require (
 	dario.cat/mergo v1.0.1
-	github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20241218184455-8f3ec029ce57
+	github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd
 	github.com/Masterminds/semver v1.5.0
 	github.com/alessio/shellescape v1.4.2
 	github.com/aws/aws-sdk-go-v2 v1.32.7

go.sum

@@ -2,8 +2,8 @@ dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
 dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
 github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20241218184455-8f3ec029ce57 h1:nqYy5ad9fceRRw6oc8sJrSLgzK+rUUA9w/AoiIEfDqg=
-github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20241218184455-8f3ec029ce57/go.mod h1:BECd5pnMX9MEnARCAV+S7M0Sk/gYwopL7QlhCFdXSI0=
+github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd h1:kam3LA9L/VuBRPQLqW4CBnelpxF1KY4WGbb/W2UHn2g=
+github.com/DataDog/datadog-agent/pkg/util/option v0.0.0-20250102215417-1af8863cd8cd/go.mod h1:BECd5pnMX9MEnARCAV+S7M0Sk/gYwopL7QlhCFdXSI0=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=