add changelog

Author: asreehari-splunk

.chloggen/signalfxexporter-prioritize-token-in-context.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: 'signalfxexporter'
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: 'Prioritize token in context when accesstokenpassthrough is enabled'
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [37102]
+
+# (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: []

exporter/signalfxexporter/config.go

@@ -215,7 +215,7 @@ func (cfg *Config) Unmarshal(componentParser *confmap.Conf) error {
 
 // Validate checks if the exporter configuration is valid.
 func (cfg *Config) Validate() error {
-	if cfg.AccessToken == "" && !cfg.AccessTokenPassthrough {
+	if cfg.AccessToken == "" {
 		return errors.New(`requires a non-empty "access_token"`)
 	}
 

exporter/signalfxexporter/config_test.go

@@ -284,182 +284,6 @@ func TestLoadConfig(t *testing.T) {
 				SendOTLPHistograms:            true,
 			},
 		},
-		{
-			id: component.NewIDWithName(metadata.Type, ""),
-			expected: &Config{
-				AccessToken: "",
-				Realm:       "ap0",
-				ClientConfig: confighttp.ClientConfig{
-					Timeout:              10 * time.Second,
-					Headers:              map[string]configopaque.String{},
-					MaxIdleConns:         &hundred,
-					MaxIdleConnsPerHost:  &hundred,
-					MaxConnsPerHost:      &defaultMaxConnsPerHost,
-					IdleConnTimeout:      &idleConnTimeout,
-					HTTP2ReadIdleTimeout: 10 * time.Second,
-					HTTP2PingTimeout:     10 * time.Second,
-				},
-				BackOffConfig: configretry.BackOffConfig{
-					Enabled:             true,
-					InitialInterval:     5 * time.Second,
-					MaxInterval:         30 * time.Second,
-					MaxElapsedTime:      5 * time.Minute,
-					RandomizationFactor: backoff.DefaultRandomizationFactor,
-					Multiplier:          backoff.DefaultMultiplier,
-				},
-				QueueSettings: exporterhelper.NewDefaultQueueConfig(),
-				AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{
-					AccessTokenPassthrough: true,
-				},
-				LogDimensionUpdates: false,
-				DimensionClient: DimensionClientConfig{
-					MaxBuffered:         10000,
-					SendDelay:           10 * time.Second,
-					MaxIdleConns:        20,
-					MaxIdleConnsPerHost: 20,
-					MaxConnsPerHost:     20,
-					IdleConnTimeout:     30 * time.Second,
-					Timeout:             10 * time.Second,
-				},
-				TranslationRules:    nil,
-				ExcludeMetrics:      nil,
-				IncludeMetrics:      nil,
-				DeltaTranslationTTL: 3600,
-				ExcludeProperties:   nil,
-				Correlation: &correlation.Config{
-					ClientConfig: confighttp.ClientConfig{
-						Endpoint:            "",
-						Timeout:             5 * time.Second,
-						Headers:             map[string]configopaque.String{},
-						MaxIdleConns:        &defaultMaxIdleConns,
-						MaxIdleConnsPerHost: &defaultMaxIdleConnsPerHost,
-						MaxConnsPerHost:     &defaultMaxConnsPerHost,
-						IdleConnTimeout:     &defaultIdleConnTimeout,
-					},
-					StaleServiceTimeout: 5 * time.Minute,
-					SyncAttributes: map[string]string{
-						"k8s.pod.uid":  "k8s.pod.uid",
-						"container.id": "container.id",
-					},
-					Config: apmcorrelation.Config{
-						MaxRequests:     20,
-						MaxBuffered:     10_000,
-						MaxRetries:      2,
-						LogUpdates:      false,
-						RetryDelay:      30 * time.Second,
-						CleanupInterval: 1 * time.Minute,
-					},
-				},
-				NonAlphanumericDimensionChars: "_-.",
-				SendOTLPHistograms:            false,
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.id.String(), func(t *testing.T) {
-			factory := NewFactory()
-			cfg := factory.CreateDefaultConfig()
-
-			sub, err := cm.Sub(tt.id.String())
-			require.NoError(t, err)
-			require.NoError(t, sub.Unmarshal(cfg))
-
-			assert.NoError(t, component.ValidateConfig(cfg))
-			// We need to add the default exclude rules.
-			assert.NoError(t, setDefaultExcludes(tt.expected))
-			assert.Equal(t, tt.expected, cfg)
-		})
-	}
-}
-
-func TestEmptyAccessTokenPassValidate(t *testing.T) {
-	t.Parallel()
-
-	cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
-	require.NoError(t, err)
-
-	hundred := 100
-	idleConnTimeout := 30 * time.Second
-	defaultMaxIdleConns := http.DefaultTransport.(*http.Transport).MaxIdleConns
-	defaultMaxIdleConnsPerHost := http.DefaultTransport.(*http.Transport).MaxIdleConnsPerHost
-	defaultMaxConnsPerHost := http.DefaultTransport.(*http.Transport).MaxConnsPerHost
-	defaultIdleConnTimeout := http.DefaultTransport.(*http.Transport).IdleConnTimeout
-
-	tests := []struct {
-		id       component.ID
-		expected *Config
-	}{
-		{
-			id: component.NewIDWithName(metadata.Type, ""),
-			expected: &Config{
-				AccessToken: "",
-				Realm:       "ap0",
-				ClientConfig: confighttp.ClientConfig{
-					Timeout:              10 * time.Second,
-					Headers:              map[string]configopaque.String{},
-					MaxIdleConns:         &hundred,
-					MaxIdleConnsPerHost:  &hundred,
-					MaxConnsPerHost:      &defaultMaxConnsPerHost,
-					IdleConnTimeout:      &idleConnTimeout,
-					HTTP2ReadIdleTimeout: 10 * time.Second,
-					HTTP2PingTimeout:     10 * time.Second,
-				},
-				BackOffConfig: configretry.BackOffConfig{
-					Enabled:             true,
-					InitialInterval:     5 * time.Second,
-					MaxInterval:         30 * time.Second,
-					MaxElapsedTime:      5 * time.Minute,
-					RandomizationFactor: backoff.DefaultRandomizationFactor,
-					Multiplier:          backoff.DefaultMultiplier,
-				},
-				QueueSettings: exporterhelper.NewDefaultQueueConfig(),
-				AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{
-					AccessTokenPassthrough: true,
-				},
-				LogDimensionUpdates: false,
-				DimensionClient: DimensionClientConfig{
-					MaxBuffered:         10000,
-					SendDelay:           10 * time.Second,
-					MaxIdleConns:        20,
-					MaxIdleConnsPerHost: 20,
-					MaxConnsPerHost:     20,
-					IdleConnTimeout:     30 * time.Second,
-					Timeout:             10 * time.Second,
-				},
-				TranslationRules:    nil,
-				ExcludeMetrics:      nil,
-				IncludeMetrics:      nil,
-				DeltaTranslationTTL: 3600,
-				ExcludeProperties:   nil,
-				Correlation: &correlation.Config{
-					ClientConfig: confighttp.ClientConfig{
-						Endpoint:            "",
-						Timeout:             5 * time.Second,
-						Headers:             map[string]configopaque.String{},
-						MaxIdleConns:        &defaultMaxIdleConns,
-						MaxIdleConnsPerHost: &defaultMaxIdleConnsPerHost,
-						MaxConnsPerHost:     &defaultMaxConnsPerHost,
-						IdleConnTimeout:     &defaultIdleConnTimeout,
-					},
-					StaleServiceTimeout: 5 * time.Minute,
-					SyncAttributes: map[string]string{
-						"k8s.pod.uid":  "k8s.pod.uid",
-						"container.id": "container.id",
-					},
-					Config: apmcorrelation.Config{
-						MaxRequests:     20,
-						MaxBuffered:     10_000,
-						MaxRetries:      2,
-						LogUpdates:      false,
-						RetryDelay:      30 * time.Second,
-						CleanupInterval: 1 * time.Minute,
-					},
-				},
-				NonAlphanumericDimensionChars: "_-.",
-				SendOTLPHistograms:            false,
-			},
-		},
 	}
 
 	for _, tt := range tests {
@@ -471,8 +295,6 @@ func TestEmptyAccessTokenPassValidate(t *testing.T) {
 			require.NoError(t, err)
 			require.NoError(t, sub.Unmarshal(cfg))
 
-			cfg.(*Config).AccessToken = ""
-
 			assert.NoError(t, component.ValidateConfig(cfg))
 			// We need to add the default exclude rules.
 			assert.NoError(t, setDefaultExcludes(tt.expected))

exporter/signalfxexporter/go.mod

@@ -17,6 +17,7 @@ require (
 	github.com/shirou/gopsutil/v4 v4.24.12
 	github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3
 	github.com/stretchr/testify v1.10.0
+	go.opentelemetry.io/collector/client v1.23.0
 	go.opentelemetry.io/collector/component v0.117.0
 	go.opentelemetry.io/collector/component/componenttest v0.117.0
 	go.opentelemetry.io/collector/config/confighttp v0.117.0
@@ -71,7 +72,6 @@ require (
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	go.opentelemetry.io/collector/client v1.23.0 // indirect
 	go.opentelemetry.io/collector/config/configauth v0.117.0 // indirect
 	go.opentelemetry.io/collector/config/configcompression v1.23.0 // indirect
 	go.opentelemetry.io/collector/config/configtelemetry v0.117.0 // indirect