Merge 5b0f94b into 1.1.19

reactor · May 7, 2024 · b213b7f · b213b7f
2 parents 2380dab + 5b0f94b
commit b213b7f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/reactor-netty-core/src/main/java/reactor/netty/channel/MicrometerChannelMetricsHandler.java b/reactor-netty-core/src/main/java/reactor/netty/channel/MicrometerChannelMetricsHandler.java
@@ -266,14 +266,14 @@ static final class TlsMetricsHandler extends Observation.Context
 		@Override
 		@SuppressWarnings("try")
 		public void channelActive(ChannelHandlerContext ctx) {
-			SocketAddress rАddr = remoteAddress != null ? remoteAddress : ctx.channel().remoteAddress();
-			if (rАddr instanceof InetSocketAddress) {
-				InetSocketAddress address = (InetSocketAddress) rАddr;
+			SocketAddress rAddr = remoteAddress != null ? remoteAddress : ctx.channel().remoteAddress();
+			if (rAddr instanceof InetSocketAddress) {
+				InetSocketAddress address = (InetSocketAddress) rAddr;
 				this.netPeerName = address.getHostString();
 				this.netPeerPort = address.getPort() + "";
 			}
 			else {
-				this.netPeerName = rАddr.toString();
+				this.netPeerName = rAddr.toString();
 				this.netPeerPort = "";
 			}
 			observation = Observation.createNotStarted(recorder.name() + TLS_HANDSHAKE_TIME, this, OBSERVATION_REGISTRY);

diff --git a/reactor-netty-core/src/main/java/reactor/netty/channel/MicrometerChannelMetricsRecorder.java b/reactor-netty-core/src/main/java/reactor/netty/channel/MicrometerChannelMetricsRecorder.java
@@ -176,7 +176,7 @@ public void recordTlsHandshakeTime(SocketAddress remoteAddress, Duration time, S
 	}
 
 	@Nullable
-	public final Timer getTlsHandshakeTimer(String name, String address, String status) {
+	public final Timer getTlsHandshakeTimer(String name, @Nullable String address, String status) {
 		MeterKey meterKey = new MeterKey(null, address, null, null, status);
 		return MapUtils.computeIfAbsent(tlsHandshakeTimeCache, meterKey,
 				key -> filter(Timer.builder(name)
@@ -195,7 +195,7 @@ public void recordTlsHandshakeTime(SocketAddress remoteAddress, SocketAddress pr
 	}
 
 	@Nullable
-	public final Timer getTlsHandshakeTimer(String name, String address, String proxyAddr, String status) {
+	public final Timer getTlsHandshakeTimer(String name, @Nullable String address, @Nullable String proxyAddr, String status) {
 		MeterKey meterKey = new MeterKey(null, address, proxyAddr, null, status);
 		return MapUtils.computeIfAbsent(tlsHandshakeTimeCache, meterKey,
 				key -> filter(Timer.builder(name)
@@ -213,7 +213,7 @@ public void recordConnectTime(SocketAddress remoteAddress, Duration time, String
 	}
 
 	@Nullable
-	final Timer getConnectTimer(String name, String address, String status) {
+	final Timer getConnectTimer(String name, @Nullable String address, String status) {
 		MeterKey meterKey = new MeterKey(null, address, null, null, status);
 		return MapUtils.computeIfAbsent(connectTimeCache, meterKey,
 				key -> filter(Timer.builder(name)
@@ -232,7 +232,7 @@ public void recordConnectTime(SocketAddress remoteAddress, SocketAddress proxyAd
 	}
 
 	@Nullable
-	final Timer getConnectTimer(String name, String address, String proxyAddr, String status) {
+	final Timer getConnectTimer(String name, @Nullable String address, @Nullable String proxyAddr, String status) {
 		MeterKey meterKey = new MeterKey(null, address, proxyAddr, null, status);
 		return MapUtils.computeIfAbsent(connectTimeCache, meterKey,
 				key -> filter(Timer.builder(name)
@@ -250,7 +250,7 @@ public void recordResolveAddressTime(SocketAddress remoteAddress, Duration time,
 	}
 
 	@Nullable
-	public final Timer getResolveAddressTimer(String name, String address, String status) {
+	public final Timer getResolveAddressTimer(String name, @Nullable String address, String status) {
 		MeterKey meterKey = new MeterKey(null, address, null, null, status);
 		return MapUtils.computeIfAbsent(addressResolverTimeCache, meterKey,
 				key -> filter(Timer.builder(name)

diff --git a/...etty-http/src/main/java/reactor/netty/http/client/MicrometerHttpClientMetricsHandler.java b/...etty-http/src/main/java/reactor/netty/http/client/MicrometerHttpClientMetricsHandler.java
@@ -162,7 +162,7 @@ static final class ResponseTimeHandlerContext extends RequestReplySenderContext<
 		String status = UNKNOWN;
 
 		ResponseTimeHandlerContext(MicrometerHttpClientMetricsRecorder recorder, HttpRequest request, String path,
-				SocketAddress remoteAddress, SocketAddress proxyAddress) {
+				SocketAddress remoteAddress, @Nullable SocketAddress proxyAddress) {
 			super((carrier, key, value) -> Objects.requireNonNull(carrier).headers().set(key, value));
 			this.recorder = recorder;
 			this.method = request.method().name();

diff --git a/...tty-http/src/main/java/reactor/netty/http/client/MicrometerHttpClientMetricsRecorder.java b/...tty-http/src/main/java/reactor/netty/http/client/MicrometerHttpClientMetricsRecorder.java
@@ -141,7 +141,7 @@ public void recordResponseTime(SocketAddress remoteAddress, String uri, String m
 	}
 
 	@Nullable
-	final Timer getResponseTimeTimer(String name, String address, String uri, String method, String status) {
+	final Timer getResponseTimeTimer(String name, @Nullable String address, String uri, String method, String status) {
 		MeterKey meterKey = new MeterKey(uri, address, null, method, status);
 		return MapUtils.computeIfAbsent(responseTimeCache, meterKey,
 				key -> filter(Timer.builder(name)
@@ -160,7 +160,7 @@ public void recordResponseTime(SocketAddress remoteAddress, SocketAddress proxyA
 	}
 
 	@Nullable
-	final Timer getResponseTimeTimer(String name, String address, String proxyAddress, String uri, String method, String status) {
+	final Timer getResponseTimeTimer(String name, @Nullable String address, @Nullable String proxyAddress, String uri, String method, String status) {
 		MeterKey meterKey = new MeterKey(uri, address, proxyAddress, method, status);
 		return MapUtils.computeIfAbsent(responseTimeCache, meterKey,
 				key -> filter(Timer.builder(name)

diff --git a/reactor-netty-http/src/test/java/reactor/netty/http/HttpMetricsHandlerTests.java b/reactor-netty-http/src/test/java/reactor/netty/http/HttpMetricsHandlerTests.java
@@ -1091,7 +1091,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
 					.as("awaitClose timeout")
 					.isTrue();
 
-			assertThat(ContextAwareServerRecorderBadUri.INSTANCE.nullMethodParams.size() == 0)
+			assertThat(ContextAwareServerRecorderBadUri.INSTANCE.nullMethodParams.isEmpty())
 					.as("some method got null parameters: %s", ContextAwareServerRecorderBadUri.INSTANCE.nullMethodParams)
 					.isTrue();
 
@@ -1105,7 +1105,7 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
 					.as("awaitClose timeout")
 					.isTrue();
 
-			assertThat(ServerRecorderBadUri.INSTANCE.nullMethodParams.size() == 0)
+			assertThat(ServerRecorderBadUri.INSTANCE.nullMethodParams.isEmpty())
 					.as("some method got null parameters: %s", ServerRecorderBadUri.INSTANCE.nullMethodParams)
 					.isTrue();