Merge branch 'main' into fanny/new-dda-woperator-example

.github/workflows/create_rc_pr.yml

@@ -64,7 +64,7 @@ jobs:
               with:
                 ref: ${{ matrix.value }}
                 fetch-depth: 0
-                persist-credentials: false
+                persist-credentials: true
 
             - name: Install python
               uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0

.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: b436617374bf
+  TEST_INFRA_DEFINITIONS_BUILDIMAGES: 7cd5e8a62570

.gitlab/integration_test/otel.yml

@@ -36,7 +36,7 @@ docker_image_build_otel:
     - cp test/integration/docker/otel_agent_build_tests.py /tmp/otel-ci/
     - wget https://github.com/mikefarah/yq/releases/download/3.4.1/yq_linux_amd64 -O
       /usr/bin/yq && chmod +x /usr/bin/yq
-    - export OTELCOL_VERSION=v$(/usr/bin/yq r /tmp/otel-ci/manifest.yaml dist.otelcol_version)
+    - export OTELCOL_VERSION=v$(/usr/bin/yq r /tmp/otel-ci/manifest.yaml dist.version)
     - yq w -i /tmp/otel-ci/manifest.yaml "receivers[+] gomod"
       "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver ${OTELCOL_VERSION}"
     - yq w -i /tmp/otel-ci/manifest.yaml "processors[+] gomod"
