From 70365d6260eae315ca4308fe2f77815e37226abd Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Wed, 15 Nov 2023 20:04:37 +0100 Subject: [PATCH] Downgrade otelgrpc to work around https://github.com/open-telemetry/opentelemetry-go-contrib/issues/4547 (#1668) --- go.mod | 2 +- go.sum | 4 ++-- internal/controlplane/server.go | 11 +++-------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index aafa7d39a6..392cb70f88 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/sqlc-dev/pqtype v0.3.0 github.com/stretchr/testify v1.8.4 github.com/xeipuuv/gojsonschema v1.2.0 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 go.opentelemetry.io/otel v1.20.0 go.opentelemetry.io/otel/exporters/prometheus v0.43.0 diff --git a/go.sum b/go.sum index d0fe26aa93..8e7dd7215a 100644 --- a/go.sum +++ b/go.sum @@ -1086,8 +1086,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 h1:RsQi0qJ2imFfCvZabqzM9cNXBG8k6gXMv1A0cXRmH6A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0/go.mod h1:vsh3ySueQCiKPxFLvjWC4Z135gIa34TQ/NSqkDTZYUM= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 h1:1eHu3/pUSWaOgltNK3WJFaywKsTIr/PwvHyDmi0lQA0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0/go.mod h1:HyABWq60Uy1kjJSa2BVOxUVao8Cdick5AWSKPutqy6U= go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc= diff --git a/internal/controlplane/server.go b/internal/controlplane/server.go index d8b51c87d9..7c1915c5d0 100644 --- a/internal/controlplane/server.go +++ b/internal/controlplane/server.go @@ -199,19 +199,14 @@ func (s *Server) StartGRPCServer(ctx context.Context) error { logger.Interceptor(), AuthUnaryInterceptor, } - - options := []grpc.ServerOption{ - grpc.Creds(insecure.NewCredentials()), - grpc.ChainUnaryInterceptor(interceptors...), - } - otelGRPCOpts := s.getOTELGRPCInterceptorOpts() if len(otelGRPCOpts) > 0 { - options = append(options, grpc.StatsHandler(otelgrpc.NewServerHandler())) + interceptors = append(interceptors, otelgrpc.UnaryServerInterceptor(otelGRPCOpts...)) } s.grpcServer = grpc.NewServer( - options..., + grpc.Creds(insecure.NewCredentials()), + grpc.ChainUnaryInterceptor(interceptors...), ) // register the services (declared within register_handlers.go)