adds Close method to jtracer pkg

Signed-off-by: Afzal Ansari <[email protected]>

cmd/all-in-one/main.go

@@ -16,6 +16,7 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"log"
@@ -274,7 +275,7 @@ func startQuery(
 ) *queryApp.Server {
 	spanReader = storageMetrics.NewReadMetricsDecorator(spanReader, baseFactory.Namespace(metrics.NSOptions{Name: "query"}))
 	qs := querysvc.NewQueryService(spanReader, depReader, *queryOpts)
-	tracer := jtracer.JTracer{OT: opentracing.GlobalTracer()}
+	tracer := jtracer.New()
 	server, err := queryApp.NewServer(svc.Logger, qs, metricsQueryService, qOpts, tm, tracer)
 	if err != nil {
 		svc.Logger.Fatal("Could not start jaeger-query service", zap.Error(err))
@@ -287,6 +288,10 @@ func startQuery(
 	if err := server.Start(); err != nil {
 		svc.Logger.Fatal("Could not start jaeger-query service", zap.Error(err))
 	}
+	if err = tracer.Close(context.Background()); err != nil {
+		svc.Logger.Fatal("Error shutting down tracer provider", zap.Error(err))
+	}
+
 	return server
 }
 

cmd/query/app/handler_options.go

@@ -64,8 +64,7 @@ func (handlerOptions) QueryLookbackDuration(queryLookbackDuration time.Duration)
 // Tracer creates a HandlerOption that initializes OpenTracing tracer
 func (handlerOptions) Tracer(tracer jtracer.JTracer) HandlerOption {
 	return func(apiHandler *APIHandler) {
-		apiHandler.tracer.OT = tracer.OT
-		apiHandler.tracer.OTEL = tracer.OTEL
+		apiHandler.tracer = tracer
 	}
 }
 

cmd/query/main.go

@@ -81,7 +81,6 @@ func main() {
 			}
 
 			jtracer := jtracer.New()
-			defer jtracer.Close(context.Background())
 			queryOpts, err := new(app.QueryOptions).InitFromViper(v, logger)
 			if err != nil {
 				logger.Fatal("Failed to configure query service", zap.Error(err))
@@ -133,6 +132,9 @@ func main() {
 					logger.Error("Failed to close storage factory", zap.Error(err))
 				}
 			})
+			if err = jtracer.Close(context.Background()); err != nil {
+				svc.Logger.Fatal("Error shutting down tracer provider", zap.Error(err))
+			}
 			return nil
 		},
 	}

pkg/jtracer/jtracer.go

