Merge branch 'sh-update-labkit' into 'master'

Update gitlab-labkit to v0.20.0

See merge request gitlab-org/gitlab!65809

Gemfile

@@ -310,7 +310,7 @@ gem 'pg_query', '~> 2.1'
 gem 'premailer-rails', '~> 1.10.3'
 
 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.18.0'
+gem 'gitlab-labkit', '~> 0.20.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'

Gemfile.lock

@@ -482,13 +482,13 @@ GEM
       fog-json (~> 1.2.0)
       mime-types
       ms_rest_azure (~> 0.12.0)
-    gitlab-labkit (0.18.0)
+    gitlab-labkit (0.20.0)
       actionpack (>= 5.0.0, < 7.0.0)
       activesupport (>= 5.0.0, < 7.0.0)
-      gitlab-pg_query (~> 2.0)
       grpc (~> 1.19)
       jaeger-client (~> 1.1)
       opentracing (~> 0.4)
+      pg_query (~> 2.1)
       redis (> 3.0.0, < 5.0.0)
     gitlab-license (1.5.0)
     gitlab-mail_room (0.0.9)
@@ -498,8 +498,6 @@ GEM
       addressable (~> 2.7)
       omniauth (~> 1.9)
       openid_connect (~> 1.2)
-    gitlab-pg_query (2.0.4)
-      google-protobuf (>= 3.17.1)
     gitlab-sidekiq-fetcher (0.5.6)
       sidekiq (~> 5)
     gitlab-styles (6.2.0)
@@ -1492,7 +1490,7 @@ DEPENDENCIES
   gitlab-dangerfiles (~> 2.2.1)
   gitlab-experiment (~> 0.6.1)
   gitlab-fog-azure-rm (~> 1.1.1)
-  gitlab-labkit (~> 0.18.0)
+  gitlab-labkit (~> 0.20.0)
   gitlab-license (~> 1.5)
   gitlab-mail_room (~> 0.0.9)
   gitlab-markup (~> 1.7.1)

spec/deprecation_toolkit_env.rb

@@ -56,7 +56,7 @@ module DeprecationToolkitEnv
   def self.allowed_kwarg_warning_paths
     %w[
       asciidoctor-2.0.12/lib/asciidoctor/extensions.rb
-      gitlab-labkit-0.18.0/lib/labkit/correlation/grpc/client_interceptor.rb
+      gitlab-labkit-0.20.0/lib/labkit/correlation/grpc/client_interceptor.rb
     ]
   end