Merge branch 'main' into ben.db/APPSEC-56208-asm-serverless-upgrade

.circleci/config.yml

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

.github/CODEOWNERS

@@ -209,7 +209,7 @@
 /cmd/agent/dist/conf.d/jetson.d/        @DataDog/agent-devx-infra
 /cmd/agent/dist/conf.d/oracle.d/    @DataDog/database-monitoring
 /cmd/agent/dist/conf.d/oracle-dbm.d/    @DataDog/database-monitoring
-/cmd/agent/dist/conf.d/network_path.d/  @DataDog/Networks @DataDog/network-device-monitoring
+/cmd/agent/dist/conf.d/network_path.d/  @DataDog/Networks
 /cmd/agent/dist/conf.d/sbom.d/          @DataDog/container-integrations
 /cmd/agent/dist/conf.d/snmp.d/          @DataDog/ndm-core
 /cmd/agent/dist/conf.d/win32_event_log.d/ @DataDog/windows-agent
@@ -232,7 +232,7 @@
 /cmd/system-probe/modules/process*      @DataDog/container-intake
 /cmd/system-probe/modules/eventmonitor* @DataDog/agent-security
 /cmd/system-probe/modules/tcp_queue_tracer* @DataDog/container-integrations
-/cmd/system-probe/modules/traceroute*   @DataDog/network-device-monitoring @Datadog/Networks
+/cmd/system-probe/modules/traceroute*   @Datadog/Networks
 /cmd/system-probe/modules/ping*         @DataDog/ndm-core
 /cmd/system-probe/modules/language_detection* @DataDog/container-intake @DataDog/universal-service-monitoring @DataDog/agent-discovery
 /cmd/system-probe/modules/dynamic_instrumentation* @DataDog/debugger
@@ -300,7 +300,7 @@
 /comp/metadata @DataDog/agent-configuration
 /comp/ndmtmp @DataDog/ndm-core
 /comp/netflow @DataDog/ndm-integrations
-/comp/networkpath @DataDog/Networks @DataDog/network-device-monitoring
+/comp/networkpath @DataDog/Networks
 /comp/otelcol @DataDog/opentelemetry @DataDog/opentelemetry-agent
 /comp/process @DataDog/container-intake
 /comp/remote-config @DataDog/remote-config
@@ -567,8 +567,8 @@
 /comp/core/workloadmeta/collectors/internal/nvml @DataDog/ebpf-platform
 /pkg/sbom/                              @DataDog/container-integrations @DataDog/agent-security
 /pkg/internaltelemetry                  @DataDog/windows-kernel-integrations @DataDog/fleet
-/pkg/networkpath/                       @DataDog/network-device-monitoring @DataDog/Networks
-/pkg/collector/corechecks/networkpath/  @DataDog/network-device-monitoring @DataDog/Networks
+/pkg/networkpath/                       @DataDog/Networks
+/pkg/collector/corechecks/networkpath/  @DataDog/Networks
 
 /releasenotes/                          @DataDog/documentation
 /releasenotes-dca/                      @DataDog/documentation
@@ -630,6 +630,7 @@
 /test/new-e2e/tests/agent-platform            @DataDog/container-ecosystems @DataDog/agent-delivery @DataDog/agent-devx-loops
 /test/new-e2e/tests/agent-runtimes            @DataDog/agent-runtimes
 /test/new-e2e/tests/agent-configuration       @DataDog/agent-configuration
+/test/new-e2e/tests/agent-metric-pipelines    @DataDog/agent-metric-pipelines
 /test/new-e2e/tests/agent-subcommands         @DataDog/agent-configuration
 /test/new-e2e/tests/containers                @DataDog/container-integrations @DataDog/container-platform
 /test/new-e2e/tests/discovery                 @DataDog/agent-discovery
@@ -638,7 +639,7 @@
 /test/new-e2e/tests/language-detection        @DataDog/container-intake
 /test/new-e2e/tests/ndm                       @DataDog/ndm-core
 /test/new-e2e/tests/ndm/netflow               @DataDog/ndm-integrations
-/test/new-e2e/tests/netpath                   @DataDog/Networks @DataDog/network-device-monitoring
+/test/new-e2e/tests/netpath                   @DataDog/Networks
 /test/new-e2e/tests/npm                       @DataDog/Networks
 /test/new-e2e/tests/npm/ec2_1host_wkit_test.go @DataDog/Networks @DataDog/windows-kernel-integrations
 /test/new-e2e/tests/orchestrator              @DataDog/container-app

