Merge branch '4055-geo-api-bugs' into 'master'

Fix: Geo API bug. Statistic is not collected when prometheus is disabled

Closes #4055

See merge request gitlab-org/gitlab-ee!3421

app/services/geo/metrics_update_service.rb

@@ -24,6 +24,7 @@ module Geo
 
     def fetch_geo_node_metrics(node)
       return unless node.enabled?
+      return unless Gitlab::Geo.primary? || Gitlab::Metrics.prometheus_metrics_enabled?
 
       status = node_status(node)
 
@@ -33,7 +34,7 @@ module Geo
       end
 
       update_db_metrics(node, status) if Gitlab::Geo.primary?
-      update_prometheus_metrics(node, status)
+      update_prometheus_metrics(node, status) if Gitlab::Metrics.prometheus_metrics_enabled?
     end
 
     def update_db_metrics(node, status)

app/workers/geo/metrics_update_worker.rb

@@ -7,8 +7,6 @@ module Geo
     LEASE_TIMEOUT = 5.minutes
 
     def perform
-      return unless Gitlab::Metrics.prometheus_metrics_enabled?
-
       try_obtain_lease { Geo::MetricsUpdateService.new.execute }
     end
 

changelogs/unreleased-ee/4055-geo-api-bugs.yml

+---
+title: 'Fix: Geo API bug. Statistic is not collected when prometheus is disabled'
+merge_request:
+author:
+type: fixed

spec/workers/geo/metrics_update_worker_spec.rb

@@ -13,16 +13,7 @@ RSpec.describe Geo::MetricsUpdateWorker, :geo do
       stub_current_geo_node(secondary)
     end
 
-    it 'does not execute when Prometheus metrics are disabled' do
-      allow(Gitlab::Metrics).to receive(:prometheus_metrics_enabled?).and_return(false)
-      expect(Geo::MetricsUpdateService).not_to receive(:new)
-
-      subject.perform
-    end
-
-    it 'executes when Prometheus metrics are enabled' do
-      allow(Gitlab::Metrics).to receive(:prometheus_metrics_enabled?).and_return(true)
-
+    it 'executes MetricsUpdateService' do
       service = double(:service, execute: true)
       expect(Geo::MetricsUpdateService).to receive(:new).and_return(service)