fix indy convertsion

Author: laurit

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

@@ -97,7 +97,7 @@ public static void stopTraceOnResponse(
         @Advice.This Action<?> thisAction,
         @Advice.Thrown Throwable throwable,
         @Advice.Argument(0) Request<?> req,
-        @Advice.Return(readOnly = false) Future<Result> responseFuture,
+        @Advice.Return Future<Result> responseFuture,
         @Advice.Enter @Nullable AdviceScope actionScope) {
       if (actionScope == null) {
         return;

instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/ActionInstrumentation.java

@@ -9,6 +9,7 @@
 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_6.Play26Singletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.play.v2_6.Play26Singletons.updateSpan;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -68,23 +69,25 @@ public static AdviceScope start(Context parentContext) {
         return new AdviceScope(context, context.makeCurrent());
       }
 
-      public void end(
+      public Future<Result> end(
           @Nullable Throwable throwable,
           Future<Result> responseFuture,
           Action<?> thisAction,
           Request<?> req) {
         scope.close();
+        updateSpan(context, req);
 
         if (throwable == null) {
           // span is finished when future completes
           // not using responseFuture.onComplete() because that doesn't guarantee this handler span
           // will be completed before the server span completes
           responseFuture =
-              ResponseFutureWrapper.wrap(
-                  responseFuture, context, thisAction.executionContext(), req);
+              ResponseFutureWrapper.wrap(responseFuture, context, thisAction.executionContext());
         } else {
           instrumenter().end(context, null, null, throwable);
         }
+
+        return responseFuture;
       }
     }
 
@@ -94,17 +97,18 @@ public static AdviceScope onEnter(@Advice.Argument(0) Request<?> req) {
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
-    public static void stopTraceOnResponse(
+    @Advice.AssignReturned.ToReturned
+    public static Future<Result> stopTraceOnResponse(
         @Advice.This Action<?> thisAction,
         @Advice.Thrown Throwable throwable,
         @Advice.Argument(0) Request<?> req,
-        @Advice.Return(readOnly = false) Future<Result> responseFuture,
+        @Advice.Return Future<Result> responseFuture,
         @Advice.Enter @Nullable AdviceScope actionScope) {
       if (actionScope == null) {
-        return;
+        return responseFuture;
       }
 
-      actionScope.end(throwable, responseFuture, thisAction, req);
+      return actionScope.end(throwable, responseFuture, thisAction, req);
     }
   }
 }

instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/ResponseFutureWrapper.java

@@ -6,11 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.play.v2_6;
 
 import static io.opentelemetry.javaagent.instrumentation.play.v2_6.Play26Singletons.instrumenter;
-import static io.opentelemetry.javaagent.instrumentation.play.v2_6.Play26Singletons.updateSpan;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.context.Context;
-import play.api.mvc.Request;
 import play.api.mvc.Result;
 import scala.concurrent.ExecutionContext;
 import scala.concurrent.Future;
@@ -19,14 +17,13 @@
 public final class ResponseFutureWrapper {
 
   public static Future<Result> wrap(
-      Future<Result> future, Context context, ExecutionContext executionContext, Request<?> req) {
+      Future<Result> future, Context context, ExecutionContext executionContext) {
 
     return future.transform(
         new AbstractFunction1<Result, Result>() {
           @Override
           @CanIgnoreReturnValue
           public Result apply(Result result) {
-            updateSpan(context, req);
             instrumenter().end(context, null, null, null);
             return result;
           }
@@ -35,7 +32,6 @@ public Result apply(Result result) {
           @Override
           @CanIgnoreReturnValue
           public Throwable apply(Throwable throwable) {
-            updateSpan(context, req);
             instrumenter().end(context, null, null, throwable);
             return throwable;
           }