Move EE code out of Gitlab::UsageData

This moves EE specific code out of Gitlab::UsageData and into
EE::Gitlab::UsageData. We also remove the overriding of the "CE" string
with "EE", because EE::Gitlab::UsageData already overrides this with its
own value.

ee/lib/ee/gitlab/usage_data.rb

@@ -3,142 +3,146 @@
 module EE
   module Gitlab
     module UsageData
-      extend ::Gitlab::Utils::Override
+      extend ActiveSupport::Concern
 
-      override :features_usage_data
-      def features_usage_data
-        super.merge(features_usage_data_ee)
-      end
-
-      def features_usage_data_ee
-        {
-          elasticsearch_enabled: ::Gitlab::CurrentSettings.elasticsearch_search?,
-          geo_enabled: ::Gitlab::Geo.enabled?
-        }
-      end
+      class_methods do
+        extend ::Gitlab::Utils::Override
 
-      override :license_usage_data
-      def license_usage_data
-        usage_data = super
-        license = ::License.current
-        usage_data[:edition] =
-          if license
-            license.edition
-          else
-            'EE Free'
-          end
-
-        if license
-          usage_data[:license_md5] = license.md5
-          usage_data[:license_id] = license.license_id
-          usage_data[:historical_max_users] = ::HistoricalData.max_historical_user_count
-          usage_data[:licensee] = license.licensee
-          usage_data[:license_user_count] = license.restricted_user_count
-          usage_data[:license_starts_at] = license.starts_at
-          usage_data[:license_expires_at] = license.expires_at
-          usage_data[:license_plan] = license.plan
-          usage_data[:license_add_ons] = license.add_ons
-          usage_data[:license_trial] = license.trial?
+        override :features_usage_data
+        def features_usage_data
+          super.merge(features_usage_data_ee)
         end
 
-        usage_data
-      end
+        def features_usage_data_ee
+          {
+            elasticsearch_enabled: ::Gitlab::CurrentSettings.elasticsearch_search?,
+            geo_enabled: ::Gitlab::Geo.enabled?
+          }
+        end
 
-      # rubocop: disable CodeReuse/ActiveRecord
-      def projects_mirrored_with_pipelines_enabled
-        count(::Project.joins(:project_feature).where(
-                mirror: true,
-                mirror_trigger_builds: true,
-                project_features: {
-                  builds_access_level: ::ProjectFeature::ENABLED
-                }
-        ))
-      end
-      # rubocop: enable CodeReuse/ActiveRecord
+        override :license_usage_data
+        def license_usage_data
+          usage_data = super
+          license = ::License.current
+          usage_data[:edition] =
+            if license
+              license.edition
+            else
+              'EE Free'
+            end
 
-      # rubocop: disable CodeReuse/ActiveRecord
-      def service_desk_counts
-        return {} unless ::License.feature_available?(:service_desk)
+          if license
+            usage_data[:license_md5] = license.md5
+            usage_data[:license_id] = license.license_id
+            usage_data[:historical_max_users] = ::HistoricalData.max_historical_user_count
+            usage_data[:licensee] = license.licensee
+            usage_data[:license_user_count] = license.restricted_user_count
+            usage_data[:license_starts_at] = license.starts_at
+            usage_data[:license_expires_at] = license.expires_at
+            usage_data[:license_plan] = license.plan
+            usage_data[:license_add_ons] = license.add_ons
+            usage_data[:license_trial] = license.trial?
+          end
 
-        projects_with_service_desk = ::Project.where(service_desk_enabled: true)
+          usage_data
+        end
 
