From 3d72386abb690aef5f198f692b9c64b3dc280b49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 May 2021 07:22:52 +0000
Subject: [PATCH] go: bump google.golang.org/grpc from 1.37.0 to 1.38.0

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go)
from 1.37.0 to 1.38.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.37.0...v1.38.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .changelog/3840.internal.md | 1 -
 .changelog/3953.internal.md | 1 +
 go/common/grpc/grpc.go      | 2 +-
 go/go.mod                   | 2 +-
 go/go.sum                   | 4 ++--
 5 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 .changelog/3840.internal.md
 create mode 100644 .changelog/3953.internal.md

diff --git a/.changelog/3840.internal.md b/.changelog/3840.internal.md
deleted file mode 100644
index ab3a2ee3aa6..00000000000
--- a/.changelog/3840.internal.md
+++ /dev/null
@@ -1 +0,0 @@
-go: bump google.golang.org/grpc from 1.36.1 to 1.37.0
diff --git a/.changelog/3953.internal.md b/.changelog/3953.internal.md
new file mode 100644
index 00000000000..f066ef932e7
--- /dev/null
+++ b/.changelog/3953.internal.md
@@ -0,0 +1 @@
+go: bump google.golang.org/grpc to 1.38.0
diff --git a/go/common/grpc/grpc.go b/go/common/grpc/grpc.go
index 60aa387d9fc..7e08b2e3707 100644
--- a/go/common/grpc/grpc.go
+++ b/go/common/grpc/grpc.go
@@ -628,7 +628,7 @@ func NewServer(config *ServerConfig) (*Server, error) {
 		grpc.MaxRecvMsgSize(maxRecvMsgSize),
 		grpc.MaxSendMsgSize(maxSendMsgSize),
 		grpc.KeepaliveParams(serverKeepAliveParams),
-		grpc.CustomCodec(&CBORCodec{}), // nolint: staticcheck
+		grpc.ForceServerCodec(&CBORCodec{}),
 	}
 	if config.Identity != nil && config.Identity.GetTLSCertificate() != nil {
 		tlsConfig := &tls.Config{
diff --git a/go/go.mod b/go/go.mod
index ca6107b75db..23047740a9c 100644
--- a/go/go.mod
+++ b/go/go.mod
@@ -60,7 +60,7 @@ require (
 	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
 	golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6
 	google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4
-	google.golang.org/grpc v1.37.0
+	google.golang.org/grpc v1.38.0
 	google.golang.org/grpc/security/advancedtls v0.0.0-20200902210233-8630cac324bf
 	google.golang.org/protobuf v1.26.0
 )
diff --git a/go/go.sum b/go/go.sum
index f7e869a3a2a..cbe11700a16 100644
--- a/go/go.sum
+++ b/go/go.sum
@@ -1423,8 +1423,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.37.0 h1:uSZWeQJX5j11bIQ4AJoj+McDBo29cY1MCoC1wO3ts+c=
-google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0=
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
 google.golang.org/grpc/examples v0.0.0-20200731180010-8bec2f5d898f h1:HNNmM2dnxUknBEJDvuCRZcUzhGbhkz00ckV2ha2gFJY=
 google.golang.org/grpc/examples v0.0.0-20200731180010-8bec2f5d898f/go.mod h1:TGiSRL2BBv2WqzfsFNWYp/pkWdtf5kbZS/DQ9Ee3mWk=
 google.golang.org/grpc/security/advancedtls v0.0.0-20200902210233-8630cac324bf h1:IqdIxEnvZreeZMpDPbAA66R/PkRH6AD255RbxyuyfEY=