tests tweak

elastic · Sep 26, 2023 · 4504e52 · 4504e52
1 parent 2873701
commit 4504e52
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 4 deletions.
diff --git a/server/src/main/java/org/elasticsearch/http/HttpRouteStats.java b/server/src/main/java/org/elasticsearch/http/HttpRouteStats.java
@@ -17,6 +17,8 @@
 import org.elasticsearch.xcontent.XContentBuilder;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Objects;
 import java.util.stream.IntStream;
 
 public record HttpRouteStats(
@@ -120,4 +122,27 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeVLongArray(responseSizeHistogram);
         out.writeVLongArray(responseTimeHistogram);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        HttpRouteStats that = (HttpRouteStats) o;
+        return requestCount == that.requestCount
+            && totalRequestSize == that.totalRequestSize
+            && responseCount == that.responseCount
+            && totalResponseSize == that.totalResponseSize
+            && Arrays.equals(requestSizeHistogram, that.requestSizeHistogram)
+            && Arrays.equals(responseSizeHistogram, that.responseSizeHistogram)
+            && Arrays.equals(responseTimeHistogram, that.responseTimeHistogram);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(requestCount, totalRequestSize, responseCount, totalResponseSize);
+        result = 31 * result + Arrays.hashCode(requestSizeHistogram);
+        result = 31 * result + Arrays.hashCode(responseSizeHistogram);
+        result = 31 * result + Arrays.hashCode(responseTimeHistogram);
+        return result;
+    }
 }
diff --git a/server/src/main/java/org/elasticsearch/rest/RestController.java b/server/src/main/java/org/elasticsearch/rest/RestController.java
@@ -775,6 +775,7 @@ public void sendResponse(RestResponse response) {
             try {
                 close();
                 methodHandlers.addRequestStats(contentLength);
+                methodHandlers.addResponseTime(System.currentTimeMillis() - startTime);
                 if (response.isChunked() == false) {
                     methodHandlers.addResponseStats(response.content().length());
                 } else {
@@ -783,7 +784,6 @@ public void sendResponse(RestResponse response) {
                 delegate.sendResponse(response);
                 success = true;
             } finally {
-                methodHandlers.addResponseTime(System.currentTimeMillis() - startTime);
                 if (success == false) {
                     releaseOutputBuffer();
                 }

diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java
@@ -32,6 +32,7 @@
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.discovery.DiscoveryStats;
 import org.elasticsearch.http.HttpStats;
+import org.elasticsearch.http.HttpStatsTests;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.bulk.stats.BulkStats;
@@ -859,7 +860,12 @@ public static NodeStats createNodeStats() {
                 );
                 clientStats.add(cs);
             }
-            httpStats = new HttpStats(randomNonNegativeLong(), randomNonNegativeLong(), clientStats, Map.of());
+            httpStats = new HttpStats(
+                randomNonNegativeLong(),
+                randomNonNegativeLong(),
+                clientStats,
+                randomMap(1, 3, () -> new Tuple<>(randomAlphaOfLength(10), HttpStatsTests.randomHttpRouteStats()))
+            );
         }
         AllCircuitBreakerStats allCircuitBreakerStats = null;
         if (frequently()) {

diff --git a/server/src/test/java/org/elasticsearch/http/HttpStatsTests.java b/server/src/test/java/org/elasticsearch/http/HttpStatsTests.java
@@ -10,8 +10,10 @@
 
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.unit.ByteSizeUnit;
+import org.elasticsearch.core.Tuple;
 import org.elasticsearch.test.ESTestCase;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.IntStream;
@@ -32,6 +34,9 @@ public void testMerge() {
         assertEquals(merged.getTotalOpen(), first.getTotalOpen() + second.getTotalOpen());
         assertThat(merged.getClientStats(), hasSize(first.getClientStats().size() + second.getClientStats().size()));
         assertEquals(merged.getClientStats(), Stream.concat(first.getClientStats().stream(), second.getClientStats().stream()).toList());
+        final Map<String, HttpRouteStats> m = new HashMap<>(first.httpRouteStats());
+        second.httpRouteStats().forEach((k, v) -> m.merge(k, v, HttpRouteStats::merge));
+        assertEquals(merged.httpRouteStats(), m);
     }
 
     public void testToXContent() {
@@ -74,7 +79,7 @@ public static HttpStats randomHttpStats() {
             randomLongBetween(0, Long.MAX_VALUE),
             randomLongBetween(0, Long.MAX_VALUE),
             IntStream.range(1, randomIntBetween(2, 10)).mapToObj(HttpStatsTests::randomClients).toList(),
-            Map.of()
+            randomMap(1, 3, () -> new Tuple<>(randomAlphaOfLength(10), randomHttpRouteStats()))
         );
     }
 
@@ -94,4 +99,16 @@ public static HttpStats.ClientStats randomClients(int i) {
             randomLong()
         );
     }
+
+    public static HttpRouteStats randomHttpRouteStats() {
+        return new HttpRouteStats(
+            randomLongBetween(0, 99),
+            randomLongBetween(0, 9999),
+            IntStream.range(0, 28).mapToLong(i -> randomLongBetween(0, 42)).toArray(),
+            randomLongBetween(0, 99),
+            randomLongBetween(0, 9999),
+            IntStream.range(0, 28).mapToLong(i -> randomLongBetween(0, 42)).toArray(),
+            IntStream.range(0, 18).mapToLong(i -> randomLongBetween(0, 42)).toArray()
+        );
+    }
 }
diff --git a/server/src/test/java/org/elasticsearch/rest/action/info/RestClusterInfoActionTests.java b/server/src/test/java/org/elasticsearch/rest/action/info/RestClusterInfoActionTests.java
@@ -13,6 +13,7 @@
 import org.elasticsearch.client.internal.node.NodeClient;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.node.DiscoveryNode;
+import org.elasticsearch.http.HttpRouteStats;
 import org.elasticsearch.http.HttpStats;
 import org.elasticsearch.http.HttpStatsTests;
 import org.elasticsearch.test.ESTestCase;
@@ -21,6 +22,7 @@
 
 import java.io.IOException;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.IntStream;
@@ -90,7 +92,11 @@ public void testHttpResponseMapper() {
                     .map(Collection::stream)
                     .reduce(Stream.of(), Stream::concat)
                     .toList(),
-                Map.of()
+                nodeStats.stream().map(NodeStats::getHttp).map(HttpStats::httpRouteStats).reduce(Map.of(), (l, r) -> {
+                    final var m = new HashMap<>(l);
+                    r.forEach((k, v) -> m.merge(k, v, HttpRouteStats::merge));
+                    return Map.copyOf(m);
+                })
             )
         );
     }