-        {
-          service_desk_enabled_projects: count(projects_with_service_desk),
-          service_desk_issues: count(::Issue.where(
-                                       project: projects_with_service_desk,
-                                       author: ::User.support_bot,
-                                       confidential: true
+        # rubocop: disable CodeReuse/ActiveRecord
+        def projects_mirrored_with_pipelines_enabled
+          count(::Project.joins(:project_feature).where(
+                  mirror: true,
+                  mirror_trigger_builds: true,
+                  project_features: {
+                    builds_access_level: ::ProjectFeature::ENABLED
+                  }
           ))
-        }
-      end
-      # rubocop: enable CodeReuse/ActiveRecord
-
-      # rubocop: disable CodeReuse/ActiveRecord
-      def security_products_usage
-        types = {
-          container_scanning: :container_scanning_jobs,
-          dast: :dast_jobs,
-          dependency_scanning: :dependency_scanning_jobs,
-          license_management: :license_management_jobs,
-          sast: :sast_jobs
-        }
-
-        results = count(::Ci::Build.where(name: types.keys).group(:name), fallback: Hash.new(-1))
-        results.each_with_object({}) { |(key, value), response| response[types[key.to_sym]] = value }
-      end
-      # rubocop: enable CodeReuse/ActiveRecord
-
-      # Note: when adding a preference, check if it's mapped to an attribute of a User model. If so, name
-      # the base key part after a corresponding User model attribute, use its possible values as suffix values.
-      override :user_preferences_usage
-      def user_preferences_usage
-        super.tap do |user_prefs_usage|
-          if ::Feature.enabled?(:group_overview_security_dashboard)
-            user_prefs_usage.merge!(
-              group_overview_details: count(::User.active.group_view_details),
-              group_overview_security_dashboard: count(::User.active.group_view_security_dashboard)
-            )
+        end
+        # rubocop: enable CodeReuse/ActiveRecord
+
+        # rubocop: disable CodeReuse/ActiveRecord
+        def service_desk_counts
+          return {} unless ::License.feature_available?(:service_desk)
+
+          projects_with_service_desk = ::Project.where(service_desk_enabled: true)
+
+          {
+            service_desk_enabled_projects: count(projects_with_service_desk),
+            service_desk_issues: count(::Issue.where(
+                                         project: projects_with_service_desk,
+                                         author: ::User.support_bot,
+                                         confidential: true
+            ))
+          }
+        end
+        # rubocop: enable CodeReuse/ActiveRecord
+
+        # rubocop: disable CodeReuse/ActiveRecord
+        def security_products_usage
+          types = {
+            container_scanning: :container_scanning_jobs,
+            dast: :dast_jobs,
+            dependency_scanning: :dependency_scanning_jobs,
+            license_management: :license_management_jobs,
+            sast: :sast_jobs
+          }
+
+          results = count(::Ci::Build.where(name: types.keys).group(:name), fallback: Hash.new(-1))
+          results.each_with_object({}) { |(key, value), response| response[types[key.to_sym]] = value }
+        end
+        # rubocop: enable CodeReuse/ActiveRecord
+
+        # Note: when adding a preference, check if it's mapped to an attribute of a User model. If so, name
+        # the base key part after a corresponding User model attribute, use its possible values as suffix values.
+        override :user_preferences_usage
+        def user_preferences_usage
+          super.tap do |user_prefs_usage|
+            if ::Feature.enabled?(:group_overview_security_dashboard)
+              user_prefs_usage.merge!(
+                group_overview_details: count(::User.active.group_view_details),
+                group_overview_security_dashboard: count(::User.active.group_view_security_dashboard)
+              )
+            end
           end
         end
-      end
 
-      override :system_usage_data
-      def system_usage_data
-        usage_data = super
-
-        usage_data[:counts] = usage_data[:counts].merge({
-          epics: count(::Epic),
-          feature_flags: count(Operations::FeatureFlag),
-          geo_nodes: count(::GeoNode),
-          ldap_group_links: count(::LdapGroupLink),
-          ldap_keys: count(::LDAPKey),
-          ldap_users: count(::User.ldap),
-          projects_reporting_ci_cd_back_to_github: count(::GithubService.without_defaults.active),
-          projects_mirrored_with_pipelines_enabled: projects_mirrored_with_pipelines_enabled,
-          projects_with_prometheus_alerts: count(PrometheusAlert.distinct_projects),
-          projects_with_packages: count(::Packages::Package.select('distinct project_id')),
-          projects_with_tracing_enabled: count(ProjectTracingSetting),
-          projects_enforcing_code_owner_approval: count(::Project.without_deleted.non_archived.requiring_code_owner_approval)
-        }).merge(service_desk_counts).merge(security_products_usage)
-
-        # MySql does not support recursive queries so we can't retrieve epics relationship depth
-        if ::Group.supports_nested_objects?
-          usage_data[:counts] = usage_data[:counts].merge(epics_deepest_relationship_level)
-        end
+        override :system_usage_data
+        def system_usage_data
+          usage_data = super
+
+          usage_data[:counts] = usage_data[:counts].merge({
+            epics: count(::Epic),
+            feature_flags: count(Operations::FeatureFlag),
+            geo_nodes: count(::GeoNode),
+            ldap_group_links: count(::LdapGroupLink),
+            ldap_keys: count(::LDAPKey),
+            ldap_users: count(::User.ldap),
+            projects_reporting_ci_cd_back_to_github: count(::GithubService.without_defaults.active),
+            projects_mirrored_with_pipelines_enabled: projects_mirrored_with_pipelines_enabled,
+            projects_with_prometheus_alerts: count(PrometheusAlert.distinct_projects),
+            projects_with_packages: count(::Packages::Package.select('distinct project_id')),
+            projects_with_tracing_enabled: count(ProjectTracingSetting),
+            projects_enforcing_code_owner_approval: count(::Project.without_deleted.non_archived.requiring_code_owner_approval)
+          }).merge(service_desk_counts).merge(security_products_usage)
+
+          # MySql does not support recursive queries so we can't retrieve epics relationship depth
+          if ::Group.supports_nested_objects?
+            usage_data[:counts] = usage_data[:counts].merge(epics_deepest_relationship_level)
+          end
 
-        usage_data
-      end
+          usage_data
+        end
 
-      override :jira_usage
-      def jira_usage
-        super.merge(
-          projects_jira_dvcs_cloud_active: count(ProjectFeatureUsage.with_jira_dvcs_integration_enabled),
-          projects_jira_dvcs_server_active: count(ProjectFeatureUsage.with_jira_dvcs_integration_enabled(cloud: false))
-        )
-      end
+        override :jira_usage
+        def jira_usage
+          super.merge(
+            projects_jira_dvcs_cloud_active: count(ProjectFeatureUsage.with_jira_dvcs_integration_enabled),
+            projects_jira_dvcs_server_active: count(ProjectFeatureUsage.with_jira_dvcs_integration_enabled(cloud: false))
+          )
+        end
 
-      def epics_deepest_relationship_level
-        { epics_deepest_relationship_level: ::Epic.deepest_relationship_level }
+        def epics_deepest_relationship_level
+          { epics_deepest_relationship_level: ::Epic.deepest_relationship_level }
+        end
       end
     end
   end

lib/gitlab/usage_data.rb

@@ -5,8 +5,6 @@ module Gitlab
     APPROXIMATE_COUNT_MODELS = [Label, MergeRequest, Note, Todo].freeze
 
     class << self
-      prepend EE::Gitlab::UsageData # rubocop: disable Cop/InjectEnterpriseEditionModule
-
       def data(force_refresh: false)
         Rails.cache.fetch('usage_data', force: force_refresh, expires_in: 2.weeks) { uncached_data }
       end
@@ -31,7 +29,7 @@ module Gitlab
           installation_type: Gitlab::INSTALLATION_TYPE,
           active_user_count: count(User.active),
           recorded_at: Time.now,
-          edition: 'EE'
+          edition: 'CE'
         }
 
         usage_data
@@ -192,3 +190,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::UsageData.prepend(EE::Gitlab::UsageData)