Merge branch...

Merge branch 'update-secure-usage-ping-to-be-able-to-determine-number-of-jobs-by-user' into 'master'

Add distinct user count of secure stage items to usage ping

Closes gitlab-org/secure/general#63

See merge request gitlab-org/gitlab!26194

ee/changelogs/unreleased/update-secure-usage-ping-to-be-able-to-determine-number-of-jobs-by-use.yml

+---
+title: Add distinct user count of secure stage items to usage ping
+merge_request: 26194
+author:
+type: added

ee/lib/ee/gitlab/usage_data.rb

@@ -5,6 +5,28 @@ module EE
     module UsageData
       extend ActiveSupport::Concern
 
+      SECURE_PRODUCT_TYPES = {
+        container_scanning: {
+          name: :container_scanning_jobs
+        },
+        dast: {
+          name: :dast_jobs
+        },
+        dependency_scanning: {
+          name: :dependency_scanning_jobs
+        },
+        license_management: {
+          name: :license_management_jobs
+        },
+        license_scanning: {
+          name: :license_scanning_jobs,
+          fallback: 0
+        },
+        sast: {
+          name: :sast_jobs
+        }
+      }.freeze
+
       class_methods do
         extend ::Gitlab::Utils::Override
 
@@ -92,23 +114,14 @@ module EE
 
         # rubocop: disable CodeReuse/ActiveRecord
         def security_products_usage
-          types = {
-            container_scanning: :container_scanning_jobs,
-            dast: :dast_jobs,
-            dependency_scanning: :dependency_scanning_jobs,
-            license_management: :license_management_jobs,
-            license_scanning: :license_scanning_jobs,
-            sast: :sast_jobs
-          }
-
-          results = count(::Ci::Build.where(name: types.keys).group(:name), fallback: Hash.new(-1), batch: false)
+          results = count(::Ci::Build.where(name: SECURE_PRODUCT_TYPES.keys).group(:name), fallback: Hash.new(-1), batch: false)
 
           license_scan_count = results.delete("license_scanning")
           if license_scan_count && results["license_management"]
             results["license_management"] += license_scan_count
           end
 
-          results.each_with_object({}) { |(key, value), response| response[types[key.to_sym]] = value }
+          results.each_with_object({}) { |(key, value), response| response[SECURE_PRODUCT_TYPES[key.to_sym][:name]] = value }
         end
         # rubocop: enable CodeReuse/ActiveRecord
 
@@ -194,7 +207,7 @@ module EE
 
         # Omitted because no user, creator or author associated: `auto_devops_disabled`, `auto_devops_enabled`
         # Omitted because not in use anymore: `gcp_clusters`, `gcp_clusters_disabled`, `gcp_clusters_enabled`
-        # rubocop: disable CodeReuse/ActiveRecord
+        # rubocop:disable CodeReuse/ActiveRecord
         def usage_activity_by_stage_configure(time_period)
           {
             clusters_applications_cert_managers: ::Clusters::Applications::CertManager.where(time_period).distinct_by_user,
@@ -314,10 +327,24 @@ module EE
         # container_scanning_jobs, dast_jobs, dependency_scanning_jobs, license_management_jobs, sast_jobs
         # Once https://gitlab.com/gitlab-org/gitlab/merge_requests/17568 is merged, this might be doable
         def usage_activity_by_stage_secure(time_period)
-          {
+          prefix = 'user_'
+
+          results = {
             user_preferences_group_overview_security_dashboard: count(::User.active.group_view_security_dashboard.where(time_period))
           }
+
+          SECURE_PRODUCT_TYPES.each do |secure_type, attribs|
+            results["#{prefix}#{attribs[:name]}".to_sym] = distinct_count(::Ci::Build.where(name: secure_type).where(time_period), :user_id, fallback: attribs.fetch(:fallback, -1))
+          end
+
+          # handle license rename https://gitlab.com/gitlab-org/gitlab/issues/8911
+          combined_license_key = "#{prefix}license_management_jobs".to_sym
+          license_scan_count = results.delete("#{prefix}license_scanning_jobs".to_sym)
+          results[combined_license_key] += license_scan_count
+
+          results
         end
+        # rubocop:enable CodeReuse/ActiveRecord
       end
     end
   end

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

@@ -344,11 +344,48 @@ describe Gitlab::UsageData do
           end
 
           context 'for secure' do
+            let_it_be(:user) { create(:user, group_view: :security_dashboard) }
+            let_it_be(:ci_build_container_scanning) { create(:ci_build, name: 'container_scanning', user: user) }
+            let_it_be(:ci_build_dast) { create(:ci_build, name: 'dast', user: user) }
+            let_it_be(:ci_build_dependency_scanning) { create(:ci_build, name: 'dependency_scanning', user: user) }
+            let_it_be(:ci_build_license_management) { create(:ci_build, name: 'license_management', user: user) }
+            let_it_be(:ci_build_sast) { create(:ci_build, name: 'sast', user: user) }
+
             it 'includes accurate usage_activity_by_stage data' do
-              create(:user, group_view: :security_dashboard)
+              expect(described_class.uncached_data[:usage_activity_by_stage_monthly][:secure]).to eq(
+                user_preferences_group_overview_security_dashboard: 1,
+                user_container_scanning_jobs: 1,
+                user_dast_jobs: 1,
+                user_dependency_scanning_jobs: 1,
+                user_license_management_jobs: 1,
+                user_sast_jobs: 1
+              )
+            end
+
+            it 'combines license_scanning into license_management' do
+              create(:ci_build, name: 'license_scanning', user: user)
+
+              expect(described_class.uncached_data[:usage_activity_by_stage_monthly][:secure]).to eq(
+                user_preferences_group_overview_security_dashboard: 1,
+                user_container_scanning_jobs: 1,
+                user_dast_jobs: 1,
+                user_dependency_scanning_jobs: 1,
+                user_license_management_jobs: 2,
+                user_sast_jobs: 1
+              )
+            end
+
+            it 'has to resort to 0 for counting license scan' do
+              allow(Gitlab::Database::BatchCount).to receive(:batch_distinct_count).and_raise(ActiveRecord::StatementInvalid)
+              allow(::Ci::Build).to receive(:distinct_count_by).and_raise(ActiveRecord::StatementInvalid)
 
               expect(described_class.uncached_data[:usage_activity_by_stage_monthly][:secure]).to eq(
-                user_preferences_group_overview_security_dashboard: 1
+                user_preferences_group_overview_security_dashboard: 1,
+                user_container_scanning_jobs: -1,
+                user_dast_jobs: -1,
+                user_dependency_scanning_jobs: -1,
+                user_license_management_jobs: -1,
+                user_sast_jobs: -1
               )
             end
           end