Merge branch 'smh-update-labkit-ruby' into 'master'

Upgrade labkit-ruby to v0.15.0

See merge request gitlab-org/gitaly!3118

3 files changed, 16 insertions, 9 deletions

diff --git a/changelogs/unreleased/smh-update-labkit-ruby.yml b/changelogs/unreleased/smh-update-labkit-ruby.yml
new file mode 100644
index 000000000..8d0edcf64
--- /dev/null
+++ b/changelogs/unreleased/smh-update-labkit-ruby.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade labkit-ruby to v0.15.0
+merge_request: 3118
+author:
+type: other
diff --git a/ruby/Gemfile b/ruby/Gemfile
index d2bfd715d..d2b3d2ea0 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -13,7 +13,7 @@ gem 'faraday', '~> 1.0'
 gem 'rbtrace', require: false
 
 # Labkit provides observability functionality
-gem 'gitlab-labkit', '~> 0.13.2'
+gem 'gitlab-labkit', '~> 0.15.0'
 
 # Detects the open source license the repository includes
 # This version needs to be in sync with GitLab CE/EE
diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock
index 6d565e5ec..83c5f20f7 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -39,7 +39,7 @@ GEM
     diff-lcs (1.3)
     dotenv (2.7.6)
     equalizer (0.0.11)
-    erubi (1.9.0)
+    erubi (1.10.0)
     escape_utils (1.2.1)
     factory_bot (5.0.2)
       activesupport (>= 4.2.0)
@@ -65,12 +65,13 @@ GEM
     gitlab-gollum-rugged_adapter (0.4.4.3.gitlab.1)
       mime-types (>= 1.15)
       rugged (~> 1.0)
-    gitlab-labkit (0.13.2)
-      actionpack (>= 5.0.0, < 6.1.0)
-      activesupport (>= 5.0.0, < 6.1.0)
+    gitlab-labkit (0.15.0)
+      actionpack (>= 5.0.0, < 7.0.0)
+      activesupport (>= 5.0.0, < 7.0.0)
       grpc (~> 1.19)
       jaeger-client (~> 1.1)
       opentracing (~> 0.4)
+      pg_query (~> 1.3)
       redis (> 3.0.0, < 5.0.0)
     gitlab-markup (1.7.1)
     google-protobuf (3.12.4)
@@ -93,7 +94,7 @@ GEM
       reverse_markdown (~> 1.0)
       rugged (>= 0.24, < 2.0)
       thor (>= 0.19, < 2.0)
-    loofah (2.8.0)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     memoizable (0.4.2)
@@ -120,6 +121,7 @@ GEM
     parallel (1.19.2)
     parser (2.7.2.0)
       ast (~> 2.4.1)
+    pg_query (1.3.0)
     proc_to_ast (0.1.0)
       coderay
       parser
@@ -144,7 +146,7 @@ GEM
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rdoc (6.2.0)
-    redis (4.1.3)
+    redis (4.2.5)
     regexp_parser (1.8.1)
     reverse_markdown (1.4.0)
       nokogiri
@@ -194,7 +196,7 @@ GEM
     stringex (2.8.5)
     thor (1.1.0)
     thread_safe (0.3.6)
-    thrift (0.11.0.0)
+    thrift (0.13.0)
     timecop (0.9.1)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
@@ -219,7 +221,7 @@ DEPENDENCIES
   github-linguist (~> 7.12)
   gitlab-gollum-lib (~> 4.2.7.10.gitlab.1)
   gitlab-gollum-rugged_adapter (~> 0.4.4.3.gitlab.1)
-  gitlab-labkit (~> 0.13.2)
+  gitlab-labkit (~> 0.15.0)
   gitlab-markup (~> 1.7.1)
   google-protobuf (~> 3.12)
   grpc (~> 1.30.2)