Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 11 deletions

diff --git a/app/models/analytics/instance_statistics.rb b/app/models/analytics/instance_statistics.rb
deleted file mode 100644
index df7b26e4fa6..00000000000
--- a/app/models/analytics/instance_statistics.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Analytics
-  module InstanceStatistics
-    def self.table_name_prefix
-      'analytics_instance_statistics_'
-    end
-  end
-end
diff --git a/app/models/analytics/instance_statistics/measurement.rb b/app/models/analytics/usage_trends/measurement.rb
index c8b76e005ef..40d7c7fae2e 100644
--- a/app/models/analytics/instance_statistics/measurement.rb
+++ b/app/models/analytics/usage_trends/measurement.rb
@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 module Analytics
-  module InstanceStatistics
+  module UsageTrends
     class Measurement < ApplicationRecord
+      self.table_name = 'analytics_instance_statistics_measurements'
+
       EXPERIMENTAL_IDENTIFIERS = %i[pipelines_succeeded pipelines_failed pipelines_canceled pipelines_skipped].freeze
 
       enum identifier: {
@@ -58,4 +60,4 @@ module Analytics
   end
 end
 
-Analytics::InstanceStatistics::Measurement.prepend_if_ee('EE::Analytics::InstanceStatistics::Measurement')
+Analytics::UsageTrends::Measurement.prepend_if_ee('EE::Analytics::UsageTrends::Measurement')