[pull] main from DataDog:main

.circleci/config.yml

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

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,7 +12,17 @@
 
 ### Motivation
 
-### Describe how to test/QA your changes
+### Describe how you validated your changes
+<!--
+Validate your changes before merge, ensuring that:
+* Your PR is tested by static / unit / integrations / e2e tests
+* Your PR description details which e2e tests cover your changes, if any
+* The PR description contains details of how you validated your changes. If you validated changes manually and not through automated tests, add context on why automated tests did not fit your changes validation.
+
+If you want additional validation by a second person, you can ask reviewers to do it. Describe how to set up an environment for manual tests in the PR description. Manual validation is expected to happen on every commit before merge.
+
+Any manual validation step should then map to an automated test. Manual validation should not substitute automation, minus exceptions not supported by test tooling yet.
+-->
 
 ### Possible Drawbacks / Trade-offs
 

.github/workflows/codeql-analysis.yml

@@ -45,7 +45,7 @@ jobs:
           go-version-file: ".go-version"
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
+        uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
         with:
           languages: ${{ matrix.language }}
           config: |
@@ -67,4 +67,4 @@ jobs:
           invoke agent.build --build-exclude=systemd
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
+        uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5

.github/workflows/label-analysis.yml

@@ -102,25 +102,24 @@ jobs:
     if: github.triggering_actor != 'dd-devflow[bot]'
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        with:
+          persist-credentials: false
+      - name: Setup Python3
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
+        with:
+          python-version: "3.12.6"
+          cache: "pip"
+          cache-dependency-path: '**/requirements*.txt'
+      - name: Install python dependencies
+        run: pip3 install -r requirements.txt
       - name: Check qa/[done|no-code-change] labels are not set together
-        run: |
-          is_qa_done=1
-          is_qa_no_code_change=1
-          for label in $LABELS; do
-            if [[ "$label" == "qa/done" ]]; then
-              is_qa_done=0
-            fi
-            if [[ "$label" == "qa/no-code-change" ]]; then
-              is_qa_no_code_change=0
-            fi
-          done
-          if [ $is_qa_done -eq 0 ] && [ $is_qa_no_code_change -eq 0 ]; then
-            echo "Both 'qa/done' and 'qa/no-code-change' labels are set -- only one of them should be set"
-            exit 1
-          fi
-          echo "No issue with 'qa/done' and 'qa/no-code-change' labels"
         env:
           LABELS: ${{ needs.fetch-labels.outputs.LABELS}}
+        run: |
+          inv -e github.check-qa-labels --labels "${LABELS[@]}"
+
   agenttelemetry-list-change-ack-check:
     if: github.triggering_actor != 'dd-devflow[bot]'
     runs-on: ubuntu-latest

.gitlab-ci.yml

@@ -173,49 +173,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: v48815877-9bfad02c
+  DATADOG_AGENT_BUILDIMAGES: v50094600-7b86dd80
   DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_WINBUILDIMAGES: v48815877-9bfad02c
+  DATADOG_AGENT_WINBUILDIMAGES: v50094600-7b86dd80
   DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_ARMBUILDIMAGES: v48815877-9bfad02c
+  DATADOG_AGENT_ARMBUILDIMAGES: v50094600-7b86dd80
   DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v48815877-9bfad02c
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v50094600-7b86dd80
   DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v48815877-9bfad02c
+  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v50094600-7b86dd80
   # New images to enable different version per image - not used yet
-  CI_IMAGE_BTF_GEN: v48815877-9bfad02c
+  CI_IMAGE_BTF_GEN: v50094600-7b86dd80
   CI_IMAGE_BTF_GEN_SUFFIX: ""
-  CI_IMAGE_DEB_X64: v48815877-9bfad02c
+  CI_IMAGE_DEB_X64: v50094600-7b86dd80
   CI_IMAGE_DEB_X64_SUFFIX: ""
-  CI_IMAGE_DEB_ARM64: v48815877-9bfad02c
+  CI_IMAGE_DEB_ARM64: v50094600-7b86dd80
   CI_IMAGE_DEB_ARM64_SUFFIX: ""
