From f410b067de24573ad9caaf7adba129608d4779ec Mon Sep 17 00:00:00 2001 From: Wise-Wizard Date: Tue, 23 Jul 2024 21:23:55 +0530 Subject: [PATCH] Enable Query Metrics for V2 Signed-off-by: Wise-Wizard --- cmd/jaeger/internal/extension/jaegerquery/server.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmd/jaeger/internal/extension/jaegerquery/server.go b/cmd/jaeger/internal/extension/jaegerquery/server.go index d4dfa53715d..b386b4e821e 100644 --- a/cmd/jaeger/internal/extension/jaegerquery/server.go +++ b/cmd/jaeger/internal/extension/jaegerquery/server.go @@ -14,10 +14,13 @@ import ( "github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage" queryApp "github.com/jaegertracing/jaeger/cmd/query/app" "github.com/jaegertracing/jaeger/cmd/query/app/querysvc" + "github.com/jaegertracing/jaeger/internal/metrics/otelmetrics" "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/metrics/disabled" + storageMetrics "github.com/jaegertracing/jaeger/storage/spanstore/metrics" ) var ( @@ -45,6 +48,8 @@ func (*server) Dependencies() []component.ID { } func (s *server) Start(_ context.Context, host component.Host) error { + mf := otelmetrics.NewFactory(s.telset.MeterProvider) + queryMetricsFactory := mf.Namespace(metrics.NSOptions{Name: "query"}) f, err := jaegerstorage.GetStorageFactory(s.config.TraceStoragePrimary, host) if err != nil { return fmt.Errorf("cannot find primary storage %s: %w", s.config.TraceStoragePrimary, err) @@ -54,8 +59,8 @@ func (s *server) Start(_ context.Context, host component.Host) error { if err != nil { return fmt.Errorf("cannot create span reader: %w", err) } - // TODO - // spanReader = storageMetrics.NewReadMetricsDecorator(spanReader, baseFactory.Namespace(metrics.NSOptions{Name: "query"})) + + spanReader = storageMetrics.NewReadMetricsDecorator(spanReader, queryMetricsFactory) depReader, err := f.CreateDependencyReader() if err != nil { @@ -81,6 +86,7 @@ func (s *server) Start(_ context.Context, host component.Host) error { telset := telemetery.Setting{ Logger: s.telset.Logger, TracerProvider: tracerProvider.OTEL, + Metrics: queryMetricsFactory, ReportStatus: s.telset.ReportStatus, }