.github/workflows/buildimages-update.yml

@@ -103,7 +103,7 @@ jobs:
             echo "MESSAGE=Update Go version to $INPUT_GO_VERSION" >> $GITHUB_OUTPUT
           fi
 
-      - uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
+      - uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
         id: autocommit
         with:
           commit_message: ${{ steps.update_build_images.outputs.MESSAGE }}

.github/workflows/cws-btfhub-sync.yml

@@ -130,7 +130,7 @@ jobs:
         run: |
           echo "BRANCH_NAME=cws/constants-sync-$(date +%s)" >> $GITHUB_OUTPUT
 
-      - uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
+      - uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
         id: commit-creator
         with:
           commit_message: "CWS: sync BTFhub constants"

.github/workflows/go_mod_tidy.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Update mocks
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies-go-tools') }}
         run: inv -e security-agent.gen-mocks # generate both security agent and process mocks
-      - uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
+      - uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
         id: autocommit
         with:
           commit_message: Auto-generate go.sum and LICENSE-3rdparty.csv changes

.github/workflows/serverless-benchmarks.yml

@@ -131,7 +131,7 @@ jobs:
           echo "EOF" >> $GITHUB_OUTPUT
 
       - name: Post comment
-        uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2.9.0
+        uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728 # v2.9.1
         with:
           header: serverless-benchmarks
           recreate: true

.github/workflows/serverless-binary-size.yml

@@ -43,7 +43,7 @@ jobs:
           persist-credentials: false
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
+        uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
 
       - name: Previous binary size and dependencies
         id: previous
@@ -171,7 +171,7 @@ jobs:
           ./test/integration/serverless_perf/write_message.sh
 
       - name: Post comment
-        uses: marocchino/sticky-pull-request-comment@331f8f5b4215f0445d3c07b4967662a32a2d3e31 # v2.9.0
+        uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728 # v2.9.1
         if: steps.should.outputs.should_run == 'true'
         with:
           header: serverless-binary-size

.github/workflows/serverless-integration.yml

@@ -48,13 +48,13 @@ jobs:
 
       - name: Set up QEMU
         id: qemu
-        uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
+        uses: docker/setup-qemu-action@4574d27a4764455b42196d70a065bc6853246a25 # v3.4.0
         with:
-          image: tonistiigi/binfmt:latest
+          image: tonistiigi/binfmt:qemu-v7.0.0-28
           platforms: amd64,arm64
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
+        uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
 
       - name: Create raw logs directory
         id: rawlogs

.github/workflows/update_dependencies.yml

@@ -48,7 +48,7 @@ jobs:
           # depending on module order
           inv -e tidy
           inv -e tidy
-      - uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
+      - uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
         id: autocommit
         with:
           commit_message: "chore(deps): update all golang.org/x/... dependencies"

.gitlab-ci.yml

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

.gitlab/common/test_infra_version.yml

@@ -5,5 +5,5 @@
 
 ---
 variables:
-  TEST_INFRA_DEFINITIONS_BUILDIMAGES: 5ce0da569ade
+  TEST_INFRA_DEFINITIONS_BUILDIMAGES: 4433a5761c23
   TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX: ''

.gitlab/e2e/e2e.yml

@@ -557,7 +557,7 @@ new-e2e-ndm-netflow:
     - qa_agent
   variables:
     TARGETS: ./tests/ndm/netflow
-    TEAM: network-device-monitoring
+    TEAM: ndm-integrations
 
 new-e2e-ndm-snmp:
   extends: .new_e2e_template
@@ -569,7 +569,7 @@ new-e2e-ndm-snmp:
     - qa_agent
   variables:
     TARGETS: ./tests/ndm/snmp
-    TEAM: network-device-monitoring
+    TEAM: ndm-core
 
 new-e2e-ha-agent:
   extends: .new_e2e_template_needs_deb_x64

.mockery.yaml

@@ -1,8 +1,10 @@
-with-expecter: false
+with-expecter: true
 dir: "{{.InterfaceDir}}/mocks"
 outpkg: "mocks"
 mockname: "{{.InterfaceName}}"
 filename: "{{.InterfaceNameSnake}}.go"
+issue-845-fix: true
+resolve-type-alias: false
 
 packages:
   # security agent

