Refactored to accept trace.TracerProvider

Signed-off-by: Wise-Wizard <[email protected]>

cmd/jaeger/internal/extension/jaegerquery/server.go

@@ -5,13 +5,10 @@ package jaegerquery
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/extension"
-	"go.opentelemetry.io/otel/trace"
-	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
 	queryApp "github.com/jaegertracing/jaeger/cmd/query/app"
@@ -29,18 +26,14 @@ var (
 
 type server struct {
 	config *Config
-	logger *zap.Logger
 	server *queryApp.Server
-	tracer trace.TracerProvider
-	hcFunc func(*component.StatusEvent)
+	telset component.TelemetrySettings
 }
 
 func newServer(config *Config, otel component.TelemetrySettings) *server {
 	return &server{
 		config: config,
-		logger: otel.Logger,
-		tracer: otel.TracerProvider,
-		hcFunc: otel.ReportStatus,
+		telset: otel,
 	}
 }
 
@@ -79,14 +72,10 @@ func (s *server) Start(_ context.Context, host component.Host) error {
 	// https://github.com/open-telemetry/opentelemetry-collector/issues/7532
 	//nolint
 
-	if err != nil {
-		return fmt.Errorf("could not initialize a tracer: %w", err)
-	}
-
-	telset := telemetery.Setting{
-		Logger:         s.logger,
-		TracerProvider: s.tracer,
-		ReportStatus:   s.hcFunc,
+	internalTelset := telemetery.Setting{
+		Logger:         s.telset.Logger,
+		TracerProvider: s.telset.TracerProvider,
+		ReportStatus:   s.telset.ReportStatus,
 	}
 	// TODO contextcheck linter complains about next line that context is not passed. It is not wrong.
 	//nolint
@@ -96,7 +85,7 @@ func (s *server) Start(_ context.Context, host component.Host) error {
 		metricsQueryService,
 		s.makeQueryOptions(),
 		tm,
-		telset,
+		internalTelset,
 	)
 	if err != nil {
 		return fmt.Errorf("could not create jaeger-query: %w", err)
@@ -111,7 +100,7 @@ func (s *server) Start(_ context.Context, host component.Host) error {
 
 func (s *server) addArchiveStorage(opts *querysvc.QueryServiceOptions, host component.Host) error {
 	if s.config.TraceStorageArchive == "" {
-		s.logger.Info("Archive storage not configured")
+		s.telset.Logger.Info("Archive storage not configured")
 		return nil
 	}
 
@@ -120,8 +109,8 @@ func (s *server) addArchiveStorage(opts *querysvc.QueryServiceOptions, host comp
 		return fmt.Errorf("cannot find archive storage factory: %w", err)
 	}
 
-	if !opts.InitArchiveStorage(f, s.logger) {
-		s.logger.Info("Archive storage not initialized")
+	if !opts.InitArchiveStorage(f, s.telset.Logger) {
+		s.telset.Logger.Info("Archive storage not initialized")
 	}
 	return nil
 }
@@ -137,12 +126,5 @@ func (s *server) makeQueryOptions() *queryApp.QueryOptions {
 }
 
 func (s *server) Shutdown(ctx context.Context) error {
-	var errs []error
-	if s.server != nil {
-		errs = append(errs, s.server.Close())
-	}
-	// if s.tracer != nil {
-	// 	errs = append(errs, s.tracer.Shutdown(ctx))
-	// }
-	return errors.Join(errs...)
+	return s.server.Close()
 }

cmd/query/app/apiv3/http_gateway.go

@@ -17,12 +17,12 @@ import (
 	"github.com/gorilla/mux"
 	"go.opentelemetry.io/collector/pdata/ptrace"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
+	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/cmd/query/app/internal/api_v3"
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
 	"github.com/jaegertracing/jaeger/model"
-	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
@@ -48,7 +48,7 @@ type HTTPGateway struct {
 	QueryService *querysvc.QueryService
 	TenancyMgr   *tenancy.Manager
 	Logger       *zap.Logger
-	Tracer       *jtracer.JTracer
+	Tracer       trace.TracerProvider
 }
 
 // RegisterRoutes registers HTTP endpoints for APIv3 into provided mux.
@@ -75,7 +75,7 @@ func (h *HTTPGateway) addRoute(
 	traceMiddleware := otelhttp.NewHandler(
 		otelhttp.WithRouteTag(route, handler),
 		route,
-		otelhttp.WithTracerProvider(h.Tracer.OTEL))
+		otelhttp.WithTracerProvider(h.Tracer))
 	return router.HandleFunc(route, traceMiddleware.ServeHTTP)
 }
 

cmd/query/app/apiv3/http_gateway_test.go

@@ -46,7 +46,7 @@ func setupHTTPGatewayNoServer(
 		QueryService: q,
 		TenancyMgr:   tenancy.NewManager(&tenancyOptions),
 		Logger:       zap.NewNop(),
-		Tracer:       jtracer.NoOp(),
+		Tracer:       jtracer.NoOp().OTEL,
 	}
 
 	gw.router = &mux.Router{}

cmd/query/app/handler_options.go

@@ -18,10 +18,10 @@ package app
 import (
 	"time"
 
+	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
-	"github.com/jaegertracing/jaeger/pkg/jtracer"
 )
 
 // HandlerOption is a function that sets some option on the APIHandler
@@ -62,7 +62,7 @@ func (handlerOptions) QueryLookbackDuration(queryLookbackDuration time.Duration)
 }
 
 // Tracer creates a HandlerOption that passes the tracer to the handler
-func (handlerOptions) Tracer(tracer *jtracer.JTracer) HandlerOption {
+func (handlerOptions) Tracer(tracer trace.TracerProvider) HandlerOption {
 	return func(apiHandler *APIHandler) {
 		apiHandler.tracer = tracer
 	}

cmd/query/app/http_handler.go

@@ -30,6 +30,7 @@ import (
 	"github.com/gorilla/mux"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 	"go.opentelemetry.io/otel/propagation"
+	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
@@ -90,7 +91,7 @@ type APIHandler struct {
 	basePath            string
 	apiPrefix           string
 	logger              *zap.Logger
-	tracer              *jtracer.JTracer
+	tracer              trace.TracerProvider
 }
 
 // NewAPIHandler returns an APIHandler
@@ -114,7 +115,7 @@ func NewAPIHandler(queryService *querysvc.QueryService, tm *tenancy.Manager, opt
 		aH.logger = zap.NewNop()
 	}
 	if aH.tracer == nil {
-		aH.tracer = jtracer.NoOp()
+		aH.tracer = jtracer.NoOp().OTEL
 	}
 	return aH
 }
@@ -151,7 +152,7 @@ func (aH *APIHandler) handleFunc(
 	traceMiddleware := otelhttp.NewHandler(
 		otelhttp.WithRouteTag(route, traceResponseHandler(handler)),
 		route,
-		otelhttp.WithTracerProvider(aH.tracer.OTEL))
+		otelhttp.WithTracerProvider(aH.tracer))
 	return router.HandleFunc(route, traceMiddleware.ServeHTTP)
 }
 

cmd/query/app/http_handler_test.go

@@ -321,7 +321,7 @@ func TestGetTrace(t *testing.T) {
 			jTracer := jtracer.JTracer{OTEL: tracerProvider}
 			defer tracerProvider.Shutdown(context.Background())
 
-			ts := initializeTestServer(HandlerOptions.Tracer(&jTracer))
+			ts := initializeTestServer(HandlerOptions.Tracer(jTracer.OTEL))
 			defer ts.server.Close()
 
 			ts.spanReader.On("GetTrace", mock.AnythingOfType("*context.valueCtx"), model.NewTraceID(0, 0x123456abc)).

cmd/query/app/server.go

@@ -27,7 +27,6 @@ import (
 	"github.com/gorilla/handlers"
 	"github.com/soheilhy/cmux"
 	"go.opentelemetry.io/collector/component"
-	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"google.golang.org/grpc"
@@ -84,12 +83,12 @@ func NewServer(querySvc *querysvc.QueryService,
 		return nil, errors.New("server with TLS enabled can not use same host ports for gRPC and HTTP.  Use dedicated HTTP and gRPC host ports instead")
 	}
 
-	grpcServer, err := createGRPCServer(querySvc, metricsQuerySvc, options, tm, telset.Logger, telset.TracerProvider)
+	grpcServer, err := createGRPCServer(querySvc, metricsQuerySvc, options, tm, telset)
 	if err != nil {
 		return nil, err
 	}
 
-	httpServer, err := createHTTPServer(querySvc, metricsQuerySvc, options, tm, telset.TracerProvider, telset.Logger)
+	httpServer, err := createHTTPServer(querySvc, metricsQuerySvc, options, tm, telset)
 	if err != nil {
 		return nil, err
 	}
@@ -104,11 +103,11 @@ func NewServer(querySvc *querysvc.QueryService,
 	}, nil
 }
 
-func createGRPCServer(querySvc *querysvc.QueryService, metricsQuerySvc querysvc.MetricsQueryService, options *QueryOptions, tm *tenancy.Manager, logger *zap.Logger, tracer trace.TracerProvider) (*grpc.Server, error) {
+func createGRPCServer(querySvc *querysvc.QueryService, metricsQuerySvc querysvc.MetricsQueryService, options *QueryOptions, tm *tenancy.Manager, telset telemetery.Setting) (*grpc.Server, error) {
 	var grpcOpts []grpc.ServerOption
 
 	if options.TLSGRPC.Enabled {
-		tlsCfg, err := options.TLSGRPC.Config(logger)
+		tlsCfg, err := options.TLSGRPC.Config(telset.Logger)
 		if err != nil {
 			return nil, err
 		}
@@ -128,8 +127,7 @@ func createGRPCServer(querySvc *querysvc.QueryService, metricsQuerySvc querysvc.
 	reflection.Register(server)
 
 	handler := NewGRPCHandler(querySvc, metricsQuerySvc, GRPCHandlerOptions{
-		Logger: logger,
-		Tracer: tracer,
+		Logger: telset.Logger,
 	})
 	healthServer := health.NewServer()
 
@@ -157,12 +155,11 @@ func createHTTPServer(
 	metricsQuerySvc querysvc.MetricsQueryService,
 	queryOpts *QueryOptions,
 	tm *tenancy.Manager,
-	tracer trace.TracerProvider,
-	logger *zap.Logger,
+	telset telemetery.Setting,
 ) (*httpServer, error) {
 	apiHandlerOptions := []HandlerOption{
-		HandlerOptions.Logger(logger),
-		HandlerOptions.Tracer(tracer),
+		HandlerOptions.Logger(telset.Logger),
+		HandlerOptions.Tracer(telset.TracerProvider),
 		HandlerOptions.MetricsQueryService(metricsQuerySvc),
 	}
 
@@ -178,20 +175,20 @@ func createHTTPServer(
 	(&apiv3.HTTPGateway{
 		QueryService: querySvc,
 		TenancyMgr:   tm,
-		Logger:       logger,
-		Tracer:       tracer,
+		Logger:       telset.Logger,
+		Tracer:       telset.TracerProvider,
 	}).RegisterRoutes(r)
 
 	apiHandler.RegisterRoutes(r)
 	var handler http.Handler = r
 	handler = additionalHeadersHandler(handler, queryOpts.AdditionalHeaders)
 	if queryOpts.BearerTokenPropagation {
-		handler = bearertoken.PropagationHandler(logger, handler)
+		handler = bearertoken.PropagationHandler(telset.Logger, handler)
 	}
 	handler = handlers.CompressHandler(handler)
-	recoveryHandler := recoveryhandler.NewRecoveryHandler(logger, true)
+	recoveryHandler := recoveryhandler.NewRecoveryHandler(telset.Logger, true)
 
-	errorLog, _ := zap.NewStdLogAt(logger, zapcore.ErrorLevel)
+	errorLog, _ := zap.NewStdLogAt(telset.Logger, zapcore.ErrorLevel)
 	server := &httpServer{
 		Server: &http.Server{
 			Handler:           recoveryHandler(handler),
@@ -201,14 +198,14 @@ func createHTTPServer(
 	}
 
 	if queryOpts.TLSHTTP.Enabled {
-		tlsCfg, err := queryOpts.TLSHTTP.Config(logger) // This checks if the certificates are correctly provided
+		tlsCfg, err := queryOpts.TLSHTTP.Config(telset.Logger) // This checks if the certificates are correctly provided
 		if err != nil {
 			return nil, err
 		}
 		server.TLSConfig = tlsCfg
 	}
 
-	server.staticHandlerCloser = RegisterStaticHandler(r, logger, queryOpts, querySvc.GetCapabilities())
+	server.staticHandlerCloser = RegisterStaticHandler(r, telset.Logger, queryOpts, querySvc.GetCapabilities())
 
 	return server, nil
 }