root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Order metric labels in ObservationConventions 

See gh-30223
This commit is contained in:
James Yuzawa 2023-03-28 22:10:13 -04:00 committed by Brian Clozel
parent 5ba6944145
commit 2ba206f8ba
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/http/client/observation/DefaultClientRequestObservationConvention.java
View File

@ -90,7 +90,7 @@ public class DefaultClientRequestObservationConvention implements ClientRequestO
@Override
public KeyValues getLowCardinalityKeyValues(ClientRequestObservationContext context) {
return KeyValues.of(uri(context), method(context), status(context), clientName(context), exception(context), outcome(context));
return KeyValues.of(clientName(context), exception(context), method(context), outcome(context), status(context), uri(context));
}
protected KeyValue uri(ClientRequestObservationContext context) {

2
spring-web/src/main/java/org/springframework/http/server/observation/DefaultServerRequestObservationConvention.java
View File

@ -91,7 +91,7 @@ public class DefaultServerRequestObservationConvention implements ServerRequestO
@Override
public KeyValues getLowCardinalityKeyValues(ServerRequestObservationContext context) {
return KeyValues.of(method(context), uri(context), status(context), exception(context), outcome(context));
return KeyValues.of(exception(context), method(context), outcome(context), status(context), uri(context));
}
@Override

2
spring-web/src/main/java/org/springframework/http/server/reactive/observation/DefaultServerRequestObservationConvention.java
View File

@ -91,7 +91,7 @@ public class DefaultServerRequestObservationConvention implements ServerRequestO
@Override
public KeyValues getLowCardinalityKeyValues(ServerRequestObservationContext context) {
return KeyValues.of(method(context), uri(context), status(context), exception(context), outcome(context));
return KeyValues.of(exception(context), method(context), outcome(context), status(context), uri(context));
}
@Override

2
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestObservationConvention.java
View File

@ -94,7 +94,7 @@ public class DefaultClientRequestObservationConvention implements ClientRequestO
@Override
public KeyValues getLowCardinalityKeyValues(ClientRequestObservationContext context) {
return KeyValues.of(uri(context), method(context), status(context), clientName(context), exception(context), outcome(context));
return KeyValues.of(clientName(context), exception(context), method(context), outcome(context), status(context), uri(context));
}
protected KeyValue uri(ClientRequestObservationContext context) {