@@ -65,7 +65,7 @@ ddflare_extension_ocb_build:
     - !reference [.retrieve_linux_go_deps]
     - mkdir -p /tmp/otel-ci
     - cp test/otel/testdata/* /tmp/otel-ci/
-    - wget -O /tmp/otel-ci/ocb https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/cmd%2Fbuilder%2Fv0.111.0/ocb_0.111.0_linux_amd64
+    - wget -O /tmp/otel-ci/ocb https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/cmd%2Fbuilder%2Fv0.113.0/ocb_0.113.0_linux_amd64
     - chmod +x /tmp/otel-ci/ocb
   script:
     - echo 'Building collector with OCB and test ddflare extension'

.gitlab/internal_kubernetes_deploy/internal_kubernetes_deploy.yml

@@ -24,6 +24,22 @@ internal_kubernetes_deploy_experimental:
       artifacts: false
     - job: docker_trigger_cluster_agent_internal
       artifacts: false
+    - job: docker_build_agent7_windows1809
+      artifacts: false
+    - job: docker_build_agent7_windows2022
+      artifacts: false
+    - job: docker_build_agent7_windows1809_jmx
+      artifacts: false
+    - job: docker_build_agent7_windows2022_jmx
+      artifacts: false
+    - job: docker_build_agent7_windows1809_core
+      artifacts: false
+    - job: docker_build_agent7_windows2022_core
+      artifacts: false
+    - job: docker_build_agent7_windows1809_core_jmx
+      artifacts: false
+    - job: docker_build_agent7_windows2022_core_jmx
+      artifacts: false
     - job: k8s-e2e-main # Currently only require container Argo workflow
       artifacts: false
       optional: true

cmd/security-agent/subcommands/start/command.go

@@ -45,7 +45,7 @@ import (
 	"github.com/DataDog/datadog-agent/comp/core/sysprobeconfig"
 	"github.com/DataDog/datadog-agent/comp/core/sysprobeconfig/sysprobeconfigimpl"
 	tagger "github.com/DataDog/datadog-agent/comp/core/tagger/def"
-	dualTaggerfx "github.com/DataDog/datadog-agent/comp/core/tagger/fx-dual"
+	remoteTaggerfx "github.com/DataDog/datadog-agent/comp/core/tagger/fx-remote"
 	taggerTypes "github.com/DataDog/datadog-agent/comp/core/tagger/types"
 	"github.com/DataDog/datadog-agent/comp/core/telemetry"
 	wmcatalog "github.com/DataDog/datadog-agent/comp/core/workloadmeta/collectors/catalog"
@@ -113,11 +113,7 @@ func Commands(globalParams *command.GlobalParams) []*cobra.Command {
 						AgentType: catalog,
 					}
 				}),
-				dualTaggerfx.Module(tagger.DualParams{
-					UseRemote: func(c config.Component) bool {
-						return c.GetBool("security_agent.remote_tagger")
-					},
-				}, tagger.Params{}, tagger.RemoteParams{
+				remoteTaggerfx.Module(tagger.RemoteParams{
 					RemoteTarget: func(c config.Component) (string, error) {
 						return fmt.Sprintf(":%v", c.GetInt("cmd_port")), nil
 					},

cmd/serverless/dependencies_linux_amd64.txt

@@ -522,6 +522,11 @@ github.com/outcaste-io/ristretto/z/simd
 github.com/patrickmn/go-cache
 github.com/pelletier/go-toml
 github.com/philhofer/fwd
+github.com/pierrec/lz4/v4
+github.com/pierrec/lz4/v4/internal/lz4block
+github.com/pierrec/lz4/v4/internal/lz4errors
+github.com/pierrec/lz4/v4/internal/lz4stream
+github.com/pierrec/lz4/v4/internal/xxh32
 github.com/pkg/errors
 github.com/pmezard/go-difflib/difflib
 github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil
@@ -572,7 +577,6 @@ github.com/tklauser/numcpus
 github.com/twmb/murmur3
 go.opentelemetry.io/collector/client
 go.opentelemetry.io/collector/component
-go.opentelemetry.io/collector/component/componentprofiles
 go.opentelemetry.io/collector/component/componentstatus
 go.opentelemetry.io/collector/component/componenttest
 go.opentelemetry.io/collector/config/configauth
@@ -593,23 +597,26 @@ go.opentelemetry.io/collector/connector/connectortest
 go.opentelemetry.io/collector/connector/internal
 go.opentelemetry.io/collector/consumer
 go.opentelemetry.io/collector/consumer/consumererror
+go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles
+go.opentelemetry.io/collector/consumer/consumererror/internal
 go.opentelemetry.io/collector/consumer/consumerprofiles
 go.opentelemetry.io/collector/consumer/consumertest
 go.opentelemetry.io/collector/consumer/internal
 go.opentelemetry.io/collector/exporter
 go.opentelemetry.io/collector/exporter/debugexporter
 go.opentelemetry.io/collector/exporter/debugexporter/internal/metadata
 go.opentelemetry.io/collector/exporter/debugexporter/internal/normal
+go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext
 go.opentelemetry.io/collector/exporter/exporterbatcher
 go.opentelemetry.io/collector/exporter/exporterhelper
+go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles
 go.opentelemetry.io/collector/exporter/exporterhelper/internal
 go.opentelemetry.io/collector/exporter/exporterhelper/internal/metadata
 go.opentelemetry.io/collector/exporter/exporterprofiles
 go.opentelemetry.io/collector/exporter/exporterqueue
 go.opentelemetry.io/collector/exporter/exportertest
 go.opentelemetry.io/collector/exporter/internal
 go.opentelemetry.io/collector/exporter/internal/experr
-go.opentelemetry.io/collector/exporter/internal/otlptext
 go.opentelemetry.io/collector/exporter/internal/queue
 go.opentelemetry.io/collector/exporter/otlpexporter
 go.opentelemetry.io/collector/exporter/otlpexporter/internal/metadata
@@ -620,8 +627,6 @@ go.opentelemetry.io/collector/extension/extensioncapabilities
 go.opentelemetry.io/collector/extension/extensiontest
 go.opentelemetry.io/collector/featuregate
 go.opentelemetry.io/collector/internal/fanoutconsumer
-go.opentelemetry.io/collector/internal/globalgates
-go.opentelemetry.io/collector/internal/globalsignal
 go.opentelemetry.io/collector/internal/httphelper
 go.opentelemetry.io/collector/internal/sharedcomponent
 go.opentelemetry.io/collector/otelcol
@@ -652,6 +657,8 @@ go.opentelemetry.io/collector/pdata/ptrace
 go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp
 go.opentelemetry.io/collector/pdata/testdata
 go.opentelemetry.io/collector/pipeline
+go.opentelemetry.io/collector/pipeline/internal/globalsignal
+go.opentelemetry.io/collector/pipeline/pipelineprofiles
 go.opentelemetry.io/collector/processor
 go.opentelemetry.io/collector/processor/batchprocessor
 go.opentelemetry.io/collector/processor/batchprocessor/internal/metadata
@@ -676,6 +683,7 @@ go.opentelemetry.io/collector/receiver/receivertest
 go.opentelemetry.io/collector/semconv/v1.17.0
 go.opentelemetry.io/collector/semconv/v1.18.0
 go.opentelemetry.io/collector/semconv/v1.21.0
+go.opentelemetry.io/collector/semconv/v1.26.0
 go.opentelemetry.io/collector/semconv/v1.6.1
 go.opentelemetry.io/collector/service
 go.opentelemetry.io/collector/service/extensions
@@ -691,6 +699,7 @@ go.opentelemetry.io/collector/service/internal/zpages
 go.opentelemetry.io/collector/service/pipelines
 go.opentelemetry.io/collector/service/telemetry
 go.opentelemetry.io/collector/service/telemetry/internal/otelinit
+go.opentelemetry.io/contrib/bridges/otelzap
 go.opentelemetry.io/contrib/config
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal
@@ -740,6 +749,8 @@ go.opentelemetry.io/otel/internal/baggage
 go.opentelemetry.io/otel/internal/global
 go.opentelemetry.io/otel/log
 go.opentelemetry.io/otel/log/embedded
+go.opentelemetry.io/otel/log/global
+go.opentelemetry.io/otel/log/internal/global
 go.opentelemetry.io/otel/log/noop
 go.opentelemetry.io/otel/metric
 go.opentelemetry.io/otel/metric/embedded
@@ -760,11 +771,9 @@ go.opentelemetry.io/otel/sdk/metric/metricdata
 go.opentelemetry.io/otel/sdk/resource
 go.opentelemetry.io/otel/sdk/trace
 go.opentelemetry.io/otel/sdk/trace/tracetest
-go.opentelemetry.io/otel/semconv/internal
 go.opentelemetry.io/otel/semconv/v1.17.0
 go.opentelemetry.io/otel/semconv/v1.20.0
 go.opentelemetry.io/otel/semconv/v1.26.0
-go.opentelemetry.io/otel/semconv/v1.4.0
 go.opentelemetry.io/otel/trace
 go.opentelemetry.io/otel/trace/embedded
 go.opentelemetry.io/otel/trace/noop

cmd/serverless/dependencies_linux_arm64.txt

@@ -521,6 +521,11 @@ github.com/outcaste-io/ristretto/z/simd
 github.com/patrickmn/go-cache
 github.com/pelletier/go-toml
 github.com/philhofer/fwd
+github.com/pierrec/lz4/v4
+github.com/pierrec/lz4/v4/internal/lz4block
+github.com/pierrec/lz4/v4/internal/lz4errors
+github.com/pierrec/lz4/v4/internal/lz4stream
+github.com/pierrec/lz4/v4/internal/xxh32
 github.com/pkg/errors
 github.com/pmezard/go-difflib/difflib
 github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil
@@ -571,7 +576,6 @@ github.com/tklauser/numcpus
 github.com/twmb/murmur3
 go.opentelemetry.io/collector/client
 go.opentelemetry.io/collector/component
-go.opentelemetry.io/collector/component/componentprofiles
 go.opentelemetry.io/collector/component/componentstatus
 go.opentelemetry.io/collector/component/componenttest
 go.opentelemetry.io/collector/config/configauth
@@ -592,23 +596,26 @@ go.opentelemetry.io/collector/connector/connectortest
 go.opentelemetry.io/collector/connector/internal
 go.opentelemetry.io/collector/consumer
 go.opentelemetry.io/collector/consumer/consumererror
+go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles
+go.opentelemetry.io/collector/consumer/consumererror/internal
 go.opentelemetry.io/collector/consumer/consumerprofiles
 go.opentelemetry.io/collector/consumer/consumertest
 go.opentelemetry.io/collector/consumer/internal
 go.opentelemetry.io/collector/exporter
 go.opentelemetry.io/collector/exporter/debugexporter
 go.opentelemetry.io/collector/exporter/debugexporter/internal/metadata
 go.opentelemetry.io/collector/exporter/debugexporter/internal/normal
+go.opentelemetry.io/collector/exporter/debugexporter/internal/otlptext
 go.opentelemetry.io/collector/exporter/exporterbatcher
 go.opentelemetry.io/collector/exporter/exporterhelper
+go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles
 go.opentelemetry.io/collector/exporter/exporterhelper/internal
 go.opentelemetry.io/collector/exporter/exporterhelper/internal/metadata
 go.opentelemetry.io/collector/exporter/exporterprofiles
 go.opentelemetry.io/collector/exporter/exporterqueue
 go.opentelemetry.io/collector/exporter/exportertest
 go.opentelemetry.io/collector/exporter/internal
 go.opentelemetry.io/collector/exporter/internal/experr
-go.opentelemetry.io/collector/exporter/internal/otlptext
 go.opentelemetry.io/collector/exporter/internal/queue
 go.opentelemetry.io/collector/exporter/otlpexporter
 go.opentelemetry.io/collector/exporter/otlpexporter/internal/metadata
@@ -619,8 +626,6 @@ go.opentelemetry.io/collector/extension/extensioncapabilities
 go.opentelemetry.io/collector/extension/extensiontest
 go.opentelemetry.io/collector/featuregate
 go.opentelemetry.io/collector/internal/fanoutconsumer
-go.opentelemetry.io/collector/internal/globalgates
-go.opentelemetry.io/collector/internal/globalsignal
 go.opentelemetry.io/collector/internal/httphelper
 go.opentelemetry.io/collector/internal/sharedcomponent
 go.opentelemetry.io/collector/otelcol
@@ -651,6 +656,8 @@ go.opentelemetry.io/collector/pdata/ptrace
 go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp
 go.opentelemetry.io/collector/pdata/testdata
 go.opentelemetry.io/collector/pipeline
+go.opentelemetry.io/collector/pipeline/internal/globalsignal
+go.opentelemetry.io/collector/pipeline/pipelineprofiles
 go.opentelemetry.io/collector/processor
 go.opentelemetry.io/collector/processor/batchprocessor
 go.opentelemetry.io/collector/processor/batchprocessor/internal/metadata
@@ -675,6 +682,7 @@ go.opentelemetry.io/collector/receiver/receivertest
 go.opentelemetry.io/collector/semconv/v1.17.0
 go.opentelemetry.io/collector/semconv/v1.18.0
 go.opentelemetry.io/collector/semconv/v1.21.0
+go.opentelemetry.io/collector/semconv/v1.26.0
 go.opentelemetry.io/collector/semconv/v1.6.1
 go.opentelemetry.io/collector/service
 go.opentelemetry.io/collector/service/extensions
@@ -690,6 +698,7 @@ go.opentelemetry.io/collector/service/internal/zpages
 go.opentelemetry.io/collector/service/pipelines
 go.opentelemetry.io/collector/service/telemetry
 go.opentelemetry.io/collector/service/telemetry/internal/otelinit
+go.opentelemetry.io/contrib/bridges/otelzap
 go.opentelemetry.io/contrib/config
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal
@@ -739,6 +748,8 @@ go.opentelemetry.io/otel/internal/baggage
 go.opentelemetry.io/otel/internal/global
 go.opentelemetry.io/otel/log
 go.opentelemetry.io/otel/log/embedded
+go.opentelemetry.io/otel/log/global
+go.opentelemetry.io/otel/log/internal/global
 go.opentelemetry.io/otel/log/noop
 go.opentelemetry.io/otel/metric
 go.opentelemetry.io/otel/metric/embedded
@@ -759,11 +770,9 @@ go.opentelemetry.io/otel/sdk/metric/metricdata
 go.opentelemetry.io/otel/sdk/resource
 go.opentelemetry.io/otel/sdk/trace
 go.opentelemetry.io/otel/sdk/trace/tracetest
-go.opentelemetry.io/otel/semconv/internal
 go.opentelemetry.io/otel/semconv/v1.17.0
 go.opentelemetry.io/otel/semconv/v1.20.0
 go.opentelemetry.io/otel/semconv/v1.26.0
-go.opentelemetry.io/otel/semconv/v1.4.0
 go.opentelemetry.io/otel/trace
 go.opentelemetry.io/otel/trace/embedded
 go.opentelemetry.io/otel/trace/noop

cmd/system-probe/modules/network_tracer.go

@@ -34,6 +34,7 @@ import (
 	redisdebugging "github.com/DataDog/datadog-agent/pkg/network/protocols/redis/debugging"
 	"github.com/DataDog/datadog-agent/pkg/network/protocols/telemetry"
 	"github.com/DataDog/datadog-agent/pkg/network/tracer"
+	usmconsts "github.com/DataDog/datadog-agent/pkg/network/usm/consts"
 	usm "github.com/DataDog/datadog-agent/pkg/network/usm/utils"
 	"github.com/DataDog/datadog-agent/pkg/process/statsd"
 	"github.com/DataDog/datadog-agent/pkg/util/log"
@@ -293,11 +294,11 @@ func (nt *networkTracer) Register(httpMux *module.Router) error {
 	})
 
 	httpMux.HandleFunc("/debug/usm_telemetry", telemetry.Handler)
-	httpMux.HandleFunc("/debug/usm/traced_programs", usm.TracedProgramsEndpoint)
-	httpMux.HandleFunc("/debug/usm/blocked_processes", usm.BlockedPathIDEndpoint)
-	httpMux.HandleFunc("/debug/usm/clear_blocked", usm.ClearBlockedEndpoint)
-	httpMux.HandleFunc("/debug/usm/attach-pid", usm.AttachPIDEndpoint)
-	httpMux.HandleFunc("/debug/usm/detach-pid", usm.DetachPIDEndpoint)
+	httpMux.HandleFunc("/debug/usm/traced_programs", usm.GetTracedProgramsEndpoint(usmconsts.USMModuleName))
+	httpMux.HandleFunc("/debug/usm/blocked_processes", usm.GetBlockedPathIDEndpoint(usmconsts.USMModuleName))
+	httpMux.HandleFunc("/debug/usm/clear_blocked", usm.GetClearBlockedEndpoint(usmconsts.USMModuleName))
+	httpMux.HandleFunc("/debug/usm/attach-pid", usm.GetAttachPIDEndpoint(usmconsts.USMModuleName))
+	httpMux.HandleFunc("/debug/usm/detach-pid", usm.GetDetachPIDEndpoint(usmconsts.USMModuleName))
 
 	// Convenience logging if nothing has made any requests to the system-probe in some time, let's log something.
 	// This should be helpful for customers + support to debug the underlying issue.

cmd/system-probe/modules/traceroute.go

@@ -22,12 +22,13 @@ import (
 	"github.com/DataDog/datadog-agent/cmd/system-probe/api/module"
 	sysconfigtypes "github.com/DataDog/datadog-agent/cmd/system-probe/config/types"
 	"github.com/DataDog/datadog-agent/pkg/networkpath/payload"
-	tracerouteutil "github.com/DataDog/datadog-agent/pkg/networkpath/traceroute"
+	tracerouteutil "github.com/DataDog/datadog-agent/pkg/networkpath/traceroute/config"
+	"github.com/DataDog/datadog-agent/pkg/networkpath/traceroute/runner"
 	"github.com/DataDog/datadog-agent/pkg/util/log"
 )
 
 type traceroute struct {
-	runner *tracerouteutil.Runner
+	runner *runner.Runner
 }
 
 var (
@@ -37,7 +38,7 @@ var (
 )
 
 func createTracerouteModule(_ *sysconfigtypes.Config, deps module.FactoryDependencies) (module.Module, error) {
-	runner, err := tracerouteutil.NewRunner(deps.Telemetry)
+	runner, err := runner.New(deps.Telemetry)
 	if err != nil {
 		return &traceroute{}, err
 	}

cmd/system-probe/modules/traceroute_test.go

@@ -12,7 +12,8 @@ import (
 	"net/http"
 	"testing"
 
-	tracerouteutil "github.com/DataDog/datadog-agent/pkg/networkpath/traceroute"
+	tracerouteutil "github.com/DataDog/datadog-agent/pkg/networkpath/traceroute/config"
+
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

cmd/trace-agent/subcommands/run/command.go

@@ -14,7 +14,6 @@ import (
 	"github.com/spf13/cobra"
 	"go.uber.org/fx"
 
-	"github.com/DataDog/datadog-agent/cmd/agent/common"
 	"github.com/DataDog/datadog-agent/cmd/trace-agent/subcommands"
 	"github.com/DataDog/datadog-agent/comp/agent/autoexit"
 	"github.com/DataDog/datadog-agent/comp/agent/autoexit/autoexitimpl"
@@ -27,12 +26,9 @@ import (
 	"github.com/DataDog/datadog-agent/comp/core/secrets"
 	"github.com/DataDog/datadog-agent/comp/core/secrets/secretsimpl"
 	tagger "github.com/DataDog/datadog-agent/comp/core/tagger/def"
-	dualTaggerfx "github.com/DataDog/datadog-agent/comp/core/tagger/fx-dual"
+	remoteTaggerfx "github.com/DataDog/datadog-agent/comp/core/tagger/fx-remote"
 	taggerTypes "github.com/DataDog/datadog-agent/comp/core/tagger/types"
 	"github.com/DataDog/datadog-agent/comp/core/telemetry/telemetryimpl"
-	wmcatalog "github.com/DataDog/datadog-agent/comp/core/workloadmeta/collectors/catalog"
-	workloadmeta "github.com/DataDog/datadog-agent/comp/core/workloadmeta/def"
-	workloadmetafx "github.com/DataDog/datadog-agent/comp/core/workloadmeta/fx"
 	"github.com/DataDog/datadog-agent/comp/dogstatsd/statsd"
 	"github.com/DataDog/datadog-agent/comp/trace"
 	traceagent "github.com/DataDog/datadog-agent/comp/trace/agent/def"
@@ -93,19 +89,9 @@ func runTraceAgentProcess(ctx context.Context, cliParams *Params, defaultConfPat
 			return log.ForDaemon("TRACE", "apm_config.log_file", config.DefaultLogFilePath)
 		}),
 		logtracefx.Module(),
-		// setup workloadmeta
-		wmcatalog.GetCatalog(),
-		workloadmetafx.Module(workloadmeta.Params{
-			AgentType:  workloadmeta.NodeAgent,
-			InitHelper: common.GetWorkloadmetaInit(),
-		}),
 		autoexitimpl.Module(),
 		statsd.Module(),
-		dualTaggerfx.Module(tagger.DualParams{
-			UseRemote: func(c coreconfig.Component) bool {
-				return c.GetBool("apm_config.remote_tagger")
-			},
-		}, tagger.Params{}, tagger.RemoteParams{
+		remoteTaggerfx.Module(tagger.RemoteParams{
 			RemoteTarget: func(c coreconfig.Component) (string, error) {
 				return fmt.Sprintf(":%v", c.GetInt("cmd_port")), nil
 			},