[chore] Make package naming more consistent

.mockery.yaml

@@ -64,7 +64,7 @@ packages:
   github.com/jaegertracing/jaeger/storage/dependencystore:
     interfaces:
       Reader:
-  github.com/jaegertracing/jaeger/storage/metricsstore:
+  github.com/jaegertracing/jaeger/storage/metricstore:
     config:
       all: true
   github.com/jaegertracing/jaeger/storage/samplingstore:

cmd/all-in-one/main.go

@@ -34,7 +34,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/telemetry"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/pkg/version"
-	metricsPlugin "github.com/jaegertracing/jaeger/plugin/metrics"
+	"github.com/jaegertracing/jaeger/plugin/metricstore"
 	ss "github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider"
 	"github.com/jaegertracing/jaeger/plugin/storage"
 	"github.com/jaegertracing/jaeger/ports"
@@ -64,8 +64,8 @@ func main() {
 		log.Fatalf("Cannot initialize sampling strategy factory: %v", err)
 	}
 
-	fc := metricsPlugin.FactoryConfigFromEnv()
-	metricsReaderFactory, err := metricsPlugin.NewFactory(fc)
+	fc := metricstore.FactoryConfigFromEnv()
+	metricsReaderFactory, err := metricstore.NewFactory(fc)
 	if err != nil {
 		log.Fatalf("Cannot initialize metrics store factory: %v", err)
 	}
@@ -235,7 +235,7 @@ func startQuery(
 }
 
 func createMetricsQueryService(
-	metricsReaderFactory *metricsPlugin.Factory,
+	metricsReaderFactory *metricstore.Factory,
 	v *viper.Viper,
 	telset telemetry.Settings,
 ) (querysvc.MetricsQueryService, error) {

cmd/anonymizer/app/query/query_test.go

@@ -16,7 +16,7 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/query/app"
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
 	"github.com/jaegertracing/jaeger/model"
-	"github.com/jaegertracing/jaeger/plugin/metrics/disabled"
+	"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 	dependencyStoreMocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"

cmd/internal/env/command.go

@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"github.com/jaegertracing/jaeger/plugin/metrics"
+	"github.com/jaegertracing/jaeger/plugin/metricstore"
 	"github.com/jaegertracing/jaeger/plugin/sampling/strategyprovider"
 	"github.com/jaegertracing/jaeger/plugin/storage"
 )
@@ -83,11 +83,11 @@ func Command() *cobra.Command {
 		),
 	)
 	fs.String(
-		metrics.StorageTypeEnvVar,
+		metricstore.StorageTypeEnvVar,
 		"",
 		fmt.Sprintf(
 			strings.ReplaceAll(metricsStorageTypeDescription, "\n", " "),
-			strings.Join(metrics.AllStorageTypes, ", "),
+			strings.Join(metricstore.AllStorageTypes, ", "),
 		),
 	)
 	long := fmt.Sprintf(longTemplate, strings.ReplaceAll(fs.FlagUsagesWrapped(0), "      --", "\n"))

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

