wip

Author: SylvainJuge

instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java

@@ -18,7 +18,6 @@
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
-import static io.opentelemetry.semconv.CodeAttributes.CODE_FUNCTION_NAME;
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
@@ -49,7 +48,6 @@
 import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
 import org.springframework.web.servlet.view.RedirectView;
 
-@SuppressWarnings("deprecation") // using deprecated semconv
 public abstract class AbstractSpringBootBasedTest
     extends AbstractHttpServerTest<ConfigurableApplicationContext> {
 
@@ -168,26 +166,7 @@ protected SpanDataAssert assertResponseSpan(
 
     span.hasKind(SpanKind.INTERNAL)
         .hasAttributesSatisfyingExactly(
-            satisfies(
-                CODE_FUNCTION_NAME,
-                val ->
-                    val.satisfiesAnyOf(
-                        v ->
-                            assertThat(v)
-                                .isEqualTo(
-                                    OnCommittedResponseWrapper.class.getName() + "." + methodName),
-                        v ->
-                            assertThat(v)
-                                .isEqualTo(
-                                    "org.springframework.security.web.firewall.FirewalledResponse"
-                                        + "."
-                                        + methodName),
-                        v ->
-                            assertThat(v)
-                                .isEqualTo(
-                                    "jakarta.servlet.http.HttpServletResponseWrapper"
-                                        + "."
-                                        + methodName))));
+            codeFunctionAssertions(OnCommittedResponseWrapper.class, methodName));
     return span;
   }