Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

3 files changed, 27 insertions, 6 deletions

diff --git a/spec/lib/gitlab/usage/metric_definition_spec.rb b/spec/lib/gitlab/usage/metric_definition_spec.rb
index 1ae8a0881ef..6406c0b5458 100644
--- a/spec/lib/gitlab/usage/metric_definition_spec.rb
+++ b/spec/lib/gitlab/usage/metric_definition_spec.rb
@@ -9,7 +9,8 @@ RSpec.describe Gitlab::Usage::MetricDefinition do
       value_type: 'string',
       product_category: 'collection',
       product_stage: 'growth',
-      status: 'data_available',
+      status: 'active',
+      milestone: '14.1',
       default_generation: 'generation_1',
       key_path: 'uuid',
       product_group: 'group::product analytics',
@@ -64,6 +65,7 @@ RSpec.describe Gitlab::Usage::MetricDefinition do
       :value_type         | nil
       :value_type         | 'test'
       :status             | nil
+      :milestone          | nil
       :data_category      | nil
       :key_path           | nil
       :product_group      | nil
@@ -127,9 +129,7 @@ RSpec.describe Gitlab::Usage::MetricDefinition do
     where(:status, :skip_validation?) do
       'deprecated'     | true
       'removed'        | true
-      'data_available' | false
-      'implemented'    | false
-      'not_used'       | false
+      'active'         | false
     end
 
     with_them do
@@ -191,7 +191,8 @@ RSpec.describe Gitlab::Usage::MetricDefinition do
         value_type: 'string',
         product_category: 'collection',
         product_stage: 'growth',
-        status: 'data_available',
+        status: 'active',
+        milestone: '14.1',
         default_generation: 'generation_1',
         key_path: 'counter.category.event',
         product_group: 'group::product analytics',
diff --git a/spec/lib/gitlab/usage/metric_spec.rb b/spec/lib/gitlab/usage/metric_spec.rb
index d83f59e4a7d..ea8d1a135a6 100644
--- a/spec/lib/gitlab/usage/metric_spec.rb
+++ b/spec/lib/gitlab/usage/metric_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe Gitlab::Usage::Metric do
       product_group: "group::plan",
       product_category: "issue_tracking",
       value_type: "number",
-      status: "data_available",
+      status: "active",
       time_frame: "all",
       data_source: "database",
       instrumentation_class: "CountIssuesMetric",
diff --git a/spec/lib/gitlab/usage/metrics/instrumentations/service_ping_features_metric_spec.rb b/spec/lib/gitlab/usage/metrics/instrumentations/service_ping_features_metric_spec.rb
new file mode 100644
index 00000000000..40e9b962878
--- /dev/null
+++ b/spec/lib/gitlab/usage/metrics/instrumentations/service_ping_features_metric_spec.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Usage::Metrics::Instrumentations::ServicePingFeaturesMetric do
+  using RSpec::Parameterized::TableSyntax
+
+  where(:usage_ping_features_enabled, :expected_value) do
+    true  | true
+    false | false
+  end
+
+  with_them do
+    before do
+      stub_application_setting(usage_ping_features_enabled: usage_ping_features_enabled)
+    end
+
+    it_behaves_like 'a correct instrumented metric value', { time_frame: 'none' }
+  end
+end