@@ -19,8 +19,8 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/telemetry"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
-	"github.com/jaegertracing/jaeger/plugin/metrics/disabled"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 )
 
 var (
@@ -138,7 +138,7 @@ func (s *server) addArchiveStorage(opts *querysvc.QueryServiceOptions, host comp
 	return nil
 }
 
-func (s *server) createMetricReader(host component.Host) (metricsstore.Reader, error) {
+func (s *server) createMetricReader(host component.Host) (metricstore.Reader, error) {
 	if s.config.Storage.Metrics == "" {
 		s.telset.Logger.Info("Metric storage not configured")
 		return disabled.NewMetricsReader()

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

@@ -31,8 +31,8 @@ import (
 	"github.com/jaegertracing/jaeger/storage"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	depsmocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
-	metricsstoremocks "github.com/jaegertracing/jaeger/storage/metricsstore/mocks"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
+	metricstoremocks "github.com/jaegertracing/jaeger/storage/metricstore/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 )
@@ -81,11 +81,11 @@ func (fmf fakeMetricsFactory) Initialize(telemetry.Settings) error {
 	return nil
 }
 
-func (fmf fakeMetricsFactory) CreateMetricsReader() (metricsstore.Reader, error) {
+func (fmf fakeMetricsFactory) CreateMetricsReader() (metricstore.Reader, error) {
 	if fmf.name == "need-metrics-reader-error" {
 		return nil, errors.New("test-error")
 	}
-	return &metricsstoremocks.Reader{}, nil
+	return &metricstoremocks.Reader{}, nil
 }
 
 type fakeStorageExt struct{}

cmd/jaeger/internal/extension/jaegerstorage/config.go

@@ -15,7 +15,7 @@ import (
 	casCfg "github.com/jaegertracing/jaeger/pkg/cassandra/config"
 	esCfg "github.com/jaegertracing/jaeger/pkg/es/config"
 	promCfg "github.com/jaegertracing/jaeger/pkg/prometheus/config"
-	"github.com/jaegertracing/jaeger/plugin/metrics/prometheus"
+	"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus"
 	"github.com/jaegertracing/jaeger/plugin/storage/badger"
 	"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
 	"github.com/jaegertracing/jaeger/plugin/storage/es"

cmd/jaeger/internal/extension/jaegerstorage/extension.go

@@ -14,7 +14,7 @@ import (
 
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/telemetry"
-	"github.com/jaegertracing/jaeger/plugin/metrics/prometheus"
+	"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus"
 	"github.com/jaegertracing/jaeger/plugin/storage/badger"
 	"github.com/jaegertracing/jaeger/plugin/storage/cassandra"
 	"github.com/jaegertracing/jaeger/plugin/storage/es"

cmd/query/app/grpc_handler.go

@@ -16,10 +16,10 @@ import (
 	"github.com/jaegertracing/jaeger/model"
 	_ "github.com/jaegertracing/jaeger/pkg/gogocodec" // force gogo codec registration
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
-	"github.com/jaegertracing/jaeger/plugin/metrics/disabled"
+	"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
@@ -242,7 +242,7 @@ func (g *GRPCHandler) GetLatencies(ctx context.Context, r *metrics.GetLatenciesR
 	if r.Quantile == 0 {
 		return nil, errMissingQuantile
 	}
-	queryParams := metricsstore.LatenciesQueryParameters{
+	queryParams := metricstore.LatenciesQueryParameters{
 		BaseQueryParameters: bqp,
 		Quantile:            r.Quantile,
 	}
@@ -259,7 +259,7 @@ func (g *GRPCHandler) GetCallRates(ctx context.Context, r *metrics.GetCallRatesR
 	if err := g.handleErr("failed to build parameters", err); err != nil {
 		return nil, err
 	}
-	queryParams := metricsstore.CallRateQueryParameters{
+	queryParams := metricstore.CallRateQueryParameters{
 		BaseQueryParameters: bqp,
 	}
 	m, err := g.metricsQueryService.GetCallRates(ctx, &queryParams)
@@ -275,7 +275,7 @@ func (g *GRPCHandler) GetErrorRates(ctx context.Context, r *metrics.GetErrorRate
 	if err := g.handleErr("failed to build parameters", err); err != nil {
 		return nil, err
 	}
-	queryParams := metricsstore.ErrorRateQueryParameters{
+	queryParams := metricstore.ErrorRateQueryParameters{
 		BaseQueryParameters: bqp,
 	}
 	m, err := g.metricsQueryService.GetErrorRates(ctx, &queryParams)
@@ -287,7 +287,7 @@ func (g *GRPCHandler) GetErrorRates(ctx context.Context, r *metrics.GetErrorRate
 
 // GetMinStepDuration is the gRPC handler to fetch the minimum step duration supported by the underlying metrics store.
 func (g *GRPCHandler) GetMinStepDuration(ctx context.Context, _ *metrics.GetMinStepDurationRequest) (*metrics.GetMinStepDurationResponse, error) {
-	minStep, err := g.metricsQueryService.GetMinStepDuration(ctx, &metricsstore.MinStepDurationQueryParameters{})
+	minStep, err := g.metricsQueryService.GetMinStepDuration(ctx, &metricstore.MinStepDurationQueryParameters{})
 	if err := g.handleErr("failed to fetch min step duration", err); err != nil {
 		return nil, err
 	}
@@ -312,7 +312,7 @@ func (g *GRPCHandler) handleErr(msg string, err error) error {
 	return status.Errorf(codes.Internal, "%s: %v", msg, err)
 }
 
-func (g *GRPCHandler) newBaseQueryParameters(r any) (bqp metricsstore.BaseQueryParameters, err error) {
+func (g *GRPCHandler) newBaseQueryParameters(r any) (bqp metricstore.BaseQueryParameters, err error) {
 	if r == nil {
 		return bqp, errNilRequest
 	}

cmd/query/app/grpc_handler_test.go

@@ -25,12 +25,12 @@ import (
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
-	"github.com/jaegertracing/jaeger/plugin/metrics/disabled"
+	"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
 	depsmocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
-	metricsmocks "github.com/jaegertracing/jaeger/storage/metricsstore/mocks"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
+	metricsmocks "github.com/jaegertracing/jaeger/storage/metricstore/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 )
@@ -599,21 +599,21 @@ func TestGetMetricsSuccessGRPC(t *testing.T) {
 		}{
 			{
 				mockMethod:    "GetLatencies",
-				mockParamType: "*metricsstore.LatenciesQueryParameters",
+				mockParamType: "*metricstore.LatenciesQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetLatencies(context.Background(), &metrics.GetLatenciesRequest{Quantile: 0.95, BaseRequest: baseQueryParam})
 				},
 			},
 			{
 				mockMethod:    "GetCallRates",
-				mockParamType: "*metricsstore.CallRateQueryParameters",
+				mockParamType: "*metricstore.CallRateQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetCallRates(context.Background(), &metrics.GetCallRatesRequest{BaseRequest: baseQueryParam})
 				},
 			},
 			{
 				mockMethod:    "GetErrorRates",
-				mockParamType: "*metricsstore.ErrorRateQueryParameters",
+				mockParamType: "*metricstore.ErrorRateQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetErrorRates(context.Background(), &metrics.GetErrorRatesRequest{BaseRequest: baseQueryParam})
 				},
@@ -681,8 +681,8 @@ func TestGetMetricsUseDefaultParamsGRPC(t *testing.T) {
 			BaseRequest: baseQueryParam,
 		}
 		expectedMetrics := &metrics.MetricFamily{Name: "foo"}
-		expectedParams := &metricsstore.CallRateQueryParameters{
-			BaseQueryParameters: metricsstore.BaseQueryParameters{
+		expectedParams := &metricstore.CallRateQueryParameters{
+			BaseQueryParameters: metricstore.BaseQueryParameters{
 				ServiceNames: []string{"foo"},
 				EndTime:      &now,
 				Lookback:     &defaultMetricsQueryLookbackDuration,
@@ -722,8 +722,8 @@ func TestGetMetricsOverrideDefaultParamsGRPC(t *testing.T) {
 			BaseRequest: baseQueryParam,
 		}
 		expectedMetrics := &metrics.MetricFamily{Name: "foo"}
-		expectedParams := &metricsstore.CallRateQueryParameters{
-			BaseQueryParameters: metricsstore.BaseQueryParameters{
+		expectedParams := &metricstore.CallRateQueryParameters{
+			BaseQueryParameters: metricstore.BaseQueryParameters{
 				ServiceNames: baseQueryParam.ServiceNames,
 				EndTime:      &endTime,
 				Lookback:     &lookback,
@@ -755,23 +755,23 @@ func TestGetMetricsFailureGRPC(t *testing.T) {
 		}{
 			{
 				mockMethod:    "GetLatencies",
-				mockParamType: "*metricsstore.LatenciesQueryParameters",
+				mockParamType: "*metricstore.LatenciesQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetLatencies(context.Background(), &metrics.GetLatenciesRequest{Quantile: 0.95, BaseRequest: baseQueryParam})
 				},
 				wantErr: "failed to fetch latencies: storage error",
 			},
 			{
 				mockMethod:    "GetCallRates",
-				mockParamType: "*metricsstore.CallRateQueryParameters",
+				mockParamType: "*metricstore.CallRateQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetCallRates(context.Background(), &metrics.GetCallRatesRequest{BaseRequest: baseQueryParam})
 				},
 				wantErr: "failed to fetch call rates: storage error",
 			},
 			{
 				mockMethod:    "GetErrorRates",
-				mockParamType: "*metricsstore.ErrorRateQueryParameters",
+				mockParamType: "*metricstore.ErrorRateQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetErrorRates(context.Background(), &metrics.GetErrorRatesRequest{BaseRequest: baseQueryParam})
 				},
@@ -796,7 +796,7 @@ func TestGetMetricsFailureGRPC(t *testing.T) {
 func TestGetMinStepDurationSuccessGRPC(t *testing.T) {
 	withServerAndClient(t, func(server *grpcServer, client *grpcClient) {
 		m := server.metricsQueryService.(*metricsmocks.Reader)
-		m.On("GetMinStepDuration", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*metricsstore.MinStepDurationQueryParameters")).
+		m.On("GetMinStepDuration", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*metricstore.MinStepDurationQueryParameters")).
 			Return(time.Hour, nil).Once()
 
 		res, err := client.GetMinStepDuration(context.Background(), &metrics.GetMinStepDurationRequest{})
@@ -808,7 +808,7 @@ func TestGetMinStepDurationSuccessGRPC(t *testing.T) {
 func TestGetMinStepDurationFailureGRPC(t *testing.T) {
 	withServerAndClient(t, func(server *grpcServer, client *grpcClient) {
 		m := server.metricsQueryService.(*metricsmocks.Reader)
-		m.On("GetMinStepDuration", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*metricsstore.MinStepDurationQueryParameters")).
+		m.On("GetMinStepDuration", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*metricstore.MinStepDurationQueryParameters")).
 			Return(time.Duration(0), errStorageGRPC).Once()
 
 		res, err := client.GetMinStepDuration(context.Background(), &metrics.GetMinStepDurationRequest{})
@@ -831,7 +831,7 @@ func TestGetMetricsInvalidParametersGRPC(t *testing.T) {
 			{
 				name:          "GetLatencies missing service names",
 				mockMethod:    "GetLatencies",
-				mockParamType: "*metricsstore.LatenciesQueryParameters",
+				mockParamType: "*metricstore.LatenciesQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetLatencies(context.Background(), &metrics.GetLatenciesRequest{Quantile: 0.95})
 				},
@@ -840,7 +840,7 @@ func TestGetMetricsInvalidParametersGRPC(t *testing.T) {
 			{
 				name:          "GetLatencies missing quantile",
 				mockMethod:    "GetLatencies",
-				mockParamType: "*metricsstore.LatenciesQueryParameters",
+				mockParamType: "*metricstore.LatenciesQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetLatencies(context.Background(), &metrics.GetLatenciesRequest{
 						BaseRequest: &metrics.MetricsQueryBaseRequest{
@@ -853,7 +853,7 @@ func TestGetMetricsInvalidParametersGRPC(t *testing.T) {
 			{
 				name:          "GetCallRates missing service names",
 				mockMethod:    "GetCallRates",
-				mockParamType: "*metricsstore.CallRateQueryParameters",
+				mockParamType: "*metricstore.CallRateQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetCallRates(context.Background(), &metrics.GetCallRatesRequest{}) // Test
 				},
@@ -862,7 +862,7 @@ func TestGetMetricsInvalidParametersGRPC(t *testing.T) {
 			{
 				name:          "GetErrorRates nil request",
 				mockMethod:    "GetErrorRates",
-				mockParamType: "*metricsstore.ErrorRateQueryParameters",
+				mockParamType: "*metricstore.ErrorRateQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetErrorRates(context.Background(), &metrics.GetErrorRatesRequest{})
 				},

cmd/query/app/http_handler.go

@@ -26,9 +26,9 @@ import (
 	uiconv "github.com/jaegertracing/jaeger/model/converter/json"
 	ui "github.com/jaegertracing/jaeger/model/json"
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
-	"github.com/jaegertracing/jaeger/plugin/metrics/disabled"
+	"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
@@ -306,32 +306,32 @@ func (aH *APIHandler) latencies(w http.ResponseWriter, r *http.Request) {
 		aH.handleError(w, newParseError(err, quantileParam), http.StatusBadRequest)
 		return
 	}
-	aH.metrics(w, r, func(ctx context.Context, baseParams metricsstore.BaseQueryParameters) (*metrics.MetricFamily, error) {
-		return aH.metricsQueryService.GetLatencies(ctx, &metricsstore.LatenciesQueryParameters{
+	aH.metrics(w, r, func(ctx context.Context, baseParams metricstore.BaseQueryParameters) (*metrics.MetricFamily, error) {
+		return aH.metricsQueryService.GetLatencies(ctx, &metricstore.LatenciesQueryParameters{
 			BaseQueryParameters: baseParams,
 			Quantile:            q,
 		})
 	})
 }
 
 func (aH *APIHandler) calls(w http.ResponseWriter, r *http.Request) {
-	aH.metrics(w, r, func(ctx context.Context, baseParams metricsstore.BaseQueryParameters) (*metrics.MetricFamily, error) {
-		return aH.metricsQueryService.GetCallRates(ctx, &metricsstore.CallRateQueryParameters{
+	aH.metrics(w, r, func(ctx context.Context, baseParams metricstore.BaseQueryParameters) (*metrics.MetricFamily, error) {
+		return aH.metricsQueryService.GetCallRates(ctx, &metricstore.CallRateQueryParameters{
 			BaseQueryParameters: baseParams,
 		})
 	})
 }
 
 func (aH *APIHandler) errors(w http.ResponseWriter, r *http.Request) {
-	aH.metrics(w, r, func(ctx context.Context, baseParams metricsstore.BaseQueryParameters) (*metrics.MetricFamily, error) {
-		return aH.metricsQueryService.GetErrorRates(ctx, &metricsstore.ErrorRateQueryParameters{
+	aH.metrics(w, r, func(ctx context.Context, baseParams metricstore.BaseQueryParameters) (*metrics.MetricFamily, error) {
+		return aH.metricsQueryService.GetErrorRates(ctx, &metricstore.ErrorRateQueryParameters{
 			BaseQueryParameters: baseParams,
 		})
 	})
 }
 
 func (aH *APIHandler) minStep(w http.ResponseWriter, r *http.Request) {
-	minStep, err := aH.metricsQueryService.GetMinStepDuration(r.Context(), &metricsstore.MinStepDurationQueryParameters{})
+	minStep, err := aH.metricsQueryService.GetMinStepDuration(r.Context(), &metricstore.MinStepDurationQueryParameters{})
 	if aH.handleError(w, err, http.StatusInternalServerError) {
 		return
 	}
@@ -342,7 +342,7 @@ func (aH *APIHandler) minStep(w http.ResponseWriter, r *http.Request) {
 	aH.writeJSON(w, r, &structuredRes)
 }
 
-func (aH *APIHandler) metrics(w http.ResponseWriter, r *http.Request, getMetrics func(context.Context, metricsstore.BaseQueryParameters) (*metrics.MetricFamily, error)) {
+func (aH *APIHandler) metrics(w http.ResponseWriter, r *http.Request, getMetrics func(context.Context, metricstore.BaseQueryParameters) (*metrics.MetricFamily, error)) {
 	requestParams, err := aH.queryParser.parseMetricsQueryParams(r)
 	if aH.handleError(w, err, http.StatusBadRequest) {
 		return