From fadd29fa909fbb9494f562d2c5b0e53e5976d1cf Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Thu, 12 Jan 2023 17:12:44 +0100 Subject: [PATCH] Fix build (merge conflict) (#7559) Resolves #7558 --- .../spring/webmvc/v6_0/TestWebSpringBootApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/TestWebSpringBootApp.java b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/TestWebSpringBootApp.java index 28e3795c24..2bbe4eee79 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/TestWebSpringBootApp.java +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/test/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/TestWebSpringBootApp.java @@ -117,7 +117,7 @@ class TestWebSpringBootApp { return controller( INDEXED_CHILD, () -> { - INDEXED_CHILD.collectSpanAttributes(name -> "id".equals(name) ? id : null); + INDEXED_CHILD.collectSpanAttributes(name -> name.equals("id") ? id : null); return INDEXED_CHILD.getBody(); }); }