Skip to content

Commit

Permalink
[refactor] Move plugin/metricstore to internal/storage/metricstore (
Browse files Browse the repository at this point in the history 
jaegertracing#6666)
  • Loading branch information
@mahadzaryab1
mahadzaryab1 authored Feb 4, 2025
1 parent c37dfcb commit 9825dc3
Show file tree
Hide file tree
Showing 29 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion cmd/all-in-one/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
v2querysvc "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
ss "github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/metafactory"
"github.com/jaegertracing/jaeger/internal/storage/metricstore"
storage "github.com/jaegertracing/jaeger/internal/storage/v1/factory"
"github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore"
"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
Expand All @@ -40,7 +41,6 @@ import (
"github.com/jaegertracing/jaeger/pkg/telemetry"
"github.com/jaegertracing/jaeger/pkg/tenancy"
"github.com/jaegertracing/jaeger/pkg/version"
"github.com/jaegertracing/jaeger/plugin/metricstore"
"github.com/jaegertracing/jaeger/ports"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/internal/env/command.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/spf13/pflag"

ss "github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/metafactory"
"github.com/jaegertracing/jaeger/internal/storage/metricstore"
storage "github.com/jaegertracing/jaeger/internal/storage/v1/factory"
"github.com/jaegertracing/jaeger/plugin/metricstore"
)

const (
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 @@ -17,6 +17,7 @@ import (
queryApp "github.com/jaegertracing/jaeger/cmd/query/app"
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
v2querysvc "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
"github.com/jaegertracing/jaeger/internal/storage/metricstore/disabled"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
"github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore"
Expand All @@ -26,7 +27,6 @@ import (
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/pkg/telemetry"
"github.com/jaegertracing/jaeger/pkg/tenancy"
"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
)

var (
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 @@ -12,6 +12,7 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/confmap"

"github.com/jaegertracing/jaeger/internal/storage/metricstore/prometheus"
"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
es "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch"
Expand All @@ -20,7 +21,6 @@ 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/metricstore/prometheus"
)

var (
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 @@ -12,6 +12,7 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/extension"

"github.com/jaegertracing/jaeger/internal/storage/metricstore/prometheus"
"github.com/jaegertracing/jaeger/internal/storage/v1"
"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
Expand All @@ -22,7 +23,6 @@ import (
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/pkg/telemetry"
"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus"
)

var _ Extension = (*storageExt)(nil)
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 @@ -23,12 +23,12 @@ import (

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
"github.com/jaegertracing/jaeger/internal/storage/metricstore/disabled"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
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/metricstore/disabled"
"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
)

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 @@ -32,6 +32,7 @@ import (

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
"github.com/jaegertracing/jaeger/internal/storage/metricstore/disabled"
metricsmocks "github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore/mocks"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
spanstoremocks "github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore/mocks"
Expand All @@ -40,7 +41,6 @@ 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/metricstore/disabled"
"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
)

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 @@ -23,6 +23,7 @@ import (
"github.com/jaegertracing/jaeger/cmd/query/app"
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
querysvcv2 "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
metricsPlugin "github.com/jaegertracing/jaeger/internal/storage/metricstore"
storage "github.com/jaegertracing/jaeger/internal/storage/v1/factory"
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
"github.com/jaegertracing/jaeger/pkg/bearertoken"
Expand All @@ -32,7 +33,6 @@ 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/metricstore"
"github.com/jaegertracing/jaeger/ports"
)

Expand Down
0 plugin/metricstore/disabled/factory.go → ...l/storage/metricstore/disabled/factory.go
View file
File renamed without changes.
0 plugin/metricstore/disabled/factory_test.go → ...rage/metricstore/disabled/factory_test.go
View file
File renamed without changes.
0 plugin/metricstore/disabled/package_test.go → ...rage/metricstore/disabled/package_test.go
View file
File renamed without changes.
0 plugin/metricstore/disabled/reader.go → ...al/storage/metricstore/disabled/reader.go
View file
File renamed without changes.
0 plugin/metricstore/disabled/reader_test.go → ...orage/metricstore/disabled/reader_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions plugin/metricstore/factory.go → internal/storage/metricstore/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import (
"github.com/spf13/viper"
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/internal/storage/metricstore/disabled"
"github.com/jaegertracing/jaeger/internal/storage/metricstore/prometheus"
"github.com/jaegertracing/jaeger/internal/storage/v1"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/pkg/telemetry"
"github.com/jaegertracing/jaeger/plugin"
"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus"
)

const (
Expand Down
0 plugin/metricstore/factory_config.go → ...nal/storage/metricstore/factory_config.go
View file
File renamed without changes.
0 plugin/metricstore/factory_config_test.go → ...torage/metricstore/factory_config_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion plugin/metricstore/factory_test.go → internal/storage/metricstore/factory_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"github.com/stretchr/testify/require"
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/internal/storage/metricstore/disabled"
"github.com/jaegertracing/jaeger/internal/storage/v1"
"github.com/jaegertracing/jaeger/internal/storage/v1/mocks"
"github.com/jaegertracing/jaeger/pkg/telemetry"
"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
)

var _ storage.MetricStoreFactory = new(Factory)
Expand Down
0 plugin/metricstore/package_test.go → internal/storage/metricstore/package_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion plugin/metricstore/prometheus/factory.go → ...storage/metricstore/prometheus/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"github.com/spf13/viper"
"go.uber.org/zap"

prometheusstore "github.com/jaegertracing/jaeger/internal/storage/metricstore/prometheus/metricstore"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore/metricstoremetrics"
"github.com/jaegertracing/jaeger/pkg/prometheus/config"
"github.com/jaegertracing/jaeger/pkg/telemetry"
"github.com/jaegertracing/jaeger/plugin"
prometheusstore "github.com/jaegertracing/jaeger/plugin/metricstore/prometheus/metricstore"
)

var _ plugin.Configurable = (*Factory)(nil)
Expand Down
0 ...in/metricstore/prometheus/factory_test.go → ...ge/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 ...ricstore/prometheus/metricstore/reader.go → ...ricstore/prometheus/metricstore/reader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/internal/storage/metricstore/prometheus/metricstore/dbmodel"
"github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore"
"github.com/jaegertracing/jaeger/pkg/bearertoken"
"github.com/jaegertracing/jaeger/pkg/otelsemconv"
"github.com/jaegertracing/jaeger/pkg/prometheus/config"
"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus/metricstore/dbmodel"
"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
)

Expand Down
0 ...ore/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/metricstore/prometheus/options.go → ...storage/metricstore/prometheus/options.go
View file
File renamed without changes.

0 comments on commit 9825dc3

Please sign in to comment.