Update the coverage collection to point to the prod database (#3240)

* Update the coverage collection to point to the prod database

* Fix formatting

* Misc fixes

* Update message

Author: Corrob

Metrics/Sources/Metrics/main.swift

@@ -25,6 +25,15 @@ let coveragePath = flags.string("c",
 let pullRequest = flags.int("p",
                             "pull_request",
                             description: "Required - The number of the pull request that corresponds to this coverage run.")
+
+/// Returns the current UTC time in a string format.
+func currentTime() -> String {
+  let formatter = DateFormatter()
+  formatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+  formatter.timeZone = TimeZone(identifier: "UTC")
+  return formatter.string(from: Date())
+}
+
 do {
   try flags.parse()
   if !coveragePath.wasSet {
@@ -35,13 +44,11 @@ do {
     print("Please specify the corresponding pull request number. -p or --pull_request")
     exit(1)
   }
-  let pullRequestTable = TableUpdate(table_name: "PullRequests",
-                                     column_names: ["pull_request_id"],
-                                     replace_measurements: [[Double(pullRequest.value!)]])
   let coverageReport = try CoverageReport.load(path: coveragePath.value!)
   let coverageTable = TableUpdate.createFrom(coverage: coverageReport,
-                                             pullRequest: pullRequest.value!)
-  let metrics = UploadMetrics(tables: [pullRequestTable, coverageTable])
+                                             pullRequest: pullRequest.value!,
+                                             currentTime: currentTime())
+  let metrics = UploadMetrics(tables: [coverageTable])
   try Uploader.upload(metrics: metrics)
 } catch {
   print("Error occurred: \(error)")

Metrics/Sources/MetricsLib/UploadMetrics.swift

@@ -16,15 +16,15 @@
 
 import Foundation
 
-/// A mapping of SDKs to an ID that will represent that SDK in the database.
-let TARGET_TO_SDK_INDEX = [
-  "Auth_Example_iOS.app": 0.0,
-  "Core_Example_iOS.app": 1.0,
-  "Database_Example_iOS.app": 2.0,
-  "DynamicLinks_Example_iOS.app": 3.0,
-  "InstanceID_Example_iOS.app": 4.0,
-  "Messaging_Example_iOS.app": 5.0,
-  "Storage_Example_iOS.app": 6.0,
+/// A set of SDK targets for which to collect code coverage.
+let TARGETS_TO_COLLECT: Set = [
+  "Auth_Example_iOS.app",
+  "Core_Example_iOS.app",
+  "Database_Example_iOS.app",
+  "DynamicLinks_Example_iOS.app",
+  "InstanceID_Example_iOS.app",
+  "Messaging_Example_iOS.app",
+  "Storage_Example_iOS.app",
   // TODO(Corrob): Add support for Firestore, Functions, and InAppMessaging.
 ]
 
@@ -47,30 +47,30 @@ public struct UploadMetrics: Encodable {
 public struct TableUpdate: Encodable {
   public var table_name: String
   public var column_names: [String]
-  public var replace_measurements: [[Double]]
+  public var replace_measurements: [[String]]
 
-  public init(table_name: String, column_names: [String], replace_measurements: [[Double]]) {
+  public init(table_name: String, column_names: [String], replace_measurements: [[String]]) {
     self.table_name = table_name
     self.column_names = column_names
     self.replace_measurements = replace_measurements
   }
 
   /// Creates a table update for code coverage by parsing a coverage report from XCov.
-  public static func createFrom(coverage: CoverageReport, pullRequest: Int) -> TableUpdate {
-    var metrics = [[Double]]()
+  public static func createFrom(coverage: CoverageReport, pullRequest: Int, currentTime: String) -> TableUpdate {
+    var metrics = [[String]]()
     for target in coverage.targets {
-      let sdkKey = TARGET_TO_SDK_INDEX[target.name]
-      if sdkKey == nil {
-        print("WARNING - target \(target.name) has no mapping to an SDK id. Skipping...")
-      } else {
-        var row = [Double]()
-        row.append(Double(pullRequest))
-        row.append(sdkKey!)
-        row.append(target.coverage)
+      if TARGETS_TO_COLLECT.contains(target.name) {
+        var row = [String]()
+        row.append(target.name.components(separatedBy: "_")[0])
+        row.append(String(pullRequest))
+        row.append(String(target.coverage))
+        row.append(currentTime)
         metrics.append(row)
+      } else {
+        print("WARNING - target \(target.name) is being filtered out from coverage collection. Skipping...")
       }
     }
-    let columnNames = ["pull_request_id", "sdk_id", "coverage_percent"]
-    return TableUpdate(table_name: "Coverage1", column_names: columnNames, replace_measurements: metrics)
+    let columnNames = ["product_name", "pull_request_id", "coverage_total", "collection_time"]
+    return TableUpdate(table_name: "IosCodeCoverage", column_names: columnNames, replace_measurements: metrics)
   }
 }

Metrics/Tests/MetricsTests/UploadMetricsTests.swift

@@ -18,35 +18,37 @@ import MetricsLib
 import XCTest
 
 let PULL_REQUEST = 777
+let CURRENT_TIME = "2019-06-21 11:11:11"
+let TABLE_NAME = "IosCodeCoverage"
 
 final class UploadMetricsTests: XCTestCase {
   func testShouldCreateTableUpdateFromCoverageReport() {
     let target_one = Target(name: "Auth_Example_iOS.app", coverage: 0.1)
     let target_two = Target(name: "Core_Example_iOS.app", coverage: 0.2)
     let report = CoverageReport(targets: [target_one, target_two], coverage: 0.15)
-    let metricsUpdate = TableUpdate.createFrom(coverage: report, pullRequest: PULL_REQUEST)
-    XCTAssertEqual(metricsUpdate.table_name, "Coverage1")
+    let metricsUpdate = TableUpdate.createFrom(coverage: report, pullRequest: PULL_REQUEST, currentTime: CURRENT_TIME)
+    XCTAssertEqual(metricsUpdate.table_name, TABLE_NAME)
     XCTAssertEqual(metricsUpdate.replace_measurements.count, 2)
     XCTAssertEqual(metricsUpdate.replace_measurements[0],
-                   [Double(PULL_REQUEST), 0, target_one.coverage])
+                   ["Auth", String(PULL_REQUEST), String(target_one.coverage), CURRENT_TIME])
     XCTAssertEqual(metricsUpdate.replace_measurements[1],
-                   [Double(PULL_REQUEST), 1, target_two.coverage])
+                   ["Core", String(PULL_REQUEST), String(target_two.coverage), CURRENT_TIME])
   }
 
   func testShouldIgnoreUnkownTargets() {
     let target = Target(name: "Unknown_Target", coverage: 0.3)
     let report = CoverageReport(targets: [target], coverage: 0.15)
-    let metrics = TableUpdate.createFrom(coverage: report, pullRequest: PULL_REQUEST)
-    XCTAssertEqual(metrics.table_name, "Coverage1")
+    let metrics = TableUpdate.createFrom(coverage: report, pullRequest: PULL_REQUEST, currentTime: CURRENT_TIME)
+    XCTAssertEqual(metrics.table_name, TABLE_NAME)
     XCTAssertEqual(metrics.replace_measurements.count, 0)
   }
 
   func testShouldConvertToJson() throws {
     let table = TableUpdate(table_name: "name",
                             column_names: ["col"],
-                            replace_measurements: [[0], [2]])
+                            replace_measurements: [["0"], ["test"]])
     let metrics = UploadMetrics(tables: [table])
     let json = try metrics.json()
-    XCTAssertEqual(json, "{\"tables\":[{\"replace_measurements\":[[0],[2]],\"column_names\":[\"col\"],\"table_name\":\"name\"}]}")
+    XCTAssertEqual(json, "{\"tables\":[{\"replace_measurements\":[[\"0\"],[\"test\"]],\"column_names\":[\"col\"],\"table_name\":\"name\"}]}")
   }
 }

scripts/install_prereqs.sh

@@ -26,7 +26,7 @@ function install_secrets() {
   # requests from forks. See
   # https://docs.travis-ci.com/user/pull-requests#pull-requests-and-security-restrictions
   if [[ ! -z $encrypted_d6a88994a5ab_key ]]; then
-    openssl aes-256-cbc -K $encrypted_d6a88994a5ab_key -iv $encrypted_d6a88994a5ab_iv \
+    openssl aes-256-cbc -K $encrypted_44810a80e6cc_key -iv $encrypted_44810a80e6cc_iv \
     -in scripts/travis-encrypted/Secrets.tar.enc \
     -out scripts/travis-encrypted/Secrets.tar -d