Merge branch 'ee-33328-usage-ping-for-gitlab-features-and-components' into 'master'

Adds gitlab features and components to usage ping data.

See merge request gitlab-org/gitlab-ee!2956

changelogs/unreleased/33328-usage-ping-for-gitlab-features-and-components.yml

+---
+title: Adds gitlab features and components to usage ping data.
+merge_request: 14305
+author:
+type: other

lib/gitlab/usage_data.rb

@@ -9,12 +9,42 @@ module Gitlab
 
       def uncached_data
         license_usage_data.merge(system_usage_data)
+                          .merge(features_usage_data)
+                          .merge(components_usage_data)
       end
 
       def to_json(force_refresh: false)
         data(force_refresh: force_refresh).to_json
       end
 
+      def license_usage_data
+        usage_data = {
+          uuid: current_application_settings.uuid,
+          hostname: Gitlab.config.gitlab.host,
+          version: Gitlab::VERSION,
+          active_user_count: User.active.count,
+          recorded_at: Time.now,
+          mattermost_enabled: Gitlab.config.mattermost.enabled,
+          edition: 'EE'
+        }
+
+        license = ::License.current
+
+        if license
+          usage_data[:edition] = license_edition(license.plan)
+          usage_data[:license_md5] = license.md5
+          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
+        end
+
+        usage_data
+      end
+
       def system_usage_data
         {
           counts: {
@@ -73,32 +103,35 @@ module Gitlab
         }
       end
 
-      def license_usage_data
-        usage_data = {
-          uuid: current_application_settings.uuid,
-          hostname: Gitlab.config.gitlab.host,
-          version: Gitlab::VERSION,
-          active_user_count: User.active.count,
-          recorded_at: Time.now,
-          mattermost_enabled: Gitlab.config.mattermost.enabled,
-          edition: 'EE'
-        }
+      def features_usage_data
+        features_usage_data_ce.merge(features_usage_data_ee)
+      end
 
-        license = ::License.current
+      def features_usage_data_ce
+        {
+          signup: current_application_settings.signup_enabled?,
+          ldap: Gitlab.config.ldap.enabled,
+          gravatar: current_application_settings.gravatar_enabled?,
+          omniauth: Gitlab.config.omniauth.enabled,
+          reply_by_email: Gitlab::IncomingEmail.enabled?,
+          container_registry: Gitlab.config.registry.enabled,
+          gitlab_shared_runners: Gitlab.config.gitlab_ci.shared_runners_enabled
+        }
+      end
 
-        if license
-          usage_data[:edition] = license_edition(license.plan)
-          usage_data[:license_md5] = license.md5
-          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
-        end
+      def features_usage_data_ee
+        {
+          elasticsearch: current_application_settings.elasticsearch_search?,
+          geo: Gitlab::Geo.enabled?
+        }
+      end
 
-        usage_data
+      def components_usage_data
+        {
+          gitlab_pages: { enabled: Gitlab.config.pages.enabled, version: Gitlab::Pages::VERSION },
+          git: { version: Gitlab::Git.version },
+          database: { adapter: Gitlab::Database.adapter_name, version: Gitlab::Database.version }
+        }
       end
 
       def license_edition(plan)

spec/lib/gitlab/usage_data_spec.rb

@@ -35,6 +35,18 @@ describe Gitlab::UsageData do
         version
         uuid
         hostname
+        signup
+        ldap
+        gravatar
+        omniauth
+        reply_by_email
+        container_registry
+        gitlab_pages
+        gitlab_shared_runners
+        elasticsearch
+        geo
+        git
+        database
       ))
     end
 
@@ -101,6 +113,41 @@ describe Gitlab::UsageData do
     end
   end
 
+  describe '#features_usage_data_ce' do
+    subject { described_class.features_usage_data_ce }
+
+    it 'gathers feature usage data' do
+      expect(subject[:signup]).to eq(current_application_settings.signup_enabled?)
+      expect(subject[:ldap]).to eq(Gitlab.config.ldap.enabled)
+      expect(subject[:gravatar]).to eq(current_application_settings.gravatar_enabled?)
+      expect(subject[:omniauth]).to eq(Gitlab.config.omniauth.enabled)
+      expect(subject[:reply_by_email]).to eq(Gitlab::IncomingEmail.enabled?)
+      expect(subject[:container_registry]).to eq(Gitlab.config.registry.enabled)
+      expect(subject[:gitlab_shared_runners]).to eq(Gitlab.config.gitlab_ci.shared_runners_enabled)
+    end
+  end
+
+  describe '#features_usage_data_ee' do
+    subject { described_class.features_usage_data_ee }
+
+    it 'gathers feature usage data of EE' do
+      expect(subject[:elasticsearch]).to eq(current_application_settings.elasticsearch_search?)
+      expect(subject[:geo]).to eq(Gitlab::Geo.enabled?)
+    end
+  end
+
+  describe '#components_usage_data' do
+    subject { described_class.components_usage_data }
+
+    it 'gathers components usage data' do
+      expect(subject[:gitlab_pages][:enabled]).to eq(Gitlab.config.pages.enabled)
+      expect(subject[:gitlab_pages][:version]).to eq(Gitlab::Pages::VERSION)
+      expect(subject[:git][:version]).to eq(Gitlab::Git.version)
+      expect(subject[:database][:adapter]).to eq(Gitlab::Database.adapter_name)
+      expect(subject[:database][:version]).to eq(Gitlab::Database.version)
+    end
+  end
+
   describe '#license_usage_data' do
     subject { described_class.license_usage_data }