tidy

Author: mhl-b

modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStore.java

@@ -751,7 +751,7 @@ OptionalBytesReference compareAndExchangeRegister(
                         Storage.BlobTargetOption.generationMatch()
                     )
                 );
-                stats.trackOperation(OperationPurpose.SNAPSHOT_DATA, Operation.MULTIPART_UPLOAD);
+                stats.trackOperation(purpose, Operation.MULTIPART_UPLOAD);
                 return OptionalBytesReference.of(expected);
             } catch (Exception e) {
                 final var serviceException = unwrapServiceException(e);

modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageOperationsStats.java

@@ -24,13 +24,14 @@ final class GoogleCloudStorageOperationsStats {
      * Represented by {@code Map<Purpose,Map<Operation,Counters>>}
      * <pre>
      * {@code
-     * | Purpose      | Operation   | OperationsCnt |  RequestCnt |
-     * |--------------+-------------+---------------+-------------|
-     * | SnapshotData | GetObject   |            10 |          10 |
-     * | SnapshotData | ListObjects |            20 | 21(1 retry) |
-     * | SnapshotData | ...         |               |             |
-     * | Translog     | GetObject   |             5 |           5 |
-     * | ...          |             |               |             |
+     * | Purpose      | Operation       | OperationsCnt | RequestCnt |
+     * |--------------+-----------------+---------------+------------|
+     * | SnapshotData | GetObject       |             1 |          1 |
+     * | SnapshotData | ListObjects     |             2 |          2 |
+     * | SnapshotData | ResumableUpload |             1 |         10 |
+     * | SnapshotData | ...             |               |            |
+     * | Translog     | GetObject       |             5 |          5 |
+     * | ...          |                 |               |            |
      * }
      * </pre>
      */

modules/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobContainerStatsTests.java

@@ -52,10 +52,10 @@
 import static org.elasticsearch.repositories.gcs.GoogleCloudStorageClientSettings.CONNECT_TIMEOUT_SETTING;
 import static org.elasticsearch.repositories.gcs.GoogleCloudStorageClientSettings.PROJECT_ID_SETTING;
 import static org.elasticsearch.repositories.gcs.GoogleCloudStorageClientSettings.READ_TIMEOUT_SETTING;
+import static org.elasticsearch.repositories.gcs.GoogleCloudStorageOperationsStats.Operation;
 import static org.elasticsearch.repositories.gcs.GoogleCloudStorageOperationsStats.Operation.GET_OBJECT;
 import static org.elasticsearch.repositories.gcs.GoogleCloudStorageOperationsStats.Operation.MULTIPART_UPLOAD;
 import static org.elasticsearch.repositories.gcs.GoogleCloudStorageOperationsStats.Operation.RESUMABLE_UPLOAD;
-import static org.elasticsearch.repositories.gcs.GoogleCloudStorageOperationsStatsTests.StatsMap;
 
 @SuppressForbidden(reason = "Uses a HttpServer to emulate a Google Cloud Storage endpoint")
 public class GoogleCloudStorageBlobContainerStatsTests extends ESTestCase {
@@ -275,6 +275,21 @@ protected String getEndpointForServer(final HttpServer server) {
         return "http://" + address.getHostString() + ":" + address.getPort();
     }
 
+    static class StatsMap extends HashMap<String, BlobStoreActionStats> {
+        StatsMap() {
+            for (var purpose : OperationPurpose.values()) {
+                for (var operation : Operation.values()) {
+                    put(purpose + "_" + operation, new BlobStoreActionStats(0, 0));
+                }
+            }
+        }
+
+        StatsMap add(OperationPurpose purpose, Operation operation, long ops, long reqs) {
+            put(purpose + "_" + operation, new BlobStoreActionStats(ops, reqs));
+            return this;
+        }
+    }
+
     private record ContainerAndBlobStore(GoogleCloudStorageBlobContainer blobContainer, GoogleCloudStorageBlobStore blobStore)
         implements
             Closeable {