Browse Source

Order metric labels in ObservationConventions

See gh-30223
pull/30231/head
James Yuzawa 3 years ago committed by Brian Clozel
parent
commit
2ba206f8ba
  1. 2
      spring-web/src/main/java/org/springframework/http/client/observation/DefaultClientRequestObservationConvention.java
  2. 2
      spring-web/src/main/java/org/springframework/http/server/observation/DefaultServerRequestObservationConvention.java
  3. 2
      spring-web/src/main/java/org/springframework/http/server/reactive/observation/DefaultServerRequestObservationConvention.java
  4. 2
      spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestObservationConvention.java

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

@ -90,7 +90,7 @@ public class DefaultClientRequestObservationConvention implements ClientRequestO
@Override @Override
public KeyValues getLowCardinalityKeyValues(ClientRequestObservationContext context) { 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) { protected KeyValue uri(ClientRequestObservationContext context) {

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

@ -91,7 +91,7 @@ public class DefaultServerRequestObservationConvention implements ServerRequestO
@Override @Override
public KeyValues getLowCardinalityKeyValues(ServerRequestObservationContext context) { 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 @Override

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

@ -91,7 +91,7 @@ public class DefaultServerRequestObservationConvention implements ServerRequestO
@Override @Override
public KeyValues getLowCardinalityKeyValues(ServerRequestObservationContext context) { 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 @Override

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

@ -94,7 +94,7 @@ public class DefaultClientRequestObservationConvention implements ClientRequestO
@Override @Override
public KeyValues getLowCardinalityKeyValues(ClientRequestObservationContext context) { 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) { protected KeyValue uri(ClientRequestObservationContext context) {

Loading…
Cancel
Save