post-review changes

Author: SylvainJuge

javaagent-tooling/src/testExceptionHandler/java/io/opentelemetry/javaagent/tooling/bytebuddy/BadAdvice.java

@@ -5,13 +5,16 @@
 
 package io.opentelemetry.javaagent.tooling.bytebuddy;
 
+import java.util.concurrent.atomic.AtomicBoolean;
 import net.bytebuddy.asm.Advice;
 
 @SuppressWarnings("unused")
 public class BadAdvice {
 
   @Advice.OnMethodExit(suppress = Throwable.class)
-  public static boolean throwAnException() {
+  public static boolean throwAnException(@Advice.Argument(0) AtomicBoolean isInstrumented) {
+    // mark that the advice has been executed
+    isInstrumented.set(true);
     throw new IllegalStateException("Test Exception");
   }
 

javaagent-tooling/src/testExceptionHandler/java/io/opentelemetry/javaagent/tooling/bytebuddy/ExceptionHandlerTest.java

@@ -15,6 +15,7 @@
 import io.opentelemetry.javaagent.bootstrap.ExceptionLogger;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import net.bytebuddy.agent.ByteBuddyAgent;
@@ -85,9 +86,9 @@ void exceptionHandlerInvoked() {
     int initLogEvents = testHandler.getRecords().size();
 
     // Triggers classload and instrumentation
-    assertThat(SomeClass.isInstrumented())
-        .describedAs("method return value should be preserved when exception is thrown in advice")
-        .isFalse();
+    AtomicBoolean isInstrumented = new AtomicBoolean(false);
+    SomeClass.isInstrumented(isInstrumented);
+    assertThat(isInstrumented.get()).describedAs("method should have been instrumented").isTrue();
 
     assertThat(testHandler.getRecords())
         .hasSize(initLogEvents + 1)
@@ -128,8 +129,8 @@ void exceptionHandlerSetsCorrectStackSize() {
 
   public static class SomeClass {
 
-    public static boolean isInstrumented() {
-      return false;
+    public static void isInstrumented(AtomicBoolean instrumented) {
+      instrumented.set(false);
     }
 
     public static void smallStack() {