Use OnMethodEnter for blocking sessions in vert.x (#8225)

DataDog · Jan 16, 2025 · ae1aa30 · ae1aa30
1 parent 296ed7b
commit ae1aa30
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/...main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextSessionAdvice.java b/...main/java/datadog/trace/instrumentation/vertx_3_4/server/RoutingContextSessionAdvice.java
@@ -17,11 +17,10 @@
 
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 class RoutingContextSessionAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+  @Advice.OnMethodEnter(suppress = Throwable.class)
   static void after(
       @ActiveRequestContext final RequestContext reqCtx,
-      @Advice.Argument(0) final Session session,
-      @Advice.Thrown(readOnly = false) Throwable throwable) {
+      @Advice.Argument(0) final Session session) {
 
     if (session == null) {
       return;
@@ -47,9 +46,7 @@ static void after(
           rba.getStatusCode(),
           rba.getBlockingContentType(),
           rba.getExtraHeaders());
-      if (throwable == null) {
-        throwable = new BlockingException("Blocked request (for session)");
-      }
+      throw new BlockingException("Blocked request (for session)");
     }
   }
 }
diff --git a/...main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextSessionAdvice.java b/...main/java/datadog/trace/instrumentation/vertx_4_0/server/RoutingContextSessionAdvice.java
@@ -17,11 +17,10 @@
 
 @RequiresRequestContext(RequestContextSlot.APPSEC)
 class RoutingContextSessionAdvice {
-  @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
+  @Advice.OnMethodEnter(suppress = Throwable.class)
   static void after(
       @ActiveRequestContext final RequestContext reqCtx,
-      @Advice.Argument(0) final Session session,
-      @Advice.Thrown(readOnly = false) Throwable throwable) {
+      @Advice.Argument(0) final Session session) {
 
     if (session == null) {
       return;
@@ -47,9 +46,7 @@ static void after(
           rba.getStatusCode(),
           rba.getBlockingContentType(),
           rba.getExtraHeaders());
-      if (throwable == null) {
-        throwable = new BlockingException("Blocked request (for session)");
-      }
+      throw new BlockingException("Blocked request (for session)");
     }
   }
 }