lint

Signed-off-by: alex boten <[email protected]>

Author: codeboten

otelconf/config.go

@@ -2,14 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 // Package otelconf provides an OpenTelemetry declarative configuration SDK.
-package otelconf // import "go.opentelemetry.io/contrib/otelconf/v1.0.0-rc.1"
+package otelconf // import "go.opentelemetry.io/contrib/otelconf"
 
 import (
 	"context"
 	"errors"
-	"fmt"
 
-	"go.opentelemetry.io/otel/baggage"
 	"go.opentelemetry.io/otel/log"
 	nooplog "go.opentelemetry.io/otel/log/noop"
 	"go.opentelemetry.io/otel/metric"
@@ -24,25 +22,6 @@ import (
 	"go.opentelemetry.io/contrib/otelconf/internal/provider"
 )
 
-const (
-	compressionGzip = "gzip"
-	compressionNone = "none"
-)
-
-type configOptions struct {
-	ctx                   context.Context
-	opentelemetryConfig   OpenTelemetryConfiguration
-	loggerProviderOptions []sdklog.LoggerProviderOption
-	meterProviderOptions  []sdkmetric.Option
-	tracerProviderOptions []sdktrace.TracerProviderOption
-}
-
-type shutdownFunc func(context.Context) error
-
-func noopShutdown(context.Context) error {
-	return nil
-}
-
 // SDK is a struct that contains all the providers
 // configured via the configuration model.
 type SDK struct {
@@ -190,27 +169,3 @@ func ParseYAML(file []byte) (*OpenTelemetryConfiguration, error) {
 
 	return &cfg, nil
 }
-
-// createHeadersConfig combines the two header config fields. Headers take precedence over headersList.
-func createHeadersConfig(headers []NameStringValuePair, headersList *string) (map[string]string, error) {
-	result := make(map[string]string)
-	if headersList != nil {
-		// Parsing follows https://github.com/open-telemetry/opentelemetry-configuration/blob/568e5080816d40d75792eb754fc96bde09654159/schema/type_descriptions.yaml#L584.
-		headerslist, err := baggage.Parse(*headersList)
-		if err != nil {
-			return nil, fmt.Errorf("invalid headers list: %w", err)
-		}
-		for _, kv := range headerslist.Members() {
-			result[kv.Key()] = kv.Value()
-		}
-	}
-	// Headers take precedence over HeadersList, so this has to be after HeadersList is processed
-	if len(headers) > 0 {
-		for _, kv := range headers {
-			if kv.Value != nil {
-				result[kv.Name] = *kv.Value
-			}
-		}
-	}
-	return result, nil
-}

otelconf/config_common.go

@@ -25,8 +25,8 @@ const (
 type configOptions struct {
 	ctx                   context.Context
 	opentelemetryConfig   OpenTelemetryConfiguration
-	meterProviderOptions  []sdkmetric.Option
 	loggerProviderOptions []sdklog.LoggerProviderOption
+	meterProviderOptions  []sdkmetric.Option
 	tracerProviderOptions []sdktrace.TracerProviderOption
 }
 

otelconf/config_json.go

@@ -646,6 +646,8 @@ func (j *CardinalityLimits) UnmarshalJSON(value []byte) error {
 	*j = CardinalityLimits(plain)
 	return nil
 }
+
+// UnmarshalJSON implements json.Unmarshaler.
 func (j *PullMetricReader) UnmarshalJSON(b []byte) error {
 	var raw map[string]any
 	if err := json.Unmarshal(b, &raw); err != nil {
@@ -676,6 +678,8 @@ func (j *SpanLimits) UnmarshalJSON(value []byte) error {
 	*j = SpanLimits(plain)
 	return nil
 }
+
+// UnmarshalJSON implements json.Unmarshaler.
 func (j *SimpleLogRecordProcessor) UnmarshalJSON(b []byte) error {
 	var raw map[string]any
 	if err := json.Unmarshal(b, &raw); err != nil {

otelconf/config_test.go

@@ -1378,13 +1378,14 @@ func TestUnmarshalCardinalityLimits(t *testing.T) {
 		})
 	}
 }
+
 func TestCreateHeadersConfig(t *testing.T) {
 	tests := []struct {
 		name        string
 		headers     []NameStringValuePair
 		headersList *string
 		wantHeaders map[string]string
-		wantErr     string
+		wantErr     error
 	}{
 		{
 			name:        "no headers",
@@ -1454,18 +1455,13 @@ func TestCreateHeadersConfig(t *testing.T) {
 		{
 			name:        "invalid headerslist",
 			headersList: ptr("==="),
-			wantErr:     "invalid headers list: invalid key: \"\"",
+			wantErr:     newErrInvalid("invalid headers_list"),
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			headersMap, err := createHeadersConfig(tt.headers, tt.headersList)
-			if tt.wantErr != "" {
-				require.Error(t, err)
-				require.Equal(t, tt.wantErr, err.Error())
-			} else {
-				require.NoError(t, err)
-			}
+			require.ErrorIs(t, err, tt.wantErr)
 			require.Equal(t, tt.wantHeaders, headersMap)
 		})
 	}

otelconf/config_yaml.go

@@ -255,6 +255,8 @@ func (j *BatchLogRecordProcessor) UnmarshalYAML(node *yaml.Node) error {
 	*j = BatchLogRecordProcessor(plain)
 	return nil
 }
+
+// UnmarshalYAML implements yaml.Unmarshaler.
 func (j *NameStringValuePair) UnmarshalYAML(node *yaml.Node) error {
 	var raw map[string]any
 	if err := node.Decode(&raw); err != nil {
@@ -371,6 +373,8 @@ func (j *SpanLimits) UnmarshalYAML(node *yaml.Node) error {
 	*j = SpanLimits(plain)
 	return nil
 }
+
+// UnmarshalYAML implements yaml.Unmarshaler.
 func (j *ExperimentalLanguageSpecificInstrumentation) UnmarshalYAML(unmarshal func(any) error) error {
 	var raw map[string]any
 	if err := unmarshal(&raw); err != nil {

otelconf/log.go

@@ -23,8 +23,7 @@ import (
 )
 
 func loggerProvider(cfg configOptions, res *resource.Resource) (log.LoggerProvider, shutdownFunc, error) {
-	provider, ok := cfg.opentelemetryConfig.LoggerProvider.(*LoggerProviderJson)
-	if provider == nil {
+	if cfg.opentelemetryConfig.LoggerProvider == nil {
 		return noop.NewLoggerProvider(), noopShutdown, nil
 	}
 	provider, ok := cfg.opentelemetryConfig.LoggerProvider.(*LoggerProviderJson)

otelconf/metric.go

@@ -40,8 +40,7 @@ var zeroScope instrumentation.Scope
 const instrumentKindUndefined = sdkmetric.InstrumentKind(0)
 
 func meterProvider(cfg configOptions, res *resource.Resource) (metric.MeterProvider, shutdownFunc, error) {
-	provider, ok := cfg.opentelemetryConfig.MeterProvider.(*MeterProviderJson)
-	if provider == nil {
+	if cfg.opentelemetryConfig.MeterProvider == nil {
 		return noop.NewMeterProvider(), noopShutdown, nil
 	}
 	provider, ok := cfg.opentelemetryConfig.MeterProvider.(*MeterProviderJson)

otelconf/trace.go

@@ -25,8 +25,7 @@ import (
 var errInvalidSamplerConfiguration = newErrInvalid("sampler configuration")
 
 func tracerProvider(cfg configOptions, res *resource.Resource) (trace.TracerProvider, shutdownFunc, error) {
-	provider, ok := cfg.opentelemetryConfig.TracerProvider.(*TracerProviderJson)
-	if provider == nil {
+	if cfg.opentelemetryConfig.TracerProvider == nil {
 		return noop.NewTracerProvider(), noopShutdown, nil
 	}
 	provider, ok := cfg.opentelemetryConfig.TracerProvider.(*TracerProviderJson)