cmd/system-probe/modules/gpu.go

@@ -14,6 +14,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"strconv"
 	"time"
 
 	"github.com/NVIDIA/go-nvml/pkg/nvml"
@@ -44,6 +45,9 @@ var processEventConsumer *consumers.ProcessConsumer
 const processConsumerID = "gpu"
 const processConsumerChanSize = 100
 
+const defaultCollectedDebugEvents = 100
+const maxCollectedDebugEvents = 1000000
+
 var processConsumerEventTypes = []consumers.ProcessConsumerEventTypes{consumers.ExecEventType, consumers.ExitEventType}
 
 // GPUMonitoring Factory
@@ -116,6 +120,7 @@ func (t *GPUMonitoringModule) Register(httpMux *module.Router) error {
 	httpMux.HandleFunc("/debug/clear-blocked", usm.GetClearBlockedEndpoint(gpu.GpuModuleName))
 	httpMux.HandleFunc("/debug/attach-pid", usm.GetAttachPIDEndpoint(gpu.GpuModuleName))
 	httpMux.HandleFunc("/debug/detach-pid", usm.GetDetachPIDEndpoint(gpu.GpuModuleName))
+	httpMux.HandleFunc("/debug/collect-events", t.collectEventsHandler)
 
 	return nil
 }
@@ -127,6 +132,46 @@ func (t *GPUMonitoringModule) GetStats() map[string]interface{} {
 	}
 }
 
