Skip to content

Commit 89ddf1e

Browse files
sAchin-680sAchin-680
committed
Refactor package structure by moving bearertoken and httpfs to internal directory and adding new context and test files
Signed-off-by: sAchin-680 <[email protected]>
1 parent cc25af9 commit 89ddf1e

File tree

30 files changed

+14
-14
lines changed

30 files changed

+14
-14
lines changed

‎pkg/queue/bounded_queue.go ‎cmd/collector/app/queue/bounded_queue.go

File renamed without changes.

‎pkg/queue/bounded_queue_test.go ‎cmd/collector/app/queue/bounded_queue_test.go

File renamed without changes.

‎cmd/collector/app/server/http.go

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

1515
"github.com/jaegertracing/jaeger/cmd/collector/app/handler"
1616
"github.com/jaegertracing/jaeger/internal/healthcheck"
17+
"github.com/jaegertracing/jaeger/internal/httpmetrics"
1718
"github.com/jaegertracing/jaeger/internal/metrics"
1819
"github.com/jaegertracing/jaeger/internal/recoveryhandler"
1920
samplinghttp "github.com/jaegertracing/jaeger/internal/sampling/http"
2021
"github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy"
2122
"github.com/jaegertracing/jaeger/internal/telemetry"
22-
"github.com/jaegertracing/jaeger/pkg/httpmetrics"
2323
)
2424

2525
// HTTPServerParams to construct a new Jaeger Collector HTTP Server

‎cmd/collector/app/span_processor.go

+1-1
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/grpc_handler_test.go

+1-1
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/internal/gogocodec" // force gogo codec registration
2727
)
2828

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

‎cmd/query/app/server.go

+1-1
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

+1-1
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

+1-1
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

+1-1
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

‎cmd/remote-storage/app/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ import (
1717
"google.golang.org/grpc/health"
1818
"google.golang.org/grpc/reflection"
1919

20+
"github.com/jaegertracing/jaeger/internal/bearertoken"
2021
"github.com/jaegertracing/jaeger/internal/storage/v1/api/dependencystore"
2122
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
2223
"github.com/jaegertracing/jaeger/internal/storage/v1/grpc/shared"
2324
"github.com/jaegertracing/jaeger/internal/telemetry"
2425
"github.com/jaegertracing/jaeger/internal/tenancy"
25-
"github.com/jaegertracing/jaeger/pkg/bearertoken"
2626
)
2727

2828
// Server runs a gRPC server

‎examples/hotrod/services/frontend/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/jaegertracing/jaeger/examples/hotrod/pkg/httperr"
2121
"github.com/jaegertracing/jaeger/examples/hotrod/pkg/log"
2222
"github.com/jaegertracing/jaeger/examples/hotrod/pkg/tracing"
23-
"github.com/jaegertracing/jaeger/pkg/httpfs"
23+
"github.com/jaegertracing/jaeger/internal/httpfs"
2424
)
2525

2626
//go:embed web_assets/*

‎pkg/bearertoken/context.go ‎internal/bearertoken/context.go

File renamed without changes.

‎pkg/bearertoken/context_test.go ‎internal/bearertoken/context_test.go

File renamed without changes.

‎pkg/bearertoken/grpc.go ‎internal/bearertoken/grpc.go

File renamed without changes.

‎pkg/bearertoken/grpc_test.go ‎internal/bearertoken/grpc_test.go

File renamed without changes.

‎pkg/bearertoken/http.go ‎internal/bearertoken/http.go

File renamed without changes.

‎pkg/bearertoken/http_test.go ‎internal/bearertoken/http_test.go

File renamed without changes.

‎pkg/bearertoken/package_test.go ‎internal/bearertoken/package_test.go

File renamed without changes.

‎pkg/bearertoken/transport.go ‎internal/bearertoken/transport.go

File renamed without changes.

‎pkg/bearertoken/transport_test.go ‎internal/bearertoken/transport_test.go

File renamed without changes.

‎pkg/httpfs/prefixed.go ‎internal/httpfs/prefixed.go

File renamed without changes.

‎pkg/httpfs/prefixed_test.go ‎internal/httpfs/prefixed_test.go

File renamed without changes.

‎pkg/httpfs/test_assets/somefile.txt ‎internal/httpfs/test_assets/somefile.txt

File renamed without changes.

‎pkg/httpmetrics/metrics.go ‎internal/httpmetrics/metrics.go

File renamed without changes.

‎pkg/httpmetrics/metrics_test.go ‎internal/httpmetrics/metrics_test.go

File renamed without changes.

‎internal/storage/metricstore/prometheus/metricstore/reader.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"go.opentelemetry.io/otel/trace"
2323
"go.uber.org/zap"
2424

25+
"github.com/jaegertracing/jaeger/internal/bearertoken"
2526
config "github.com/jaegertracing/jaeger/internal/config/promcfg"
2627
"github.com/jaegertracing/jaeger/internal/storage/metricstore/prometheus/metricstore/dbmodel"
2728
"github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore"
28-
"github.com/jaegertracing/jaeger/pkg/bearertoken"
2929
"github.com/jaegertracing/jaeger/pkg/otelsemconv"
3030
"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
3131
)

‎internal/storage/metricstore/prometheus/metricstore/reader_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
"go.opentelemetry.io/otel/trace"
2727
"go.uber.org/zap"
2828

29+
"github.com/jaegertracing/jaeger/internal/bearertoken"
2930
config "github.com/jaegertracing/jaeger/internal/config/promcfg"
3031
"github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore"
3132
"github.com/jaegertracing/jaeger/internal/testutils"
32-
"github.com/jaegertracing/jaeger/pkg/bearertoken"
3333
"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
3434
)
3535

‎internal/storage/v1/elasticsearch/options.go

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

1313
"github.com/spf13/viper"
1414

15+
"github.com/jaegertracing/jaeger/internal/bearertoken"
1516
"github.com/jaegertracing/jaeger/internal/config/tlscfg"
16-
"github.com/jaegertracing/jaeger/pkg/bearertoken"
1717
"github.com/jaegertracing/jaeger/pkg/es/config"
1818
)
1919

‎internal/storage/v1/grpc/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"go.uber.org/zap"
2222
"google.golang.org/grpc"
2323

24+
"github.com/jaegertracing/jaeger/internal/bearertoken"
2425
"github.com/jaegertracing/jaeger/internal/metrics"
2526
"github.com/jaegertracing/jaeger/internal/storage/v1"
2627
"github.com/jaegertracing/jaeger/internal/storage/v1/api/dependencystore"
@@ -29,7 +30,6 @@ import (
2930
"github.com/jaegertracing/jaeger/internal/storage/v1/grpc/shared"
3031
"github.com/jaegertracing/jaeger/internal/telemetry"
3132
"github.com/jaegertracing/jaeger/internal/tenancy"
32-
"github.com/jaegertracing/jaeger/pkg/bearertoken"
3333
)
3434

3535
var ( // interface comformance checks

‎pkg/es/config/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
"go.uber.org/zap/zapcore"
2727
"go.uber.org/zap/zapgrpc"
2828

29+
"github.com/jaegertracing/jaeger/internal/bearertoken"
2930
"github.com/jaegertracing/jaeger/internal/metrics"
3031
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore/spanstoremetrics"
31-
"github.com/jaegertracing/jaeger/pkg/bearertoken"
3232
"github.com/jaegertracing/jaeger/pkg/es"
3333
eswrapper "github.com/jaegertracing/jaeger/pkg/es/wrapper"
3434
)

0 commit comments

Comments
 (0)