Merge branch 'psk-add-billable-users-to-usage-ping' into 'master'

Add billable_users metric to Usage Ping

See merge request gitlab-org/gitlab!62850

doc/development/usage_ping/dictionary.md

@@ -7174,6 +7174,18 @@ Status: `data_available`
 
 Tiers: `free`
 
+### `license_billable_users`
+
+Number of all billable users (active users excluding bots and guests).
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210531204603_license_billable_users.yml)
+
+Group: `group::product intelligence`
+
+Status: `implemented`
+
+Tiers: `premium`, `ultimate`
+
 ### `license_expires_at`
 
 The date the license ends

ee/config/metrics/license/20210531204603_license_billable_users.yml

+---
+key_path: license_billable_users
+name: billable_users
+description: Number of all billable users (active users excluding bots and guests).
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: number
+status: implemented
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62850
+time_frame: all
+data_source: database
+distribution:
+- ee
+tier:
+- premium
+- ultimate

ee/lib/ee/gitlab/usage_data.rb

@@ -97,6 +97,7 @@ module EE
             # rubocop: enable UsageData/LargeTable
             usage_data[:licensee] = license.licensee
             usage_data[:license_user_count] = license.restricted_user_count
+            usage_data[:license_billable_users] = alt_usage_data { license.daily_billable_users_count }
             usage_data[:license_starts_at] = license.starts_at
             usage_data[:license_expires_at] = license.expires_at
             usage_data[:license_plan] = license.plan

ee/spec/lib/ee/gitlab/usage_data_non_sql_metrics_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Gitlab::UsageDataNonSqlMetrics do
         described_class.uncached_data
       end
 
-      expect(recorder.count).to eq(52)
+      expect(recorder.count).to eq(54)
     end
   end
 end

ee/spec/lib/ee/gitlab/usage_data_spec.rb

@@ -79,6 +79,7 @@ RSpec.describe Gitlab::UsageData do
         elasticsearch_enabled
         geo_enabled
         license_trial_ends_on
+        license_billable_users
       ))
     end
 
@@ -180,6 +181,7 @@ RSpec.describe Gitlab::UsageData do
       expect(subject[:license_add_ons]).to eq(license.add_ons)
       expect(subject[:license_trial]).to eq(license.trial?)
       expect(subject[:license_subscription_id]).to eq(license.subscription_id)
+      expect(subject[:license_billable_users]).to eq(license.daily_billable_users_count)
     end
   end