Merge branch 'main' into aiuto/curl

Author: aiuto

.gitlab/integration_test/otel.yml

@@ -43,27 +43,28 @@ docker_image_build_otel:
     - !reference [.except_mergequeue]
     - when: on_success
 
-datadog_otel_components_ocb_build:
-  stage: integration_test
-  image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux$CI_IMAGE_LINUX_SUFFIX:$CI_IMAGE_LINUX
-  tags: ["arch:amd64", "specific:true"]
-  needs: ["go_deps"]
-  artifacts:
-    paths:
-      - ocb-output.log
-      - otelcol-custom.log
-      - flare-info.log
-    when: always
-  before_script:
-    - !reference [.retrieve_linux_go_deps]
-  script:
-    - echo "Building custom collector with datadog components"
-    - test/otel/testdata/ocb_build_script.sh
-    - echo "see artifacts for job logs"
-  rules:
-    - !reference [.except_mergequeue]
-    - when: on_success
-  timeout: 15 minutes
+# TODO(songy23): re-enable datadog_otel_components_ocb_build after OSS DD exporter adopts https://github.com/DataDog/datadog-agent/pull/42542
+# datadog_otel_components_ocb_build:
+#   stage: integration_test
+#   image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux$CI_IMAGE_LINUX_SUFFIX:$CI_IMAGE_LINUX
+#   tags: ["arch:amd64", "specific:true"]
+#   needs: ["go_deps"]
+#   artifacts:
+#     paths:
+#       - ocb-output.log
+#       - otelcol-custom.log
+#       - flare-info.log
+#     when: always
+#   before_script:
+#     - !reference [.retrieve_linux_go_deps]
+#   script:
+#     - echo "Building custom collector with datadog components"
+#     - test/otel/testdata/ocb_build_script.sh
+#     - echo "see artifacts for job logs"
+#   rules:
+#     - !reference [.except_mergequeue]
+#     - when: on_success
+#   timeout: 15 minutes
 
 # Test that the BYOC packages can be built with the existing Dockerfile
 ddot_byoc_package_build_test_rpm:

cmd/agent/subcommands/snmp/command.go

