Replace Tag to KeyValues adapter code

Closes gh-32876
spring-projects · Nov 2, 2022 · 05c5b12 · 05c5b12
1 parent cc0ba82
commit 05c5b12
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/.../actuate/autoconfigure/observation/web/client/ClientHttpObservationConventionAdapter.java b/.../actuate/autoconfigure/observation/web/client/ClientHttpObservationConventionAdapter.java
@@ -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

diff --git a/...boot/actuate/autoconfigure/observation/web/client/ClientObservationConventionAdapter.java b/...boot/actuate/autoconfigure/observation/web/client/ClientObservationConventionAdapter.java
@@ -57,11 +57,7 @@ public boolean supportsContext(Observation.Context context) {
 	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) {

diff --git a/...ate/autoconfigure/observation/web/reactive/ServerRequestObservationConventionAdapter.java b/...ate/autoconfigure/observation/web/reactive/ServerRequestObservationConventionAdapter.java
@@ -59,11 +59,7 @@ public String getName() {
 	@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);
 	}
 
 }
diff --git a/...uate/autoconfigure/observation/web/servlet/ServerRequestObservationConventionAdapter.java b/...uate/autoconfigure/observation/web/servlet/ServerRequestObservationConventionAdapter.java
@@ -66,11 +66,7 @@ public boolean supportsContext(Observation.Context context) {
 	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) {