cleaned up and added ignores

Author: dhilpipre

Kotlin-Coroutines_1.2/build.gradle

@@ -22,9 +22,12 @@ jar {
 }
 
 verifyInstrumentation {
-	passes 'org.jetbrains.kotlinx:kotlinx-coroutines-core:[1.2.0,)'
+	passes 'org.jetbrains.kotlinx:kotlinx-coroutines-core:[1.2.0,1.4.0)'
+	passes 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:[1.3.9,1.4.0)'
 	excludeRegex '.*SNAPSHOT'
 	excludeRegex '.*alpha'
 	excludeRegex '.*-eap-.*'
 	excludeRegex '.*-native-.*'
-}
+	excludeRegex '.*-M[0-9]'
+	excludeRegex '.*-rc'
+}

Kotlin-Coroutines_1.2/src/main/java/com/newrelic/instrumentation/kotlin/coroutines/NRContinuationWrapper.java

@@ -2,6 +2,7 @@
 
 import com.newrelic.agent.bridge.AgentBridge;
 import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.Token;
 import com.newrelic.api.agent.Trace;
 
 import kotlin.coroutines.Continuation;
@@ -10,10 +11,12 @@
 public class NRContinuationWrapper<T> implements Continuation<T> {
 
 	private Continuation<T> delegate = null;
+	private String name = null;
 	private static boolean isTransformed = false;
 
-	public NRContinuationWrapper(Continuation<T> d) {
+	public NRContinuationWrapper(Continuation<T> d, String n) {
 		delegate = d;
+		name = n;
 		if(!isTransformed) {
 			AgentBridge.instrumentation.retransformUninstrumentedClass(getClass());
 			isTransformed = true;
@@ -26,9 +29,14 @@ public CoroutineContext getContext() {
 	}
 
 	@Override
-	@Trace(dispatcher=true)
+	@Trace(async=true)
 	public void resumeWith(Object p0) {
-		NewRelic.getAgent().getTracedMethod().setMetricName("Custom","ContinuationWrapper","resumeWith",delegate.getClass().getSimpleName());
+		
+		NewRelic.getAgent().getTracedMethod().setMetricName("Custom","ContinuationWrapper","resumeWith",name != null ? name : Utils.getCoroutineName(getContext(), delegate.getClass()));
+		Token token = Utils.getToken(getContext());
+		if(token != null) {
+			token.link();
+		}
 		delegate.resumeWith(p0);
 	}
 

Kotlin-Coroutines_1.2/src/main/java/com/newrelic/instrumentation/kotlin/coroutines/NRCoroutineToken.java

@@ -0,0 +1,51 @@
+package com.newrelic.instrumentation.kotlin.coroutines;
+
+import com.newrelic.api.agent.Token;
+
+import kotlin.coroutines.AbstractCoroutineContextElement;
+import kotlin.coroutines.CoroutineContext;
+
+public class NRCoroutineToken extends AbstractCoroutineContextElement
+ {
+	public static Key key = new Key();
+
+	public NRCoroutineToken(Token t) {
+		super(key);
+		token = t;
+	}
+
+	private Token token = null;
+
+	public static final class Key implements CoroutineContext.Key<NRCoroutineToken> {
+		private Key() {}
+	}
+	
+	public Token getToken() {
+		return token;
+	}
+
+	@Override
+	public int hashCode() {
+		return token.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if(this != obj ) {
+			if(obj instanceof NRCoroutineToken) {
+				NRCoroutineToken t = (NRCoroutineToken)obj;
+				return t.token == token;
+			}
+		} else {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public String toString() {
+		return "NRCoroutineToken";
+	}
+	
+	
+}

Kotlin-Coroutines_1.2/src/main/java/com/newrelic/instrumentation/kotlin/coroutines/NRFunction1Wrapper.java

@@ -1,7 +1,5 @@
 package com.newrelic.instrumentation.kotlin.coroutines;
 
-import java.util.logging.Level;
-
 import com.newrelic.agent.bridge.AgentBridge;
 import com.newrelic.api.agent.NewRelic;
 import com.newrelic.api.agent.Trace;
@@ -15,7 +13,6 @@ public class NRFunction1Wrapper<P1,R> implements Function1<P1, R> {
 	private static boolean isTransformed = false;
 
 	public NRFunction1Wrapper(Function1<P1, R> d, String n) {
-		NewRelic.getAgent().getLogger().log(Level.FINE, "Wrapping Function1: {0} using name: {1}", d,n);
 		delegate = d;
 		name = n;
 		if(!isTransformed) {

Kotlin-Coroutines_1.2/src/main/java/com/newrelic/instrumentation/kotlin/coroutines/NRFunction2Wrapper.java

@@ -1,23 +1,21 @@
 package com.newrelic.instrumentation.kotlin.coroutines;
 
-import java.util.logging.Level;
-
 import com.newrelic.agent.bridge.AgentBridge;
 import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.Token;
 import com.newrelic.api.agent.Trace;
 
 import kotlin.coroutines.Continuation;
-import kotlin.coroutines.jvm.internal.BaseContinuationImpl;
 import kotlin.jvm.functions.Function2;
 
 public class NRFunction2Wrapper<P1, P2, R> implements Function2<P1, P2, R> {
 
 	private Function2<P1, P2, R> delegate = null;
 	private String name = null;
 	private static boolean isTransformed = false;
+	public Token token = null;
 
 	public NRFunction2Wrapper(Function2<P1, P2, R> d,String n) {
-		NewRelic.getAgent().getLogger().log(Level.FINE, "Wrapping Function2: {0} - {1} using name: {2}", d, d.getClass().getName(),n);
 		delegate = d;
 		name = n;
 		if(!isTransformed) {
@@ -26,14 +24,22 @@ public NRFunction2Wrapper(Function2<P1, P2, R> d,String n) {
 		}
 	}
 
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
-	@Trace(dispatcher=true)
+	@Trace(async=true)
 	public R invoke(P1 p1, P2 p2) {
+		if(token != null) {
+			token.linkAndExpire();
+			token = null;
+		}
 		String nameStr = null;
 		if(p2 instanceof Continuation) {
 			Continuation continuation = (Continuation)p2;
-			NRContinuationWrapper wrapper = new NRContinuationWrapper(continuation);
-			p2 = (P2) wrapper;
+			
+			if (!Utils.ignoreContinuation(name) && !Utils.ignoreContinuation(continuation.getClass(), continuation.getContext())) {
+				NRContinuationWrapper wrapper = new NRContinuationWrapper(continuation, name);
+				p2 = (P2) wrapper;
+			}
 		}
 		if(nameStr == null) {
 			nameStr = name;