[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/exporters/storageexporter/exporter_test.go

@@ -52,7 +52,7 @@ func (m *mockStorageExt) TraceStorageFactory(name string) (storage.Factory, bool
 	return nil, false
 }
 
-func (m *mockStorageExt) MetricStorageFactory(name string) (storage.MetricsFactory, bool) {
+func (m *mockStorageExt) MetricStorageFactory(name string) (storage.MetricStoreFactory, bool) {
 	if m.name == name {
 		return m.metricsFactory, true
 	}

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{}
@@ -99,7 +99,7 @@ func (fakeStorageExt) TraceStorageFactory(name string) (storage.Factory, bool) {
 	return fakeFactory{name: name}, true
 }
 
-func (fakeStorageExt) MetricStorageFactory(name string) (storage.MetricsFactory, bool) {
+func (fakeStorageExt) MetricStorageFactory(name string) (storage.MetricStoreFactory, bool) {
 	if name == "need-factory-error" {
 		return nil, false
 	}

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"
@@ -30,14 +30,14 @@ var _ Extension = (*storageExt)(nil)
 type Extension interface {
 	extension.Extension
 	TraceStorageFactory(name string) (storage.Factory, bool)
-	MetricStorageFactory(name string) (storage.MetricsFactory, bool)
+	MetricStorageFactory(name string) (storage.MetricStoreFactory, bool)
 }
 
 type storageExt struct {
 	config           *Config
 	telset           component.TelemetrySettings
 	factories        map[string]storage.Factory
-	metricsFactories map[string]storage.MetricsFactory
+	metricsFactories map[string]storage.MetricStoreFactory
 }
 
 // GetStorageFactory locates the extension in Host and retrieves
@@ -59,7 +59,7 @@ func GetStorageFactory(name string, host component.Host) (storage.Factory, error
 
 // GetMetricStorageFactory locates the extension in Host and retrieves
 // a metric storage factory from it with the given name.
-func GetMetricStorageFactory(name string, host component.Host) (storage.MetricsFactory, error) {
+func GetMetricStorageFactory(name string, host component.Host) (storage.MetricStoreFactory, error) {
 	ext, err := findExtension(host)
 	if err != nil {
 		return nil, err
@@ -110,7 +110,7 @@ func newStorageExt(config *Config, telset component.TelemetrySettings) *storageE
 		config:           config,
 		telset:           telset,
 		factories:        make(map[string]storage.Factory),
-		metricsFactories: make(map[string]storage.MetricsFactory),
+		metricsFactories: make(map[string]storage.MetricStoreFactory),
 	}
 }
 
@@ -175,7 +175,7 @@ func (s *storageExt) Start(_ context.Context, host component.Host) error {
 
 	for metricStorageName, cfg := range s.config.MetricBackends {
 		s.telset.Logger.Sugar().Infof("Initializing metrics storage '%s'", metricStorageName)
-		var metricsFactory storage.MetricsFactory
+		var metricsFactory storage.MetricStoreFactory
 		var err error
 		if cfg.Prometheus != nil {
 			promTelset := telset
@@ -211,7 +211,7 @@ func (s *storageExt) TraceStorageFactory(name string) (storage.Factory, bool) {
 	return f, ok
 }
 
-func (s *storageExt) MetricStorageFactory(name string) (storage.MetricsFactory, bool) {
+func (s *storageExt) MetricStorageFactory(name string) (storage.MetricStoreFactory, bool) {
 	mf, ok := s.metricsFactories[name]
 	return mf, ok
 }

cmd/jaeger/internal/integration/storagecleaner/extension_test.go

@@ -41,7 +41,7 @@ func (f *PurgerFactory) Purge(_ context.Context) error {
 type mockStorageExt struct {
 	name           string
 	factory        storage.Factory
-	metricsFactory storage.MetricsFactory
+	metricsFactory storage.MetricStoreFactory
 }
 
 func (*mockStorageExt) Start(context.Context, component.Host) error {
@@ -59,7 +59,7 @@ func (m *mockStorageExt) TraceStorageFactory(name string) (storage.Factory, bool
 	return nil, false
 }
 
-func (m *mockStorageExt) MetricStorageFactory(name string) (storage.MetricsFactory, bool) {
+func (m *mockStorageExt) MetricStorageFactory(name string) (storage.MetricStoreFactory, bool) {
 	if m.name == name {
 		return m.metricsFactory, true
 	}

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
 	}