Implement Telemetery struct for V1 Components Initialization

cmd/all-in-one/main.go

@@ -38,11 +38,12 @@
 	"github.com/jaegertracing/jaeger/cmd/internal/flags"
 	"github.com/jaegertracing/jaeger/cmd/internal/printconfig"
 	"github.com/jaegertracing/jaeger/cmd/internal/status"
 	queryApp "github.com/jaegertracing/jaeger/cmd/query/app"
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
+	"github.com/jaegertracing/jaeger/pkg/telemetery"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/pkg/version"
 	metricsPlugin "github.com/jaegertracing/jaeger/plugin/metrics"
@@ -193,12 +194,17 @@
 				logger.Fatal("Could not create collector proxy", zap.Error(err))
 			}
 			agent := startAgent(cp, aOpts, logger, agentMetricsFactory)
-
+			telset := telemetery.Setting{
+				Logger:       svc.Logger,
+				Tracer:       tracer,
+				Metrics:      queryMetricsFactory,
+				ReportStatus: telemetery.HCAdapter(svc.HC()),
+			}
 			// query
 			querySrv := startQuery(
 				svc, qOpts, qOpts.BuildQueryServiceOptions(storageFactory, logger),
 				spanReader, dependencyReader, metricsQueryService,
-				queryMetricsFactory, tm, tracer,
+				tm, telset,
 			)
 
 			svc.RunAndThen(func() {
@@ -273,13 +279,13 @@
 	spanReader spanstore.Reader,
 	depReader dependencystore.Reader,
 	metricsQueryService querysvc.MetricsQueryService,
-	metricsFactory metrics.Factory,
 	tm *tenancy.Manager,
-	jt *jtracer.JTracer,
+	telset telemetery.Setting,
 ) *queryApp.Server {
-	spanReader = storageMetrics.NewReadMetricsDecorator(spanReader, metricsFactory)
+	spanReader = storageMetrics.NewReadMetricsDecorator(spanReader, telset.Metrics)
 	qs := querysvc.NewQueryService(spanReader, depReader, *queryOpts)
-	server, err := queryApp.NewServer(svc.Logger, svc.HC(), qs, metricsQueryService, qOpts, tm, jt)
+
+	server, err := queryApp.NewServer(qs, metricsQueryService, qOpts, tm, telset)
 	if err != nil {
 		svc.Logger.Fatal("Could not create jaeger-query", zap.Error(err))
 	}

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

@@ -17,6 +17,7 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
 	"github.com/jaegertracing/jaeger/pkg/healthcheck"
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
+	"github.com/jaegertracing/jaeger/pkg/telemetery"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/plugin/metrics/disabled"
 	"github.com/jaegertracing/jaeger/ports"
@@ -79,18 +80,20 @@ func (s *server) Start(_ context.Context, host component.Host) error {
 	if err != nil {
 		return fmt.Errorf("could not initialize a tracer: %w", err)
 	}
-
+	telset := telemetery.Setting{
+		Logger:       s.logger,
+		Tracer:       s.jtracer,
+		ReportStatus: telemetery.HCAdapter(healthcheck.New()),
+	}
 	// TODO contextcheck linter complains about next line that context is not passed. It is not wrong.
 	//nolint
 	s.server, err = queryApp.NewServer(
-		s.logger,
 		// TODO propagate healthcheck updates up to the collector's runtime
-		healthcheck.New(),
 		qs,
 		metricsQueryService,
 		s.makeQueryOptions(),
 		tm,
-		s.jtracer,
+		telset,
 	)
 	if err != nil {
 		return fmt.Errorf("could not create jaeger-query: %w", err)

cmd/query/app/server.go

@@ -42,6 +42,7 @@
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/netutils"
 	"github.com/jaegertracing/jaeger/pkg/recoveryhandler"
+	"github.com/jaegertracing/jaeger/pkg/telemetery"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
@@ -50,7 +51,7 @@
 // Server runs HTTP, Mux and a grpc server
 type Server struct {
 	logger       *zap.Logger
-	healthCheck  *healthcheck.HealthCheck
+	hcFunc       func(*telemetery.StatusEvent)
 	querySvc     *querysvc.QueryService
 	queryOptions *QueryOptions
 
@@ -67,7 +68,12 @@
 }
 
 // NewServer creates and initializes Server
-func NewServer(logger *zap.Logger, healthCheck *healthcheck.HealthCheck, querySvc *querysvc.QueryService, metricsQuerySvc querysvc.MetricsQueryService, options *QueryOptions, tm *tenancy.Manager, tracer *jtracer.JTracer) (*Server, error) {
+func NewServer(querySvc *querysvc.QueryService,
+	metricsQuerySvc querysvc.MetricsQueryService,
+	options *QueryOptions,
+	tm *tenancy.Manager,
+	telset telemetery.Setting,
+) (*Server, error) {
 	_, httpPort, err := net.SplitHostPort(options.HTTPHostPort)
 	if err != nil {
 		return nil, fmt.Errorf("invalid HTTP server host:port: %w", err)
@@ -81,22 +87,22 @@
 		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, logger, tracer)
+	grpcServer, err := createGRPCServer(querySvc, metricsQuerySvc, options, tm, telset.Logger, telset.Tracer)
 	if err != nil {
 		return nil, err
 	}
 
-	httpServer, err := createHTTPServer(querySvc, metricsQuerySvc, options, tm, tracer, logger)
+	httpServer, err := createHTTPServer(querySvc, metricsQuerySvc, options, tm, telset.Tracer, telset.Logger)
 	if err != nil {
 		return nil, err
 	}
 
 	return &Server{
-		logger:        logger,
-		healthCheck:   healthCheck,
+		logger:        telset.Logger,
+		hcFunc:        telset.ReportStatus,
 		querySvc:      querySvc,
 		queryOptions:  options,
-		tracer:        tracer,
+		tracer:        telset.Tracer,
 		grpcServer:    grpcServer,
 		httpServer:    httpServer,
 		separatePorts: grpcPort != httpPort,
@@ -308,7 +314,7 @@
 			s.logger.Error("Could not start HTTP server", zap.Error(err))
 		}
 		s.logger.Info("HTTP server stopped", zap.Int("port", httpPort), zap.String("addr", s.queryOptions.HTTPHostPort))
-		s.healthCheck.Set(healthcheck.Unavailable)
+		s.hcFunc(&telemetery.StatusEvent{status: healthcheck.Unavailable})
 		s.bgFinished.Done()
 	}()
 
@@ -322,7 +328,7 @@
 			s.logger.Error("Could not start GRPC server", zap.Error(err))
 		}
 		s.logger.Info("GRPC server stopped", zap.Int("port", grpcPort), zap.String("addr", s.queryOptions.GRPCHostPort))
-		s.healthCheck.Set(healthcheck.Unavailable)
+		s.hcFunc(&telemetery.StatusEvent{status: healthcheck.Unavailable})
 		s.bgFinished.Done()
 	}()
 
@@ -338,7 +344,7 @@
 				s.logger.Error("Could not start multiplexed server", zap.Error(err))
 			}
 			s.logger.Info("CMUX server stopped", zap.Int("port", tcpPort), zap.String("addr", s.queryOptions.HTTPHostPort))
-			s.healthCheck.Set(healthcheck.Unavailable)
+			s.hcFunc(&telemetery.StatusEvent{status: healthcheck.Unavailable})
 			s.bgFinished.Done()
 		}()
 	}

