Track stats for all kinds of error responses too

elastic · Mar 22, 2023 · 905e5ad · 905e5ad
1 parent f2e42f1
commit 905e5ad
Showing 1 changed file with 30 additions and 29 deletions.
diff --git a/server/src/main/java/org/elasticsearch/transport/InboundHandler.java b/server/src/main/java/org/elasticsearch/transport/InboundHandler.java
@@ -220,10 +220,26 @@ private <T extends TransportRequest> void handleRequest(TcpChannel channel, Head
                 channel.close();
             }
         } else {
+            final TransportChannel transportChannel;
+            final RequestHandlerRegistry<T> reg;
             try {
-                messageListener.onRequestReceived(requestId, action);
-                if (message.isShortCircuit()) {
-                    final TransportChannel transportChannel = new TcpTransportChannel(
+                reg = requestHandlers.getHandler(action);
+                assert reg != null;
+                transportChannel = new TcpTransportChannel(
+                    outboundHandler,
+                    channel,
+                    action,
+                    requestId,
+                    version,
+                    header.getCompressionScheme(),
+                    reg,
+                    header.isHandshake(),
+                    message.takeBreakerReleaseControl()
+                );
+            } catch (Exception e) {
+                sendErrorResponse(
+                    action,
+                    new TcpTransportChannel(
                         outboundHandler,
                         channel,
                         action,
@@ -233,25 +249,21 @@ private <T extends TransportRequest> void handleRequest(TcpChannel channel, Head
                         ResponseStatsConsumer.NONE,
                         header.isHandshake(),
                         message.takeBreakerReleaseControl()
-                    );
+                    ),
+                    e
+                );
+                return;
+            }
+
+            try {
+                messageListener.onRequestReceived(requestId, action);
+                reg.addRequestStats(header.getNetworkMessageSize() + TcpHeader.BYTES_REQUIRED_FOR_MESSAGE_SIZE);
+
+                if (message.isShortCircuit()) {
                     sendErrorResponse(action, transportChannel, message.getException());
                 } else {
                     final StreamInput stream = namedWriteableStream(message.openOrGetStreamInput());
                     assertRemoteVersion(stream, header.getVersion());
-                    final RequestHandlerRegistry<T> reg = requestHandlers.getHandler(action);
-                    assert reg != null;
-                    reg.addRequestStats(header.getNetworkMessageSize() + TcpHeader.BYTES_REQUIRED_FOR_MESSAGE_SIZE);
-                    final TransportChannel transportChannel = new TcpTransportChannel(
-                        outboundHandler,
-                        channel,
-                        action,
-                        requestId,
-                        version,
-                        header.getCompressionScheme(),
-                        reg,
-                        header.isHandshake(),
-                        message.takeBreakerReleaseControl()
-                    );
                     final T request;
                     try {
                         request = reg.newRequest(stream);
@@ -324,17 +336,6 @@ public void onAfter() {
                     }
                 }
             } catch (Exception e) {
-                final TransportChannel transportChannel = new TcpTransportChannel(
-                    outboundHandler,
-                    channel,
-                    action,
-                    requestId,
-                    version,
-                    header.getCompressionScheme(),
-                    ResponseStatsConsumer.NONE,
-                    header.isHandshake(),
-                    message.takeBreakerReleaseControl()
-                );
                 sendErrorResponse(action, transportChannel, e);
             }
         }