1 files changed, 43 insertions, 4 deletions
diff --git a/lib/gitlab/utils/usage_data.rb b/lib/gitlab/utils/usage_data.rb
index 36046ca14bf..ca6a36c9cea 100644
--- a/lib/gitlab/utils/usage_data.rb
+++ b/lib/gitlab/utils/usage_data.rb
@@ -59,6 +59,12 @@ module Gitlab
         FALLBACK
       end
 
+      def sum(relation, column, batch_size: nil, start: nil, finish: nil)
+        Gitlab::Database::BatchCount.batch_sum(relation, column, batch_size: batch_size, start: start, finish: finish)
+      rescue ActiveRecord::StatementInvalid
+        FALLBACK
+      end
+
       def alt_usage_data(value = nil, fallback: FALLBACK, &block)
         if block_given?
           yield
@@ -77,11 +83,11 @@ module Gitlab
         end
       end
 
-      def with_prometheus_client(fallback: nil)
-        return fallback unless Gitlab::Prometheus::Internal.prometheus_enabled?
+      def with_prometheus_client(fallback: nil, verify: true)
+        client = prometheus_client(verify: verify)
+        return fallback unless client
 
-        prometheus_address = Gitlab::Prometheus::Internal.uri
-        yield Gitlab::PrometheusClient.new(prometheus_address, allow_local_requests: true)
+        yield client
       end
 
       def measure_duration
@@ -96,8 +102,41 @@ module Gitlab
         yield.merge(key => Time.current)
       end
 
+      # @param event_name [String] the event name
+      # @param values [Array|String] the values counted
+      def track_usage_event(event_name, values)
+        return unless Feature.enabled?(:"usage_data_#{event_name}", default_enabled: true)
+        return unless Gitlab::CurrentSettings.usage_ping_enabled?
+
+        Gitlab::UsageDataCounters::HLLRedisCounter.track_event(values, event_name.to_s)
+      end
+
       private
 
+      def prometheus_client(verify:)
+        server_address = prometheus_server_address
+
+        return unless server_address
+
+        # There really is not a way to discover whether a Prometheus connection is using TLS or not
+        # Try TLS first because HTTPS will return fast if failed.
+        %w[https http].find do |scheme|
+          api_url = "#{scheme}://#{server_address}"
+          client = Gitlab::PrometheusClient.new(api_url, allow_local_requests: true, verify: verify)
+          break client if client.ready?
+        rescue
+          nil
+        end
+      end
+
+      def prometheus_server_address
+        if Gitlab::Prometheus::Internal.prometheus_enabled?
+          Gitlab::Prometheus::Internal.server_address
+        elsif Gitlab::Consul::Internal.api_url
+          Gitlab::Consul::Internal.discover_prometheus_server_address
+        end
+      end
+
       def redis_usage_counter
         yield
       rescue ::Redis::CommandError, Gitlab::UsageDataCounters::BaseCounter::UnknownEvent