fix nesting and cast

Author: jaydeluca

instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_4/ActionInstrumentation.java

@@ -57,7 +57,7 @@ public static AdviceScope onEnter(@Advice.Argument(0) Request<?> req) {
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopTraceOnResponse(
-        @Advice.This Object thisAction,
+        @Advice.This Action<?> thisAction,
         @Advice.Thrown Throwable throwable,
         @Advice.Argument(0) Request<?> req,
         @Advice.Return(readOnly = false) Future<Result> responseFuture,
@@ -66,43 +66,43 @@ public static void stopTraceOnResponse(
         return;
       }
 
-      actionScope.end(throwable, responseFuture, (Action<?>) thisAction, req);
+      actionScope.end(throwable, responseFuture, thisAction, req);
     }
-  }
-
-  public static class AdviceScope {
-    private final Context context;
-    private final Scope scope;
 
-    public AdviceScope(Context context, Scope scope) {
-      this.context = context;
-      this.scope = scope;
-    }
+    public static class AdviceScope {
+      private final Context context;
+      private final Scope scope;
 
-    @Nullable
-    public static AdviceScope start(Context parentContext) {
-      if (!instrumenter().shouldStart(parentContext, null)) {
-        return null;
+      public AdviceScope(Context context, Scope scope) {
+        this.context = context;
+        this.scope = scope;
       }
 
-      Context context = instrumenter().start(parentContext, null);
-      return new AdviceScope(context, context.makeCurrent());
-    }
+      @Nullable
+      public static AdviceScope start(Context parentContext) {
+        if (!instrumenter().shouldStart(parentContext, null)) {
+          return null;
+        }
+
+        Context context = instrumenter().start(parentContext, null);
+        return new AdviceScope(context, context.makeCurrent());
+      }
 
-    public void end(
-        @Nullable Throwable throwable,
-        Future<Result> responseFuture,
-        Action<?> thisAction,
-        Request<?> req) {
-      scope.close();
-      updateSpan(context, req);
-
-      if (throwable == null) {
-        // span finished in RequestCompleteCallback
-        responseFuture.onComplete(
-            new RequestCompleteCallback(context), thisAction.executionContext());
-      } else {
-        instrumenter().end(context, null, null, throwable);
+      public void end(
+          @Nullable Throwable throwable,
+          Future<Result> responseFuture,
+          Action<?> thisAction,
+          Request<?> req) {
+        scope.close();
+        updateSpan(context, req);
+
+        if (throwable == null) {
+          // span finished in RequestCompleteCallback
+          responseFuture.onComplete(
+              new RequestCompleteCallback(context), thisAction.executionContext());
+        } else {
+          instrumenter().end(context, null, null, throwable);
+        }
       }
     }
   }