From 7f102819a56b55607e657447b51d2eeb45b2fe94 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Mon, 26 Aug 2019 14:57:59 +0100 Subject: Fix Peek on Puma Peek's `Peek.request_id` method doesn't work well with a multi-threaded server and concurrent requests, because requests can 'steal' another request's ID, or unset it before it was due. The upstream change resolves this; the commit here is just to ensure that GitLab works with that upstream change, mostly by not using `Peek.request_id` any more (as the method doesn't exist). --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 595dedd4656..0611ad2110f 100644 --- a/Gemfile +++ b/Gemfile @@ -295,7 +295,7 @@ gem 'gettext', '~> 3.2.2', require: false, group: :development gem 'batch-loader', '~> 1.4.0' # Perf bar -gem 'peek', '~> 1.0.1' +gem 'peek', git: 'https://github.com/smcgivern/peek', branch: 'remove-peek-request-id' # Snowplow events tracking gem 'snowplow-tracker', '~> 0.6.1' -- cgit v1.2.3 From c2452db59cf045f01244b8d72e14cb0144d19722 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Wed, 28 Aug 2019 12:43:34 +0100 Subject: Use gitlab-peek forked gem --- Gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 0611ad2110f..a8976eceba1 100644 --- a/Gemfile +++ b/Gemfile @@ -295,7 +295,8 @@ gem 'gettext', '~> 3.2.2', require: false, group: :development gem 'batch-loader', '~> 1.4.0' # Perf bar -gem 'peek', git: 'https://github.com/smcgivern/peek', branch: 'remove-peek-request-id' +# https://gitlab.com/gitlab-org/gitlab-ee/issues/13996 +gem 'gitlab-peek', '~> 0.0.1', require: 'peek' # Snowplow events tracking gem 'snowplow-tracker', '~> 0.6.1' -- cgit v1.2.3