diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-02 06:06:09 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-02 06:06:09 +0000 |
commit | 01de60f3a8f4d99e641d04d31369628425137c21 (patch) | |
tree | 0d00bf0bd3c93c8ddc49a595ff97ef18b594a259 /lib/gitlab | |
parent | 558702b0b569b723474e3652bf46c3b84f322618 (diff) | |
download | gitlab-ce-01de60f3a8f4d99e641d04d31369628425137c21.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/marginalia.rb | 23 | ||||
-rw-r--r-- | lib/gitlab/marginalia/active_record_instrumentation.rb | 20 | ||||
-rw-r--r-- | lib/gitlab/marginalia/comment.rb | 42 | ||||
-rw-r--r-- | lib/gitlab/marginalia/inline_annotation.rb | 37 |
4 files changed, 0 insertions, 122 deletions
diff --git a/lib/gitlab/marginalia.rb b/lib/gitlab/marginalia.rb deleted file mode 100644 index d2e0e335127..00000000000 --- a/lib/gitlab/marginalia.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -module Gitlab - module Marginalia - MARGINALIA_FEATURE_FLAG = :marginalia - - def self.set_application_name - ::Marginalia.application_name = Gitlab.process_name - end - - def self.enable_sidekiq_instrumentation - if Sidekiq.server? - ::Marginalia::SidekiqInstrumentation.enable! - end - end - - def self.feature_enabled? - return false unless Gitlab::Database.cached_table_exists?('features') - - Feature.enabled?(MARGINALIA_FEATURE_FLAG) - end - end -end diff --git a/lib/gitlab/marginalia/active_record_instrumentation.rb b/lib/gitlab/marginalia/active_record_instrumentation.rb deleted file mode 100644 index f4500a48090..00000000000 --- a/lib/gitlab/marginalia/active_record_instrumentation.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -# Patch to annotate sql only when the feature is enabled. -module Gitlab - module Marginalia - module ActiveRecordInstrumentation - # CAUTION: - # Any method call which generates a query inside this function will get into a recursive loop unless called within `Marginalia.without_annotation` method. - def annotate_sql(sql) - if ActiveRecord::Base.connected? && - ::Marginalia.annotation_allowed? && - ::Marginalia.without_annotation { Gitlab::Marginalia.feature_enabled? } - super(sql) - else - sql - end - end - end - end -end diff --git a/lib/gitlab/marginalia/comment.rb b/lib/gitlab/marginalia/comment.rb deleted file mode 100644 index a0eee823763..00000000000 --- a/lib/gitlab/marginalia/comment.rb +++ /dev/null @@ -1,42 +0,0 @@ -# frozen_string_literal: true - -# Module to support correlation_id and additional job details. -module Gitlab - module Marginalia - module Comment - private - - def jid - bg_job["jid"] if bg_job.present? - end - - def job_class - bg_job["class"] if bg_job.present? - end - - def correlation_id - if bg_job.present? - bg_job["correlation_id"] - else - Labkit::Correlation::CorrelationId.current_id - end - end - - def bg_job - job = ::Marginalia::Comment.marginalia_job - - # We are using 'Marginalia::SidekiqInstrumentation' which does not support 'ActiveJob::Base'. - # Gitlab also uses 'ActionMailer::DeliveryJob' which inherits from ActiveJob::Base. - # So below condition is used to return metadata for such jobs. - if job && job.is_a?(ActionMailer::DeliveryJob) - { - "class" => job.arguments.first, - "jid" => job.job_id - } - else - job - end - end - end - end -end diff --git a/lib/gitlab/marginalia/inline_annotation.rb b/lib/gitlab/marginalia/inline_annotation.rb deleted file mode 100644 index 6d78f3b81ec..00000000000 --- a/lib/gitlab/marginalia/inline_annotation.rb +++ /dev/null @@ -1,37 +0,0 @@ -# frozen_string_literal: true - -# Module with util methods to support ::Marginalia.without_annotation method. - -module Gitlab - module Marginalia - module InlineAnnotation - def without_annotation(&block) - return unless block.present? - - annotation_stack.push(false) - yield - ensure - annotation_stack.pop - end - - def with_annotation(comment, &block) - annotation_stack.push(true) - super(comment, &block) - ensure - annotation_stack.pop - end - - def annotation_stack - Thread.current[:annotation_stack] ||= [] - end - - def annotation_stack_top - annotation_stack.last - end - - def annotation_allowed? - annotation_stack.empty? ? true : annotation_stack_top - end - end - end -end |