From 66cdf43b56dcc4e6ebbe397c3c0488d24face414 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Wed, 29 Mar 2023 10:55:00 +0200 Subject: [PATCH] Polish Closes gh-30223 --- .../observation/DefaultClientRequestObservationConvention.java | 2 ++ .../observation/DefaultServerRequestObservationConvention.java | 2 ++ .../observation/DefaultServerRequestObservationConvention.java | 2 ++ .../client/DefaultClientRequestObservationConvention.java | 2 ++ 4 files changed, 8 insertions(+) diff --git a/spring-web/src/main/java/org/springframework/http/client/observation/DefaultClientRequestObservationConvention.java b/spring-web/src/main/java/org/springframework/http/client/observation/DefaultClientRequestObservationConvention.java index 913d6fbe2e..7e63dfff68 100644 --- a/spring-web/src/main/java/org/springframework/http/client/observation/DefaultClientRequestObservationConvention.java +++ b/spring-web/src/main/java/org/springframework/http/client/observation/DefaultClientRequestObservationConvention.java @@ -90,6 +90,7 @@ public class DefaultClientRequestObservationConvention implements ClientRequestO @Override public KeyValues getLowCardinalityKeyValues(ClientRequestObservationContext context) { + // Make sure that KeyValues entries are already sorted by name for better performance return KeyValues.of(clientName(context), exception(context), method(context), outcome(context), status(context), uri(context)); } @@ -158,6 +159,7 @@ public class DefaultClientRequestObservationConvention implements ClientRequestO @Override public KeyValues getHighCardinalityKeyValues(ClientRequestObservationContext context) { + // Make sure that KeyValues entries are already sorted by name for better performance return KeyValues.of(requestUri(context)); } diff --git a/spring-web/src/main/java/org/springframework/http/server/observation/DefaultServerRequestObservationConvention.java b/spring-web/src/main/java/org/springframework/http/server/observation/DefaultServerRequestObservationConvention.java index f0a84ffbb6..4249f09c25 100644 --- a/spring-web/src/main/java/org/springframework/http/server/observation/DefaultServerRequestObservationConvention.java +++ b/spring-web/src/main/java/org/springframework/http/server/observation/DefaultServerRequestObservationConvention.java @@ -91,11 +91,13 @@ public class DefaultServerRequestObservationConvention implements ServerRequestO @Override public KeyValues getLowCardinalityKeyValues(ServerRequestObservationContext context) { + // Make sure that KeyValues entries are already sorted by name for better performance return KeyValues.of(exception(context), method(context), outcome(context), status(context), uri(context)); } @Override public KeyValues getHighCardinalityKeyValues(ServerRequestObservationContext context) { + // Make sure that KeyValues entries are already sorted by name for better performance return KeyValues.of(httpUrl(context)); } diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/observation/DefaultServerRequestObservationConvention.java b/spring-web/src/main/java/org/springframework/http/server/reactive/observation/DefaultServerRequestObservationConvention.java index d9cbd63e3e..bdcba4aa2e 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/observation/DefaultServerRequestObservationConvention.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/observation/DefaultServerRequestObservationConvention.java @@ -91,11 +91,13 @@ public class DefaultServerRequestObservationConvention implements ServerRequestO @Override public KeyValues getLowCardinalityKeyValues(ServerRequestObservationContext context) { + // Make sure that KeyValues entries are already sorted by name for better performance return KeyValues.of(exception(context), method(context), outcome(context), status(context), uri(context)); } @Override public KeyValues getHighCardinalityKeyValues(ServerRequestObservationContext context) { + // Make sure that KeyValues entries are already sorted by name for better performance return KeyValues.of(httpUrl(context)); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestObservationConvention.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestObservationConvention.java index 7f45b4456d..b2b0fda53e 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestObservationConvention.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestObservationConvention.java @@ -94,6 +94,7 @@ public class DefaultClientRequestObservationConvention implements ClientRequestO @Override public KeyValues getLowCardinalityKeyValues(ClientRequestObservationContext context) { + // Make sure that KeyValues entries are already sorted by name for better performance return KeyValues.of(clientName(context), exception(context), method(context), outcome(context), status(context), uri(context)); } @@ -165,6 +166,7 @@ public class DefaultClientRequestObservationConvention implements ClientRequestO @Override public KeyValues getHighCardinalityKeyValues(ClientRequestObservationContext context) { + // Make sure that KeyValues entries are already sorted by name for better performance return KeyValues.of(httpUrl(context)); }