Merge branch 'remove-join-to-builds-analyzer-scans' into 'master'

Secure `[analyzer]_scans` metrics report on all CI jobs

See merge request gitlab-org/gitlab!67812

ee/lib/ee/gitlab/usage_data.rb

@@ -401,10 +401,8 @@ def count_secure_scans(time_period)
           {}.tap do |secure_jobs|
             ::Security::Scan.scan_types.each do |name, scan_type|
-              secure_jobs["#{name}_scans".to_sym] = count(::Security::Scan.joins(:build)
-                .where(scan_type: scan_type)
-                .merge(::CommitStatus.latest.success)
-                .where(time_period), :build_id, start: start, finish: finish)
+              by_scan_type = ::Security::Scan.where(scan_type: scan_type).where(time_period)
+              secure_jobs["#{name}_scans".to_sym] = count(by_scan_type, :build_id, start: start, finish: finish)
             end
           end
         end

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

@@ -598,8 +598,8 @@ def ldap_server_config
         user_sast_jobs: 1,
         user_secret_detection_jobs: 1,
         user_unique_users_all_secure_scanners: 1,
-        sast_scans: 0,
-        dependency_scanning_scans: 4,
+        sast_scans: 2,
+        dependency_scanning_scans: 6,
         container_scanning_scans: 2,
         dast_scans: 0,
         secret_detection_scans: 2,
@@ -625,8 +625,8 @@ def ldap_server_config
         coverage_fuzzing_pipeline: be_within(error_rate).percent_of(0),
         api_fuzzing_pipeline: be_within(error_rate).percent_of(0),
         user_unique_users_all_secure_scanners: 1,
-        sast_scans: 0,
-        dependency_scanning_scans: 2,
+        sast_scans: 1,
+        dependency_scanning_scans: 3,
         container_scanning_scans: 1,
         dast_scans: 0,
         secret_detection_scans: 1,