From c59ccca643562acfd4aed1d604412933cfbe711c Mon Sep 17 00:00:00 2001 From: Yang Song Date: Wed, 10 Jul 2024 14:21:50 -0400 Subject: [PATCH 1/6] [exporter/datadog] Respect confighttp in trace agent --- connector/datadogconnector/go.mod | 2 +- connector/datadogconnector/go.sum | 4 ++-- exporter/datadogexporter/go.mod | 2 +- exporter/datadogexporter/go.sum | 4 ++-- exporter/datadogexporter/integrationtest/go.mod | 2 +- exporter/datadogexporter/integrationtest/go.sum | 4 ++-- exporter/datadogexporter/traces_exporter.go | 3 +++ 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index a0d0745c7274c..9c87be607c6c1 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -6,7 +6,7 @@ require ( github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.1 github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.1 github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.1 - github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1 + github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 github.com/DataDog/datadog-go/v5 v5.5.0 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.17.0 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.17.0 diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index a6501be02f447..173543057389d 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -158,8 +158,8 @@ github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 h1:EoliKKR76N8dw github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1 h1:esIonH+3dYwSrTVMtTD3bGGJvd9+yVt4r9q6Cw8uXUo= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1/go.mod h1:v369ANtHEIt5AvDPAZLs6paKioXhvpWCAM5CB1Syy1g= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1 h1:V7sm69xhL9r2XlPE3VyvU7jYrdLZR8HeJWR3IT9vEwM= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 h1:v6i8/VujvriZC2DIs+fay9Ox7xy493Bevj5/VFxp/O8= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1 h1:ZYX5KnklcbqvMdGmicwJuTwTzdybRTsQ4t/SGui6deQ= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.1 h1:79wJLXex6qheSfSDNlPOHmIqj72uK6FbQ6M1fKJYE0Q= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index e338965bd793c..d8c54ad5ab30b 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -22,7 +22,7 @@ require ( github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.1 github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1 + github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.1 // indirect github.com/DataDog/datadog-api-client-go/v2 v2.27.0 github.com/DataDog/datadog-go/v5 v5.5.0 diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 51c7d361e67b7..301305c1de663 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -165,8 +165,8 @@ github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 h1:EoliKKR76N8dw github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1 h1:esIonH+3dYwSrTVMtTD3bGGJvd9+yVt4r9q6Cw8uXUo= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1/go.mod h1:v369ANtHEIt5AvDPAZLs6paKioXhvpWCAM5CB1Syy1g= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1 h1:V7sm69xhL9r2XlPE3VyvU7jYrdLZR8HeJWR3IT9vEwM= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 h1:v6i8/VujvriZC2DIs+fay9Ox7xy493Bevj5/VFxp/O8= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1 h1:ZYX5KnklcbqvMdGmicwJuTwTzdybRTsQ4t/SGui6deQ= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.1 h1:79wJLXex6qheSfSDNlPOHmIqj72uK6FbQ6M1fKJYE0Q= diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index f05d571a4b5db..241b7f2837867 100644 --- a/exporter/datadogexporter/integrationtest/go.mod +++ b/exporter/datadogexporter/integrationtest/go.mod @@ -70,7 +70,7 @@ require ( github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 // indirect github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.1 // indirect diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index fbed04830b729..74ef7880f560a 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -158,8 +158,8 @@ github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 h1:EoliKKR76N8dw github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1 h1:esIonH+3dYwSrTVMtTD3bGGJvd9+yVt4r9q6Cw8uXUo= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1/go.mod h1:v369ANtHEIt5AvDPAZLs6paKioXhvpWCAM5CB1Syy1g= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1 h1:V7sm69xhL9r2XlPE3VyvU7jYrdLZR8HeJWR3IT9vEwM= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 h1:v6i8/VujvriZC2DIs+fay9Ox7xy493Bevj5/VFxp/O8= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1 h1:ZYX5KnklcbqvMdGmicwJuTwTzdybRTsQ4t/SGui6deQ= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.1 h1:79wJLXex6qheSfSDNlPOHmIqj72uK6FbQ6M1fKJYE0Q= diff --git a/exporter/datadogexporter/traces_exporter.go b/exporter/datadogexporter/traces_exporter.go index 04134645450de..b2d6abb0955e7 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -212,6 +212,9 @@ func newTraceAgentConfig(ctx context.Context, params exporter.Settings, cfg *Con acfg.PeerTagsAggregation = cfg.Traces.PeerTagsAggregation acfg.PeerTags = cfg.Traces.PeerTags acfg.MaxSenderRetries = 4 + acfg.HTTPClientFunc = func() *http.Client { + return clientutil.NewHTTPClient(cfg.ClientConfig) + } if v := cfg.Traces.flushInterval; v > 0 { acfg.TraceWriter.FlushPeriodSeconds = v } From c886c1be16a6d931f7b63f039a8ac33788ad0246 Mon Sep 17 00:00:00 2001 From: Yang Song Date: Wed, 10 Jul 2024 14:35:39 -0400 Subject: [PATCH 2/6] changelog, featuregate & tidy --- .chloggen/ddexp-trace-http.yaml | 27 +++++++++++++++++++++ cmd/otelcontribcol/go.mod | 2 +- cmd/otelcontribcol/go.sum | 4 +-- exporter/datadogexporter/traces_exporter.go | 14 +++++++++-- 4 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 .chloggen/ddexp-trace-http.yaml diff --git a/.chloggen/ddexp-trace-http.yaml b/.chloggen/ddexp-trace-http.yaml new file mode 100644 index 0000000000000..fc488030b401b --- /dev/null +++ b/.chloggen/ddexp-trace-http.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: datadogexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Add a feature gate `exporter.datadogexporter.TraceAgentUseCustomHTTPClient` that allows a custom HTTP client to be used in trace export" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [34025] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: "This is an experimental feature. By default the feature gate is disabled and trace export uses a default HTTP client." + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index adaf2fb129b5c..24e1b1e40d6b8 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -327,7 +327,7 @@ require ( github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 // indirect github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.1 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 88c112f8cfaf1..13f712b5e4933 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -813,8 +813,8 @@ github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 h1:EoliKKR76N8dw github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1 h1:esIonH+3dYwSrTVMtTD3bGGJvd9+yVt4r9q6Cw8uXUo= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1/go.mod h1:v369ANtHEIt5AvDPAZLs6paKioXhvpWCAM5CB1Syy1g= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1 h1:V7sm69xhL9r2XlPE3VyvU7jYrdLZR8HeJWR3IT9vEwM= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 h1:v6i8/VujvriZC2DIs+fay9Ox7xy493Bevj5/VFxp/O8= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1 h1:ZYX5KnklcbqvMdGmicwJuTwTzdybRTsQ4t/SGui6deQ= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.1 h1:79wJLXex6qheSfSDNlPOHmIqj72uK6FbQ6M1fKJYE0Q= diff --git a/exporter/datadogexporter/traces_exporter.go b/exporter/datadogexporter/traces_exporter.go index b2d6abb0955e7..e9b54ae4a23d7 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -22,6 +22,7 @@ import ( "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes/source" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" @@ -33,6 +34,13 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/scrub" ) +var traceCustomHTTPFeatureGate = featuregate.GlobalRegistry().MustRegister( + "exporter.datadogexporter.TraceAgentUseCustomHTTPClient", + featuregate.StageAlpha, + featuregate.WithRegisterDescription("When enabled, trace agent uses the HTTP client from the exporter HTTP configs"), + featuregate.WithRegisterFromVersion("v0.105.0"), +) + type traceExporter struct { params exporter.Settings cfg *Config @@ -212,8 +220,10 @@ func newTraceAgentConfig(ctx context.Context, params exporter.Settings, cfg *Con acfg.PeerTagsAggregation = cfg.Traces.PeerTagsAggregation acfg.PeerTags = cfg.Traces.PeerTags acfg.MaxSenderRetries = 4 - acfg.HTTPClientFunc = func() *http.Client { - return clientutil.NewHTTPClient(cfg.ClientConfig) + if traceCustomHTTPFeatureGate.IsEnabled() { + acfg.HTTPClientFunc = func() *http.Client { + return clientutil.NewHTTPClient(cfg.ClientConfig) + } } if v := cfg.Traces.flushInterval; v > 0 { acfg.TraceWriter.FlushPeriodSeconds = v From 19afc32a6a4d428a0c4daa467abdc8b2984e456b Mon Sep 17 00:00:00 2001 From: Yang Song Date: Wed, 10 Jul 2024 14:41:58 -0400 Subject: [PATCH 3/6] Add a warn log --- exporter/datadogexporter/traces_exporter.go | 1 + 1 file changed, 1 insertion(+) diff --git a/exporter/datadogexporter/traces_exporter.go b/exporter/datadogexporter/traces_exporter.go index e9b54ae4a23d7..aad06f033ca51 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -221,6 +221,7 @@ func newTraceAgentConfig(ctx context.Context, params exporter.Settings, cfg *Con acfg.PeerTags = cfg.Traces.PeerTags acfg.MaxSenderRetries = 4 if traceCustomHTTPFeatureGate.IsEnabled() { + params.Logger.Warn("Experimental feature: datadog exporter trace export uses a custom HTTP client from the exporter HTTP configs") acfg.HTTPClientFunc = func() *http.Client { return clientutil.NewHTTPClient(cfg.ClientConfig) } From 8abc7b55996d681e558c6b22ac01a3481c9a92d4 Mon Sep 17 00:00:00 2001 From: Yang Song Date: Thu, 11 Jul 2024 08:57:49 -0400 Subject: [PATCH 4/6] Update exporter/datadogexporter/traces_exporter.go Co-authored-by: Pablo Baeyens --- exporter/datadogexporter/traces_exporter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporter/datadogexporter/traces_exporter.go b/exporter/datadogexporter/traces_exporter.go index aad06f033ca51..2765b6423897f 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -221,7 +221,7 @@ func newTraceAgentConfig(ctx context.Context, params exporter.Settings, cfg *Con acfg.PeerTags = cfg.Traces.PeerTags acfg.MaxSenderRetries = 4 if traceCustomHTTPFeatureGate.IsEnabled() { - params.Logger.Warn("Experimental feature: datadog exporter trace export uses a custom HTTP client from the exporter HTTP configs") + params.Logger.Info("Experimental feature: datadog exporter trace export uses a custom HTTP client from the exporter HTTP configs") acfg.HTTPClientFunc = func() *http.Client { return clientutil.NewHTTPClient(cfg.ClientConfig) } From 97b1e045b1008fa44d55c558d978183c91664d8b Mon Sep 17 00:00:00 2001 From: Yang Song Date: Thu, 11 Jul 2024 09:02:18 -0400 Subject: [PATCH 5/6] Rename to TraceExportUseCustomHTTPClient --- .chloggen/ddexp-trace-http.yaml | 2 +- exporter/datadogexporter/traces_exporter.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.chloggen/ddexp-trace-http.yaml b/.chloggen/ddexp-trace-http.yaml index fc488030b401b..6b47cfc63b7ce 100644 --- a/.chloggen/ddexp-trace-http.yaml +++ b/.chloggen/ddexp-trace-http.yaml @@ -7,7 +7,7 @@ change_type: enhancement component: datadogexporter # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "Add a feature gate `exporter.datadogexporter.TraceAgentUseCustomHTTPClient` that allows a custom HTTP client to be used in trace export" +note: "Add a feature gate `exporter.datadogexporter.TraceExportUseCustomHTTPClient` that allows a custom HTTP client to be used in trace export" # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. issues: [34025] diff --git a/exporter/datadogexporter/traces_exporter.go b/exporter/datadogexporter/traces_exporter.go index 2765b6423897f..899ea006fd7c0 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -35,9 +35,9 @@ import ( ) var traceCustomHTTPFeatureGate = featuregate.GlobalRegistry().MustRegister( - "exporter.datadogexporter.TraceAgentUseCustomHTTPClient", + "exporter.datadogexporter.TraceExportUseCustomHTTPClient", featuregate.StageAlpha, - featuregate.WithRegisterDescription("When enabled, trace agent uses the HTTP client from the exporter HTTP configs"), + featuregate.WithRegisterDescription("When enabled, trace export uses the HTTP client from the exporter HTTP configs"), featuregate.WithRegisterFromVersion("v0.105.0"), ) From 99ede233e2ddff7c2197bb10b3230ba627153ab1 Mon Sep 17 00:00:00 2001 From: Yang Song Date: Thu, 11 Jul 2024 09:07:36 -0400 Subject: [PATCH 6/6] Update version --- cmd/otelcontribcol/go.mod | 2 +- cmd/otelcontribcol/go.sum | 4 ++-- connector/datadogconnector/go.mod | 2 +- connector/datadogconnector/go.sum | 4 ++-- exporter/datadogexporter/go.mod | 2 +- exporter/datadogexporter/go.sum | 4 ++-- exporter/datadogexporter/integrationtest/go.mod | 2 +- exporter/datadogexporter/integrationtest/go.sum | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 24e1b1e40d6b8..8d451e6a8952b 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -327,7 +327,7 @@ require ( github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240711082232-dc70454ece9f // indirect github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.1 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 13f712b5e4933..03be03b3fcb22 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -813,8 +813,8 @@ github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 h1:EoliKKR76N8dw github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1 h1:esIonH+3dYwSrTVMtTD3bGGJvd9+yVt4r9q6Cw8uXUo= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1/go.mod h1:v369ANtHEIt5AvDPAZLs6paKioXhvpWCAM5CB1Syy1g= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 h1:v6i8/VujvriZC2DIs+fay9Ox7xy493Bevj5/VFxp/O8= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240711082232-dc70454ece9f h1:0ErjSIbMq6VP16/XTFzwj030wXwucEWCsmi+RdMSmyE= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240711082232-dc70454ece9f/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1 h1:ZYX5KnklcbqvMdGmicwJuTwTzdybRTsQ4t/SGui6deQ= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.1 h1:79wJLXex6qheSfSDNlPOHmIqj72uK6FbQ6M1fKJYE0Q= diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index 9c87be607c6c1..3fe0d5929299e 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -6,7 +6,7 @@ require ( github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.1 github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.1 github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.1 - github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 + github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240711082232-dc70454ece9f github.com/DataDog/datadog-go/v5 v5.5.0 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.17.0 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.17.0 diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index 173543057389d..8ca4ca78cb7e3 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -158,8 +158,8 @@ github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 h1:EoliKKR76N8dw github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1 h1:esIonH+3dYwSrTVMtTD3bGGJvd9+yVt4r9q6Cw8uXUo= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1/go.mod h1:v369ANtHEIt5AvDPAZLs6paKioXhvpWCAM5CB1Syy1g= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 h1:v6i8/VujvriZC2DIs+fay9Ox7xy493Bevj5/VFxp/O8= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240711082232-dc70454ece9f h1:0ErjSIbMq6VP16/XTFzwj030wXwucEWCsmi+RdMSmyE= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240711082232-dc70454ece9f/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1 h1:ZYX5KnklcbqvMdGmicwJuTwTzdybRTsQ4t/SGui6deQ= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.1 h1:79wJLXex6qheSfSDNlPOHmIqj72uK6FbQ6M1fKJYE0Q= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index d8c54ad5ab30b..a5c168032a50f 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -22,7 +22,7 @@ require ( github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.1 github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 + github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240711082232-dc70454ece9f github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.1 // indirect github.com/DataDog/datadog-api-client-go/v2 v2.27.0 github.com/DataDog/datadog-go/v5 v5.5.0 diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 301305c1de663..08f694ba57d9d 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -165,8 +165,8 @@ github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 h1:EoliKKR76N8dw github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1 h1:esIonH+3dYwSrTVMtTD3bGGJvd9+yVt4r9q6Cw8uXUo= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1/go.mod h1:v369ANtHEIt5AvDPAZLs6paKioXhvpWCAM5CB1Syy1g= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 h1:v6i8/VujvriZC2DIs+fay9Ox7xy493Bevj5/VFxp/O8= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240711082232-dc70454ece9f h1:0ErjSIbMq6VP16/XTFzwj030wXwucEWCsmi+RdMSmyE= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240711082232-dc70454ece9f/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1 h1:ZYX5KnklcbqvMdGmicwJuTwTzdybRTsQ4t/SGui6deQ= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.1 h1:79wJLXex6qheSfSDNlPOHmIqj72uK6FbQ6M1fKJYE0Q= diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index 241b7f2837867..e2ea10e74df4d 100644 --- a/exporter/datadogexporter/integrationtest/go.mod +++ b/exporter/datadogexporter/integrationtest/go.mod @@ -70,7 +70,7 @@ require ( github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240711082232-dc70454ece9f // indirect github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.1 // indirect diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index 74ef7880f560a..1c7e046437986 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -158,8 +158,8 @@ github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 h1:EoliKKR76N8dw github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1 h1:esIonH+3dYwSrTVMtTD3bGGJvd9+yVt4r9q6Cw8uXUo= github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.1/go.mod h1:v369ANtHEIt5AvDPAZLs6paKioXhvpWCAM5CB1Syy1g= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76 h1:v6i8/VujvriZC2DIs+fay9Ox7xy493Bevj5/VFxp/O8= -github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240710175018-c53b98332e76/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240711082232-dc70454ece9f h1:0ErjSIbMq6VP16/XTFzwj030wXwucEWCsmi+RdMSmyE= +github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240711082232-dc70454ece9f/go.mod h1:1/d0P1YxPTMLcFUMvYyIIEwqW1e+z0J/pt0YXpbtnME= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1 h1:ZYX5KnklcbqvMdGmicwJuTwTzdybRTsQ4t/SGui6deQ= github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.1/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.1 h1:79wJLXex6qheSfSDNlPOHmIqj72uK6FbQ6M1fKJYE0Q=