From f06b204c74976660004392462bed1a8c6b8171ca Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Mon, 20 Dec 2021 12:28:27 -0800 Subject: [PATCH] Bump google.golang.org/grpc from 1.42.0 to 1.43.0 (#1535) --- .../google.golang.org/grpc/otelgrpc/benchmark_test.go | 3 ++- .../grpc/otelgrpc/example/client/main.go | 3 ++- .../google.golang.org/grpc/otelgrpc/example/go.mod | 2 +- .../google.golang.org/grpc/otelgrpc/example/go.sum | 4 ++-- instrumentation/google.golang.org/grpc/otelgrpc/go.mod | 2 +- instrumentation/google.golang.org/grpc/otelgrpc/go.sum | 4 ++-- .../google.golang.org/grpc/otelgrpc/test/go.mod | 2 +- .../google.golang.org/grpc/otelgrpc/test/go.sum | 4 ++-- .../google.golang.org/grpc/otelgrpc/test/grpc_test.go | 3 ++- .../grpc/otelgrpc/test/interceptor_test.go | 9 +++++---- propagators/opencensus/examples/go.mod | 2 +- propagators/opencensus/examples/go.sum | 4 ++-- .../opencensus/examples/opencensus_client/client.go | 3 ++- 13 files changed, 25 insertions(+), 20 deletions(-) diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/benchmark_test.go b/instrumentation/google.golang.org/grpc/otelgrpc/benchmark_test.go index e3b4913fa58..c24fc37aee5 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/benchmark_test.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/benchmark_test.go @@ -20,6 +20,7 @@ import ( "testing" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/interop" pb "google.golang.org/grpc/interop/grpc_testing" "google.golang.org/grpc/test/bufconn" @@ -52,7 +53,7 @@ func benchmark(b *testing.B, cOpt []grpc.DialOption, sOpt []grpc.ServerOption) { "bufnet", append([]grpc.DialOption{ grpc.WithContextDialer(dial), - grpc.WithInsecure(), + grpc.WithTransportCredentials(insecure.NewCredentials()), }, cOpt...)..., ) if err != nil { diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/example/client/main.go b/instrumentation/google.golang.org/grpc/otelgrpc/example/client/main.go index e01632cd883..b32bc329f15 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/example/client/main.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/example/client/main.go @@ -26,6 +26,7 @@ import ( "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/metadata" ) @@ -38,7 +39,7 @@ func main() { }() var conn *grpc.ClientConn - conn, err := grpc.Dial(":7777", grpc.WithInsecure(), + conn, err := grpc.Dial(":7777", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()), grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()), ) diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod index 79258692a78..183ef61c19f 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod +++ b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod @@ -14,5 +14,5 @@ require ( go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.3.0 go.opentelemetry.io/otel/sdk v1.3.0 golang.org/x/net v0.0.0-20200822124328-c89045814202 - google.golang.org/grpc v1.42.0 + google.golang.org/grpc v1.43.0 ) diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.sum b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.sum index 163eb33ff53..1d6c07a1f02 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.sum +++ b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.sum @@ -119,8 +119,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/go.mod b/instrumentation/google.golang.org/grpc/otelgrpc/go.mod index 8291f9038fe..5a884307438 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/go.mod +++ b/instrumentation/google.golang.org/grpc/otelgrpc/go.mod @@ -8,5 +8,5 @@ require ( github.com/golang/protobuf v1.5.2 go.opentelemetry.io/otel v1.3.0 go.opentelemetry.io/otel/trace v1.3.0 - google.golang.org/grpc v1.42.0 + google.golang.org/grpc v1.43.0 ) diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/go.sum b/instrumentation/google.golang.org/grpc/otelgrpc/go.sum index ef1eba6352f..2366e83ac22 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/go.sum +++ b/instrumentation/google.golang.org/grpc/otelgrpc/go.sum @@ -114,8 +114,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod b/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod index c8abb48723f..199b71e7045 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod +++ b/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod @@ -9,7 +9,7 @@ require ( go.opentelemetry.io/otel v1.3.0 go.opentelemetry.io/otel/sdk v1.3.0 go.uber.org/goleak v1.1.12 - google.golang.org/grpc v1.42.0 + google.golang.org/grpc v1.43.0 ) replace ( diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/test/go.sum b/instrumentation/google.golang.org/grpc/otelgrpc/test/go.sum index 31a70567035..bbc4f596156 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/test/go.sum +++ b/instrumentation/google.golang.org/grpc/otelgrpc/test/go.sum @@ -143,8 +143,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/test/grpc_test.go b/instrumentation/google.golang.org/grpc/otelgrpc/test/grpc_test.go index b5102b6f8fe..d6eb5fa9554 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/test/grpc_test.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/test/grpc_test.go @@ -23,6 +23,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" "google.golang.org/grpc/codes" + "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/interop" pb "google.golang.org/grpc/interop/grpc_testing" "google.golang.org/grpc/test/bufconn" @@ -56,7 +57,7 @@ func doCalls(cOpt []grpc.DialOption, sOpt []grpc.ServerOption) error { "bufnet", append([]grpc.DialOption{ grpc.WithContextDialer(dial), - grpc.WithInsecure(), + grpc.WithTransportCredentials(insecure.NewCredentials()), }, cOpt...)..., ) if err != nil { diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/test/interceptor_test.go b/instrumentation/google.golang.org/grpc/otelgrpc/test/interceptor_test.go index a884c36af42..ebd65da0847 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/test/interceptor_test.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/test/interceptor_test.go @@ -37,6 +37,7 @@ import ( "go.uber.org/goleak" "google.golang.org/grpc" grpc_codes "google.golang.org/grpc/codes" + "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" ) @@ -132,7 +133,7 @@ func (mm *mockProtoMessage) ProtoMessage() { } func TestUnaryClientInterceptor(t *testing.T) { - clientConn, err := grpc.Dial("fake:connection", grpc.WithInsecure()) + clientConn, err := grpc.Dial("fake:connection", grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { t.Fatalf("failed to create client connection: %v", err) } @@ -362,7 +363,7 @@ func newMockClientStream(opts clientStreamOpts) *mockClientStream { func createInterceptedStreamClient(t *testing.T, method string, opts clientStreamOpts) (grpc.ClientStream, *tracetest.SpanRecorder) { mockStream := newMockClientStream(opts) - clientConn, err := grpc.Dial("fake:connection", grpc.WithInsecure()) + clientConn, err := grpc.Dial("fake:connection", grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { t.Fatalf("failed to create client connection: %v", err) } @@ -527,7 +528,7 @@ func TestStreamClientInterceptorOnUnidirectionalClientServerStream(t *testing.T) // There should be no goleaks func TestStreamClientInterceptorCancelContext(t *testing.T) { defer goleak.VerifyNone(t) - clientConn, err := grpc.Dial("fake:connection", grpc.WithInsecure()) + clientConn, err := grpc.Dial("fake:connection", grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { t.Fatalf("failed to create client connection: %v", err) } @@ -580,7 +581,7 @@ func TestStreamClientInterceptorCancelContext(t *testing.T) { func TestStreamClientInterceptorWithError(t *testing.T) { defer goleak.VerifyNone(t) - clientConn, err := grpc.Dial("fake:connection", grpc.WithInsecure()) + clientConn, err := grpc.Dial("fake:connection", grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { t.Fatalf("failed to create client connection: %v", err) } diff --git a/propagators/opencensus/examples/go.mod b/propagators/opencensus/examples/go.mod index 0b6f8204d4c..47d8528801d 100644 --- a/propagators/opencensus/examples/go.mod +++ b/propagators/opencensus/examples/go.mod @@ -9,7 +9,7 @@ require ( go.opentelemetry.io/otel v1.3.0 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.3.0 go.opentelemetry.io/otel/sdk v1.3.0 - google.golang.org/grpc v1.42.0 + google.golang.org/grpc v1.43.0 ) replace ( diff --git a/propagators/opencensus/examples/go.sum b/propagators/opencensus/examples/go.sum index 712f6934338..7a6afa375fa 100644 --- a/propagators/opencensus/examples/go.sum +++ b/propagators/opencensus/examples/go.sum @@ -144,8 +144,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/propagators/opencensus/examples/opencensus_client/client.go b/propagators/opencensus/examples/opencensus_client/client.go index c12e3364372..f33a796107c 100644 --- a/propagators/opencensus/examples/opencensus_client/client.go +++ b/propagators/opencensus/examples/opencensus_client/client.go @@ -25,6 +25,7 @@ import ( "go.opencensus.io/plugin/ocgrpc" "go.opencensus.io/trace" "google.golang.org/grpc" + "google.golang.org/grpc/credentials/insecure" ) const ( @@ -39,7 +40,7 @@ func main() { // Set up a connection to the server with the OpenCensus // stats handler to enable tracing. - conn, err := grpc.Dial(address, grpc.WithStatsHandler(&ocgrpc.ClientHandler{}), grpc.WithInsecure()) + conn, err := grpc.Dial(address, grpc.WithStatsHandler(&ocgrpc.ClientHandler{}), grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { log.Fatalf("Cannot connect: %v", err) }