Make the metrics produced by jaeger query scoped to the query component, and generated for all span readers (not just ES)

Signed-off-by: Gary Brown <gary@brownuk.com>

Author: objectiser

cmd/all-in-one/main.go

@@ -55,6 +55,7 @@ import (
 	"github.com/jaegertracing/jaeger/plugin/storage"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
+	storageMetrics "github.com/jaegertracing/jaeger/storage/spanstore/metrics"
 	jc "github.com/jaegertracing/jaeger/thrift-gen/jaeger"
 	sc "github.com/jaegertracing/jaeger/thrift-gen/sampling"
 	zc "github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
@@ -286,6 +287,8 @@ func startQuery(
 	}
 	opentracing.SetGlobalTracer(tracer)
 
+	spanReader = storageMetrics.NewReadMetricsDecorator(spanReader, baseFactory.Namespace("query", nil))
+
 	apiHandler := queryApp.NewAPIHandler(
 		spanReader,
 		depReader,

cmd/query/main.go

@@ -41,6 +41,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/version"
 	"github.com/jaegertracing/jaeger/plugin/storage"
 	istorage "github.com/jaegertracing/jaeger/storage"
+	storageMetrics "github.com/jaegertracing/jaeger/storage/spanstore/metrics"
 )
 
 func main() {
@@ -107,6 +108,7 @@ func main() {
 			if err != nil {
 				logger.Fatal("Failed to create span reader", zap.Error(err))
 			}
+			spanReader = storageMetrics.NewReadMetricsDecorator(spanReader, baseFactory.Namespace("query", nil))
 			dependencyReader, err := storageFactory.CreateDependencyReader()
 			if err != nil {
 				logger.Fatal("Failed to create dependency reader", zap.Error(err))

plugin/storage/es/spanstore/reader.go

@@ -29,7 +29,6 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/es"
 	"github.com/jaegertracing/jaeger/plugin/storage/es/spanstore/dbmodel"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
-	storageMetrics "github.com/jaegertracing/jaeger/storage/spanstore/metrics"
 )
 
 const (
@@ -109,7 +108,7 @@ type SpanReaderParams struct {
 
 // NewSpanReader returns a new SpanReader with a metrics.
 func NewSpanReader(p SpanReaderParams) spanstore.Reader {
-	return storageMetrics.NewReadMetricsDecorator(newSpanReader(p), p.MetricsFactory)
+	return newSpanReader(p)
 }
 
 func newSpanReader(p SpanReaderParams) *SpanReader {