Merge branch '338762-track-security-scan-report-size-in-snowplow' into 'master'

Add `findings_count` to security scan telemetry

See merge request gitlab-org/gitlab!69711

ee/app/services/security/track_scan_service.rb

@@ -5,7 +5,7 @@
 # @param build [Ci::Build] the build that ran the scan.
 module Security
   class TrackScanService
-    SECURE_SCAN_SCHEMA_URL = 'iglu:com.gitlab/secure_scan/jsonschema/1-0-1'
+    SECURE_SCAN_SCHEMA_URL = 'iglu:com.gitlab/secure_scan/jsonschema/1-1-0'
 
     def initialize(build)
       @build = build
@@ -40,11 +40,13 @@ module Security
       analyzer = report&.analyzer
       scan = report&.scan
       primary_scanner = report&.primary_scanner
+      findings = report&.findings || []
 
       {
         analyzer: analyzer_id(report),
         analyzer_vendor: analyzer&.vendor,
         analyzer_version: analyzer&.version,
+        findings_count: findings.count,
         end_time: scan&.end_time,
         report_schema_version: report&.version,
         scan_type: scan_type(report, report_type),

ee/spec/services/security/track_scan_service_spec.rb

@@ -32,6 +32,7 @@ RSpec.describe Security::TrackScanService do
                         analyzer_vendor: 'GitLab',
                         analyzer_version: '2.0.1',
                         end_time: '2021-06-11T07:27:50',
+                        findings_count: 1,
                         scan_type: 'dast',
                         scanner: 'zaproxy-browserker',
                         scanner_vendor: 'GitLab',
@@ -69,6 +70,7 @@ RSpec.describe Security::TrackScanService do
                         analyzer_vendor: nil,
                         analyzer_version: nil,
                         end_time: nil,
+                        findings_count: 1,
                         scan_type: 'dast',
                         scanner: "zaproxy",
                         scanner_vendor: nil,