chore(benchmarking): Fix throughput conversion issue and report metrics in seconds (#2211)

sydney-munro · gcf-owl-bot[bot] · web-flow · commit 834732c24302 · 2023-09-25T09:34:30.000-07:00
* chore(benchmarking): Fix throughput conversion issue and report metrics in seconds * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
diff --git a/storage-shared-benchmarking/src/main/java/com/google/cloud/storage/benchmarking/StorageSharedBenchmarkingUtils.java b/storage-shared-benchmarking/src/main/java/com/google/cloud/storage/benchmarking/StorageSharedBenchmarkingUtils.java
@@ -28,9 +28,12 @@ public static void cleanupObject(Storage storage, Blob created) {
         created.getBlobId(), Storage.BlobSourceOption.generationMatch(created.getGeneration()));
   }
 
-  public static double calculateThroughput(long size, Duration elapsedTime) {
-    return size >= StorageSharedBenchmarkingUtils.SSB_SIZE_THRESHOLD_BYTES
-        ? size / 1024 / 1024 / (elapsedTime.toNanos())
-        : size / 1024 / (elapsedTime.toNanos());
+  public static double calculateThroughput(double size, Duration elapsedTime) {
+    double adjustedSize =
+        size >= StorageSharedBenchmarkingUtils.SSB_SIZE_THRESHOLD_BYTES
+            ? (size / 1024D) / 1024D
+            : size / 1024D;
+    double throughput = adjustedSize / (elapsedTime.toMillis() / 1000D);
+    return throughput;
   }
 }
diff --git a/storage-shared-benchmarking/src/main/java/com/google/cloud/storage/benchmarking/W1R3.java b/storage-shared-benchmarking/src/main/java/com/google/cloud/storage/benchmarking/W1R3.java
@@ -58,9 +58,9 @@ final class W1R3 implements Callable<String> {
   @Override
   public String call() throws Exception {
     // Create the file to be uploaded and fill it with data
+
     try (TmpFile file = DataGenerator.base64Characters().tempFile(tempDirectory, objectSize)) {
       BlobInfo blob = BlobInfo.newBuilder(bucketName, file.toString()).build();
-
       // Get the start time
       Clock clock = Clock.systemDefaultZone();
       Instant startTime = clock.instant();
@@ -71,7 +71,7 @@ public String call() throws Exception {
           generateCloudMonitoringResult(
                   "WRITE",
                   StorageSharedBenchmarkingUtils.calculateThroughput(
-                      created.getSize().longValue(), elapsedTimeUpload),
+                      created.getSize().doubleValue(), elapsedTimeUpload),
                   created)
               .formatAsCustomMetric());
       for (int i = 0; i <= StorageSharedBenchmarkingUtils.DEFAULT_NUMBER_OF_READS; i++) {
@@ -84,7 +84,7 @@ public String call() throws Exception {
               generateCloudMonitoringResult(
                       "READ[" + i + "]",
                       StorageSharedBenchmarkingUtils.calculateThroughput(
-                          created.getSize().longValue(), elapsedTimeDownload),
+                          created.getSize().doubleValue(), elapsedTimeDownload),
                       created)
                   .formatAsCustomMetric());
         }

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,12 @@ public static void cleanupObject(Storage storage, Blob created) {`
`28`	`28`	`created.getBlobId(), Storage.BlobSourceOption.generationMatch(created.getGeneration()));`
`29`	`29`	`}`
`30`	`30`
`31`		`- public static double calculateThroughput(long size, Duration elapsedTime) {`
`32`		`- return size >= StorageSharedBenchmarkingUtils.SSB_SIZE_THRESHOLD_BYTES`
`33`		`- ? size / 1024 / 1024 / (elapsedTime.toNanos())`
`34`		`- : size / 1024 / (elapsedTime.toNanos());`
	`31`	`+ public static double calculateThroughput(double size, Duration elapsedTime) {`
	`32`	`+ double adjustedSize =`
	`33`	`+ size >= StorageSharedBenchmarkingUtils.SSB_SIZE_THRESHOLD_BYTES`
	`34`	`+ ? (size / 1024D) / 1024D`
	`35`	`+ : size / 1024D;`
	`36`	`+ double throughput = adjustedSize / (elapsedTime.toMillis() / 1000D);`
	`37`	`+ return throughput;`
`35`	`38`	`}`
`36`	`39`	`}`