-  CI_IMAGE_DEB_ARMHF: v48815877-9bfad02c
+  CI_IMAGE_DEB_ARMHF: v50094600-7b86dd80
   CI_IMAGE_DEB_ARMHF_SUFFIX: ""
-  CI_IMAGE_DD_AGENT_TESTING: v48815877-9bfad02c
+  CI_IMAGE_DD_AGENT_TESTING: v50094600-7b86dd80
   CI_IMAGE_DD_AGENT_TESTING_SUFFIX: ""
-  CI_IMAGE_DOCKER_X64: v48815877-9bfad02c
+  CI_IMAGE_DOCKER_X64: v50094600-7b86dd80
   CI_IMAGE_DOCKER_X64_SUFFIX: ""
-  CI_IMAGE_DOCKER_ARM64: v48815877-9bfad02c
+  CI_IMAGE_DOCKER_ARM64: v50094600-7b86dd80
   CI_IMAGE_DOCKER_ARM64_SUFFIX: ""
-  CI_IMAGE_GITLAB_AGENT_DEPLOY: v48815877-9bfad02c
+  CI_IMAGE_GITLAB_AGENT_DEPLOY: v50094600-7b86dd80
   CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: ""
-  CI_IMAGE_LINUX_GLIBC_2_17_X64: v48815877-9bfad02c
+  CI_IMAGE_LINUX_GLIBC_2_17_X64: v50094600-7b86dd80
   CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: ""
-  CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v48815877-9bfad02c
+  CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v50094600-7b86dd80
   CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: ""
-  CI_IMAGE_SYSTEM_PROBE_X64: v48815877-9bfad02c
+  CI_IMAGE_SYSTEM_PROBE_X64: v50094600-7b86dd80
   CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: ""
-  CI_IMAGE_SYSTEM_PROBE_ARM64: v48815877-9bfad02c
+  CI_IMAGE_SYSTEM_PROBE_ARM64: v50094600-7b86dd80
   CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: ""
-  CI_IMAGE_RPM_X64: v48815877-9bfad02c
+  CI_IMAGE_RPM_X64: v50094600-7b86dd80
   CI_IMAGE_RPM_X64_SUFFIX: ""
-  CI_IMAGE_RPM_ARM64: v48815877-9bfad02c
+  CI_IMAGE_RPM_ARM64: v50094600-7b86dd80
   CI_IMAGE_RPM_ARM64_SUFFIX: ""
-  CI_IMAGE_RPM_ARMHF: v48815877-9bfad02c
+  CI_IMAGE_RPM_ARMHF: v50094600-7b86dd80
   CI_IMAGE_RPM_ARMHF_SUFFIX: ""
-  CI_IMAGE_WIN_1809_X64: v48815877-9bfad02c
+  CI_IMAGE_WIN_1809_X64: v50094600-7b86dd80
   CI_IMAGE_WIN_1809_X64_SUFFIX: ""
-  CI_IMAGE_WIN_LTSC2022_X64: v48815877-9bfad02c
+  CI_IMAGE_WIN_LTSC2022_X64: v50094600-7b86dd80
   CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: ""
 
   DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded

.gitlab/common/test_infra_version.yml

@@ -4,4 +4,4 @@ variables:
   # and check the job creating the image to make sure you have the right SHA prefix
   TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ""
   # Make sure to update test-infra-definitions version in go.mod as well
-  TEST_INFRA_DEFINITIONS_BUILDIMAGES: 047dd64128b6
+  TEST_INFRA_DEFINITIONS_BUILDIMAGES: 1f340fd450e3

.gitlab/source_test/macos.yml

@@ -40,7 +40,6 @@ tests_macos:
   rules:
     - !reference [.except_mergequeue]
     - when: on_success
-  allow_failure: true
   extends: .macos_gitlab
   needs: ["go_deps", "go_tools_deps"]
   variables:
@@ -78,6 +77,7 @@ tests_macos_gitlab_arm64:
   rules:
     !reference [.manual]
   tags: ["macos:monterey-arm64", "specific:true"]
+  allow_failure: true
   after_script:
     - !reference [.vault_login]
     - !reference [.select_python_env_commands]

LICENSE-3rdparty.csv

