From f64a639bcfa1fc2bc89ca7db268f594306edfd7c Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 16 Mar 2021 18:18:33 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-10-stable-ee

---
 lib/gitlab/marginalia/active_record_instrumentation.rb | 12 ------------
 lib/gitlab/marginalia/comment.rb                       |  4 ++++
 2 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 lib/gitlab/marginalia/active_record_instrumentation.rb

(limited to 'lib/gitlab/marginalia')

diff --git a/lib/gitlab/marginalia/active_record_instrumentation.rb b/lib/gitlab/marginalia/active_record_instrumentation.rb
deleted file mode 100644
index 452f472bf6a..00000000000
--- a/lib/gitlab/marginalia/active_record_instrumentation.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-# Patch to annotate sql only when the feature is enabled.
-module Gitlab
-  module Marginalia
-    module ActiveRecordInstrumentation
-      def annotate_sql(sql)
-        Gitlab::Marginalia.enabled ? super(sql) : sql
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/marginalia/comment.rb b/lib/gitlab/marginalia/comment.rb
index 7b4e4b06f00..ee15d3b1812 100644
--- a/lib/gitlab/marginalia/comment.rb
+++ b/lib/gitlab/marginalia/comment.rb
@@ -37,6 +37,10 @@ module Gitlab
           job
         end
       end
+
+      def endpoint_id
+        Labkit::Context.current&.get_attribute(:caller_id)
+      end
     end
   end
 end
-- 
cgit v1.2.3