Skip to content

Commit 5666e36

Browse files
ZLATAN628bclozel
authored andcommitted
Fix wrong uri tag for client observation convention
Prior to this commit, a client sending a request to "https://example.org" would record the wrong URI tag as "/https://example.org". This commit ensures that the scheme+host part is matched correctly in the default client observation conventions. See gh-33867
1 parent f06853a commit 5666e36

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Diff for: spring-web/src/main/java/org/springframework/http/client/observation/DefaultClientRequestObservationConvention.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class DefaultClientRequestObservationConvention implements ClientRequestO
4343

4444
private static final String DEFAULT_NAME = "http.client.requests";
4545

46-
private static final Pattern PATTERN_BEFORE_PATH = Pattern.compile("^https?://[^/]+/");
46+
private static final Pattern PATTERN_BEFORE_PATH = Pattern.compile("^https?://[^/]+/?");
4747

4848
private static final KeyValue URI_NONE = KeyValue.of(LowCardinalityKeyNames.URI, KeyValue.NONE_VALUE);
4949

Diff for: spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestObservationConvention.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class DefaultClientRequestObservationConvention implements ClientRequestO
4343

4444
private static final String ROOT_PATH = "/";
4545

46-
private static final Pattern PATTERN_BEFORE_PATH = Pattern.compile("^https?://[^/]+/");
46+
private static final Pattern PATTERN_BEFORE_PATH = Pattern.compile("^https?://[^/]+/?");
4747

4848
private static final KeyValue URI_NONE = KeyValue.of(LowCardinalityKeyNames.URI, KeyValue.NONE_VALUE);
4949

0 commit comments

Comments
 (0)