Skip to content

Commit 363f997

Browse files
authored
Move pkg/{gogocodec,httpfs,bearertoken,boundqueue} to internal (#6896)
## Which problem is this PR solving? - **Resolves** #6869 ## Description of the changes - Moved `pkg/gogocodec` to `internal/gogocodec` - Updated all imports referencing `pkg/gogocodec` to `internal/gogocodec` ## How was this change tested? - Ran all tests to confirm that no other parts of the project were affected: ```bash make test ``` ## 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: sAchin-680 <[email protected]>
1 parent cc96a93 commit 363f997

File tree

34 files changed

+18
-18
lines changed

34 files changed

+18
-18
lines changed
File renamed without changes.

cmd/collector/app/span_processor.go

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

1919
"github.com/jaegertracing/jaeger-idl/model/v1"
2020
"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
21+
"github.com/jaegertracing/jaeger/cmd/collector/app/queue"
2122
"github.com/jaegertracing/jaeger/cmd/collector/app/sanitizer"
2223
sanitizerv2 "github.com/jaegertracing/jaeger/cmd/jaeger/sanitizer"
2324
"github.com/jaegertracing/jaeger/internal/jptrace"
2425
"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
2526
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
2627
"github.com/jaegertracing/jaeger/internal/telemetry"
2728
"github.com/jaegertracing/jaeger/internal/tenancy"
28-
"github.com/jaegertracing/jaeger/pkg/queue"
2929
)
3030

3131
const (

cmd/query/app/apiv3/gateway_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"go.opentelemetry.io/collector/pdata/pcommon"
2323
"go.opentelemetry.io/collector/pdata/ptrace"
2424

25+
_ "github.com/jaegertracing/jaeger/internal/gogocodec" // force gogo codec registration
2526
"github.com/jaegertracing/jaeger/internal/proto/api_v3"
2627
"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
2728
tracestoremocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore/mocks"
28-
_ "github.com/jaegertracing/jaeger/pkg/gogocodec" // force gogo codec registration
2929
)
3030

3131
// Utility functions used from http_gateway_test.go.

cmd/query/app/apiv3/grpc_handler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import (
1818
"google.golang.org/grpc/credentials/insecure"
1919

2020
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
21+
_ "github.com/jaegertracing/jaeger/internal/gogocodec" // force gogo codec registration
2122
"github.com/jaegertracing/jaeger/internal/jptrace"
2223
"github.com/jaegertracing/jaeger/internal/proto/api_v3"
2324
dependencyStoreMocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore/mocks"
2425
"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
2526
tracestoremocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore/mocks"
26-
_ "github.com/jaegertracing/jaeger/pkg/gogocodec" // force gogo codec registration
2727
)
2828

2929
var matchContext = mock.AnythingOfType("*context.valueCtx")

cmd/query/app/grpc_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
"github.com/jaegertracing/jaeger-idl/model/v1"
1616
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
1717
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
18+
_ "github.com/jaegertracing/jaeger/internal/gogocodec" // force gogo codec registration
1819
"github.com/jaegertracing/jaeger/internal/jtracer"
1920
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
20-
_ "github.com/jaegertracing/jaeger/pkg/gogocodec" // force gogo codec registration
2121
)
2222

2323
const (

cmd/query/app/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import (
2929
"github.com/jaegertracing/jaeger/cmd/query/app/apiv3"
3030
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
3131
v2querysvc "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
32+
"github.com/jaegertracing/jaeger/internal/bearertoken"
3233
"github.com/jaegertracing/jaeger/internal/proto/api_v3"
3334
"github.com/jaegertracing/jaeger/internal/recoveryhandler"
3435
"github.com/jaegertracing/jaeger/internal/telemetry"
3536
"github.com/jaegertracing/jaeger/internal/tenancy"
36-
"github.com/jaegertracing/jaeger/pkg/bearertoken"
3737
"github.com/jaegertracing/jaeger/pkg/netutils"
3838
)
3939

cmd/query/app/token_propagation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import (
2222
"github.com/jaegertracing/jaeger/cmd/internal/flags"
2323
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
2424
v2querysvc "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
25+
"github.com/jaegertracing/jaeger/internal/bearertoken"
2526
"github.com/jaegertracing/jaeger/internal/config"
2627
es "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch"
2728
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
2829
"github.com/jaegertracing/jaeger/internal/telemetry"
2930
"github.com/jaegertracing/jaeger/internal/tenancy"
30-
"github.com/jaegertracing/jaeger/pkg/bearertoken"
3131
"github.com/jaegertracing/jaeger/ports"
3232
)
3333

cmd/query/app/ui/assets.go

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

1212
"github.com/jaegertracing/jaeger/internal/gzipfs"
13-
"github.com/jaegertracing/jaeger/pkg/httpfs"
13+
"github.com/jaegertracing/jaeger/internal/httpfs"
1414
)
1515

1616
//go:embed actual/*

cmd/query/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"github.com/jaegertracing/jaeger/cmd/query/app"
2525
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
2626
querysvcv2 "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
27+
"github.com/jaegertracing/jaeger/internal/bearertoken"
2728
"github.com/jaegertracing/jaeger/internal/config"
2829
"github.com/jaegertracing/jaeger/internal/jtracer"
2930
"github.com/jaegertracing/jaeger/internal/metrics"
@@ -34,7 +35,6 @@ import (
3435
"github.com/jaegertracing/jaeger/internal/telemetry"
3536
"github.com/jaegertracing/jaeger/internal/tenancy"
3637
"github.com/jaegertracing/jaeger/internal/version"
37-
"github.com/jaegertracing/jaeger/pkg/bearertoken"
3838
"github.com/jaegertracing/jaeger/ports"
3939
)
4040

0 commit comments

Comments
 (0)