RepositoryStats#requestCounts -> RepositoryStats#actionStats

Author: nicktindall

modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java

@@ -228,7 +228,7 @@ public void testAbortRequestStats() throws Exception {
             }
         }).filter(Objects::nonNull).map(Repository::stats).reduce(RepositoryStats::merge).get();
 
-        Map<String, Long> sdkRequestCounts = repositoryStats.requestCounts.entrySet()
+        Map<String, Long> sdkRequestCounts = repositoryStats.actionStats.entrySet()
             .stream()
             .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().requests()));
         assertThat(sdkRequestCounts.get("AbortMultipartObject"), greaterThan(0L));

server/src/main/java/org/elasticsearch/repositories/RepositoryStats.java

@@ -25,17 +25,17 @@ public class RepositoryStats implements Writeable {
 
     public static final RepositoryStats EMPTY_STATS = new RepositoryStats(Collections.emptyMap());
 
-    public final Map<String, BlobStoreActionStats> requestCounts;
+    public final Map<String, BlobStoreActionStats> actionStats;
 
-    public RepositoryStats(Map<String, BlobStoreActionStats> requestCounts) {
-        this.requestCounts = Collections.unmodifiableMap(requestCounts);
+    public RepositoryStats(Map<String, BlobStoreActionStats> actionStats) {
+        this.actionStats = Collections.unmodifiableMap(actionStats);
     }
 
     public RepositoryStats(StreamInput in) throws IOException {
         if (in.getTransportVersion().onOrAfter(TransportVersions.RETRIES_AND_OPERATIONS_IN_BLOBSTORE_STATS)) {
-            this.requestCounts = in.readMap(BlobStoreActionStats::new);
+            this.actionStats = in.readMap(BlobStoreActionStats::new);
         } else {
-            this.requestCounts = in.readMap(si -> {
+            this.actionStats = in.readMap(si -> {
                 long legacyValue = in.readLong();
                 return new BlobStoreActionStats(legacyValue, legacyValue);
             });
@@ -44,8 +44,8 @@ public RepositoryStats(StreamInput in) throws IOException {
 
     public RepositoryStats merge(RepositoryStats otherStats) {
         final Map<String, BlobStoreActionStats> result = new HashMap<>();
-        result.putAll(requestCounts);
-        for (Map.Entry<String, BlobStoreActionStats> entry : otherStats.requestCounts.entrySet()) {
+        result.putAll(actionStats);
+        for (Map.Entry<String, BlobStoreActionStats> entry : otherStats.actionStats.entrySet()) {
             result.merge(entry.getKey(), entry.getValue(), BlobStoreActionStats::add);
         }
         return new RepositoryStats(result);
@@ -54,9 +54,9 @@ public RepositoryStats merge(RepositoryStats otherStats) {
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         if (out.getTransportVersion().onOrAfter(TransportVersions.RETRIES_AND_OPERATIONS_IN_BLOBSTORE_STATS)) {
-            out.writeMap(requestCounts, (so, v) -> v.writeTo(so));
+            out.writeMap(actionStats, (so, v) -> v.writeTo(so));
         } else {
-            out.writeMap(requestCounts, (so, v) -> so.writeLong(v.requests()));
+            out.writeMap(actionStats, (so, v) -> so.writeLong(v.requests()));
         }
     }
 
@@ -65,16 +65,16 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         RepositoryStats that = (RepositoryStats) o;
-        return requestCounts.equals(that.requestCounts);
+        return actionStats.equals(that.actionStats);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(requestCounts);
+        return Objects.hash(actionStats);
     }
 
     @Override
     public String toString() {
-        return "RepositoryStats{" + "requestCounts=" + requestCounts + '}';
+        return "RepositoryStats{actionStats=" + actionStats + '}';
     }
 }

server/src/main/java/org/elasticsearch/repositories/RepositoryStatsSnapshot.java

@@ -72,7 +72,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.startObject();
         repositoryInfo.toXContent(builder, params);
         builder.startObject("request_counts");
-        for (Map.Entry<String, BlobStoreActionStats> entry : repositoryStats.requestCounts.entrySet()) {
+        for (Map.Entry<String, BlobStoreActionStats> entry : repositoryStats.actionStats.entrySet()) {
             final BlobStoreActionStats stats = entry.getValue();
             builder.field(entry.getKey(), stats.operations());
         }

server/src/test/java/org/elasticsearch/repositories/RepositoriesStatsArchiveTests.java

@@ -46,10 +46,7 @@ public void testStatsAreEvictedOnceTheyAreOlderThanRetentionPeriod() {
         List<RepositoryStatsSnapshot> archivedStats = repositoriesStatsArchive.getArchivedStats();
         assertThat(archivedStats.size(), equalTo(statsToBeRetainedCount));
         for (RepositoryStatsSnapshot repositoryStatsSnapshot : archivedStats) {
-            assertThat(
-                repositoryStatsSnapshot.getRepositoryStats().requestCounts,
-                equalTo(Map.of("GET", new BlobStoreActionStats(10, 13)))
-            );
+            assertThat(repositoryStatsSnapshot.getRepositoryStats().actionStats, equalTo(Map.of("GET", new BlobStoreActionStats(10, 13))));
         }
     }
 

test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java

@@ -229,7 +229,7 @@ public void testRequestStats() throws Exception {
         }).filter(Objects::nonNull).map(Repository::stats).reduce(RepositoryStats::merge).get();
 
         // Since no abort request is made, filter it out from the stats (also ensure it is 0) before comparing to the mock counts
-        Map<String, Long> sdkRequestCounts = repositoryStats.requestCounts.entrySet()
+        Map<String, Long> sdkRequestCounts = repositoryStats.actionStats.entrySet()
             .stream()
             .filter(entry -> false == ("AbortMultipartObject".equals(entry.getKey()) && entry.getValue().requests() == 0L))
             .collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, e -> e.getValue().requests()));

x-pack/plugin/repositories-metering-api/src/test/java/org/elasticsearch/xpack/repositories/metering/AbstractRepositoriesMeteringAPIRestTestCase.java

@@ -79,7 +79,7 @@ public void testStatsAreUpdatedAfterRepositoryOperations() throws Exception {
             assertThat(repoStatsBeforeRestore.size(), equalTo(1));
 
             RepositoryStatsSnapshot repositoryStatsBeforeRestore = repoStatsBeforeRestore.get(0);
-            Map<String, BlobStoreActionStats> requestCountsBeforeRestore = repositoryStatsBeforeRestore.getRepositoryStats().requestCounts;
+            Map<String, BlobStoreActionStats> requestCountsBeforeRestore = repositoryStatsBeforeRestore.getRepositoryStats().actionStats;
             assertRepositoryStatsBelongToRepository(repositoryStatsBeforeRestore, repository);
             assertRequestCountersAccountedForReads(repositoryStatsBeforeRestore);
             assertRequestCountersAccountedForWrites(repositoryStatsBeforeRestore);
@@ -91,7 +91,7 @@ public void testStatsAreUpdatedAfterRepositoryOperations() throws Exception {
             List<RepositoryStatsSnapshot> updatedRepoStats = getRepositoriesStats();
             assertThat(updatedRepoStats.size(), equalTo(1));
             RepositoryStatsSnapshot repoStatsAfterRestore = updatedRepoStats.get(0);
-            Map<String, BlobStoreActionStats> requestCountsAfterRestore = repoStatsAfterRestore.getRepositoryStats().requestCounts;
+            Map<String, BlobStoreActionStats> requestCountsAfterRestore = repoStatsAfterRestore.getRepositoryStats().actionStats;
 
             for (String readCounterKey : readCounterKeys()) {
                 assertThat(
@@ -257,7 +257,7 @@ private void snapshotAndRestoreIndex(String snapshot, CheckedBiConsumer<String,
 
     private void assertRequestCountersAccountedForReads(RepositoryStatsSnapshot statsSnapshot) {
         RepositoryStats repositoryStats = statsSnapshot.getRepositoryStats();
-        Map<String, BlobStoreActionStats> requestCounts = repositoryStats.requestCounts;
+        Map<String, BlobStoreActionStats> requestCounts = repositoryStats.actionStats;
         for (String readCounterKey : readCounterKeys()) {
             assertThat(requestCounts.get(readCounterKey), is(notNullValue()));
             assertThat(requestCounts.get(readCounterKey).operations(), is(greaterThan(0L)));
@@ -267,7 +267,7 @@ private void assertRequestCountersAccountedForReads(RepositoryStatsSnapshot stat
 
     private void assertRequestCountersAccountedForWrites(RepositoryStatsSnapshot statsSnapshot) {
         RepositoryStats repositoryStats = statsSnapshot.getRepositoryStats();
-        Map<String, BlobStoreActionStats> requestCounts = repositoryStats.requestCounts;
+        Map<String, BlobStoreActionStats> requestCounts = repositoryStats.actionStats;
         for (String writeCounterKey : writeCounterKeys()) {
             assertThat(requestCounts.get(writeCounterKey), is(notNullValue()));
             assertThat(requestCounts.get(writeCounterKey).operations(), is(greaterThan(0L)));
@@ -297,7 +297,7 @@ private void assertRepositoryStatsBelongToRepository(RepositoryStatsSnapshot sta
 
     private void assertAllRequestCountsAreZero(RepositoryStatsSnapshot statsSnapshot) {
         RepositoryStats stats = statsSnapshot.getRepositoryStats();
-        for (BlobStoreActionStats requestCount : stats.requestCounts.values()) {
+        for (BlobStoreActionStats requestCount : stats.actionStats.values()) {
             assertThat(requestCount.requests(), equalTo(0));
         }
     }