Skip to content

Commit

Permalink
Rename plugin/metrics To plugin/metricstore
Browse files Browse the repository at this point in the history 
Signed-off-by: Mahad Zaryab <[email protected]>
  • Loading branch information
@mahadzaryab1
mahadzaryab1 committed Dec 2, 2024
1 parent fa9c575 commit 5d7d9cc
Show file tree
Hide file tree
Showing 32 changed files with 26 additions and 26 deletions.
8 changes: 4 additions & 4 deletions cmd/all-in-one/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -235,7 +235,7 @@ func startQuery(
}

func createMetricsQueryService(
metricsReaderFactory *metricsPlugin.Factory,
metricsReaderFactory *metricstore.Factory,
v *viper.Viper,
telset telemetry.Settings,
) (querysvc.MetricsQueryService, error) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/anonymizer/app/query/query_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions cmd/internal/env/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion cmd/jaeger/internal/extension/jaegerquery/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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/plugin/metricstore/disabled"
"github.com/jaegertracing/jaeger/storage/metricsstore"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/jaeger/internal/extension/jaegerstorage/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/jaeger/internal/extension/jaegerstorage/extension.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/query/app/grpc_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ 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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/query/app/grpc_handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ 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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/query/app/http_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ 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/spanstore"
Expand Down
2 changes: 1 addition & 1 deletion cmd/query/app/http_handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
ui "github.com/jaegertracing/jaeger/model/json"
"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/metrics"
depsmocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
metricsmocks "github.com/jaegertracing/jaeger/storage/metricsstore/mocks"
Expand Down
2 changes: 1 addition & 1 deletion cmd/query/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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"
metricsPlugin "github.com/jaegertracing/jaeger/plugin/metricstore"
"github.com/jaegertracing/jaeger/plugin/storage"
"github.com/jaegertracing/jaeger/ports"
)
Expand Down
0 plugin/metrics/disabled/factory.go → plugin/metricstore/disabled/factory.go
View file
File renamed without changes.
0 plugin/metrics/disabled/factory_test.go → plugin/metricstore/disabled/factory_test.go
View file
File renamed without changes.
0 plugin/metrics/disabled/package_test.go → plugin/metricstore/disabled/package_test.go
View file
File renamed without changes.
0 plugin/metrics/disabled/reader.go → plugin/metricstore/disabled/reader.go
View file
File renamed without changes.
0 plugin/metrics/disabled/reader_test.go → plugin/metricstore/disabled/reader_test.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions plugin/metrics/factory.go → plugin/metricstore/factory.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2021 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0

package metrics
package metricstore

import (
"flag"
Expand All @@ -13,8 +13,8 @@ import (
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/pkg/telemetry"
"github.com/jaegertracing/jaeger/plugin"
"github.com/jaegertracing/jaeger/plugin/metrics/disabled"
"github.com/jaegertracing/jaeger/plugin/metrics/prometheus"
"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus"
"github.com/jaegertracing/jaeger/storage"
"github.com/jaegertracing/jaeger/storage/metricsstore"
)
Expand Down
2 changes: 1 addition & 1 deletion plugin/metrics/factory_config.go → plugin/metricstore/factory_config.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2021 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0

package metrics
package metricstore

import (
"os"
Expand Down
2 changes: 1 addition & 1 deletion plugin/metrics/factory_config_test.go → plugin/metricstore/factory_config_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2021 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0

package metrics
package metricstore

import (
"testing"
Expand Down
4 changes: 2 additions & 2 deletions plugin/metrics/factory_test.go → plugin/metricstore/factory_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2021 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0

package metrics
package metricstore

import (
"flag"
Expand All @@ -13,7 +13,7 @@ import (
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/pkg/telemetry"
"github.com/jaegertracing/jaeger/plugin/metrics/disabled"
"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
"github.com/jaegertracing/jaeger/storage"
"github.com/jaegertracing/jaeger/storage/mocks"
)
Expand Down
2 changes: 1 addition & 1 deletion plugin/metrics/package_test.go → plugin/metricstore/package_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2023 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0

package metrics
package metricstore

import (
"testing"
Expand Down
2 changes: 1 addition & 1 deletion plugin/metrics/prometheus/factory.go → plugin/metricstore/prometheus/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/jaegertracing/jaeger/pkg/prometheus/config"
"github.com/jaegertracing/jaeger/pkg/telemetry"
"github.com/jaegertracing/jaeger/plugin"
prometheusstore "github.com/jaegertracing/jaeger/plugin/metrics/prometheus/metricstore"
prometheusstore "github.com/jaegertracing/jaeger/plugin/metricstore/prometheus/metricstore"
"github.com/jaegertracing/jaeger/storage/metricsstore"
"github.com/jaegertracing/jaeger/storage/metricsstore/metricstoremetrics"
)
Expand Down
0 plugin/metrics/prometheus/factory_test.go → ...in/metricstore/prometheus/factory_test.go
View file
File renamed without changes.
0 ...ometheus/metricstore/dbmodel/to_domain.go → ...ometheus/metricstore/dbmodel/to_domain.go
View file
File renamed without changes.
0 ...eus/metricstore/dbmodel/to_domain_test.go → ...eus/metricstore/dbmodel/to_domain_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../metrics/prometheus/metricstore/reader.go → ...ricstore/prometheus/metricstore/reader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/jaegertracing/jaeger/pkg/bearertoken"
"github.com/jaegertracing/jaeger/pkg/otelsemconv"
"github.com/jaegertracing/jaeger/pkg/prometheus/config"
"github.com/jaegertracing/jaeger/plugin/metrics/prometheus/metricstore/dbmodel"
"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus/metricstore/dbmodel"
"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
"github.com/jaegertracing/jaeger/storage/metricsstore"
)
Expand Down
0 ...ics/prometheus/metricstore/reader_test.go → ...ore/prometheus/metricstore/reader_test.go
View file
File renamed without changes.
0 .../metricstore/testdata/empty_response.json → .../metricstore/testdata/empty_response.json
View file
File renamed without changes.
0 .../testdata/service_datapoint_response.json → .../testdata/service_datapoint_response.json
View file
File renamed without changes.
0 ...service_span_name_datapoint_response.json → ...service_span_name_datapoint_response.json
View file
File renamed without changes.
0 ...etricstore/testdata/warning_response.json → ...etricstore/testdata/warning_response.json
View file
File renamed without changes.
0 plugin/metrics/prometheus/options.go → plugin/metricstore/prometheus/options.go
View file
File renamed without changes.

0 comments on commit 5d7d9cc

Please sign in to comment.