Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace Tag to KeyValues adapter code

Browse Source 
Closes gh-32876
This commit is contained in:
Moritz Halbritter
2022-11-02 16:25:37 +01:00
parent cc0ba8265b
commit 05c5b1225c
4 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/ClientHttpObservationConventionAdapter.java
View File

@@ -46,11 +46,7 @@ class ClientHttpObservationConventionAdapter implements ClientRequestObservation
public KeyValues getLowCardinalityKeyValues(ClientRequestObservationContext context) {
Iterable<Tag> tags = this.tagsProvider.getTags(context.getUriTemplate(), context.getCarrier(),
context.getResponse());
KeyValues keyValues = KeyValues.empty();
for (Tag tag : tags) {
keyValues = keyValues.and(tag.getKey(), tag.getValue());
}
return keyValues;
return KeyValues.of(tags, Tag::getKey, Tag::getValue);
}
@Override

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/client/ClientObservationConventionAdapter.java
View File

@@ -57,11 +57,7 @@ class ClientObservationConventionAdapter implements ClientRequestObservationConv
public KeyValues getLowCardinalityKeyValues(ClientRequestObservationContext context) {
mutateClientRequest(context);
Iterable<Tag> tags = this.tagsProvider.tags(context.getCarrier(), context.getResponse(), context.getError());
KeyValues keyValues = KeyValues.empty();
for (Tag tag : tags) {
keyValues = keyValues.and(tag.getKey(), tag.getValue());
}
return keyValues;
return KeyValues.of(tags, Tag::getKey, Tag::getValue);
}
private void mutateClientRequest(ClientRequestObservationContext context) {

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/reactive/ServerRequestObservationConventionAdapter.java
View File

@@ -59,11 +59,7 @@ class ServerRequestObservationConventionAdapter implements ServerRequestObservat
@Override
public KeyValues getLowCardinalityKeyValues(ServerRequestObservationContext context) {
Iterable<Tag> tags = this.tagsProvider.httpRequestTags(context.getServerWebExchange(), context.getError());
KeyValues keyValues = KeyValues.empty();
for (Tag tag : tags) {
keyValues = keyValues.and(tag.getKey(), tag.getValue());
}
return keyValues;
return KeyValues.of(tags, Tag::getKey, Tag::getValue);
}
}

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/observation/web/servlet/ServerRequestObservationConventionAdapter.java
View File

@@ -66,11 +66,7 @@ class ServerRequestObservationConventionAdapter implements ServerRequestObservat
public KeyValues getLowCardinalityKeyValues(ServerRequestObservationContext context) {
Iterable<Tag> tags = this.tagsProvider.getTags(context.getCarrier(), context.getResponse(), getHandler(context),
context.getError());
KeyValues keyValues = KeyValues.empty();
for (Tag tag : tags) {
keyValues = keyValues.and(tag.getKey(), tag.getValue());
}
return keyValues;
return KeyValues.of(tags, Tag::getKey, Tag::getValue);
}
private Object getHandler(ServerRequestObservationContext context) {