From ae9d6916044abc8ac71dd8d22277fb1c0e9704f8 Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@vanlanduyt.co>
Date: Wed, 3 Mar 2021 19:39:25 +0100
Subject: [PATCH] Read the caller_id directly from labkit
This will only materialize a single attribute.
---
Gemfile | 2 +-
Gemfile.lock | 9 ++++-----
lib/gitlab/marginalia/comment.rb | 2 +-
spec/requests/api/api_spec.rb | 4 ++--
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Gemfile b/Gemfile
index dbeda69ef981f..3258135d68668 100644
--- a/Gemfile
+++ b/Gemfile
@@ -310,7 +310,7 @@ gem 'pg_query', '~> 1.3.0'
gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '0.14.0'
+gem 'gitlab-labkit', '~> 0.16.0'
# I18n
gem 'ruby_parser', '~> 3.15', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 5e06975ec8745..257d60a2cfacc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -435,19 +435,18 @@ GEM
fog-json (~> 1.2.0)
mime-types
ms_rest_azure (~> 0.12.0)
- gitlab-labkit (0.14.0)
+ gitlab-labkit (0.16.0)
actionpack (>= 5.0.0, < 7.0.0)
activesupport (>= 5.0.0, < 7.0.0)
- gitlab-pg_query (~> 1.3)
grpc (~> 1.19)
jaeger-client (~> 1.1)
opentracing (~> 0.4)
+ pg_query (~> 1.3)
redis (> 3.0.0, < 5.0.0)
gitlab-license (1.3.1)
gitlab-mail_room (0.0.8)
gitlab-markup (1.7.1)
gitlab-net-dns (0.9.1)
- gitlab-pg_query (1.3.1)
gitlab-pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
@@ -1186,7 +1185,7 @@ GEM
rack (>= 1, < 3)
thor (1.1.0)
thread_safe (0.3.6)
- thrift (0.13.0)
+ thrift (0.14.0)
tilt (2.0.10)
timecop (0.9.1)
timeliness (0.3.10)
@@ -1373,7 +1372,7 @@ DEPENDENCIES
gitlab-chronic (~> 0.10.5)
gitlab-experiment (~> 0.4.12)
gitlab-fog-azure-rm (~> 1.0.1)
- gitlab-labkit (= 0.14.0)
+ gitlab-labkit (~> 0.16.0)
gitlab-license (~> 1.3)
gitlab-mail_room (~> 0.0.8)
gitlab-markup (~> 1.7.1)
diff --git a/lib/gitlab/marginalia/comment.rb b/lib/gitlab/marginalia/comment.rb
index ed641b38945d1..ee15d3b181282 100644
--- a/lib/gitlab/marginalia/comment.rb
+++ b/lib/gitlab/marginalia/comment.rb
@@ -39,7 +39,7 @@ def bg_job
end
def endpoint_id
- Labkit::Context.current.to_h['meta.caller_id']
+ Labkit::Context.current&.get_attribute(:caller_id)
end
end
end
diff --git a/spec/requests/api/api_spec.rb b/spec/requests/api/api_spec.rb
index 67b3a32230f00..e1050d0b5f786 100644
--- a/spec/requests/api/api_spec.rb
+++ b/spec/requests/api/api_spec.rb
@@ -138,8 +138,8 @@
let_it_be(:user) { create(:user) }
let(:component_map) do
{
- "application" => "test",
- "endpoint_id" => "/api/:version/users/:id"
+ "application" => "test",
+ "endpoint_id" => "/api/:version/users/:id"
}
end
--
GitLab