Merge branch 'mwaw/change_quarantine_metrics_to_defualt_on' into 'master'

Skip secure product metrics in service ping

See merge request gitlab-org/gitlab!72198

ee/config/feature_flags/ops/quarantine_security_products_usage_metrics.yml → ee/config/feature_flags/ops/allow_quarantined_security_products_usage_metrics.yml

 ---
-name: quarantine_security_products_usage_metrics
+name: allow_quarantined_security_products_usage_metrics
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/71722
 rollout_issue_url:
 milestone: '14.4'

ee/lib/ee/gitlab/usage_data.rb

@@ -143,10 +143,10 @@ module EE
 
         def security_products_usage
           results = SECURE_PRODUCT_TYPES.each_with_object({}) do |(secure_type, attribs), response|
-            response[attribs[:name]] = if ::Feature.enabled?(:quarantine_security_products_usage_metrics, type: :ops, default_enabled: :yaml)
-                                         ::Gitlab::Database::BatchCounter::FALLBACK
-                                       else
+            response[attribs[:name]] = if ::Feature.enabled?(:allow_quarantined_security_products_usage_metrics, type: :ops, default_enabled: :yaml)
                                          count(::Ci::Build.where(name: secure_type)) # rubocop:disable CodeReuse/ActiveRecord
+                                       else
+                                         ::Gitlab::Database::BatchCounter::FALLBACK
                                        end
           end
 

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

@@ -128,48 +128,48 @@ RSpec.describe Gitlab::UsageData do
       expect(count_data[:epic_issues]).to eq(2)
     end
 
-    context 'with quarantine_security_products_usage_metrics turned on' do
-      it 'returns fallback value for quarantined security products usage data' do
-        expect(count_data[:container_scanning_jobs]).to eq(-1)
-        expect(count_data[:dast_jobs]).to eq(-1)
-        expect(count_data[:dependency_scanning_jobs]).to eq(-1)
-        expect(count_data[:license_management_jobs]).to eq(-1)
-        expect(count_data[:sast_jobs]).to eq(-1)
-        expect(count_data[:secret_detection_jobs]).to eq(-1)
-        expect(count_data[:coverage_fuzzing_jobs]).to eq(-1)
-        expect(count_data[:api_fuzzing_jobs]).to eq(-1)
-        expect(count_data[:api_fuzzing_dnd_jobs]).to eq(-1)
+    context 'with allow_quarantined_security_products_usage_metrics turned on' do
+      it 'gathers security products usage data' do
+        expect(count_data[:container_scanning_jobs]).to eq(1)
+        expect(count_data[:dast_jobs]).to eq(1)
+        expect(count_data[:dependency_scanning_jobs]).to eq(1)
+        expect(count_data[:license_management_jobs]).to eq(2)
+        expect(count_data[:sast_jobs]).to eq(1)
+        expect(count_data[:secret_detection_jobs]).to eq(1)
+        expect(count_data[:coverage_fuzzing_jobs]).to eq(1)
+        expect(count_data[:api_fuzzing_jobs]).to eq(1)
+        expect(count_data[:api_fuzzing_dnd_jobs]).to eq(1)
         expect(count_data[:dast_on_demand_pipelines]).to eq(1)
       end
 
-      it 'avoid counting metrics' do
-        expect(described_class).not_to receive(:count)
+      it 'counts metrics data' do
+        expect(described_class).to receive(:count).exactly(10).times
 
         described_class.security_products_usage
       end
     end
 
-    context 'with quarantine_security_products_usage_metrics turned off' do
+    context 'with allow_quarantined_security_products_usage_metrics turned off' do
       before do
-        stub_feature_flags(quarantine_security_products_usage_metrics: false)
+        stub_feature_flags(allow_quarantined_security_products_usage_metrics: false)
       end
 
-      it 'counts metrics data' do
-        expect(described_class).to receive(:count).exactly(10).times
+      it 'avoid counting metrics' do
+        expect(described_class).not_to receive(:count)
 
         described_class.security_products_usage
       end
 
-      it 'gathers security products usage data' do
-        expect(count_data[:container_scanning_jobs]).to eq(1)
-        expect(count_data[:dast_jobs]).to eq(1)
-        expect(count_data[:dependency_scanning_jobs]).to eq(1)
-        expect(count_data[:license_management_jobs]).to eq(2)
-        expect(count_data[:sast_jobs]).to eq(1)
-        expect(count_data[:secret_detection_jobs]).to eq(1)
-        expect(count_data[:coverage_fuzzing_jobs]).to eq(1)
-        expect(count_data[:api_fuzzing_jobs]).to eq(1)
-        expect(count_data[:api_fuzzing_dnd_jobs]).to eq(1)
+      it 'returns fallback value for quarantined security products usage data' do
+        expect(count_data[:container_scanning_jobs]).to eq(-1)
+        expect(count_data[:dast_jobs]).to eq(-1)
+        expect(count_data[:dependency_scanning_jobs]).to eq(-1)
+        expect(count_data[:license_management_jobs]).to eq(-1)
+        expect(count_data[:sast_jobs]).to eq(-1)
+        expect(count_data[:secret_detection_jobs]).to eq(-1)
+        expect(count_data[:coverage_fuzzing_jobs]).to eq(-1)
+        expect(count_data[:api_fuzzing_jobs]).to eq(-1)
+        expect(count_data[:api_fuzzing_dnd_jobs]).to eq(-1)
         expect(count_data[:dast_on_demand_pipelines]).to eq(1)
       end
     end