@@ -287,7 +287,9 @@ func scanDevice(connParams *snmpparse.SNMPConfig, args argsType, snmpScanner snm
 	deviceID := namespace + ":" + connParams.IPAddress
 	// Start the scan
 	fmt.Printf("Launching scan for device: %s\n", deviceID)
-	err := snmpScanner.ScanDeviceAndSendData(connParams, namespace, metadata.ManualScan)
+	err := snmpScanner.ScanDeviceAndSendData(connParams, namespace, snmpscan.ScanParams{
+		ScanType: metadata.ManualScan,
+	})
 	if err != nil {
 		fmt.Printf("Unable to perform device scan for device %s : %e", deviceID, err)
 	}

comp/core/agenttelemetry/impl/config.go

@@ -602,7 +602,7 @@ func parseConfig(cfg config.Component) (*Config, error) {
 	atCfgMap := cfg.GetStringMap("agent_telemetry")
 	if len(atCfgMap) > 0 {
 		// Reconvert to string and back to object.
-		// Config.UnmarshalKey() is better but it did not work in some cases
+		// structure.UnmarshalKey() is better but it did not work in some cases
 		atCfgBytes, err := yaml.Marshal(atCfgMap)
 		if err != nil {
 			return nil, err

comp/core/workloadfilter/catalog/filter_config.go

@@ -14,6 +14,7 @@ import (
 	"github.com/DataDog/datadog-agent/comp/core/config"
 	workloadfilter "github.com/DataDog/datadog-agent/comp/core/workloadfilter/def"
 	"github.com/DataDog/datadog-agent/comp/core/workloadfilter/impl/parse"
+	"github.com/DataDog/datadog-agent/pkg/config/structure"
 )
 
 // FilterConfig holds all configuration values needed for filter initialization
@@ -127,7 +128,7 @@ func loadCELConfig(cfg config.Component) ([]workloadfilter.RuleBundle, error) {
 	var celConfig []workloadfilter.RuleBundle
 
 	// First try the standard UnmarshalKey method (input defined in datadog.yaml)
-	err := cfg.UnmarshalKey("cel_workload_exclude", &celConfig)
+	err := structure.UnmarshalKey(cfg, "cel_workload_exclude", &celConfig)
 	if err == nil {
 		return celConfig, nil
 	}

comp/core/workloadfilter/catalog/filter_config_test.go

@@ -23,11 +23,11 @@ func TestNewFilterConfig_CELFallback(t *testing.T) {
 		mockConfig := configmock.New(t)
 
 		// Set up valid CEL config that should unmarshal successfully
-		celConfig := []workloadfilter.RuleBundle{
+		celConfig := []map[string]interface{}{
 			{
-				Products: []workloadfilter.Product{workloadfilter.ProductMetrics},
-				Rules: map[workloadfilter.ResourceType][]string{
-					workloadfilter.ContainerType: {"container.name == 'test'"},
+				"products": []string{"metrics"},
+				"rules": map[string][]string{
+					"container": {"container.name == 'test'"},
 				},
 			},
 		}

comp/core/workloadfilter/impl/parse/parse_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	configcomp "github.com/DataDog/datadog-agent/comp/core/config"
+	"github.com/DataDog/datadog-agent/pkg/config/structure"
 
 	workloadfilter "github.com/DataDog/datadog-agent/comp/core/workloadfilter/def"
 )
@@ -129,7 +130,7 @@ cel_workload_exclude:
 `
 	configComponent := configcomp.NewMockFromYAML(t, yamlConfig)
 	var filterConfig []workloadfilter.RuleBundle
-	err := configComponent.UnmarshalKey("cel_workload_exclude", &filterConfig)
+	err := structure.UnmarshalKey(configComponent, "cel_workload_exclude", &filterConfig)
 
 	require.NoError(t, err)
 	assert.Len(t, filterConfig, 2)

comp/networkpath/npcollector/npcollectorimpl/config.go

@@ -12,6 +12,7 @@ import (
 	log "github.com/DataDog/datadog-agent/comp/core/log/def"
 	"github.com/DataDog/datadog-agent/comp/networkpath/npcollector/npcollectorimpl/connfilter"
 	"github.com/DataDog/datadog-agent/comp/networkpath/npcollector/npcollectorimpl/pathteststore"
+	"github.com/DataDog/datadog-agent/pkg/config/structure"
 	"github.com/DataDog/datadog-agent/pkg/networkpath/payload"
 )
 
@@ -43,7 +44,7 @@ type collectorConfigs struct {
 
 func newConfig(agentConfig config.Component, logger log.Component) *collectorConfigs {
 	var filterConfigs []connfilter.Config
-	err := agentConfig.UnmarshalKey("network_path.collector.filters", &filterConfigs)
+	err := structure.UnmarshalKey(agentConfig, "network_path.collector.filters", &filterConfigs)
 	if err != nil {
 		logger.Errorf("Error unmarshalling network_path.collector.filters")
 		filterConfigs = nil

comp/otelcol/ddprofilingextension/impl/extension_test.go

@@ -41,7 +41,7 @@ func (c testComponent) SetOTelAttributeTranslator(attrstrans *otlpattributes.Tra
 	c.Agent.OTLPReceiver.SetOTelAttributeTranslator(attrstrans)
 }
 
-func (c testComponent) ReceiveOTLPSpans(ctx context.Context, rspans ptrace.ResourceSpans, httpHeader http.Header, hostFromAttributesHandler otlpattributes.HostFromAttributesHandler) otlpsource.Source {
+func (c testComponent) ReceiveOTLPSpans(ctx context.Context, rspans ptrace.ResourceSpans, httpHeader http.Header, hostFromAttributesHandler otlpattributes.HostFromAttributesHandler) (otlpsource.Source, error) {
 	return c.Agent.OTLPReceiver.ReceiveResourceSpans(ctx, rspans, httpHeader, hostFromAttributesHandler)
 }
 

comp/otelcol/otlp/components/exporter/datadogexporter/host_metadata_test.go

@@ -155,7 +155,7 @@ func createTestFactory(t *testing.T, serverAddr string) exporter.Factory {
 	traceagent := pkgagent.NewAgent(ctx, tcfg, telemetry.NewNoopCollector(), &ddgostatsd.NoOpClient{}, implgzip.NewComponent())
 	go traceagent.Run()
 
-	return NewFactory(testComponent{traceagent}, srlz, &mockLogsAgentPipeline{}, sourceProvider, metricsclient.NewStatsdClientWrapper(&ddgostatsd.NoOpClient{}), otel.NewDisabledGatewayUsage(), serializerexporter.TelemetryStore{})
+	return NewFactory(testComponent{traceagent, nil}, srlz, &mockLogsAgentPipeline{}, sourceProvider, metricsclient.NewStatsdClientWrapper(&ddgostatsd.NoOpClient{}), otel.NewDisabledGatewayUsage(), serializerexporter.TelemetryStore{})
 }
 
 func TestHostMetadata_FromTraces(t *testing.T) {

comp/otelcol/otlp/components/exporter/datadogexporter/traces_exporter.go

@@ -76,7 +76,10 @@ func (exp *traceExporter) consumeTraces(
 				exp.params.Logger.Warn("failed to consume resource for host metadata", zap.Error(err), zap.Any("resource", res))
 			}
 		}
-		src := exp.traceagentcmp.ReceiveOTLPSpans(ctx, rspan, header, exp.gatewayUsage.GetHostFromAttributesHandler())
+		src, err := exp.traceagentcmp.ReceiveOTLPSpans(ctx, rspan, header, exp.gatewayUsage.GetHostFromAttributesHandler())
+		if err != nil {
+			return err
+		}
 		switch src.Kind {
 		case source.HostnameKind:
 			hosts[src.Identifier] = struct{}{}