@@ -17,7 +17,6 @@ package jtracer
 import (
 	"context"
 	"fmt"
-	"log"
 	"sync"
 
 	"github.com/go-logr/zapr"
@@ -30,20 +29,38 @@ import (
 	"go.opentelemetry.io/otel/sdk/resource"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
+	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
 
 type JTracer struct {
-	OT   opentracing.Tracer
-	OTEL *sdktrace.TracerProvider
-	log  *zap.Logger
+	OT     opentracing.Tracer
+	OTEL   trace.TracerProvider
+	log    *zap.Logger
+	closer func() error
 }
 
 var once sync.Once
 
 func New() JTracer {
 	jt := JTracer{}
+	opentracingTracer, otelTracerProvider, logger, closed := jt.initBoth()
+
+	return JTracer{
+		OT:     opentracingTracer,
+		OTEL:   otelTracerProvider,
+		log:    logger,
+		closer: closed,
+	}
+}
+
+func NoOp() JTracer {
+	return JTracer{OT: opentracing.NoopTracer{}, OTEL: trace.NewNoopTracerProvider()}
+}
+
+// initBoth initializes OpenTelemetry SDK and uses OTel-OpenTracing Bridge
+func (jt JTracer) initBoth() (opentracing.Tracer, trace.TracerProvider, *zap.Logger, func() error) {
 	zc := zap.NewDevelopmentConfig()
 	zc.Level = zap.NewAtomicLevelAt(zapcore.Level(-8)) // level used by OTEL's Debug()
 	logger, err := zc.Build()
@@ -52,20 +69,9 @@ func New() JTracer {
 	}
 	otel.SetLogger(zapr.NewLogger(logger))
 
-	opentracingTracer, otelTracerProvider := jt.initBoth()
-
-	return JTracer{OT: opentracingTracer, OTEL: otelTracerProvider, log: logger}
-}
-
-func NoOp() JTracer {
-	return JTracer{OT: opentracing.NoopTracer{}, OTEL: &sdktrace.TracerProvider{}}
-}
-
-// initBoth initializes OpenTelemetry SDK and uses OTel-OpenTracing Bridge
-func (jt JTracer) initBoth() (opentracing.Tracer, *sdktrace.TracerProvider) {
-	traceExporter, err := newExporter()
+	traceExporter, err := otelExporter()
 	if err != nil {
-		jt.log.Sugar().Fatalf("failed to create exporter", zap.Any("error", err))
+		logger.Sugar().Fatalf("failed to create exporter", zap.Any("error", err))
 	}
 
 	// Register the trace exporter with a TracerProvider, using a batch
@@ -88,17 +94,19 @@ func (jt JTracer) initBoth() (opentracing.Tracer, *sdktrace.TracerProvider) {
 	})
 
 	// Use the bridgeTracer as your OpenTracing tracer(otTrace).
-	otTracer, _ := otbridge.NewTracerPair(tracerProvider.Tracer(""))
+	otTracer, wrapperTracerProvider := otbridge.NewTracerPair(tracerProvider.Tracer(""))
 
-	return otTracer, tracerProvider
+	closer := func() error {
+		return tracerProvider.Shutdown(context.Background())
+	}
+
+	return otTracer, wrapperTracerProvider, logger, closer
 }
 
-// newExporter returns a console exporter.
-func newExporter() (sdktrace.SpanExporter, error) {
+func otelExporter() (sdktrace.SpanExporter, error) {
 	client := otlptracegrpc.NewClient(
 		otlptracegrpc.WithInsecure(),
 	)
-	// Set up a otlp-trace exporter
 	traceExporter, err := otlptrace.New(context.Background(), client)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create trace exporter: %w", err)
@@ -108,9 +116,6 @@ func newExporter() (sdktrace.SpanExporter, error) {
 }
 
 // Shutdown the tracerProvider to clean up resources
-func (jt JTracer) Close(ctx context.Context) {
-	err := jt.OTEL.Shutdown(ctx)
-	if err != nil {
-		log.Fatalf("Error shutting down tracer provider: %v", err)
-	}
+func (jt JTracer) Close(ctx context.Context) error {
+	return jt.closer()
 }

plugin/metrics/prometheus/metricsstore/reader.go

@@ -29,7 +29,6 @@ import (
 	"github.com/prometheus/client_golang/api"
 	promapi "github.com/prometheus/client_golang/api/prometheus/v1"
 	"go.opentelemetry.io/otel/attribute"
-	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.20.0"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
@@ -230,7 +229,9 @@ func (m MetricsReader) executeQuery(ctx context.Context, p metricsQueryParams) (
 
 	ctx, span := startSpanForQuery(ctx, p.metricName, promQuery, m.tracer.OTEL)
 	defer span.End()
-	defer m.tracer.Close(ctx)
+	if err := m.tracer.Close(context.Background()); err != nil {
+		m.logger.Error("Error shutting down tracer provider", zap.Error(err))
+	}
 
 	queryRange := promapi.Range{
 		Start: p.EndTime.Add(-1 * *p.Lookback),
@@ -292,7 +293,7 @@ func promqlDurationString(d *time.Duration) string {
 	return string(b)
 }
 
-func startSpanForQuery(ctx context.Context, metricName, query string, tp *sdktrace.TracerProvider) (context.Context, trace.Span) {
+func startSpanForQuery(ctx context.Context, metricName, query string, tp trace.TracerProvider) (context.Context, trace.Span) {
 	ctx, span := tp.Tracer("prom-metrics-reader").Start(ctx, metricName)
 	span.SetAttributes(
 		attribute.Key(semconv.DBStatementKey).String(query),