Merge Sentry's contexts and users into ApplicationContext

Issue https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/846

app/controllers/application_controller.rb

@@ -29,7 +29,6 @@ class ApplicationController < ActionController::Base
   before_action :validate_user_service_ticket!
   before_action :check_password_expiration, if: :html_request?
   before_action :ldap_security_check
-  around_action :sentry_context
   before_action :default_headers
   before_action :default_cache_headers
   before_action :add_gon_variables, if: :html_request?
@@ -528,10 +527,6 @@ class ApplicationController < ActionController::Base
       .execute
   end
 
-  def sentry_context(&block)
-    Gitlab::ErrorTracking.with_context(current_user, &block)
-  end
-
   def allow_gitaly_ref_name_caching
     ::Gitlab::GitalyClient.allow_ref_name_caching do
       yield

app/services/merge_requests/base_service.rb

@@ -181,9 +181,7 @@ module MergeRequests
       }
 
       if exception
-        Gitlab::ErrorTracking.with_context(current_user) do
-          Gitlab::ErrorTracking.track_exception(exception, data)
-        end
+        Gitlab::ErrorTracking.track_exception(exception, data)
 
         data[:"exception.message"] = exception.message
       end

lib/api/helpers.rb

@@ -467,9 +467,7 @@ module API
     def handle_api_exception(exception)
       if report_exception?(exception)
         define_params_for_grape_middleware
-        Gitlab::ErrorTracking.with_context(current_user) do
-          Gitlab::ErrorTracking.track_exception(exception)
-        end
+        Gitlab::ErrorTracking.track_exception(exception)
       end
 
       # This is used with GrapeLogging::Loggers::ExceptionLogger

lib/gitlab/application_context.rb

@@ -27,6 +27,10 @@ module Gitlab
       Labkit::Context.push(application_context.to_lazy_hash)
     end
 
+    def self.current
+      Labkit::Context.current.to_h
+    end
+
     def self.current_context_include?(attribute_name)
       Labkit::Context.current.to_h.include?(Labkit::Context.log_key(attribute_name))
     end
@@ -78,6 +82,14 @@ module Gitlab
       user&.username
     end
 
+    def user_id
+      user&.id
+    end
+
+    def user_email
+      user&.email
+    end
+
     def root_namespace_path
       if namespace
         namespace.full_path_components.first

lib/gitlab/error_tracking.rb

@@ -27,33 +27,16 @@ module Gitlab
           config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s)
           config.processors << ::Gitlab::ErrorTracking::Processor::SidekiqProcessor
           config.processors << ::Gitlab::ErrorTracking::Processor::GrpcErrorProcessor
+          config.processors << ::Gitlab::ErrorTracking::Processor::ApplicationContextProcessor
 
           # Sanitize authentication headers
           config.sanitize_http_headers = %w[Authorization Private-Token]
-          config.tags = extra_tags_from_env.merge(program: Gitlab.process_name)
           config.before_send = method(:before_send)
 
           yield config if block_given?
         end
       end
 
-      def with_context(current_user = nil)
-        last_user_context = Raven.context.user
-
-        user_context = {
-          id: current_user&.id,
-          email: current_user&.email,
-          username: current_user&.username
-        }.compact
-
-        Raven.tags_context(default_tags)
-        Raven.user_context(user_context)
-
-        yield
-      ensure
-        Raven.user_context(last_user_context)
-      end
-
       # This should be used when you want to passthrough exception handling:
       # rescue and raise to be catched in upper layers of the application.
       #
@@ -125,7 +108,7 @@ module Gitlab
         extra = sanitize_request_parameters(extra)
 
         if sentry && Raven.configuration.server
-          Raven.capture_exception(exception, tags: default_tags, extra: extra)
+          Raven.capture_exception(exception, extra: extra)
         end
 
         if logging
@@ -160,22 +143,6 @@ module Gitlab
         Rails.env.development? || Rails.env.test?
       end
 
-      def default_tags
-        {
-          Labkit::Correlation::CorrelationId::LOG_KEY.to_sym => Labkit::Correlation::CorrelationId.current_id,
-          locale: I18n.locale
-        }
-      end
-
-      # Static tags that are set on application start
-      def extra_tags_from_env
-        Gitlab::Json.parse(ENV.fetch('GITLAB_SENTRY_EXTRA_TAGS', '{}')).to_hash
-      rescue => e
-        Gitlab::AppLogger.debug("GITLAB_SENTRY_EXTRA_TAGS could not be parsed as JSON: #{e.class.name}: #{e.message}")
-
-        {}
-      end
-
       # Group common, mostly non-actionable exceptions by type and message,
       # rather than cause
       def custom_fingerprinting(event, ex)

lib/gitlab/error_tracking/processor/application_context_processor.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module ErrorTracking
+    module Processor
+      class ApplicationContextProcessor < ::Raven::Processor
+        def process(event)
+          append_tags!(event)
+          append_user!(event)
+
+          event
+        end
+
+        private
+
+        def append_tags!(event)
+          event[:tags] ||= {}
+          event[:tags]
+            .merge!(extra_tags_from_env)
+            .merge!(
+              program: Gitlab.process_name,
+              locale: I18n.locale,
+              feature_category: current_context['meta.feature_category'],
+              Labkit::Correlation::CorrelationId::LOG_KEY.to_sym => Labkit::Correlation::CorrelationId.current_id
+            )
+        end
+
+        def append_user!(event)
+          event[:user] ||= {}
+          event[:user].merge!(
+            username: current_context['meta.user']
+          )
+        end
+
+        # Static tags that are set on application start
+        def extra_tags_from_env
+          Gitlab::Json.parse(ENV.fetch('GITLAB_SENTRY_EXTRA_TAGS', '{}')).to_hash
+        rescue => e
+          Gitlab::AppLogger.debug("GITLAB_SENTRY_EXTRA_TAGS could not be parsed as JSON: #{e.class.name}: #{e.message}")
+
+          {}
+        end
+
+        def current_context
+          ::Gitlab::ApplicationContext.current.to_h
+        end
+      end
+    end
+  end
+end