Skip to content

Commit a67cfc1

Browse files
danish9039amol-verma-allen
authored andcommitted
Move pkg/jtracer to internal/jtracer (jaegertracing#6907)
## Which problem is this PR solving? - part of jaegertracing#6869 ## Description of the changes - moved `pkg/jtracer` to` internal/jtracer` ## 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]> Signed-off-by: hippie-danish <[email protected]> Signed-off-by: amol-verma-allen <[email protected]>
1 parent 09afb8d commit a67cfc1

File tree

12 files changed

+10
-10
lines changed

12 files changed

+10
-10
lines changed

cmd/all-in-one/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
3131
v2querysvc "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
3232
"github.com/jaegertracing/jaeger/internal/config"
33+
"github.com/jaegertracing/jaeger/internal/jtracer"
3334
ss "github.com/jaegertracing/jaeger/internal/sampling/samplingstrategy/metafactory"
3435
"github.com/jaegertracing/jaeger/internal/storage/metricstore"
3536
storage "github.com/jaegertracing/jaeger/internal/storage/v1/factory"
@@ -38,7 +39,6 @@ import (
3839
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
3940
"github.com/jaegertracing/jaeger/internal/telemetry"
4041
"github.com/jaegertracing/jaeger/internal/tenancy"
41-
"github.com/jaegertracing/jaeger/pkg/jtracer"
4242
"github.com/jaegertracing/jaeger/pkg/metrics"
4343
"github.com/jaegertracing/jaeger/pkg/version"
4444
"github.com/jaegertracing/jaeger/ports"

cmd/jaeger/internal/extension/jaegerquery/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
queryApp "github.com/jaegertracing/jaeger/cmd/query/app"
1818
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
1919
v2querysvc "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
20+
"github.com/jaegertracing/jaeger/internal/jtracer"
2021
"github.com/jaegertracing/jaeger/internal/storage/metricstore/disabled"
2122
"github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore"
2223
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
@@ -25,7 +26,6 @@ import (
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/jtracer"
2929
"github.com/jaegertracing/jaeger/pkg/metrics"
3030
)
3131

cmd/query/app/apiv3/http_gateway_test.go

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

2424
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
25+
"github.com/jaegertracing/jaeger/internal/jtracer"
2526
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
2627
dependencyStoreMocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore/mocks"
2728
"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
2829
tracestoremocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore/mocks"
2930
"github.com/jaegertracing/jaeger/internal/testutils"
30-
"github.com/jaegertracing/jaeger/pkg/jtracer"
3131
)
3232

3333
func setupHTTPGatewayNoServer(

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/jtracer"
1819
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
1920
_ "github.com/jaegertracing/jaeger/pkg/gogocodec" // force gogo codec registration
20-
"github.com/jaegertracing/jaeger/pkg/jtracer"
2121
)
2222

2323
const (

cmd/query/app/grpc_handler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ import (
2424
"github.com/jaegertracing/jaeger-idl/model/v1"
2525
"github.com/jaegertracing/jaeger-idl/proto-gen/api_v2"
2626
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
27+
"github.com/jaegertracing/jaeger/internal/jtracer"
2728
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
2829
spanstoremocks "github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore/mocks"
2930
"github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore"
3031
depsmocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore/mocks"
3132
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
3233
"github.com/jaegertracing/jaeger/internal/tenancy"
33-
"github.com/jaegertracing/jaeger/pkg/jtracer"
3434
)
3535

3636
var (

cmd/query/app/http_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import (
2424
"github.com/jaegertracing/jaeger-idl/model/v1"
2525
"github.com/jaegertracing/jaeger/cmd/query/app/qualitymetrics"
2626
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
27+
"github.com/jaegertracing/jaeger/internal/jtracer"
2728
"github.com/jaegertracing/jaeger/internal/storage/metricstore/disabled"
2829
"github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore"
2930
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
3031
uiconv "github.com/jaegertracing/jaeger/model/converter/json"
3132
ui "github.com/jaegertracing/jaeger/model/json"
32-
"github.com/jaegertracing/jaeger/pkg/jtracer"
3333
"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
3434
)
3535

cmd/query/app/http_handler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"github.com/jaegertracing/jaeger-idl/model/v1"
3434
"github.com/jaegertracing/jaeger/cmd/query/app/qualitymetrics"
3535
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
36+
"github.com/jaegertracing/jaeger/internal/jtracer"
3637
"github.com/jaegertracing/jaeger/internal/storage/metricstore/disabled"
3738
metricsmocks "github.com/jaegertracing/jaeger/internal/storage/v1/api/metricstore/mocks"
3839
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
@@ -41,7 +42,6 @@ import (
4142
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
4243
"github.com/jaegertracing/jaeger/internal/tenancy"
4344
ui "github.com/jaegertracing/jaeger/model/json"
44-
"github.com/jaegertracing/jaeger/pkg/jtracer"
4545
"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
4646
)
4747

cmd/query/app/server_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ import (
3636
v2querysvc "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
3737
"github.com/jaegertracing/jaeger/internal/grpctest"
3838
"github.com/jaegertracing/jaeger/internal/healthcheck"
39+
"github.com/jaegertracing/jaeger/internal/jtracer"
3940
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
4041
spanstoremocks "github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore/mocks"
4142
depsmocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore/mocks"
4243
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
4344
"github.com/jaegertracing/jaeger/internal/telemetry"
4445
"github.com/jaegertracing/jaeger/internal/tenancy"
45-
"github.com/jaegertracing/jaeger/pkg/jtracer"
4646
"github.com/jaegertracing/jaeger/ports"
4747
)
4848

cmd/query/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ import (
2525
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
2626
querysvcv2 "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/v2/querysvc"
2727
"github.com/jaegertracing/jaeger/internal/config"
28+
"github.com/jaegertracing/jaeger/internal/jtracer"
2829
metricsPlugin "github.com/jaegertracing/jaeger/internal/storage/metricstore"
2930
storage "github.com/jaegertracing/jaeger/internal/storage/v1/factory"
3031
"github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore"
3132
"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
3233
"github.com/jaegertracing/jaeger/internal/telemetry"
3334
"github.com/jaegertracing/jaeger/internal/tenancy"
3435
"github.com/jaegertracing/jaeger/pkg/bearertoken"
35-
"github.com/jaegertracing/jaeger/pkg/jtracer"
3636
"github.com/jaegertracing/jaeger/pkg/metrics"
3737
"github.com/jaegertracing/jaeger/pkg/version"
3838
"github.com/jaegertracing/jaeger/ports"
File renamed without changes.

0 commit comments

Comments
 (0)