From 770a7c39abd701dfc3d5c990de8b6b48180079a4 Mon Sep 17 00:00:00 2001
From: Violeta Georgieva <violetag@vmware.com>
Date: Fri, 24 Jun 2022 14:17:53 +0300
Subject: [PATCH] Additional change to 12544db7c

---
 .../http/client/AbstractHttpClientMetricsHandler.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/reactor-netty-http/src/main/java/reactor/netty/http/client/AbstractHttpClientMetricsHandler.java b/reactor-netty-http/src/main/java/reactor/netty/http/client/AbstractHttpClientMetricsHandler.java
index 7741251beb..b30db4832a 100644
--- a/reactor-netty-http/src/main/java/reactor/netty/http/client/AbstractHttpClientMetricsHandler.java
+++ b/reactor-netty-http/src/main/java/reactor/netty/http/client/AbstractHttpClientMetricsHandler.java
@@ -90,7 +90,15 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
 
 			if (msg instanceof LastHttpContent) {
 				SocketAddress address = ctx.channel().remoteAddress();
-				promise.addListener(future -> recordWrite(address));
+				promise.addListener(future -> {
+					try {
+						recordWrite(address);
+					}
+					catch (RuntimeException e) {
+						log.warn("Exception caught while recording metrics.", e);
+						// Allow request-response exchange to continue, unaffected by metrics problem
+					}
+				});
 			}
 		}
 		catch (RuntimeException e) {