@@ -2143,6 +2143,7 @@ core,github.com/stormcat24/protodep/pkg/logger,Apache-2.0,Copyright Akinori Yama
 core,github.com/streadway/amqp,BSD-2-Clause,"Copyright (c) 2012-2019, Sean Treadway, SoundCloud Ltd"
 core,github.com/stretchr/objx,MIT,"Copyright (c) 2014 Stretchr, Inc | Copyright (c) 2017-2018 objx contributors"
 core,github.com/stretchr/testify/assert,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"
+core,github.com/stretchr/testify/assert/yaml,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"
 core,github.com/stretchr/testify/mock,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"
 core,github.com/stretchr/testify/require,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"
 core,github.com/stretchr/testify/suite,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"

cmd/cws-instrumentation/subcommands/tracecmd/trace.go

@@ -120,6 +120,10 @@ func Command() []*cobra.Command {
 
 			// attach mode
 			if n := len(params.PIDs); n > 0 {
+				if params.PIDPerTracer <= 0 {
+					return fmt.Errorf("%s option but be greater or equal to 1", pidPerTracer)
+				}
+
 				if n < params.PIDPerTracer {
 					return ptracer.Attach(params.PIDs, params.ProbeAddr, opts)
 				}
@@ -145,27 +149,39 @@ func Command() []*cobra.Command {
 					go func(set []int) {
 						defer wg.Done()
 
-						args := []string{"trace"}
-
-						if params.ProcScanDisabled {
-							args = append(args, fmt.Sprintf(`--%s`, disableProcScanOpt))
-						}
-						if params.Async {
-							args = append(args, fmt.Sprintf(`--%s`, asyncOpt))
+						args := []string{
+							"trace",
+							fmt.Sprintf(`--%s`, probeAddrOpt),
+							params.ProbeAddr,
 						}
+
 						if params.Verbose {
 							args = append(args, fmt.Sprintf(`--%s`, verboseOpt))
 						}
-						if params.StatsDisabled {
-							args = append(args, fmt.Sprintf(`--%s`, disableStatsOpt))
+						if params.Debug {
+							args = append(args, fmt.Sprintf(`--%s`, debugOpt))
 						}
 						if params.UID != -1 {
 							args = append(args, fmt.Sprintf(`--%s`, uidOpt), fmt.Sprintf(`%d`, params.UID))
 						}
 						if params.GID != -1 {
 							args = append(args, fmt.Sprintf(`--%s`, gidOpt), fmt.Sprintf(`%d`, params.GID))
 						}
-						args = append(args, fmt.Sprintf(`--%s`, probeAddrOpt), params.ProbeAddr)
+						if params.Async {
+							args = append(args, fmt.Sprintf(`--%s`, asyncOpt))
+						}
+						if params.StatsDisabled {
+							args = append(args, fmt.Sprintf(`--%s`, disableStatsOpt))
+						}
+						if params.ProcScanDisabled {
+							args = append(args, fmt.Sprintf(`--%s`, disableProcScanOpt))
+						}
+						if params.ScanProcEvery != "" {
+							args = append(args, fmt.Sprintf(`--%s`, scanProcEveryOpt), params.ScanProcEvery)
+						}
+						if params.SeccompDisabled {
+							args = append(args, fmt.Sprintf(`--%s`, disableSeccompOpt))
+						}
 
 						for _, pid := range set {
 							args = append(args, fmt.Sprintf(`--%s`, pidOpt), fmt.Sprintf(`%d`, pid))

cmd/installer/main.go

@@ -9,13 +9,33 @@
 package main
 
 import (
+	"fmt"
 	"os"
 
 	"github.com/DataDog/datadog-agent/cmd/installer/command"
 	"github.com/DataDog/datadog-agent/cmd/installer/subcommands"
-	"github.com/DataDog/datadog-agent/cmd/internal/runcmd"
+	"github.com/spf13/cobra"
+	"go.uber.org/dig"
+
+	installerErrors "github.com/DataDog/datadog-agent/pkg/fleet/installer/errors"
 )
 
 func main() {
-	os.Exit(runcmd.Run(command.MakeCommand(subcommands.InstallerSubcommands())))
+	os.Exit(runCmd(command.MakeCommand(subcommands.InstallerSubcommands())))
+}
+
+func runCmd(cmd *cobra.Command) int {
+	// always silence errors, since they are handled here
+	cmd.SilenceErrors = true
+
+	err := cmd.Execute()
+	if err != nil {
+		if rootCauseErr := dig.RootCause(err); rootCauseErr != err {
+			fmt.Fprintln(cmd.ErrOrStderr(), installerErrors.FromErr(rootCauseErr).ToJSON())
+		} else {
+			fmt.Fprintln(cmd.ErrOrStderr(), installerErrors.FromErr(err).ToJSON())
+		}
+		return -1
+	}
+	return 0
 }

cmd/installer/subcommands/installer/command.go

@@ -17,8 +17,8 @@ import (
 
 	"github.com/DataDog/datadog-agent/cmd/installer/command"
 	"github.com/DataDog/datadog-agent/pkg/fleet/bootstrapper"
-	"github.com/DataDog/datadog-agent/pkg/fleet/env"
 	"github.com/DataDog/datadog-agent/pkg/fleet/installer"
+	"github.com/DataDog/datadog-agent/pkg/fleet/installer/env"
 	"github.com/DataDog/datadog-agent/pkg/fleet/telemetry"
 	"github.com/DataDog/datadog-agent/pkg/version"
 	"github.com/spf13/cobra"
@@ -226,7 +226,7 @@ func newTelemetry(env *env.Env) *telemetry.Telemetry {
 	if site == "" {
 		site = config.Site
 	}
-	t, err := telemetry.NewTelemetry(apiKey, site, "datadog-installer") // No sampling rules for commands
+	t, err := telemetry.NewTelemetry(env.HTTPClient(), apiKey, site, "datadog-installer") // No sampling rules for commands
 	if err != nil {
 		fmt.Printf("failed to initialize telemetry: %v\n", err)
 		return nil

cmd/system-probe/config/adjust_usm.go

@@ -19,7 +19,6 @@ const (
 
 func adjustUSM(cfg model.Config) {
 	if cfg.GetBool(smNS("enabled")) {
-		applyDefault(cfg, netNS("enable_http_monitoring"), true)
 		applyDefault(cfg, netNS("enable_https_monitoring"), true)
 		applyDefault(cfg, spNS("enable_runtime_compiler"), true)
 		applyDefault(cfg, spNS("enable_kernel_header_download"), true)
@@ -28,6 +27,7 @@ func adjustUSM(cfg model.Config) {
 	}
 
 	deprecateBool(cfg, netNS("enable_http_monitoring"), smNS("enable_http_monitoring"))
+	applyDefault(cfg, smNS("enable_http_monitoring"), true)
 	deprecateBool(cfg, netNS("enable_https_monitoring"), smNS("tls", "native", "enabled"))
 	deprecateBool(cfg, smNS("enable_go_tls_support"), smNS("tls", "go", "enabled"))
 	applyDefault(cfg, smNS("tls", "go", "enabled"), true)

comp/api/api/def/go.mod

@@ -5,6 +5,7 @@ go 1.22.0
 require go.uber.org/fx v1.22.2
 
 require (
+	github.com/stretchr/testify v1.10.0 // indirect
 	go.uber.org/dig v1.18.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect

comp/api/authtoken/go.mod

@@ -47,7 +47,7 @@ require (
 	github.com/DataDog/datadog-agent/pkg/api v0.56.0
 	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0
 	github.com/DataDog/datadog-agent/pkg/util/optional v0.59.0
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.10.0
 	go.uber.org/fx v1.22.2
 )
 

comp/core/config/go.mod

@@ -44,7 +44,7 @@ require (
 	github.com/DataDog/datadog-agent/pkg/util/optional v0.59.0
 	github.com/DataDog/datadog-agent/pkg/util/winutil v0.59.0
 	github.com/DataDog/viper v1.13.5
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.10.0
 	go.uber.org/fx v1.22.2
 )
 

comp/core/flare/types/go.mod

@@ -10,7 +10,7 @@ require (
 )
 
 require (
-	github.com/stretchr/testify v1.9.0 // indirect
+	github.com/stretchr/testify v1.10.0 // indirect
 	go.uber.org/dig v1.18.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect