Skip to content

Commit c406984

Browse files
committed
Fix import path for gogo codec and remove unused telemetry import.
Signed-off-by: sAchin-680 <[email protected]>
1 parent 29ac512 commit c406984

File tree

8 files changed

+6
-6
lines changed

8 files changed

+6
-6
lines changed

cmd/query/app/apiv3/gateway_test.go

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
dependencyStoreMocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore/mocks"
2424
"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
2525
tracestoremocks "github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore/mocks"
26-
_ "github.com/jaegertracing/jaeger/pkg/gogocodec" // force gogo codec registration
26+
_ "github.com/jaegertracing/jaeger/internal/gogocodec" // force gogo codec registration
2727
)
2828

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

cmd/query/app/grpc_handler.go

+1-1
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 (
File renamed without changes.
File renamed without changes.

internal/jptrace/traces.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/gogo/protobuf/proto"
99
"go.opentelemetry.io/collector/pdata/ptrace"
1010

11-
"github.com/jaegertracing/jaeger/pkg/gogocodec"
11+
"github.com/jaegertracing/jaeger/internal/gogocodec"
1212
)
1313

1414
// TracesData is an alias to ptrace.Traces that supports Gogo marshaling.

internal/storage/v1/grpc/shared/grpc_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
"google.golang.org/grpc/status"
1616

1717
"github.com/jaegertracing/jaeger-idl/model/v1"
18+
_ "github.com/jaegertracing/jaeger/internal/gogocodec" // force gogo codec registration
1819
"github.com/jaegertracing/jaeger/internal/storage/v1/api/dependencystore"
1920
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
20-
_ "github.com/jaegertracing/jaeger/pkg/gogocodec" // force gogo codec registration
2121
"github.com/jaegertracing/jaeger/proto-gen/storage_v1"
2222
)
2323

internal/storage/v1/grpc/shared/grpc_handler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"google.golang.org/grpc/status"
1717

1818
"github.com/jaegertracing/jaeger-idl/model/v1"
19+
_ "github.com/jaegertracing/jaeger/internal/gogocodec" // force gogo codec registration
1920
"github.com/jaegertracing/jaeger/internal/storage/v1/api/dependencystore"
2021
"github.com/jaegertracing/jaeger/internal/storage/v1/api/spanstore"
21-
_ "github.com/jaegertracing/jaeger/pkg/gogocodec" // force gogo codec registration
2222
"github.com/jaegertracing/jaeger/proto-gen/storage_v1"
2323
)
2424

0 commit comments

Comments
 (0)