From c865d7da57029d45e6702729535b684993062e77 Mon Sep 17 00:00:00 2001 From: albertteoh Date: Sun, 13 Jun 2021 15:47:14 +1000 Subject: [PATCH] Simplify and make consistent Signed-off-by: albertteoh --- cmd/all-in-one/main.go | 11 +++++------ cmd/query/main.go | 8 ++------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/cmd/all-in-one/main.go b/cmd/all-in-one/main.go index d6116c89ad9..8571f829f12 100644 --- a/cmd/all-in-one/main.go +++ b/cmd/all-in-one/main.go @@ -50,7 +50,6 @@ import ( "github.com/jaegertracing/jaeger/plugin/storage" "github.com/jaegertracing/jaeger/ports" "github.com/jaegertracing/jaeger/storage/dependencystore" - "github.com/jaegertracing/jaeger/storage/metricsstore" "github.com/jaegertracing/jaeger/storage/spanstore" storageMetrics "github.com/jaegertracing/jaeger/storage/spanstore/metrics" ) @@ -116,7 +115,7 @@ by default uses only in-memory database.`, logger.Fatal("Failed to create dependency reader", zap.Error(err)) } - metricsReader, err := createMetricsReader(metricsReaderFactory, v, logger) + metricsQueryService, err := createMetricsQueryService(metricsReaderFactory, v, logger) if err != nil { logger.Fatal("Failed to create metrics reader", zap.Error(err)) } @@ -171,7 +170,7 @@ by default uses only in-memory database.`, // query querySrv := startQuery( svc, qOpts, qOpts.BuildQueryServiceOptions(storageFactory, logger), - spanReader, dependencyReader, metricsReader, + spanReader, dependencyReader, metricsQueryService, metricsFactory, ) @@ -244,12 +243,12 @@ func startQuery( queryOpts *querysvc.QueryServiceOptions, spanReader spanstore.Reader, depReader dependencystore.Reader, - metricsReader metricsstore.Reader, + metricsQueryService querysvc.MetricsQueryService, baseFactory metrics.Factory, ) *queryApp.Server { spanReader = storageMetrics.NewReadMetricsDecorator(spanReader, baseFactory.Namespace(metrics.NSOptions{Name: "query"})) qs := querysvc.NewQueryService(spanReader, depReader, *queryOpts) - server, err := queryApp.NewServer(svc.Logger, qs, metricsReader, qOpts, opentracing.GlobalTracer()) + server, err := queryApp.NewServer(svc.Logger, qs, metricsQueryService, qOpts, opentracing.GlobalTracer()) if err != nil { svc.Logger.Fatal("Could not start jaeger-query service", zap.Error(err)) } @@ -288,7 +287,7 @@ func initTracer(metricsFactory metrics.Factory, logger *zap.Logger) io.Closer { return closer } -func createMetricsReader(factory *metricsPlugin.Factory, v *viper.Viper, logger *zap.Logger) (metricsstore.Reader, error) { +func createMetricsQueryService(factory *metricsPlugin.Factory, v *viper.Viper, logger *zap.Logger) (querysvc.MetricsQueryService, error) { if err := factory.Initialize(logger); err != nil { return nil, fmt.Errorf("failed to init metrics reader factory: %w", err) } diff --git a/cmd/query/main.go b/cmd/query/main.go index a0c1eda3fd1..cc012180597 100644 --- a/cmd/query/main.go +++ b/cmd/query/main.go @@ -165,14 +165,10 @@ func main() { func createMetricsQueryService(factory *metricsPlugin.Factory, v *viper.Viper, logger *zap.Logger) (querysvc.MetricsQueryService, error) { if err := factory.Initialize(logger); err != nil { - return nil, fmt.Errorf("failed to init metrics factory: %w", err) + return nil, fmt.Errorf("failed to init metrics reader factory: %w", err) } // Ensure default parameter values are loaded correctly. factory.InitFromViper(v) - metricsReader, err := factory.CreateMetricsReader() - if err != nil { - return nil, fmt.Errorf("failed to create metrics reader: %w", err) - } - return metricsReader, nil + return factory.CreateMetricsReader() }