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,6 +3,9 @@
 module EE
   module Gitlab
     module UsageData
+      extend ActiveSupport::Concern
+
+      class_methods do
         extend ::Gitlab::Utils::Override
 
         override :features_usage_data
@@ -142,4 +145,5 @@ module EE
         end
       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)