1 files changed, 19 insertions, 7 deletions
diff --git a/lib/gitlab/usage/metrics/instrumentations/redis_metric.rb b/lib/gitlab/usage/metrics/instrumentations/redis_metric.rb
index a25bad2436b..26d963e2407 100644
--- a/lib/gitlab/usage/metrics/instrumentations/redis_metric.rb
+++ b/lib/gitlab/usage/metrics/instrumentations/redis_metric.rb
@@ -11,37 +11,49 @@ module Gitlab
         # instrumentation_class: RedisMetric
         # options:
         #   event: pushes
-        #   counter_class: SourceCodeCounter
+        #   prefix: source_code
         #
         class RedisMetric < BaseMetric
+          include Gitlab::UsageDataCounters::RedisCounter
+
+          USAGE_PREFIX = "USAGE_"
+
           def initialize(time_frame:, options: {})
             super
 
             raise ArgumentError, "'event' option is required" unless metric_event.present?
-            raise ArgumentError, "'counter class' option is required" unless counter_class.present?
+            raise ArgumentError, "'prefix' option is required" unless prefix.present?
           end
 
           def metric_event
             options[:event]
           end
 
-          def counter_class_name
-            options[:counter_class]
+          def prefix
+            options[:prefix]
           end
 
-          def counter_class
-            "Gitlab::UsageDataCounters::#{counter_class_name}".constantize
+          def include_usage_prefix?
+            options.fetch(:include_usage_prefix, true)
           end
 
           def value
             redis_usage_data do
-              counter_class.read(metric_event)
+              total_count(redis_key)
             end
           end
 
           def suggested_name
             Gitlab::Usage::Metrics::NameSuggestion.for(:redis)
           end
+
+          private
+
+          def redis_key
+            key = "#{prefix}_#{metric_event}".upcase
+            key.prepend(USAGE_PREFIX) if include_usage_prefix?
+            key
+          end
         end
       end
     end