fix warnings

open-telemetry · Apr 12, 2024 · 20f596b · 20f596b
1 parent 4812148
commit 20f596b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/...ion/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/ServletFilterTest.java b/...ion/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/ServletFilterTest.java
@@ -6,10 +6,9 @@
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
-import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME;
-import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE;
-import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE;
-import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_TYPE;
+import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
+import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
+import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.common.collect.ImmutableMap;
@@ -62,7 +61,7 @@ protected SpanDataAssert assertHandlerSpan(
           .hasEventsSatisfyingExactly(
               event ->
                   event
-                      .hasName(EXCEPTION_EVENT_NAME)
+                      .hasName("exception")
                       .hasAttributesSatisfyingExactly(
                           equalTo(
                               EXCEPTION_TYPE,

diff --git a/...n/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/SpringBootBasedTest.java b/...n/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/SpringBootBasedTest.java
@@ -6,10 +6,9 @@
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
-import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_EVENT_NAME;
-import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_MESSAGE;
-import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_STACKTRACE;
-import static io.opentelemetry.semconv.SemanticAttributes.EXCEPTION_TYPE;
+import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
+import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
+import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
 
 import boot.AbstractSpringBootBasedTest;
 import boot.AppConfig;
@@ -71,7 +70,7 @@ protected SpanDataAssert assertHandlerSpan(
           .hasEventsSatisfyingExactly(
               event ->
                   event
-                      .hasName(EXCEPTION_EVENT_NAME)
+                      .hasName("exception")
                       .hasAttributesSatisfyingExactly(
                           equalTo(
                               EXCEPTION_TYPE,

diff --git a/...g-webmvc/spring-webmvc-common/testing/src/main/java/boot/AbstractSpringBootBasedTest.java b/...g-webmvc/spring-webmvc-common/testing/src/main/java/boot/AbstractSpringBootBasedTest.java
@@ -16,11 +16,11 @@
 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.incubating.CodeIncubatingAttributes.CODE_FUNCTION;
-import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE;
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
+import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION;
+import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.common.AttributeKey;