From 14735484c392e5cd8b2fbf66ae1362550581ee7f Mon Sep 17 00:00:00 2001 From: Trong Huu Nguyen Date: Fri, 24 Nov 2023 14:21:34 +0100 Subject: [PATCH] refactor(otel): remove unneeded meter provider --- cmd/wonderwall/main.go | 2 +- pkg/otel/otel.go | 29 ++--------------------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/cmd/wonderwall/main.go b/cmd/wonderwall/main.go index d99d2a4..43ed546 100644 --- a/cmd/wonderwall/main.go +++ b/cmd/wonderwall/main.go @@ -56,7 +56,7 @@ func run() error { otelServiceName := envOrDefault("OTEL_SERVICE_NAME", "wonderwall") + "-" + envOrDefault("CLUSTERNAME", "unknown-cluster") - otelShutdown, err := otel.SetupOTelSDK(ctx, otelServiceName, "") + otelShutdown, err := otel.Setup(ctx, otelServiceName, "") if err != nil { return err } diff --git a/pkg/otel/otel.go b/pkg/otel/otel.go index 7a61af0..420b2db 100644 --- a/pkg/otel/otel.go +++ b/pkg/otel/otel.go @@ -5,18 +5,15 @@ import ( "errors" "time" - "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" - "go.opentelemetry.io/otel" - "go.opentelemetry.io/otel/exporters/stdout/stdoutmetric" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" "go.opentelemetry.io/otel/propagation" - "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/resource" "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/semconv/v1.21.0" ) -func SetupOTelSDK(ctx context.Context, serviceName, serviceVersion string) (shutdown func(context.Context) error, err error) { +func Setup(ctx context.Context, serviceName, serviceVersion string) (shutdown func(context.Context) error, err error) { var shutdownFuncs []func(context.Context) error shutdown = func(ctx context.Context) error { @@ -48,14 +45,6 @@ func SetupOTelSDK(ctx context.Context, serviceName, serviceVersion string) (shut shutdownFuncs = append(shutdownFuncs, tracerProvider.Shutdown) otel.SetTracerProvider(tracerProvider) - meterProvider, err := newMeterProvider(res) - if err != nil { - handleErr(err) - return - } - shutdownFuncs = append(shutdownFuncs, meterProvider.Shutdown) - otel.SetMeterProvider(meterProvider) - return } @@ -87,17 +76,3 @@ func newTraceProvider(ctx context.Context, res *resource.Resource) (*trace.Trace ) return traceProvider, nil } - -func newMeterProvider(res *resource.Resource) (*metric.MeterProvider, error) { - metricExporter, err := stdoutmetric.New() - if err != nil { - return nil, err - } - - meterProvider := metric.NewMeterProvider( - metric.WithResource(res), - metric.WithReader(metric.NewPeriodicReader(metricExporter, - metric.WithInterval(1*time.Minute))), - ) - return meterProvider, nil -}