refactored code to reduce overhead

Author: dhilpipre

Kotlin-Coroutines_1.2/src/main/java/com/nr/instrumentation/kotlin/coroutines/NRWrappedRunnable.java

@@ -8,8 +8,8 @@
 
 @Weave(type=MatchType.BaseClass)
 public abstract class BaseContinuationImpl {
-	
-	
+
+
 	@Trace
 	public void resumeWith(Object obj) {
 		String name =  null;
@@ -23,5 +23,17 @@ public void resumeWith(Object obj) {
 		Weaver.callOriginal();
 	}
 
+	@Trace
+	protected Object invokeSuspend(Object obj) {
+		String name = null;
+		StackTraceElement element = getStackTraceElement();
+		if (element != null)
+			name = element.getClassName() + "." + element.getMethodName(); 
+		if (name != null)
+			NewRelic.getAgent().getTracedMethod().setMetricName(new String[] { "Custom", "Continuation", name, "invokeSuspend" }); 
+		return Weaver.callOriginal();
+	}
+
+
 	public abstract StackTraceElement getStackTraceElement();
 }

Kotlin-Coroutines_1.2/src/main/java/kotlin/coroutines/jvm/internal/BaseContinuationImpl.java

@@ -1,10 +1,8 @@
 package kotlinx.coroutines;
 
 import com.newrelic.api.agent.NewRelic;
-import com.newrelic.api.agent.Token;
 import com.newrelic.api.agent.Trace;
 import com.newrelic.api.agent.weaver.MatchType;
-import com.newrelic.api.agent.weaver.NewField;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
 
@@ -22,65 +20,48 @@ public AbstractCoroutine(CoroutineContext ctx, boolean active) {
 
 	public abstract String nameString$kotlinx_coroutines_core();
 
-	@NewField
-	private Token token = null;
-
-	@Trace(async=true)
+	@Trace
 	public final void resumeWith(Object obj) {
 		String name = nameString$kotlinx_coroutines_core();
 		if(name != null && !name.isEmpty()) {
 			NewRelic.getAgent().getTracedMethod().setMetricName(new String[] {"Custom","Coroutine",name,"resumeWith"});
 		}
-		if(token != null) {
-			token.linkAndExpire();
-			token = null;
-		}
 		Weaver.callOriginal();
 	}
 
-	@Trace(dispatcher=true)
+	@Trace
 	public final void start(CoroutineStart start, Function1<? super Continuation<? super T>, ? extends Object> f) {
 		String name = nameString$kotlinx_coroutines_core();
 		if(name != null && !name.isEmpty()) {
 			NewRelic.getAgent().getTracedMethod().setMetricName(new String[] {"Custom","Coroutine",name,"start"});
 		}
-//		token = NewRelic.getAgent().getTransaction().getToken();
 		Weaver.callOriginal();
 	}
 
-	@Trace(dispatcher=true)
+	@Trace
 	public final <R> void start(CoroutineStart start, R r, Function2<? super R, ? super Continuation<? super T>, ? extends Object> f) {
 		String name = nameString$kotlinx_coroutines_core();
 		if(name != null && !name.isEmpty()) {
 			NewRelic.getAgent().getTracedMethod().setMetricName(new String[] {"Custom","Coroutine",name,"start"});
 		}
-//		token = NewRelic.getAgent().getTransaction().getToken();
 		Weaver.callOriginal();
 	}
 
-	@Trace(async=true)
+	@Trace
 	protected void onCompleted(T t) {
 		String name = nameString$kotlinx_coroutines_core();
 		if(name != null && !name.isEmpty()) {
 			NewRelic.getAgent().getTracedMethod().setMetricName(new String[] {"Custom","Coroutine",name,"onCompleted"});
 		}
-		if(token != null) {
-			token.linkAndExpire();
-			token = null;
-		}
 		Weaver.callOriginal();
 	}
 
-	@Trace(async=true)
+	@Trace
 	public  void handleOnCompletionException$kotlinx_coroutines_core(java.lang.Throwable t) {
 		String name = nameString$kotlinx_coroutines_core();
 		if(name != null && !name.isEmpty()) {
 			NewRelic.getAgent().getTracedMethod().setMetricName(new String[] {"Custom","Coroutine",name,"handleOnCompletionException"});
 		}
-		if(token != null) {
-			token.linkAndExpire();
-			token = null;
-		}
 		Weaver.callOriginal();
 	}
 }

Kotlin-Coroutines_1.2/src/main/java/kotlinx/coroutines/AbstractCoroutine.java

@@ -1,12 +1,20 @@
 package kotlinx.coroutines;
 
+import com.newrelic.api.agent.NewRelic;
 import com.newrelic.api.agent.Trace;
 import com.newrelic.api.agent.weaver.MatchType;
 import com.newrelic.api.agent.weaver.Weave;
+import com.newrelic.api.agent.weaver.Weaver;
 
 @Weave(type=MatchType.BaseClass)
 public abstract class CompletionHandlerBase {
 
 	@Trace
-	public abstract void invoke(Throwable t);
+	public void invoke(Throwable t) {
+		NewRelic.getAgent().getTracedMethod().setMetricName("Custom","CompletionHandler",getClass().getSimpleName(),"invoke");
+		if(t != null) {
+			NewRelic.noticeError(t);
+		}
+		Weaver.callOriginal();
+	}
 }

Kotlin-Coroutines_1.2/src/main/java/kotlinx/coroutines/CancelHandlerBase.java

@@ -10,24 +10,23 @@
 
 import kotlin.Unit;
 import kotlin.coroutines.Continuation;
-import kotlin.jvm.functions.Function1;
 
 @Weave(type=MatchType.Interface)
 public abstract class Job {
 
 	@Trace
 	public void cancel(CancellationException e) {
-		NewRelic.noticeError(e);
+		NewRelic.getAgent().getTracedMethod().setMetricName("Custom","Job",getClass().getSimpleName(),"cancel");
+		if(e != null) {
+			NewRelic.noticeError(e);
+		}
 		Weaver.callOriginal();
 	}
 
 	@Trace
-	public abstract Object join(Continuation<? super Unit> c);
-	
-	@Trace
-	public abstract DisposableHandle invokeOnCompletion(Function1<? super Throwable, kotlin.Unit> f);
+	public Object join(Continuation<? super Unit> c) {
+		NewRelic.getAgent().getTracedMethod().setMetricName("Custom","Job",getClass().getSimpleName(),"join");
+		return Weaver.callOriginal();
+	}
 
-	@Trace
-	public abstract DisposableHandle invokeOnCompletion(boolean b1, boolean b2, Function1<? super Throwable, Unit> f);
-
 }