[connector/datadog] remove TracesConfig

Author: atoulme

.chloggen/remove_deprecated_struct.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: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: datadogconnector
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove `datagodconnector.TracesConfig`, use `datadogconfig.TracesConnectorConfig` instead
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [38661]
+
+# (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:
+
+# 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: [api]

connector/datadogconnector/config.go

@@ -14,13 +14,9 @@ var _ component.Config = (*Config)(nil)
 // Config defines configuration for the Datadog connector.
 type Config struct {
 	// Traces defines the Traces specific configuration
-	Traces TracesConfig `mapstructure:"traces"`
+	Traces datadogconfig.TracesConnectorConfig `mapstructure:"traces"`
 }
 
-// Deprecated: [v0.110.0] Use `datadog.TracesConnectorConfig` instead.
-// TracesConfig defines the traces specific configuration options
-type TracesConfig = datadogconfig.TracesConnectorConfig
-
 // Validate checks if the configuration is valid
 func (c *Config) Validate() error {
 	return c.Traces.Validate()

connector/datadogconnector/config_test.go

@@ -21,7 +21,7 @@ func TestValidate(t *testing.T) {
 		{
 			name: "span name remapping valid",
 			cfg: &Config{
-				Traces: TracesConfig{
+				Traces: datadogconfig.TracesConnectorConfig{
 					TracesConfig: datadogconfig.TracesConfig{
 						SpanNameRemappings: map[string]string{"old.opentelemetryspan.name": "updated.name"},
 					},
@@ -30,7 +30,7 @@ func TestValidate(t *testing.T) {
 		},
 		{
 			name: "span name remapping empty val",
-			cfg: &Config{Traces: TracesConfig{
+			cfg: &Config{Traces: datadogconfig.TracesConnectorConfig{
 				TracesConfig: datadogconfig.TracesConfig{
 					SpanNameRemappings: map[string]string{"oldname": ""},
 				},
@@ -39,7 +39,7 @@ func TestValidate(t *testing.T) {
 		},
 		{
 			name: "span name remapping empty key",
-			cfg: &Config{Traces: TracesConfig{
+			cfg: &Config{Traces: datadogconfig.TracesConnectorConfig{
 				TracesConfig: datadogconfig.TracesConfig{
 					SpanNameRemappings: map[string]string{"": "newname"},
 				},
@@ -48,15 +48,15 @@ func TestValidate(t *testing.T) {
 		},
 		{
 			name: "ignore resources valid",
-			cfg: &Config{Traces: TracesConfig{
+			cfg: &Config{Traces: datadogconfig.TracesConnectorConfig{
 				TracesConfig: datadogconfig.TracesConfig{
 					IgnoreResources: []string{"[123]"},
 				},
 			}},
 		},
 		{
 			name: "ignore resources missing bracket",
-			cfg: &Config{Traces: TracesConfig{
+			cfg: &Config{Traces: datadogconfig.TracesConnectorConfig{
 				TracesConfig: datadogconfig.TracesConfig{
 					IgnoreResources: []string{"[123"},
 				},
@@ -65,21 +65,21 @@ func TestValidate(t *testing.T) {
 		},
 		{
 			name: "With trace_buffer",
-			cfg: &Config{Traces: TracesConfig{
+			cfg: &Config{Traces: datadogconfig.TracesConnectorConfig{
 				TraceBuffer: 10,
 			}},
 		},
 		{
 			name: "neg trace_buffer",
-			cfg: &Config{Traces: TracesConfig{
+			cfg: &Config{Traces: datadogconfig.TracesConnectorConfig{
 				TraceBuffer: -10,
 			}},
 			err: "trace buffer must be non-negative",
 		},
 		{
 			name: "With peer_tags",
 			cfg: &Config{
-				Traces: TracesConfig{
+				Traces: datadogconfig.TracesConnectorConfig{
 					TracesConfig: datadogconfig.TracesConfig{
 						PeerTags: []string{"tag1", "tag2"},
 					},
@@ -89,13 +89,13 @@ func TestValidate(t *testing.T) {
 		{
 			name: "With bucket_interval",
 			cfg: &Config{
-				Traces: TracesConfig{BucketInterval: 30 * time.Second},
+				Traces: datadogconfig.TracesConnectorConfig{BucketInterval: 30 * time.Second},
 			},
 		},
 		{
 			name: "neg bucket_interval",
 			cfg: &Config{
-				Traces: TracesConfig{BucketInterval: -30 * time.Second},
+				Traces: datadogconfig.TracesConnectorConfig{BucketInterval: -30 * time.Second},
 			},
 			err: "bucket interval must be non-negative",
 		},

connector/datadogconnector/connector.go

@@ -26,6 +26,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog"
+	datadogconfig "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog/config"
 )
 
 // traceToMetricConnector is the schema for connector
@@ -99,7 +100,7 @@ func newTraceToMetricConnector(set component.TelemetrySettings, cfg component.Co
 	}, nil
 }
 
-func getTraceAgentCfg(logger *zap.Logger, cfg TracesConfig, attributesTranslator *attributes.Translator) *traceconfig.AgentConfig {
+func getTraceAgentCfg(logger *zap.Logger, cfg datadogconfig.TracesConnectorConfig, attributesTranslator *attributes.Translator) *traceconfig.AgentConfig {
 	acfg := traceconfig.New()
 	acfg.OTLPReceiver.AttributesTranslator = attributesTranslator
 	acfg.OTLPReceiver.SpanNameRemappings = cfg.SpanNameRemappings

connector/datadogconnector/factory.go

@@ -43,7 +43,7 @@ func NewFactory() connector.Factory {
 
 func createDefaultConfig() component.Config {
 	return &Config{
-		Traces: TracesConfig{
+		Traces: datadogconfig.TracesConnectorConfig{
 			TracesConfig: datadogconfig.TracesConfig{
 				IgnoreResources:        []string{},
 				PeerServiceAggregation: true,

connector/datadogconnector/factory_test.go

@@ -19,7 +19,7 @@ func TestCreateDefaultConfig(t *testing.T) {
 
 	assert.Equal(t,
 		&Config{
-			Traces: TracesConfig{
+			Traces: datadogconfig.TracesConnectorConfig{
 				TracesConfig: datadogconfig.TracesConfig{
 					IgnoreResources:        []string{},
 					PeerServiceAggregation: true,