review

Author: trask

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts

@@ -96,7 +96,7 @@ tasks {
     jvmArgs("-Dotel.semconv.exception.signal.opt-in=logs")
     systemProperty(
       "metadataConfig",
-      "otel.instrumentation.common.experimental.controller-telemetry.enabled," +
+      "otel.instrumentation.common.experimental.controller-telemetry.enabled=true," +
         "otel.semconv.exception.signal.opt-in=logs"
     )
   }

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpClientTest.java

@@ -1270,12 +1270,12 @@ private void assertParentExceptionLog(Throwable exception) {
                       equalTo(EXCEPTION_TYPE, exceptionType),
                       satisfies(
                           EXCEPTION_MESSAGE,
-                          message -> {
+                          val -> {
                             if (exception.getMessage() != null) {
-                              message.isEqualTo(exception.getMessage());
+                              val.isEqualTo(exception.getMessage());
                             }
                           }),
-                      satisfies(EXCEPTION_STACKTRACE, stacktrace -> stacktrace.isNotNull()));
+                      satisfies(EXCEPTION_STACKTRACE, val -> val.isNotNull()));
             });
   }
 
@@ -1296,12 +1296,12 @@ private void assertClientExceptionLog(Throwable exception, String eventName) {
                       equalTo(EXCEPTION_TYPE, exceptionType),
                       satisfies(
                           EXCEPTION_MESSAGE,
-                          message -> {
+                          val -> {
                             if (exception.getMessage() != null) {
-                              message.isEqualTo(exception.getMessage());
+                              val.isEqualTo(exception.getMessage());
                             }
                           }),
-                      satisfies(EXCEPTION_STACKTRACE, stacktrace -> stacktrace.isNotNull()));
+                      satisfies(EXCEPTION_STACKTRACE, val -> val.isNotNull()));
             });
   }
 

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java

@@ -1061,12 +1061,12 @@ protected void assertExceptionLogs(Throwable expectedException, String expectedE
                       equalTo(EXCEPTION_TYPE, expectedException.getClass().getName()),
                       satisfies(
                           EXCEPTION_MESSAGE,
-                          message -> {
+                          val -> {
                             if (expectedException.getMessage() != null) {
-                              message.isEqualTo(expectedException.getMessage());
+                              val.isEqualTo(expectedException.getMessage());
                             }
                           }),
-                      satisfies(EXCEPTION_STACKTRACE, stacktrace -> stacktrace.isNotNull()));
+                      satisfies(EXCEPTION_STACKTRACE, val -> val.isNotNull()));
             });
   }