remove unused sampler configuration

Signed-off-by: Alex Boten <[email protected]>

Author: codeboten

.chloggen/codeboten_use-config-sdk.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: service
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: ensure the tracer provider is configured via go.opentelemetry.io/contrib/config
+
+# One or more tracking issues or pull requests related to the change
+issues: [9967]
+
+# (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:
+
+# 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: []

service/go.mod

@@ -32,11 +32,8 @@ require (
 	go.opentelemetry.io/otel/bridge/opencensus v1.25.0
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.25.0
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.25.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.25.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.25.0
 	go.opentelemetry.io/otel/exporters/prometheus v0.47.0
 	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.25.0
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.25.0
 	go.opentelemetry.io/otel/metric v1.25.0
 	go.opentelemetry.io/otel/sdk v1.25.0
 	go.opentelemetry.io/otel/sdk/metric v1.25.0
@@ -78,6 +75,9 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.opentelemetry.io/contrib/zpages v0.50.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.25.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.25.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.25.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.25.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.1.0 // indirect
 	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/sys v0.19.0 // indirect

service/telemetry/otel_trace_sampler.go

@@ -73,6 +73,25 @@ func New(ctx context.Context, set Settings, cfg Config) (*Telemetry, error) {
 			config.OpenTelemetryConfiguration{
 				TracerProvider: &config.TracerProvider{
 					Processors: cfg.Traces.Processors,
+					// TODO: once https://github.com/open-telemetry/opentelemetry-configuration/issues/83 is resolved,
+					// configuration for sampler should be done here via something like the following:
+					//
+					// Sampler: &config.Sampler{
+					// 	ParentBased: &config.SamplerParentBased{
+					// 		LocalParentSampled: &config.Sampler{
+					// 			AlwaysOn: config.SamplerAlwaysOn{},
+					// 		},
+					// 		LocalParentNotSampled: &config.Sampler{
+					//	        RecordOnly: config.SamplerRecordOnly{},
+					//      },
+					// 		RemoteParentSampled: &config.Sampler{
+					// 			AlwaysOn: config.SamplerAlwaysOn{},
+					// 		},
+					// 		RemoteParentNotSampled: &config.Sampler{
+					//	        RecordOnly: config.SamplerRecordOnly{},
+					//      },
+					// 	},
+					// },
 				},
 			},
 		),

service/telemetry/telemetry.go

@@ -9,10 +9,13 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
 	"go.opentelemetry.io/collector/config/configtelemetry"
+	"go.opentelemetry.io/otel/trace"
+	"go.opentelemetry.io/otel/trace/noop"
 )
 
 func TestTelemetryConfiguration(t *testing.T) {
@@ -115,3 +118,26 @@ func TestSampledLogger(t *testing.T) {
 		})
 	}
 }
+
+func TestTelemetryShutdown(t *testing.T) {
+	tests := []struct {
+		name     string
+		provider trace.TracerProvider
+		wantErr  error
+	}{
+		{
+			name: "No provider",
+		},
+		{
+			name:     "Non-SDK provider",
+			provider: noop.NewTracerProvider(),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			telemetry := Telemetry{tracerProvider: tt.provider}
+			err := telemetry.Shutdown(context.Background())
+			require.Equal(t, tt.wantErr, err)
+		})
+	}
+}