Skip to content

Commit d5432a1

Browse files
[refactor] Move memory implementation to internal package (jaegertracing#6646)
## Which problem is this PR solving? - Towards jaegertracing#6637 ## Description of the changes - This PR moves the implementation for memory storage from `plugin/storage/` to `internal/storage/` ## How was this change tested? - CI ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: Mahad Zaryab <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]>
1 parent 3588dbe commit d5432a1

File tree

25 files changed

+12
-12
lines changed

25 files changed

+12
-12
lines changed

cmd/collector/app/span_handler_builder_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313

1414
"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
1515
cmdFlags "github.com/jaegertracing/jaeger/cmd/internal/flags"
16+
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
1617
"github.com/jaegertracing/jaeger/pkg/config"
1718
"github.com/jaegertracing/jaeger/pkg/metrics"
1819
"github.com/jaegertracing/jaeger/pkg/tenancy"
19-
"github.com/jaegertracing/jaeger/plugin/storage/memory"
2020
"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
2121
)
2222

cmd/jaeger/internal/exporters/storageexporter/exporter_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"github.com/jaegertracing/jaeger-idl/model/v1"
2424
"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
25-
"github.com/jaegertracing/jaeger/plugin/storage/memory"
25+
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
2626
"github.com/jaegertracing/jaeger/storage"
2727
factoryMocks "github.com/jaegertracing/jaeger/storage/mocks"
2828
"github.com/jaegertracing/jaeger/storage/spanstore"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import (
1414

1515
"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
1616
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
17+
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
1718
casCfg "github.com/jaegertracing/jaeger/pkg/cassandra/config"
1819
esCfg "github.com/jaegertracing/jaeger/pkg/es/config"
1920
promCfg "github.com/jaegertracing/jaeger/pkg/prometheus/config"
2021
"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus"
2122
"github.com/jaegertracing/jaeger/plugin/storage/es"
2223
"github.com/jaegertracing/jaeger/plugin/storage/grpc"
23-
"github.com/jaegertracing/jaeger/plugin/storage/memory"
2424
)
2525

2626
var (

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import (
1414

1515
"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
1616
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
17+
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
1718
"github.com/jaegertracing/jaeger/pkg/metrics"
1819
"github.com/jaegertracing/jaeger/pkg/telemetry"
1920
"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus"
2021
"github.com/jaegertracing/jaeger/plugin/storage/es"
2122
"github.com/jaegertracing/jaeger/plugin/storage/grpc"
22-
"github.com/jaegertracing/jaeger/plugin/storage/memory"
2323
"github.com/jaegertracing/jaeger/storage"
2424
"github.com/jaegertracing/jaeger/storage_v2/tracestore"
2525
"github.com/jaegertracing/jaeger/storage_v2/v1adapter"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import (
2323

2424
"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
2525
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
26+
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
2627
esCfg "github.com/jaegertracing/jaeger/pkg/es/config"
2728
"github.com/jaegertracing/jaeger/pkg/metrics"
2829
promCfg "github.com/jaegertracing/jaeger/pkg/prometheus/config"
2930
"github.com/jaegertracing/jaeger/plugin/storage/grpc"
30-
"github.com/jaegertracing/jaeger/plugin/storage/memory"
3131
"github.com/jaegertracing/jaeger/storage"
3232
"github.com/jaegertracing/jaeger/storage/dependencystore"
3333
"github.com/jaegertracing/jaeger/storage/spanstore"

cmd/jaeger/internal/extension/remotesampling/extension_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
3131
"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
3232
"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/adaptive"
33-
"github.com/jaegertracing/jaeger/plugin/storage/memory"
33+
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
3434
)
3535

3636
func makeStorageExtension(t *testing.T, memstoreName string) component.Host {

cmd/jaeger/internal/processors/adaptivesampling/processor_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/jaegerstorage"
2323
"github.com/jaegertracing/jaeger/cmd/jaeger/internal/extension/remotesampling"
2424
"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/adaptive"
25-
"github.com/jaegertracing/jaeger/plugin/storage/memory"
25+
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
2626
)
2727

2828
func makeStorageExtension(t *testing.T, memstoreName string) component.Host {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

plugin/storage/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ import (
1616
"github.com/jaegertracing/jaeger/internal/safeexpvar"
1717
"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
1818
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
19+
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
1920
"github.com/jaegertracing/jaeger/pkg/metrics"
2021
"github.com/jaegertracing/jaeger/plugin"
2122
"github.com/jaegertracing/jaeger/plugin/storage/blackhole"
2223
"github.com/jaegertracing/jaeger/plugin/storage/es"
2324
"github.com/jaegertracing/jaeger/plugin/storage/grpc"
2425
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
25-
"github.com/jaegertracing/jaeger/plugin/storage/memory"
2626
"github.com/jaegertracing/jaeger/storage"
2727
"github.com/jaegertracing/jaeger/storage/dependencystore"
2828
"github.com/jaegertracing/jaeger/storage/spanstore"

plugin/storage/integration/kafka_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import (
1818
"github.com/jaegertracing/jaeger-idl/model/v1"
1919
"github.com/jaegertracing/jaeger/cmd/ingester/app"
2020
"github.com/jaegertracing/jaeger/cmd/ingester/app/builder"
21+
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
2122
"github.com/jaegertracing/jaeger/pkg/config"
2223
"github.com/jaegertracing/jaeger/pkg/kafka/consumer"
2324
"github.com/jaegertracing/jaeger/pkg/metrics"
2425
"github.com/jaegertracing/jaeger/pkg/testutils"
2526
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
26-
"github.com/jaegertracing/jaeger/plugin/storage/memory"
2727
"github.com/jaegertracing/jaeger/storage/spanstore"
2828
"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
2929
)

plugin/storage/integration/memstore_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"go.uber.org/zap"
1111

12+
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
1213
"github.com/jaegertracing/jaeger/pkg/testutils"
13-
"github.com/jaegertracing/jaeger/plugin/storage/memory"
1414
"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
1515
)
1616

storage_v2/v1adapter/tracereader_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"go.opentelemetry.io/collector/pdata/ptrace"
1717

1818
"github.com/jaegertracing/jaeger-idl/model/v1"
19+
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
1920
"github.com/jaegertracing/jaeger/pkg/iter"
20-
"github.com/jaegertracing/jaeger/plugin/storage/memory"
2121
dependencyStoreMocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
2222
"github.com/jaegertracing/jaeger/storage/spanstore"
2323
spanStoreMocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"

storage_v2/v1adapter/tracewriter_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"go.opentelemetry.io/collector/pdata/ptrace"
1616

1717
"github.com/jaegertracing/jaeger-idl/model/v1"
18-
"github.com/jaegertracing/jaeger/plugin/storage/memory"
18+
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
1919
"github.com/jaegertracing/jaeger/storage/spanstore"
2020
spanstoreMocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
2121
tracestoremocks "github.com/jaegertracing/jaeger/storage_v2/tracestore/mocks"

0 commit comments

Comments
 (0)