Merge branch 'main' into main

open-telemetry · Aug 6, 2024 · 46818ea · 46818ea
2 parents 71cdb84 + a790c77
commit 46818ea
Show file tree

Hide file tree

Showing 12 changed files with 786 additions and 786 deletions.
diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod
@@ -290,74 +290,74 @@ require (
 	github.com/ClickHouse/ch-go v0.61.5 // indirect
 	github.com/ClickHouse/clickhouse-go/v2 v2.26.0 // indirect
 	github.com/Code-Hex/go-generics-cache v1.5.1 // indirect
-	github.com/DataDog/agent-payload/v5 v5.0.128 // indirect
-	github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.7 // indirect
+	github.com/DataDog/agent-payload/v5 v5.0.129 // indirect
+	github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.9 // indirect
 	github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240722160158-ad956a31a730 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.7 // indirect
-	github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.7 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.9 // indirect
+	github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.9 // indirect
 	github.com/DataDog/datadog-api-client-go/v2 v2.28.0 // indirect
 	github.com/DataDog/datadog-go/v5 v5.5.0 // indirect
 	github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe // indirect
 	github.com/DataDog/go-sqllexer v0.0.12 // indirect
 	github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
 	github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
-	github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.17.0 // indirect
-	github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.17.0 // indirect
-	github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.17.0 // indirect
-	github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.17.0 // indirect
-	github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.17.0 // indirect
+	github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.18.0 // indirect
+	github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.18.0 // indirect
+	github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.18.0 // indirect
+	github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.18.0 // indirect
+	github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.18.0 // indirect
 	github.com/DataDog/sketches-go v1.4.6 // indirect
 	github.com/DataDog/viper v1.13.5 // indirect
 	github.com/DataDog/zstd v1.5.5 // indirect