Skip to content

Commit 29ac512

Browse files
authored
Move pkg/kafka to internal/kafka (#6908)
## Which problem is this PR solving? - part of #6869 ## Description of the changes - moved `pkg/kafka` to `internal/kafka` ## How was this change tested? - ## Checklist - [ ] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ] I have signed all commits - [ ] I have added unit tests for the new functionality - [ ] 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: danish9039 <[email protected]>
1 parent 6174c01 commit 29ac512

30 files changed

+19
-19
lines changed

cmd/ingester/app/builder/builder.go

Lines changed: 1 addition & 1 deletion
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+
kafkaConsumer "github.com/jaegertracing/jaeger/internal/storage/kafka/consumer"
1516
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
1617
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
17-
kafkaConsumer "github.com/jaegertracing/jaeger/pkg/kafka/consumer"
1818
"github.com/jaegertracing/jaeger/pkg/metrics"
1919
)
2020

cmd/ingester/app/consumer/consumer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"go.uber.org/zap"
1313

1414
"github.com/jaegertracing/jaeger/cmd/ingester/app/processor"
15-
"github.com/jaegertracing/jaeger/pkg/kafka/consumer"
15+
"github.com/jaegertracing/jaeger/internal/storage/kafka/consumer"
1616
"github.com/jaegertracing/jaeger/pkg/metrics"
1717
)
1818

cmd/ingester/app/consumer/consumer_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"github.com/jaegertracing/jaeger/cmd/ingester/app/processor"
2222
pmocks "github.com/jaegertracing/jaeger/cmd/ingester/app/processor/mocks"
2323
"github.com/jaegertracing/jaeger/internal/metricstest"
24-
"github.com/jaegertracing/jaeger/pkg/kafka/consumer"
25-
kmocks "github.com/jaegertracing/jaeger/pkg/kafka/consumer/mocks"
24+
"github.com/jaegertracing/jaeger/internal/storage/kafka/consumer"
25+
kmocks "github.com/jaegertracing/jaeger/internal/storage/kafka/consumer/mocks"
2626
"github.com/jaegertracing/jaeger/pkg/metrics"
2727
)
2828

cmd/ingester/app/consumer/processor_factory.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/jaegertracing/jaeger/cmd/ingester/app/consumer/offset"
1212
"github.com/jaegertracing/jaeger/cmd/ingester/app/processor"
1313
"github.com/jaegertracing/jaeger/cmd/ingester/app/processor/decorator"
14-
"github.com/jaegertracing/jaeger/pkg/kafka/consumer"
14+
"github.com/jaegertracing/jaeger/internal/storage/kafka/consumer"
1515
"github.com/jaegertracing/jaeger/pkg/metrics"
1616
)
1717

cmd/ingester/app/consumer/processor_factory_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
cmocks "github.com/jaegertracing/jaeger/cmd/ingester/app/consumer/mocks"
1616
"github.com/jaegertracing/jaeger/cmd/ingester/app/processor/mocks"
17-
kmocks "github.com/jaegertracing/jaeger/pkg/kafka/consumer/mocks"
17+
kmocks "github.com/jaegertracing/jaeger/internal/storage/kafka/consumer/mocks"
1818
"github.com/jaegertracing/jaeger/pkg/metrics"
1919
)
2020

cmd/ingester/app/flags.go

Lines changed: 2 additions & 2 deletions
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/kafka/auth"
16+
kafkaConsumer "github.com/jaegertracing/jaeger/internal/storage/kafka/consumer"
1517
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
16-
"github.com/jaegertracing/jaeger/pkg/kafka/auth"
17-
kafkaConsumer "github.com/jaegertracing/jaeger/pkg/kafka/consumer"
1818
)
1919

2020
const (

cmd/ingester/app/flags_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"go.opentelemetry.io/collector/config/configtls"
1414

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

2121
func TestOptionsWithFlags(t *testing.T) {

internal/storage/integration/kafka_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ import (
1919
"github.com/jaegertracing/jaeger/cmd/ingester/app"
2020
"github.com/jaegertracing/jaeger/cmd/ingester/app/builder"
2121
"github.com/jaegertracing/jaeger/internal/config"
22+
"github.com/jaegertracing/jaeger/internal/storage/kafka/consumer"
2223
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
2324
"github.com/jaegertracing/jaeger/internal/storage/v1/kafka"
2425
"github.com/jaegertracing/jaeger/internal/storage/v1/memory"
2526
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
2627
"github.com/jaegertracing/jaeger/internal/testutils"
27-
"github.com/jaegertracing/jaeger/pkg/kafka/consumer"
2828
"github.com/jaegertracing/jaeger/pkg/metrics"
2929
)
3030

File renamed without changes.

0 commit comments

Comments
 (0)