Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/gitlab/metrics/subscribers/active_record.rb b/lib/gitlab/metrics/subscribers/active_record.rb
index c1ecbe994cd..e3756a8c9f6 100644
--- a/lib/gitlab/metrics/subscribers/active_record.rb
+++ b/lib/gitlab/metrics/subscribers/active_record.rb
@@ -186,7 +186,10 @@ module Gitlab
             end
 
             ::Gitlab::Database.database_base_models.keys.each do |config_name|
-              counters << compose_metric_key(metric, nil, config_name) # main / ci
+              counters << compose_metric_key(metric, nil, config_name) # main / ci / geo
+            end
+
+            ::Gitlab::Database.database_base_models_using_load_balancing.keys.each do |config_name|
               counters << compose_metric_key(metric, nil, config_name + ::Gitlab::Database::LoadBalancing::LoadBalancer::REPLICA_SUFFIX) # main_replica / ci_replica
             end
           end