Skip to content

Commit 5f5efc5

Browse files
Merge pull request #397 from pace/grpc-drop-opentracing
grpc: Drop opentracing
2 parents 79b8e04 + f218b5a commit 5f5efc5

File tree

4 files changed

+0
-9
lines changed

4 files changed

+0
-9
lines changed

go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ require (
6565
github.com/modern-go/reflect2 v1.0.2 // indirect
6666
github.com/onsi/ginkgo v1.16.5 // indirect
6767
github.com/onsi/gomega v1.34.2 // indirect
68-
github.com/opentracing/opentracing-go v1.1.0 // indirect
6968
github.com/otiai10/copy v1.14.0 // indirect
7069
github.com/prometheus/client_model v0.5.0 // indirect
7170
github.com/prometheus/common v0.48.0 // indirect

go.sum

-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
260260
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
261261
github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
262262
github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
263-
github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
264263
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
265264
github.com/otiai10/copy v1.0.2/go.mod h1:c7RpqBkwMom4bYTSkLSym4VSJz/XtncWRAj/J4PEIMY=
266265
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=

grpc/client.go

-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717

1818
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"
1919
grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
20-
grpc_opentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing"
2120
)
2221

2322
// Deprecated: Use NewClient instead.
@@ -42,8 +41,6 @@ func NewClient(addr string) (*grpc.ClientConn, error) {
4241
conn, err := grpc.NewClient(addr,
4342
grpc.WithTransportCredentials(insecure.NewCredentials()),
4443
grpc.WithChainStreamInterceptor(
45-
grpc_opentracing.StreamClientInterceptor(),
46-
grpc_opentracing.StreamClientInterceptor(),
4744
grpc_retry.StreamClientInterceptor(opts...),
4845
func(ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn, method string, streamer grpc.Streamer, opts ...grpc.CallOption) (grpc.ClientStream, error) {
4946
start := time.Now()
@@ -57,7 +54,6 @@ func NewClient(addr string) (*grpc.ClientConn, error) {
5754
},
5855
),
5956
grpc.WithChainUnaryInterceptor(
60-
grpc_opentracing.UnaryClientInterceptor(),
6157
clientMetrics.UnaryClientInterceptor(),
6258
grpc_retry.UnaryClientInterceptor(opts...),
6359
func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {

grpc/server.go

-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/auth"
1414
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"
1515
grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags"
16-
grpc_opentracing "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing"
1716
"github.com/pace/bricks/http/middleware"
1817
"github.com/pace/bricks/http/security"
1918
"github.com/pace/bricks/locale"
@@ -74,7 +73,6 @@ func Server(ab AuthBackend) *grpc.Server {
7473
myServer := grpc.NewServer(
7574
grpc.StreamInterceptor(grpc_middleware.ChainStreamServer(
7675
grpc_ctxtags.StreamServerInterceptor(),
77-
grpc_opentracing.StreamServerInterceptor(),
7876
serverMetrics.StreamServerInterceptor(),
7977
func(srv interface{}, stream grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
8078
ctx := stream.Context()
@@ -110,7 +108,6 @@ func Server(ab AuthBackend) *grpc.Server {
110108
)),
111109
grpc.UnaryInterceptor(grpc_middleware.ChainUnaryServer(
112110
grpc_ctxtags.UnaryServerInterceptor(),
113-
grpc_opentracing.UnaryServerInterceptor(),
114111
serverMetrics.UnaryServerInterceptor(),
115112
func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp interface{}, err error) {
116113
ctx, md := prepareContext(ctx)

0 commit comments

Comments
 (0)