Merge branch '231248-dont-use-db-in-global-search-sampler' into 'master'

Dont use DB connection in GlobalSearchSampler

Closes #231248

See merge request gitlab-org/gitlab!38138

ee/changelogs/unreleased/231248-dont-use-db-in-global-search-sampler.yml

+---
+title: Dont use DB connection in GlobalSearchSampler
+merge_request: 38138
+author:
+type: fixed

ee/lib/elastic/metrics_update_service.rb

@@ -3,9 +3,6 @@
 module Elastic
   class MetricsUpdateService
     def execute
-      return unless elasticsearch_enabled?
-      return unless prometheus_enabled?
-
       incremental_gauge = Gitlab::Metrics.gauge(:global_search_bulk_cron_queue_size, 'Number of incremental database updates waiting to be synchronized to Elasticsearch', {}, :max)
       incremental_gauge.set({}, Elastic::ProcessBookkeepingService.queue_size)
@@ -15,15 +12,5 @@ module Elastic
       awaiting_indexing_gauge = Gitlab::Metrics.gauge(:global_search_awaiting_indexing_queue_size, 'Number of database updates waiting to be synchronized to Elasticsearch while indexing is paused.', {}, :max)
       awaiting_indexing_gauge.set({}, Elastic::IndexingControlService.queue_size)
     end
-
-    private
-
-    def elasticsearch_enabled?
-      ::Gitlab::CurrentSettings.elasticsearch_indexing?
-    end
-
-    def prometheus_enabled?
-      ::Gitlab::Metrics.prometheus_metrics_enabled?
-    end
   end
 end

ee/spec/services/elastic/metrics_update_service_spec.rb

@@ -5,11 +5,6 @@ require 'spec_helper'
 RSpec.describe Elastic::MetricsUpdateService, :prometheus do
   subject { described_class.new }
-  before do
-    stub_ee_application_setting(elasticsearch_indexing: true)
-    allow(Gitlab::Metrics).to receive(:prometheus_metrics_enabled?).and_return(true)
-  end
-
   describe '#execute' do
     it 'sets gauges' do
       expect(Elastic::ProcessBookkeepingService).to receive(:queue_size).and_return(4)
@@ -37,29 +32,5 @@ RSpec.describe Elastic::MetricsUpdateService, :prometheus do
       subject.execute
     end
-
-    context 'when prometheus metrics is disabled' do
-      before do
-        allow(Gitlab::Metrics).to receive(:prometheus_metrics_enabled?).and_return(false)
-      end
-
-      it 'does not set a gauge' do
-        expect(Gitlab::Metrics).not_to receive(:gauge)
-
-        subject.execute
-      end
-    end
-
-    context 'when elasticsearch indexing and search is disabled' do
-      before do
-        stub_ee_application_setting(elasticsearch_indexing: false)
-      end
-
-      it 'does not set a gauge' do
-        expect(Gitlab::Metrics).not_to receive(:gauge)
-
-        subject.execute
-      end
-    end
   end
 end