Add latest changes from gitlab-org/gitlab@master

2 files changed, 41 insertions, 0 deletions

diff --git a/lib/gitlab/usage_counters/common.rb b/lib/gitlab/usage_counters/common.rb
new file mode 100644
index 00000000000..a5bdac430f4
--- /dev/null
+++ b/lib/gitlab/usage_counters/common.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module UsageCounters
+    class Common
+      class << self
+        def increment(project_id)
+          Gitlab::Redis::SharedState.with { |redis| redis.hincrby(base_key, project_id, 1) }
+        end
+
+        def usage_totals
+          Gitlab::Redis::SharedState.with do |redis|
+            total_sum = 0
+
+            totals = redis.hgetall(base_key).each_with_object({}) do |(project_id, count), result|
+              total_sum += result[project_id.to_i] = count.to_i
+            end
+
+            totals[:total] = total_sum
+            totals
+          end
+        end
+
+        def base_key
+          raise NotImplementedError
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/usage_counters/pod_logs.rb b/lib/gitlab/usage_counters/pod_logs.rb
new file mode 100644
index 00000000000..94e29d2fad7
--- /dev/null
+++ b/lib/gitlab/usage_counters/pod_logs.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module UsageCounters
+    class PodLogs < Common
+      def self.base_key
+        'POD_LOGS_USAGE_COUNTS'
+      end
+    end
+  end
+end