From 31189d4e5400af95ee4877c7ac73fda11326dd33 Mon Sep 17 00:00:00 2001 From: gfonseca-tc Date: Tue, 7 Dec 2021 14:07:10 -0300 Subject: [PATCH] open-telemetry#1909 Change configuration place. --- exporter/datadogexporter/README.md | 3 ++- exporter/datadogexporter/config/config.go | 10 +++++----- exporter/datadogexporter/translate_traces.go | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/exporter/datadogexporter/README.md b/exporter/datadogexporter/README.md index a5af2959b3c3..b9fe46c2df29 100644 --- a/exporter/datadogexporter/README.md +++ b/exporter/datadogexporter/README.md @@ -34,7 +34,8 @@ datadog: datadog: api: key: "" - span_name_as_resource_name: true + traces: + span_name_as_resource_name: true ``` The hostname, environment, service and version can be set in the configuration for unified service tagging. diff --git a/exporter/datadogexporter/config/config.go b/exporter/datadogexporter/config/config.go index 97404c542f8d..467bf07c62a5 100644 --- a/exporter/datadogexporter/config/config.go +++ b/exporter/datadogexporter/config/config.go @@ -58,11 +58,6 @@ type APIConfig struct { // It can also be set through the `DD_SITE` environment variable. // The default value is "datadoghq.com". Site string `mapstructure:"site"` - - // If set to true the OpenTelemetry span name will used in the Datadog resource name. - // If set to false the resource name will be filled with the instrumentation library name + span kind. - // The default value is `false`. - SpanNameAsResourceName bool `mapstructure:"span_name_as_resource_name"` } // GetCensoredKey returns the API key censored for logging purposes @@ -158,6 +153,11 @@ type TracesConfig struct { // instrumentation:express.server: express // go.opentelemetry.io_contrib_instrumentation_net_http_otelhttp.client: http.client SpanNameRemappings map[string]string `mapstructure:"span_name_remappings"` + + // If set to true the OpenTelemetry span name will used in the Datadog resource name. + // If set to false the resource name will be filled with the instrumentation library name + span kind. + // The default value is `false`. + SpanNameAsResourceName bool `mapstructure:"span_name_as_resource_name"` } // TagsConfig defines the tag-related configuration diff --git a/exporter/datadogexporter/translate_traces.go b/exporter/datadogexporter/translate_traces.go index 80a2157ab443..b701e8728d46 100644 --- a/exporter/datadogexporter/translate_traces.go +++ b/exporter/datadogexporter/translate_traces.go @@ -292,7 +292,7 @@ func spanToDatadogSpan(s pdata.Span, span := &pb.Span{ TraceID: decodeAPMTraceID(s.TraceID().Bytes()), SpanID: decodeAPMSpanID(s.SpanID().Bytes()), - Name: remapDatadogSpanName(getDatadogSpanName(s, tags, cfg.API.SpanNameAsResourceName), spanNameMap), + Name: remapDatadogSpanName(getDatadogSpanName(s, tags, cfg.Traces.SpanNameAsResourceName), spanNameMap), Resource: resourceName, Service: normalizedServiceName, Start: int64(startTime),