Merge branch '119082-add-trial-counters-to-usage-ping' into 'master'

Add trial counters to usage ping

See merge request gitlab-org/gitlab!22279

ee/changelogs/unreleased/119082-add-trial-counters-to-usage-ping.yml

+---
+title: Add trial counters to usage ping
+merge_request: 22279
+author:
+type: added

ee/lib/ee/gitlab/usage_data.rb

@@ -32,6 +32,7 @@ module EE
         def features_usage_data_ee
           {
             elasticsearch_enabled: ::Gitlab::CurrentSettings.elasticsearch_search?,
+            license_trial_ends_on: License.trial_ends_on,
             geo_enabled: ::Gitlab::Geo.enabled?
           }
         end

ee/spec/lib/gitlab/usage_data_spec.rb

@@ -56,6 +56,7 @@ describe Gitlab::UsageData do
         license_id
         elasticsearch_enabled
         geo_enabled
+        license_trial_ends_on
       ))
     end
 
@@ -133,6 +134,7 @@ describe Gitlab::UsageData do
     it 'gathers feature usage data of EE' do
       expect(subject[:elasticsearch_enabled]).to eq(Gitlab::CurrentSettings.elasticsearch_search?)
       expect(subject[:geo_enabled]).to eq(Gitlab::Geo.enabled?)
+      expect(subject[:license_trial_ends_on]).to eq(License.trial_ends_on)
     end
   end