chore(otel): support OTEL_SDK_DISABLED

thomaspoignant · Nov 4, 2024 · abe8028 · abe8028
1 parent 45b7084
commit abe8028
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cmd/relayproxy/api/opentelemetry/otel.go b/cmd/relayproxy/api/opentelemetry/otel.go
@@ -30,7 +30,7 @@ func NewOtelService() OtelService {
 func (s *OtelService) Init(ctx context.Context, zapLog *zap.Logger, config config.Config) error {
 	// Require the endpoint to be set either by the openTelemetryOtlpEndpoint
 	// config element or otel.exporter.otlp.endpoint
-	if config.OpenTelemetryOtlpEndpoint == "" && config.OtelConfig.Exporter.Otlp.Endpoint == "" {
+	if (config.OpenTelemetryOtlpEndpoint == "" && config.OtelConfig.Exporter.Otlp.Endpoint == "") || config.OtelConfig.SDK.Disabled {
 		otel.SetTracerProvider(noop.NewTracerProvider())
 		return nil
 	}

diff --git a/cmd/relayproxy/api/opentelemetry/otel_test.go b/cmd/relayproxy/api/opentelemetry/otel_test.go
@@ -177,6 +177,7 @@ func TestInit(t *testing.T) {
 
 	t.Run("disabled", func(t *testing.T) {
 		t.Setenv("OTEL_SDK_DISABLED", "true")
+		t.Setenv("OTEL_EXPORTER_OTLP_ENDPOINT", "https://example.com:4318")
 		f := pflag.NewFlagSet("config", pflag.ContinueOnError)
 		c, errC := config.New(f, zap.L(), "1.X.X")
 		require.NoError(t, errC)