Created Healthcheck Adapter

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

cmd/all-in-one/main.go

@@ -195,10 +195,10 @@ by default uses only in-memory database.`,
 			}
 			agent := startAgent(cp, aOpts, logger, agentMetricsFactory)
 			telset := telemetery.Setting{
-				Logger:  svc.Logger,
-				Tracer:  tracer,
-				Metrics: queryMetricsFactory,
-				HC:      svc.HC(),
+				Logger:       svc.Logger,
+				Tracer:       tracer,
+				Metrics:      queryMetricsFactory,
+				ReportStatus: telemetery.HCAdapter(svc.HC()),
 			}
 			// query
 			querySrv := startQuery(

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

@@ -81,9 +81,9 @@ func (s *server) Start(_ context.Context, host component.Host) error {
 		return fmt.Errorf("could not initialize a tracer: %w", err)
 	}
 	telset := telemetery.Setting{
-		Logger: s.logger,
-		Tracer: s.jtracer,
-		HC:    healthcheck.New(),
+		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

cmd/query/app/server.go

@@ -51,7 +51,7 @@ import (
 // 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
 
@@ -99,7 +99,7 @@ func NewServer(querySvc *querysvc.QueryService,
 
 	return &Server{
 		logger:        telset.Logger,
-		healthCheck:   telset.HC,
+		hcFunc:        telset.ReportStatus,
 		querySvc:      querySvc,
 		queryOptions:  options,
 		tracer:        telset.Tracer,
@@ -314,7 +314,7 @@ func (s *Server) Start() error {
 			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()
 	}()
 
@@ -328,7 +328,7 @@ func (s *Server) Start() error {
 			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()
 	}()
 
@@ -344,7 +344,7 @@ func (s *Server) Start() error {
 				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

@@ -93,9 +93,9 @@ func runQueryService(t *testing.T, esURL string) *Server {
 
 	querySvc := querysvc.NewQueryService(spanReader, nil, querysvc.QueryServiceOptions{})
 	telset := telemetery.Setting{
-		Logger: flagsSvc.Logger,
-		Tracer: jtracer.NoOp(),
-		HC:     flagsSvc.HC(),
+		Logger:       flagsSvc.Logger,
+		Tracer:       jtracer.NoOp(),
+		ReportStatus: telemetery.HCAdapter(flagsSvc.HC()),
 	}
 	server, err := NewServer(querySvc, nil,
 		&QueryOptions{

cmd/query/main.go

@@ -115,9 +115,9 @@ func main() {
 				*queryServiceOptions)
 			tm := tenancy.NewManager(&queryOpts.Tenancy)
 			telset := telemetery.Setting{
-				Logger: logger,
-				Tracer: jt,
-				HC:     svc.HC(),
+				Logger:       logger,
+				Tracer:       jt,
+				ReportStatus: telemetery.HCAdapter(svc.HC()),
 			}
 			server, err := app.NewServer(queryService, metricsQueryService, queryOpts, tm, telset)
 			if err != nil {

pkg/telemetery/settings.go

@@ -1,15 +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"
-	"go.uber.org/zap"
 )
 
 type Setting struct {
-	Logger  *zap.Logger
-	Tracer  *jtracer.JTracer
-	Metrics metrics.Factory
-	HC      *healthcheck.HealthCheck
+	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)
+	}
 }