Merge branch 'fix-structured-logger' into 'master'

Fix Structured Logger

See merge request gitlab-org/gitlab!60632

ee/lib/ee/gitlab/sidekiq_middleware.rb

@@ -13,7 +13,7 @@ module EE
           super.call(chain)
 
           if load_balancing_enabled?
-            chain.insert_after(::Labkit::Middleware::Sidekiq::Server,
+            chain.insert_after(::Gitlab::SidekiqMiddleware::InstrumentationLogger,
                                ::Gitlab::Database::LoadBalancing::SidekiqServerMiddleware)
           end
         end

ee/spec/lib/ee/gitlab/sidekiq_middleware_spec.rb

@@ -62,8 +62,8 @@ RSpec.describe Gitlab::SidekiqMiddleware do
         ::Gitlab::SidekiqMiddleware::ExtraDoneLogMetadata,
         ::Gitlab::SidekiqMiddleware::BatchLoader,
         ::Labkit::Middleware::Sidekiq::Server,
-        ::Gitlab::Database::LoadBalancing::SidekiqServerMiddleware,
         ::Gitlab::SidekiqMiddleware::InstrumentationLogger,
+        ::Gitlab::Database::LoadBalancing::SidekiqServerMiddleware,
         ::Gitlab::SidekiqMiddleware::AdminMode::Server,
         ::Gitlab::SidekiqVersioning::Middleware,
         ::Gitlab::SidekiqStatus::ServerMiddleware,

lib/gitlab/sidekiq_logging/structured_logger.rb

@@ -39,7 +39,7 @@ module Gitlab
       private
 
       def add_instrumentation_keys!(job, output_payload)
-        output_payload.merge!(job[:instrumentation].stringify_keys)
+        output_payload.merge!(job[:instrumentation].stringify_keys) if job[:instrumentation]
       end
 
       def add_logging_extras!(job, output_payload)

spec/lib/gitlab/sidekiq_logging/structured_logger_spec.rb

@@ -293,6 +293,16 @@ RSpec.describe Gitlab::SidekiqLogging::StructuredLogger do
         end
       end
     end
+
+    context 'when instrumentation data is not loaded' do
+      before do
+        allow(logger).to receive(:info)
+      end
+
+      it 'does not raise exception' do
+        expect { subject.call(job.dup, 'test_queue') {} }.not_to raise_error
+      end
+    end
   end
 
   describe '#add_time_keys!' do