Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

2 files changed, 6 insertions, 16 deletions

diff --git a/lib/gitlab/metrics/dashboard/stages/cluster_endpoint_inserter.rb b/lib/gitlab/metrics/dashboard/stages/cluster_endpoint_inserter.rb
index 2c17982d299..31d75225972 100644
--- a/lib/gitlab/metrics/dashboard/stages/cluster_endpoint_inserter.rb
+++ b/lib/gitlab/metrics/dashboard/stages/cluster_endpoint_inserter.rb
@@ -74,7 +74,7 @@ module Gitlab
 
           def verify_params
             raise Errors::DashboardProcessingError, _('Cluster is required for Stages::ClusterEndpointInserter') unless params[:cluster]
-            raise Errors::DashboardProcessingError, _('Cluster type must be specificed for Stages::ClusterEndpointInserter') unless params[:cluster_type]
+            raise Errors::DashboardProcessingError, _('Cluster type must be specified for Stages::ClusterEndpointInserter') unless params[:cluster_type]
           end
         end
       end
diff --git a/lib/gitlab/metrics/subscribers/active_record.rb b/lib/gitlab/metrics/subscribers/active_record.rb
index 715dd86d93c..12576cabb19 100644
--- a/lib/gitlab/metrics/subscribers/active_record.rb
+++ b/lib/gitlab/metrics/subscribers/active_record.rb
@@ -134,11 +134,7 @@ module Gitlab
                              :"gitlab_transaction_db_#{counter}_total"
                            end
 
-          if ENV['GITLAB_MULTIPLE_DATABASE_METRICS']
-            current_transaction&.increment(prometheus_key, 1, { db_config_name: db_config_name })
-          else
-            current_transaction&.increment(prometheus_key, 1)
-          end
+          current_transaction&.increment(prometheus_key, 1, { db_config_name: db_config_name })
 
           Gitlab::SafeRequestStore[log_key] = Gitlab::SafeRequestStore[log_key].to_i + 1
 
@@ -154,11 +150,7 @@ module Gitlab
         def observe(histogram, event, &block)
           db_config_name = db_config_name(event.payload)
 
-          if ENV['GITLAB_MULTIPLE_DATABASE_METRICS']
-            current_transaction&.observe(histogram, event.duration / 1000.0, { db_config_name: db_config_name }, &block)
-          else
-            current_transaction&.observe(histogram, event.duration / 1000.0, &block)
-          end
+          current_transaction&.observe(histogram, event.duration / 1000.0, { db_config_name: db_config_name }, &block)
         end
 
         def current_transaction
@@ -193,11 +185,9 @@ module Gitlab
               counters << compose_metric_key(metric, role)
             end
 
-            if ENV['GITLAB_MULTIPLE_DATABASE_METRICS']
-              ::Gitlab::Database.db_config_names.each do |config_name|
-                counters << compose_metric_key(metric, nil, config_name) # main
-                counters << compose_metric_key(metric, nil, config_name + ::Gitlab::Database::LoadBalancing::LoadBalancer::REPLICA_SUFFIX) # main_replica
-              end
+            ::Gitlab::Database.db_config_names.each do |config_name|
+              counters << compose_metric_key(metric, nil, config_name) # main
+              counters << compose_metric_key(metric, nil, config_name + ::Gitlab::Database::LoadBalancing::LoadBalancer::REPLICA_SUFFIX) # main_replica
             end
           end