cmd/query/app/token_propagation_test.go

@@ -32,6 +32,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
+	"github.com/jaegertracing/jaeger/pkg/telemetery"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/plugin/storage/es"
 	"github.com/jaegertracing/jaeger/ports"
@@ -91,7 +92,12 @@ func runQueryService(t *testing.T, esURL string) *Server {
 	require.NoError(t, err)
 
 	querySvc := querysvc.NewQueryService(spanReader, nil, querysvc.QueryServiceOptions{})
-	server, err := NewServer(flagsSvc.Logger, flagsSvc.HC(), querySvc, nil,
+	telset := telemetery.Setting{
+		Logger:       flagsSvc.Logger,
+		Tracer:       jtracer.NoOp(),
+		ReportStatus: telemetery.HCAdapter(flagsSvc.HC()),
+	}
+	server, err := NewServer(querySvc, nil,
 		&QueryOptions{
 			GRPCHostPort: ":0",
 			HTTPHostPort: ":0",
@@ -100,7 +106,7 @@ func runQueryService(t *testing.T, esURL string) *Server {
 			},
 		},
 		tenancy.NewManager(&tenancy.Options{}),
-		jtracer.NoOp(),
+		telset,
 	)
 	require.NoError(t, err)
 	require.NoError(t, server.Start())

cmd/query/main.go

@@ -31,12 +31,13 @@
 	"github.com/jaegertracing/jaeger/cmd/internal/flags"
 	"github.com/jaegertracing/jaeger/cmd/internal/printconfig"
 	"github.com/jaegertracing/jaeger/cmd/internal/status"
 	"github.com/jaegertracing/jaeger/cmd/query/app"
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
 	"github.com/jaegertracing/jaeger/pkg/bearertoken"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
+	"github.com/jaegertracing/jaeger/pkg/telemetery"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/pkg/version"
 	metricsPlugin "github.com/jaegertracing/jaeger/plugin/metrics"
@@ -113,7 +114,12 @@
 				dependencyReader,
 				*queryServiceOptions)
 			tm := tenancy.NewManager(&queryOpts.Tenancy)
-			server, err := app.NewServer(svc.Logger, svc.HC(), queryService, metricsQueryService, queryOpts, tm, jt)
+			telset := telemetery.Setting{
+				Logger:       logger,
+				Tracer:       jt,
+				ReportStatus: telemetery.HCAdapter(svc.HC()),
+			}
+			server, err := app.NewServer(queryService, metricsQueryService, queryOpts, tm, telset)
 			if err != nil {
 				logger.Fatal("Failed to create server", zap.Error(err))
 			}

pkg/telemetery/settings.go

@@ -0,0 +1,29 @@
+// Copyright (c) 2024 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package telemetery
+
+import (
+	"go.uber.org/zap"
+
+	"github.com/jaegertracing/jaeger/pkg/healthcheck"
+	"github.com/jaegertracing/jaeger/pkg/jtracer"
+	"github.com/jaegertracing/jaeger/pkg/metrics"
+)
+
+type Setting struct {
+	Logger       *zap.Logger
+	Tracer       *jtracer.JTracer
+	Metrics      metrics.Factory
+	ReportStatus func(*StatusEvent)
+}
+
+type StatusEvent struct {
+	status healthcheck.Status
+}
+
+func HCAdapter(hc *healthcheck.HealthCheck) func(*StatusEvent) {
+	return func(event *StatusEvent) {
+		hc.Set(event.status)
+	}
+}