finish moving logic into advicescope class

Author: jaydeluca

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

@@ -8,7 +8,6 @@
 import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
-import static io.opentelemetry.javaagent.instrumentation.play.v2_4.Play24Singletons.updateSpan;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -70,12 +69,8 @@ public static void stopTraceOnResponse(
       if (actionScope == null) {
         return;
       }
-      actionScope.closeScope();
 
-      updateSpan(actionScope.getContext(), req);
-
-      // span finished in RequestCompleteCallback
-      actionScope.end(throwable, responseFuture, (Action<?>) thisAction);
+      actionScope.end(throwable, responseFuture, (Action<?>) thisAction, req);
     }
   }
 }

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

@@ -6,11 +6,13 @@
 package io.opentelemetry.javaagent.instrumentation.play.v2_4;
 
 import static io.opentelemetry.javaagent.instrumentation.play.v2_4.Play24Singletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.play.v2_4.Play24Singletons.updateSpan;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import javax.annotation.Nullable;
 import play.api.mvc.Action;
+import play.api.mvc.Request;
 import play.api.mvc.Result;
 import scala.concurrent.Future;
 
@@ -27,10 +29,6 @@ public AdviceScope(Context context, Scope scope, ActionData actionData) {
     this.scope = scope;
   }
 
-  public Context getContext() {
-    return context;
-  }
-
   @Nullable
   public static AdviceScope start(Context parentContext, ActionData actionData) {
     if (!instrumenter().shouldStart(parentContext, actionData)) {
@@ -47,12 +45,15 @@ public void closeScope() {
     }
   }
 
-  public void end(Throwable throwable, Future<Result> responseFuture, Action<?> thisAction) {
+  public void end(
+      Throwable throwable, Future<Result> responseFuture, Action<?> thisAction, Request<?> req) {
     closeScope();
+    updateSpan(context, req);
 
     if (throwable == null) {
+      // span finished in RequestCompleteCallback
       responseFuture.onComplete(
-          new RequestCompleteCallback(getContext()), thisAction.executionContext());
+          new RequestCompleteCallback(context), thisAction.executionContext());
     } else {
       instrumenter().end(context, actionData, null, throwable);
     }