Skip to content

Commit

Permalink
[refactor] Move kafka implementation to internal package (jaegertraci…
Browse files Browse the repository at this point in the history
…ng#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 <mahadzaryab1@gmail.com>
  • Loading branch information
mahadzaryab1 authored Feb 2, 2025
1 parent 987f795 commit 3dfdf8e
Show file tree
Hide file tree
Showing 20 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .mockery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ packages:
github.com/jaegertracing/jaeger/internal/storage/v1/grpc/shared:
interfaces:
PluginCapabilities:
github.com/jaegertracing/jaeger/plugin/storage/kafka:
github.com/jaegertracing/jaeger/internal/storage/v1/kafka:
interfaces:
Marshaller:
Unmarshaller:
Expand Down
2 changes: 1 addition & 1 deletion cmd/ingester/app/builder/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/jaegertracing/jaeger/cmd/ingester/app"
"github.com/jaegertracing/jaeger/cmd/ingester/app/consumer"
"github.com/jaegertracing/jaeger/cmd/ingester/app/processor"
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
kafkaConsumer "github.com/jaegertracing/jaeger/pkg/kafka/consumer"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
"github.com/jaegertracing/jaeger/storage/spanstore"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/ingester/app/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (

"github.com/spf13/viper"

"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
"github.com/jaegertracing/jaeger/pkg/kafka/auth"
kafkaConsumer "github.com/jaegertracing/jaeger/pkg/kafka/consumer"
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/ingester/app/flags_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/config/configtls"

"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
"github.com/jaegertracing/jaeger/pkg/config"
"github.com/jaegertracing/jaeger/pkg/kafka/auth"
"github.com/jaegertracing/jaeger/pkg/testutils"
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
)

func TestOptionsWithFlags(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/ingester/app/processor/span_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"io"

"github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer"
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
"github.com/jaegertracing/jaeger/storage/spanstore"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/ingester/app/processor/span_processor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"github.com/jaegertracing/jaeger-idl/model/v1"
cmocks "github.com/jaegertracing/jaeger/cmd/ingester/app/consumer/mocks"
umocks "github.com/jaegertracing/jaeger/plugin/storage/kafka/mocks"
umocks "github.com/jaegertracing/jaeger/internal/storage/v1/kafka/mocks"
smocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
)

Expand Down
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.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/internal/metricstest"
"github.com/jaegertracing/jaeger/plugin/storage/kafka/mocks"
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka/mocks"
"github.com/jaegertracing/jaeger/storage/spanstore"
)

Expand Down
2 changes: 1 addition & 1 deletion plugin/storage/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (
"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
"github.com/jaegertracing/jaeger/internal/storage/v1/es"
"github.com/jaegertracing/jaeger/internal/storage/v1/grpc"
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/plugin"
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
"github.com/jaegertracing/jaeger/storage"
"github.com/jaegertracing/jaeger/storage/dependencystore"
"github.com/jaegertracing/jaeger/storage/spanstore"
Expand Down
2 changes: 1 addition & 1 deletion plugin/storage/integration/kafka_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ import (
"github.com/jaegertracing/jaeger-idl/model/v1"
"github.com/jaegertracing/jaeger/cmd/ingester/app"
"github.com/jaegertracing/jaeger/cmd/ingester/app/builder"
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
"github.com/jaegertracing/jaeger/pkg/config"
"github.com/jaegertracing/jaeger/pkg/kafka/consumer"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/pkg/testutils"
"github.com/jaegertracing/jaeger/plugin/storage/kafka"
"github.com/jaegertracing/jaeger/storage/spanstore"
"github.com/jaegertracing/jaeger/storage_v2/v1adapter"
)
Expand Down

0 comments on commit 3dfdf8e

Please sign in to comment.