diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-06 03:11:28 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-06 03:11:28 +0000 |
| commit | c855426afdc9c081fbb16b9df9249b0cb117a25c (patch) | |
| tree | af0caa97dd2c98a9277adcbc370820604fe952a8 /lib/gitlab | |
| parent | 49f32104434abc51d6a115fe214f0bf6b420d3bc (diff) | |
| download | gitlab-ce-c855426afdc9c081fbb16b9df9249b0cb117a25c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
4 files changed, 54 insertions, 17 deletions
diff --git a/lib/gitlab/usage/metrics/instrumentations/edition_metric.rb b/lib/gitlab/usage/metrics/instrumentations/edition_metric.rb new file mode 100644 index 00000000000..83153242703 --- /dev/null +++ b/lib/gitlab/usage/metrics/instrumentations/edition_metric.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +module Gitlab + module Usage + module Metrics + module Instrumentations + class EditionMetric < GenericMetric + value do + if Gitlab.ee? + ::License.current&.edition || 'EE Free' + else + 'CE' + end + end + end + end + end + end +end diff --git a/lib/gitlab/usage/metrics/instrumentations/installation_type_metric.rb b/lib/gitlab/usage/metrics/instrumentations/installation_type_metric.rb new file mode 100644 index 00000000000..7147fc2e624 --- /dev/null +++ b/lib/gitlab/usage/metrics/instrumentations/installation_type_metric.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +module Gitlab + module Usage + module Metrics + module Instrumentations + class InstallationTypeMetric < GenericMetric + value do + if Rails.env.production? + Gitlab::INSTALLATION_TYPE + else + "gitlab-development-kit" + end + end + end + end + end + end +end diff --git a/lib/gitlab/usage/metrics/instrumentations/version_metric.rb b/lib/gitlab/usage/metrics/instrumentations/version_metric.rb new file mode 100644 index 00000000000..cc26268067f --- /dev/null +++ b/lib/gitlab/usage/metrics/instrumentations/version_metric.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +module Gitlab + module Usage + module Metrics + module Instrumentations + class VersionMetric < GenericMetric + value do + Gitlab::VERSION + end + end + end + end + end +end diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 2965008b0cf..846bb934a3d 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -47,15 +47,7 @@ module Gitlab end def license_usage_data - { - recorded_at: recorded_at, - uuid: add_metric('UuidMetric'), - hostname: add_metric('HostnameMetric'), - version: alt_usage_data { Gitlab::VERSION }, - installation_type: alt_usage_data { installation_type }, - active_user_count: add_metric('ActiveUserCountMetric'), - edition: 'CE' - } + { recorded_at: recorded_at } end def recorded_at @@ -357,14 +349,6 @@ module Gitlab } end - def installation_type - if Rails.env.production? - Gitlab::INSTALLATION_TYPE - else - "gitlab-development-kit" - end - end - def operating_system ohai_data = Ohai::System.new.tap do |oh| oh.all_plugins(['platform']) |