Merge branch '331588-grpc-1.38' into 'master'

[Ruby 3 support] Update grpc to 1.38, labkit to 0.21

See merge request gitlab-org/gitlab!65846

Gemfile

@@ -310,7 +310,7 @@ gem 'pg_query', '~> 2.1'
 gem 'premailer-rails', '~> 1.10.3'
 
 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.20.0'
+gem 'gitlab-labkit', '~> 0.21.0'
 # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
 gem 'thrift', '>= 0.14.0'
@@ -477,7 +477,7 @@ gem 'gitaly', '~> 14.1.0.pre.rc4'
 # KAS GRPC protocol definitions
 gem 'kas-grpc', '~> 0.0.2'
 
-gem 'grpc', '~> 1.30.2'
+gem 'grpc', '~> 1.38.0'
 
 gem 'google-protobuf', '~> 3.17.1'
 

Gemfile.lock

@@ -482,10 +482,10 @@ GEM
       fog-json (~> 1.2.0)
       mime-types
       ms_rest_azure (~> 0.12.0)
-    gitlab-labkit (0.20.0)
+    gitlab-labkit (0.21.0)
       actionpack (>= 5.0.0, < 7.0.0)
       activesupport (>= 5.0.0, < 7.0.0)
-      grpc (~> 1.19)
+      grpc (~> 1.38)
       jaeger-client (~> 1.1)
       opentracing (~> 0.4)
       pg_query (~> 2.1)
@@ -580,8 +580,8 @@ GEM
       graphql (~> 1.6)
       html-pipeline (~> 2.8)
       sass (~> 3.4)
-    grpc (1.30.2)
-      google-protobuf (~> 3.12)
+    grpc (1.38.0)
+      google-protobuf (~> 3.15)
       googleapis-common-protos-types (~> 1.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
@@ -1488,7 +1488,7 @@ DEPENDENCIES
   gitlab-dangerfiles (~> 2.2.2)
   gitlab-experiment (~> 0.6.2)
   gitlab-fog-azure-rm (~> 1.1.1)
-  gitlab-labkit (~> 0.20.0)
+  gitlab-labkit (~> 0.21.0)
   gitlab-license (~> 2.0)
   gitlab-mail_room (~> 0.0.9)
   gitlab-markup (~> 1.7.1)
@@ -1510,7 +1510,7 @@ DEPENDENCIES
   graphlient (~> 0.4.0)
   graphql (~> 1.11.8)
   graphql-docs (~> 1.6.0)
-  grpc (~> 1.30.2)
+  grpc (~> 1.38.0)
   gssapi
   guard-rspec
   haml_lint (~> 0.36.0)