Fix code review feedback

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

ee/lib/ee/gitlab/metrics/subscribers/active_record.rb

@@ -19,20 +19,16 @@ module ActiveRecord
             override :db_counter_payload
             def db_counter_payload
-              return super unless ::Gitlab::SafeRequestStore.active?
-
-              payload = super
-
-              if ::Gitlab::Database::LoadBalancing.enable?
-                DB_LOAD_BALANCING_COUNTERS.each do |counter|
-                  payload[counter] = ::Gitlab::SafeRequestStore[counter].to_i
-                end
-                DB_LOAD_BALANCING_DURATIONS.each do |duration|
-                  payload[duration] = ::Gitlab::SafeRequestStore[duration].to_f.round(6)
+              super.tap do |payload|
+                if ::Gitlab::SafeRequestStore.active? && ::Gitlab::Database::LoadBalancing.enable?
+                  DB_LOAD_BALANCING_COUNTERS.each do |counter|
+                    payload[counter] = ::Gitlab::SafeRequestStore[counter].to_i
+                  end
+                  DB_LOAD_BALANCING_DURATIONS.each do |duration|
+                    payload[duration] = ::Gitlab::SafeRequestStore[duration].to_f.round(6)
+                  end
                 end
               end
-
-              payload
             end
           end

ee/spec/lib/gitlab/database/load_balancing_spec.rb

@@ -379,7 +379,7 @@
         subject.clear_configuration
       end
-      context 'when the load balancer returns :replia' do
+      context 'when the load balancer returns :replica' do
         it 'returns :replica' do
           allow(load_balancer).to receive(:db_role_for_connection).and_return(:replica)

ee/spec/lib/gitlab/metrics/subscribers/active_record_spec.rb

@@ -48,13 +48,14 @@ def sql(query, comments: true)
       let(:payload) { { name: name, sql: sql(sql_query, comments: comments), connection: connection } }
       before do
+        allow(Gitlab::Database::LoadBalancing).to receive(:enable?).and_return(true)
         allow(subscriber).to receive(:current_transaction)
           .at_least(:once)
           .and_return(transaction)
       end
+
       context 'query using a connection to a replica' do
         before do
-          allow(Gitlab::Database::LoadBalancing).to receive(:enable?).and_return(true)
           allow(Gitlab::Database::LoadBalancing).to receive(:db_role_for_connection).and_return(:replica)
         end
@@ -72,7 +73,6 @@ def sql(query, comments: true)
       context 'query using a connection to a primary' do
         before do
-          allow(Gitlab::Database::LoadBalancing).to receive(:enable?).and_return(true)
           allow(Gitlab::Database::LoadBalancing).to receive(:db_role_for_connection).and_return(:primary)
         end