Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 1 insertions, 10 deletions

diff --git a/lib/gitlab/error_tracking/processor/context_payload_processor.rb b/lib/gitlab/error_tracking/processor/context_payload_processor.rb
index 758f6aa11d7..9559d6807da 100644
--- a/lib/gitlab/error_tracking/processor/context_payload_processor.rb
+++ b/lib/gitlab/error_tracking/processor/context_payload_processor.rb
@@ -3,21 +3,12 @@
 module Gitlab
   module ErrorTracking
     module Processor
-      class ContextPayloadProcessor < ::Raven::Processor
+      module ContextPayloadProcessor
         # This processor is added to inject application context into Sentry
         # events generated by Sentry built-in integrations. When the
         # integrations are re-implemented and use Gitlab::ErrorTracking, this
         # processor should be removed.
-        def process(payload)
-          return payload if ::Feature.enabled?(:sentry_processors_before_send, default_enabled: :yaml)
-
-          context_payload = Gitlab::ErrorTracking::ContextPayloadGenerator.generate(nil, {})
-          payload.deep_merge!(context_payload)
-        end
-
         def self.call(event)
-          return event unless ::Feature.enabled?(:sentry_processors_before_send, default_enabled: :yaml)
-
           Gitlab::ErrorTracking::ContextPayloadGenerator.generate(nil, {}).each do |key, value|
             event.public_send(key).deep_merge!(value) # rubocop:disable GitlabSecurity/PublicSend
           end