Skip to content

Commit 3dfdf8e

Browse files
authored
[refactor] Move kafka implementation to internal package (jaegertracing#6651)
## Which problem is this PR solving? - Towards jaegertracing#6637 ## Description of the changes - This PR moves the implementation for gRPC 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]>
1 parent 987f795 commit 3dfdf8e

20 files changed

+9
-9
lines changed

.mockery.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ packages:
5151
github.com/jaegertracing/jaeger/internal/storage/v1/grpc/shared:
5252
interfaces:
5353
PluginCapabilities:
54-
github.com/jaegertracing/jaeger/plugin/storage/kafka:
54+
github.com/jaegertracing/jaeger/internal/storage/v1/kafka:
5555
interfaces:
5656
Marshaller:
5757
Unmarshaller:

cmd/ingester/app/builder/builder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"github.com/jaegertracing/jaeger/cmd/ingester/app"
1313
"github.com/jaegertracing/jaeger/cmd/ingester/app/consumer"
1414
"github.com/jaegertracing/jaeger/cmd/ingester/app/processor"
15+
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
1516
kafkaConsumer "github.com/jaegertracing/jaeger/pkg/kafka/consumer"
1617
"github.com/jaegertracing/jaeger/pkg/metrics"
17-
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
1818
"github.com/jaegertracing/jaeger/storage/spanstore"
1919
)
2020

cmd/ingester/app/flags.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212

1313
"github.com/spf13/viper"
1414

15+
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
1516
"github.com/jaegertracing/jaeger/pkg/kafka/auth"
1617
kafkaConsumer "github.com/jaegertracing/jaeger/pkg/kafka/consumer"
17-
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
1818
)
1919

2020
const (

cmd/ingester/app/flags_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"github.com/stretchr/testify/require"
1313
"go.opentelemetry.io/collector/config/configtls"
1414

15+
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
1516
"github.com/jaegertracing/jaeger/pkg/config"
1617
"github.com/jaegertracing/jaeger/pkg/kafka/auth"
1718
"github.com/jaegertracing/jaeger/pkg/testutils"
18-
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
1919
)
2020

2121
func TestOptionsWithFlags(t *testing.T) {

cmd/ingester/app/processor/span_processor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"io"
1010

1111
"github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer"
12-
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
12+
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
1313
"github.com/jaegertracing/jaeger/storage/spanstore"
1414
)
1515

cmd/ingester/app/processor/span_processor_test.go

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

1515
"github.com/jaegertracing/jaeger-idl/model/v1"
1616
cmocks "github.com/jaegertracing/jaeger/cmd/ingester/app/consumer/mocks"
17-
umocks "github.com/jaegertracing/jaeger/plugin/storage/kafka/mocks"
17+
umocks "github.com/jaegertracing/jaeger/internal/storage/v1/kafka/mocks"
1818
smocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
1919
)
2020

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/kafka/writer_test.go internal/storage/v1/kafka/writer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
"github.com/jaegertracing/jaeger-idl/model/v1"
1919
"github.com/jaegertracing/jaeger/internal/metricstest"
20-
"github.com/jaegertracing/jaeger/plugin/storage/kafka/mocks"
20+
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka/mocks"
2121
"github.com/jaegertracing/jaeger/storage/spanstore"
2222
)
2323

plugin/storage/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
2020
"github.com/jaegertracing/jaeger/internal/storage/v1/es"
2121
"github.com/jaegertracing/jaeger/internal/storage/v1/grpc"
22+
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
2223
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
2324
"github.com/jaegertracing/jaeger/pkg/metrics"
2425
"github.com/jaegertracing/jaeger/plugin"
25-
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
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/kafka"
2122
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
2223
"github.com/jaegertracing/jaeger/pkg/config"
2324
"github.com/jaegertracing/jaeger/pkg/kafka/consumer"
2425
"github.com/jaegertracing/jaeger/pkg/metrics"
2526
"github.com/jaegertracing/jaeger/pkg/testutils"
26-
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
2727
"github.com/jaegertracing/jaeger/storage/spanstore"
2828
"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
2929
)

0 commit comments

Comments
 (0)