Merge branch 'license-metric-class' into 'master'

Add License metric classes for Zuora Subscription ID and License MD5

See merge request gitlab-org/gitlab!66420

ee/config/metrics/license/20210204124831_license_md5.yml

@@ -9,6 +9,7 @@ value_type: string
 status: data_available
 time_frame: none
 data_source: license
+instrumentation_class: 'LicenseMdFiveMetric'
 data_category: Standard
 distribution:
 - ee

ee/config/metrics/license/20210204124852_license_subscription_id.yml

@@ -9,6 +9,7 @@ value_type: string
 status: data_available
 time_frame: none
 data_source: license
+instrumentation_class: 'ZuoraSubscriptionIdMetric'
 data_category: Standard
 distribution:
 - ee

ee/lib/gitlab/usage/metrics/instrumentations/license_md_five_metric.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module Usage
+    module Metrics
+      module Instrumentations
+        class LicenseMdFiveMetric < ::Gitlab::Usage::Metrics::Instrumentations::GenericMetric
+          value do
+            ::License.current.md5
+          end
+        end
+      end
+    end
+  end
+end

ee/lib/gitlab/usage/metrics/instrumentations/zuora_subscription_id_metric.rb

+# frozen_string_literal: true
+
+module Gitlab
+  module Usage
+    module Metrics
+      module Instrumentations
+        class ZuoraSubscriptionIdMetric < ::Gitlab::Usage::Metrics::Instrumentations::GenericMetric
+          value do
+            ::License.current.subscription_id
+          end
+        end
+      end
+    end
+  end
+end

ee/spec/lib/gitlab/usage/metrics/instrumentations/license_md_five_metric_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Usage::Metrics::Instrumentations::LicenseMdFiveMetric do
+  it_behaves_like 'a correct instrumented metric value', { time_frame: 'none', data_source: 'ruby' } do
+    let(:expected_value) { Digest::MD5.hexdigest(::License.current.data) }
+  end
+end

ee/spec/lib/gitlab/usage/metrics/instrumentations/zuora_subscription_id_metric_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Usage::Metrics::Instrumentations::ZuoraSubscriptionIdMetric do
+  it_behaves_like 'a correct instrumented metric value', { time_frame: 'none', data_source: 'ruby' } do
+    let(:expected_value) { ::License.current.subscription_id }
+  end
+end

ee/spec/lib/gitlab/usage_data_metrics_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::UsageDataMetrics do
+  describe '.uncached_data' do
+    subject { described_class.uncached_data }
+
+    around do |example|
+      described_class.instance_variable_set(:@definitions, nil)
+      example.run
+      described_class.instance_variable_set(:@definitions, nil)
+    end
+
+    before do
+      allow(ActiveRecord::Base.connection).to receive(:transaction_open?).and_return(false) # rubocop:disable Database/MultipleDatabases
+    end
+
+    context 'with instrumentation_class' do
+      it 'includes top level keys' do
+        expect(subject).to include(:license_md5)
+        expect(subject).to include(:license_subscription_id)
+      end
+    end
+  end
+end