1 files changed, 22 insertions, 1 deletions
diff --git a/lib/gitlab/sidekiq_middleware/instrumentation_logger.rb b/lib/gitlab/sidekiq_middleware/instrumentation_logger.rb
index a66a4de4655..b542aa4fe4c 100644
--- a/lib/gitlab/sidekiq_middleware/instrumentation_logger.rb
+++ b/lib/gitlab/sidekiq_middleware/instrumentation_logger.rb
@@ -3,6 +3,24 @@
 module Gitlab
   module SidekiqMiddleware
     class InstrumentationLogger
+      def self.keys
+        @keys ||= [
+          :cpu_s,
+          :gitaly_calls,
+          :gitaly_duration_s,
+          :rugged_calls,
+          :rugged_duration_s,
+          :elasticsearch_calls,
+          :elasticsearch_duration_s,
+          :elasticsearch_timed_out_count,
+          *::Gitlab::Memory::Instrumentation::KEY_MAPPING.values,
+          *::Gitlab::Instrumentation::Redis.known_payload_keys,
+          *::Gitlab::Metrics::Subscribers::ActiveRecord.known_payload_keys,
+          *::Gitlab::Metrics::Subscribers::ExternalHttp::KNOWN_PAYLOAD_KEYS,
+          *::Gitlab::Metrics::Subscribers::RackAttack::PAYLOAD_KEYS
+        ]
+      end
+
       def call(worker, job, queue)
         ::Gitlab::InstrumentationHelper.init_instrumentation_data
 
@@ -17,7 +35,10 @@ module Gitlab
         # because Sidekiq keeps a pristine copy of the original hash
         # before sending it to the middleware:
         # https://github.com/mperham/sidekiq/blob/53bd529a0c3f901879925b8390353129c465b1f2/lib/sidekiq/processor.rb#L115-L118
-        ::Gitlab::InstrumentationHelper.add_instrumentation_data(job)
+        job[:instrumentation] = {}.tap do |instrumentation_values|
+          ::Gitlab::InstrumentationHelper.add_instrumentation_data(instrumentation_values)
+          instrumentation_values.slice!(*self.class.keys)
+        end
       end
     end
   end