Clean up and fix feedback on Gitlab::ErrorTracking review

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

lib/gitlab/application_context.rb

@@ -32,7 +32,7 @@ module Gitlab
     end
 
     def self.current_context_include?(attribute_name)
-      Labkit::Context.current.to_h.include?(Labkit::Context.log_key(attribute_name))
+      current.include?(Labkit::Context.log_key(attribute_name))
     end
 
     def initialize(**args)

lib/gitlab/error_tracking.rb

@@ -108,8 +108,8 @@ module Gitlab
         end
 
         if logging
-          formater = Gitlab::ErrorTracking::LogFormatter.new
-          log_hash = formater.generate_log(exception, context_payload)
+          formatter = Gitlab::ErrorTracking::LogFormatter.new
+          log_hash = formatter.generate_log(exception, context_payload)
 
           Gitlab::ErrorTracking::Logger.error(log_hash)
         end

lib/gitlab/error_tracking/context_payload_generator.rb

@@ -8,24 +8,22 @@ module Gitlab
       end
 
       def generate(exception, extra = {})
-        payload = {}
-
-        append_extra!(payload, exception, extra)
-        append_tags!(payload)
-        append_user!(payload)
-
-        payload
+        {
+          extra: extra_payload(exception, extra),
+          tags: tags_payload,
+          user: user_payload
+        }
       end
 
       private
 
-      def append_extra!(payload, exception, extra)
+      def extra_payload(exception, extra)
         inline_extra = exception.try(:sentry_extra_data)
         if inline_extra.present? && inline_extra.is_a?(Hash)
           extra = extra.merge(inline_extra)
         end
 
-        payload[:extra] = sanitize_request_parameters(extra)
+        sanitize_request_parameters(extra)
       end
 
       def sanitize_request_parameters(parameters)
@@ -33,20 +31,17 @@ module Gitlab
         filter.filter(parameters)
       end
 
-      def append_tags!(payload)
-        payload[:tags] = {}
-        payload[: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
-          )
+      def tags_payload
+        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!(payload)
-        payload[:user] = {
+      def user_payload
+        {
           username: current_context['meta.user']
         }
       end

lib/gitlab/error_tracking/log_formatter.rb

@@ -37,22 +37,18 @@ module Gitlab
         extra = Raven.context.extra.merge(context_payload[:extra])
         extra = extra.except(:server)
 
-        sidekiq_extra = extra[:sidekiq]
         # The extra value for sidekiq is a hash whose keys are strings.
-        if sidekiq_extra.is_a?(Hash) && sidekiq_extra.key?('args')
-          sidekiq_extra = sidekiq_extra.dup
+        if extra[:sidekiq].is_a?(Hash) && extra[:sidekiq].key?('args')
+          sidekiq_extra = extra.delete(:sidekiq)
           sidekiq_extra['args'] = Gitlab::ErrorTracking::Processor::SidekiqProcessor.loggable_arguments(
             sidekiq_extra['args'], sidekiq_extra['class']
           )
+          payload["extra.sidekiq"] = sidekiq_extra
         end
 
-        extra[:sidekiq] = sidekiq_extra if sidekiq_extra
-
         extra.each do |key, value|
           payload["extra.#{key}"] = value
         end
-
-        payload
       end
     end
   end

spec/lib/gitlab/error_tracking/context_payload_generator_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'fast_spec_helper'
 require 'rspec-parameterized'
 
 RSpec.describe Gitlab::ErrorTracking::ContextPayloadGenerator do

spec/lib/gitlab/error_tracking/log_formatter_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'fast_spec_helper'
 
 RSpec.describe Gitlab::ErrorTracking::LogFormatter do
   let(:exception) { StandardError.new('boom') }
@@ -43,7 +43,7 @@ RSpec.describe Gitlab::ErrorTracking::LogFormatter do
     ::Raven::Context.clear!
   end
 
-  it 'appends error-related log fields' do
+  it 'appends error-related log fields and filters sensitive Sidekiq arguments' do
     payload = described_class.new.generate_log(exception, context_payload)
 
     expect(payload).to eql(

spec/lib/gitlab/error_tracking/processor/context_payload_processor_spec.rb

 # frozen_string_literal: true
 
-require 'spec_helper'
+require 'fast_spec_helper'
 
 RSpec.describe Gitlab::ErrorTracking::Processor::ContextPayloadProcessor do
   subject(:processor) { described_class.new }