+func (t *GPUMonitoringModule) collectEventsHandler(w http.ResponseWriter, r *http.Request) {
+	count := defaultCollectedDebugEvents
+
+	countStr := r.URL.Query().Get("count")
+	if countStr != "" {
+		var err error
+		count, err = strconv.Atoi(countStr)
+		if err != nil {
+			w.Write([]byte(fmt.Sprintf("Invalid count: %s", countStr)))
+			w.WriteHeader(http.StatusBadRequest)
+			return
+		}
+	}
+
+	if count > maxCollectedDebugEvents {
+		log.Warnf("Count %d is too high, clamping to %d", count, maxCollectedDebugEvents)
+		count = maxCollectedDebugEvents
+	}
+
+	log.Infof("Received request to collect %d GPU events, collecting...", count)
+
+	data, err := t.Probe.CollectConsumedEvents(r.Context(), count)
+	if err != nil {
+		msg := fmt.Sprintf("Error collecting GPU events: %v", err)
+		log.Warn(msg)
+		w.Write([]byte(msg))
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	log.Info("Collection finished, writing response...")
+
+	for _, row := range data {
+		w.Write([]byte(row))
+		w.Write([]byte("\n"))
+	}
+
+	w.WriteHeader(http.StatusOK)
+}
+
 // Close closes the GPU monitoring module
 func (t *GPUMonitoringModule) Close() {
 	t.Probe.Close()

comp/README.md

@@ -395,7 +395,7 @@ It does not expose any public methods.
 
 ## [comp/networkpath](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/networkpath) (Component Bundle)
 
-*Datadog Team*: Networks network-device-monitoring
+*Datadog Team*: Networks
 
 Package networkpath implements the "networkpath" bundle,
 

comp/api/api/def/go.mod

@@ -52,6 +52,7 @@ replace (
 	github.com/DataDog/datadog-agent/comp/otelcol/converter/impl => ../../../../comp/otelcol/converter/impl
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def => ../../../../comp/otelcol/ddflareextension/def
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl => ../../../../comp/otelcol/ddflareextension/impl
+	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/types => ../../../../comp/otelcol/ddflareextension/types
 	github.com/DataDog/datadog-agent/comp/otelcol/ddprofilingextension/def => ../../../../comp/otelcol/ddprofilingextension/def
 	github.com/DataDog/datadog-agent/comp/otelcol/ddprofilingextension/impl => ../../../../comp/otelcol/ddprofilingextension/impl
 	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline => ../../../../comp/otelcol/logsagentpipeline

comp/api/authtoken/go.mod

@@ -114,6 +114,7 @@ replace (
 	github.com/DataDog/datadog-agent/comp/otelcol/converter/impl => ../../../comp/otelcol/converter/impl
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def => ../../../comp/otelcol/ddflareextension/def
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl => ../../../comp/otelcol/ddflareextension/impl
+	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/types => ../../../comp/otelcol/ddflareextension/types
 	github.com/DataDog/datadog-agent/comp/otelcol/ddprofilingextension/def => ../../../comp/otelcol/ddprofilingextension/def
 	github.com/DataDog/datadog-agent/comp/otelcol/ddprofilingextension/impl => ../../../comp/otelcol/ddprofilingextension/impl
 	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline => ../../../comp/otelcol/logsagentpipeline

comp/core/config/go.mod

@@ -119,6 +119,7 @@ replace (
 	github.com/DataDog/datadog-agent/comp/otelcol/converter/impl => ../../../comp/otelcol/converter/impl
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def => ../../../comp/otelcol/ddflareextension/def
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl => ../../../comp/otelcol/ddflareextension/impl
+	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/types => ../../../comp/otelcol/ddflareextension/types
 	github.com/DataDog/datadog-agent/comp/otelcol/ddprofilingextension/def => ../../../comp/otelcol/ddprofilingextension/def
 	github.com/DataDog/datadog-agent/comp/otelcol/ddprofilingextension/impl => ../../../comp/otelcol/ddprofilingextension/impl
 	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline => ../../../comp/otelcol/logsagentpipeline

comp/core/flare/builder/go.mod

@@ -40,6 +40,7 @@ replace (
 	github.com/DataDog/datadog-agent/comp/otelcol/converter/impl => ../../../../comp/otelcol/converter/impl
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def => ../../../../comp/otelcol/ddflareextension/def
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl => ../../../../comp/otelcol/ddflareextension/impl
+	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/types => ../../../../comp/otelcol/ddflareextension/types
 	github.com/DataDog/datadog-agent/comp/otelcol/ddprofilingextension/def => ../../../../comp/otelcol/ddprofilingextension/def
 	github.com/DataDog/datadog-agent/comp/otelcol/ddprofilingextension/impl => ../../../../comp/otelcol/ddprofilingextension/impl
 	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline => ../../../../comp/otelcol/logsagentpipeline

comp/core/flare/types/go.mod

@@ -55,6 +55,7 @@ replace (
 	github.com/DataDog/datadog-agent/comp/otelcol/converter/impl => ../../../../comp/otelcol/converter/impl
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def => ../../../../comp/otelcol/ddflareextension/def
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl => ../../../../comp/otelcol/ddflareextension/impl
+	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/types => ../../../../comp/otelcol/ddflareextension/types
 	github.com/DataDog/datadog-agent/comp/otelcol/ddprofilingextension/def => ../../../../comp/otelcol/ddprofilingextension/def
 	github.com/DataDog/datadog-agent/comp/otelcol/ddprofilingextension/impl => ../../../../comp/otelcol/ddprofilingextension/impl
 	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline => ../../../../comp/otelcol/logsagentpipeline

comp/core/hostname/hostnameinterface/go.mod

@@ -61,6 +61,7 @@ replace (
 	github.com/DataDog/datadog-agent/comp/otelcol/converter/impl => ../../../../comp/otelcol/converter/impl
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def => ../../../../comp/otelcol/ddflareextension/def
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl => ../../../../comp/otelcol/ddflareextension/impl
+	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/types => ../../../../comp/otelcol/ddflareextension/types
 	github.com/DataDog/datadog-agent/comp/otelcol/ddprofilingextension/def => ../../../../comp/otelcol/ddprofilingextension/def
 	github.com/DataDog/datadog-agent/comp/otelcol/ddprofilingextension/impl => ../../../../comp/otelcol/ddprofilingextension/impl
 	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline => ../../../../comp/otelcol/logsagentpipeline

comp/core/log/def/go.mod

@@ -51,6 +51,7 @@ replace (
 	github.com/DataDog/datadog-agent/comp/otelcol/converter/impl => ../../../../comp/otelcol/converter/impl
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def => ../../../../comp/otelcol/ddflareextension/def
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl => ../../../../comp/otelcol/ddflareextension/impl
+	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/types => ../../../../comp/otelcol/ddflareextension/types
 	github.com/DataDog/datadog-agent/comp/otelcol/ddprofilingextension/def => ../../../../comp/otelcol/ddprofilingextension/def
 	github.com/DataDog/datadog-agent/comp/otelcol/ddprofilingextension/impl => ../../../../comp/otelcol/ddprofilingextension/impl
 	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline => ../../../../comp/otelcol/logsagentpipeline