baseline

dhilpipre · dhilpipre · commit 321ae11a91e8 · 2024-08-21T14:44:40.000-05:00
diff --git a/Kotlin-Coroutines-Suspends/src/main/java/com/newrelic/instrumentation/kotlin/coroutines/tracing/KotlinCoroutineTracer.java b/Kotlin-Coroutines-Suspends/src/main/java/com/newrelic/instrumentation/kotlin/coroutines/tracing/KotlinCoroutineTracer.java
@@ -0,0 +1,31 @@
+package com.newrelic.instrumentation.kotlin.coroutines.tracing;
+
+import com.newrelic.agent.Transaction;
+import com.newrelic.agent.TransactionActivity;
+import com.newrelic.agent.tracers.ClassMethodSignature;
+import com.newrelic.agent.tracers.DefaultTracer;
+import com.newrelic.agent.tracers.Tracer;
+import com.newrelic.agent.tracers.metricname.SimpleMetricNameFormat;
+import com.newrelic.api.agent.NewRelic;
+import com.newrelic.instrumentation.kotlin.coroutines.Utils;
+
+public class KotlinCoroutineTracer extends DefaultTracer {
+
+	public KotlinCoroutineTracer(Transaction transaction, ClassMethodSignature sig, Object object) {
+		super(transaction, sig, object, new SimpleMetricNameFormat("Custom/SuspendFunction/"+Utils.getSuspendString(object.toString(), object)));
+	}
+
+	@Override
+	public void performFinishWork(long finishTime, int opcode, Object returnValue) {
+		TransactionActivity txa = getTransactionActivity();
+		if(txa != null) {
+			Tracer lastTracer = txa.getLastTracer();
+			if(!lastTracer.equals(this)) {
+				NewRelic.recordMetric("Kotlin/Coroutines/SuspendTracer/InconsistentState", 1.0F);
+				return;
+			}
+		}
+		super.performFinishWork(finishTime, opcode, returnValue);
+	}	
+	
+}
diff --git a/Kotlin-Coroutines-Suspends/src/main/java/com/newrelic/instrumentation/kotlin/coroutines/tracing/SuspendClassMatcher.java b/Kotlin-Coroutines-Suspends/src/main/java/com/newrelic/instrumentation/kotlin/coroutines/tracing/SuspendClassMatcher.java
@@ -4,6 +4,7 @@
 import java.util.Collection;
 
 import com.newrelic.agent.deps.org.objectweb.asm.ClassReader;
+import com.newrelic.agent.instrumentation.classmatchers.AndClassMatcher;
 import com.newrelic.agent.instrumentation.classmatchers.ChildClassMatcher;
 import com.newrelic.agent.instrumentation.classmatchers.ClassMatcher;
 import com.newrelic.agent.instrumentation.classmatchers.ExactClassMatcher;
@@ -12,27 +13,29 @@
 public class SuspendClassMatcher extends ClassMatcher {
 	
 	ChildClassMatcher matcher;
-	NotMatcher nrMatcher;
+	AndClassMatcher allMatcher;
 	
 	public SuspendClassMatcher() {
 		matcher = new ChildClassMatcher("kotlin.coroutines.jvm.internal.BaseContinuationImpl",false);
-		nrMatcher = new NotMatcher(new ExactClassMatcher("com.newrelic.instrumentation.kotlin.coroutines.NRWrappedSuspend"));
-	}
+		allMatcher = new AndClassMatcher(new NotMatcher(new ExactClassMatcher("com.newrelic.instrumentation.kotlin.coroutines_17.NRContinuationWrapper")),
+				new NotMatcher(new ExactClassMatcher("com.newrelic.instrumentation.kotlin.coroutines_15.NRContinuationWrapper")),
+				new NotMatcher(new ExactClassMatcher("com.newrelic.instrumentation.kotlin.coroutines_14.NRContinuationWrapper")),
+				new NotMatcher(new ExactClassMatcher("com.newrelic.instrumentation.kotlin.coroutines.NRContinuationWrapper")));	}
 
 	@Override
 	public boolean isMatch(ClassLoader loader, ClassReader cr) {
-		return matcher.isMatch(loader, cr) && nrMatcher.isMatch(loader, cr);
+		return matcher.isMatch(loader, cr) && allMatcher.isMatch(loader, cr);
 	}
 
 	@Override
 	public boolean isMatch(Class<?> clazz) {
-		return matcher.isMatch(clazz) && nrMatcher.isMatch(clazz);
+		return matcher.isMatch(clazz) && allMatcher.isMatch(clazz);
 	}
 
 	@Override
 	public Collection<String> getClassNames() {
 		Collection<String> childClasses = matcher.getClassNames();
-		Collection<String> nrClasses = nrMatcher.getClassNames();
+		Collection<String> nrClasses = allMatcher.getClassNames();
 		if(childClasses == null && nrClasses == null) return null;
 		
 		ArrayList<String> list = new ArrayList<>();
diff --git a/Kotlin-Coroutines-Suspends/src/main/java/com/newrelic/instrumentation/kotlin/coroutines/tracing/SuspendTracerFactory.java b/Kotlin-Coroutines-Suspends/src/main/java/com/newrelic/instrumentation/kotlin/coroutines/tracing/SuspendTracerFactory.java
@@ -2,12 +2,9 @@
 
 import com.newrelic.agent.Transaction;
 import com.newrelic.agent.tracers.ClassMethodSignature;
-import com.newrelic.agent.tracers.DefaultTracer;
 import com.newrelic.agent.tracers.Tracer;
 import com.newrelic.agent.tracers.TracerFactory;
-import com.newrelic.agent.tracers.metricname.SimpleMetricNameFormat;
 import com.newrelic.instrumentation.kotlin.coroutines.SuspendIgnores;
-import com.newrelic.instrumentation.kotlin.coroutines.Utils;
 
 public class SuspendTracerFactory implements TracerFactory {
 	
@@ -19,7 +16,7 @@ public Tracer getTracer(Transaction transaction, ClassMethodSignature sig, Objec
 		if(SuspendIgnores.ignoreSuspend(object)) {
 			return null;
 		}
-		return new DefaultTracer(transaction, sig, object, new SimpleMetricNameFormat("Custom/SuspendFunction/"+Utils.getSuspendString(object.toString(), object)));
+		return new KotlinCoroutineTracer(transaction, sig, object);
 	}
 
 }
diff --git a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRContinuationWrapper.java b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRContinuationWrapper.java
@@ -41,7 +41,11 @@ public void resumeWith(Object p0) {
 		}
 		Token t = Utils.getToken(getContext());
 		if(t != null) {
-			t.link();
+			if(Utils.continueWithLink()) {
+				t.link();
+			} else {
+				NewRelic.recordMetric("Kotlin/Coroutines/ContinuationWrapper/TokenLinkFailed", 1.0F);
+			}
 		}
 		if(delegate != null) {
 			delegate.resumeWith(p0);
diff --git a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/Utils.java b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/Utils.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.logging.Level;
 
+import com.newrelic.agent.Transaction;
 import com.newrelic.agent.config.AgentConfig;
 import com.newrelic.agent.config.AgentConfigListener;
 import com.newrelic.agent.service.ServiceFactory;
@@ -222,4 +223,13 @@ public static <T> String getContinuationString(Continuation<T> continuation) {
 		
 		return null;
 	}
+	
+	public static boolean continueWithLink() {
+		Transaction transaction = Transaction.getTransaction(false);
+		if(transaction != null) {
+			return transaction.getTransactionTimer() != null;
+		}
+		return true;
+	}
+
 }
diff --git a/Kotlin-Coroutines_1.5/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_15/NRContinuationWrapper.java b/Kotlin-Coroutines_1.5/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_15/NRContinuationWrapper.java
@@ -41,7 +41,11 @@ public void resumeWith(Object p0) {
 		}
 		Token t = Utils.getToken(getContext());
 		if(t != null) {
-			t.link();
+			if(Utils.continueWithLink()) {
+				t.link();
+			} else {
+				NewRelic.recordMetric("Kotlin/Coroutines/ContinuationWrapper/TokenLinkFailed", 1.0F);
+			}
 		}
 		if(delegate != null) {
 			delegate.resumeWith(p0);
diff --git a/Kotlin-Coroutines_1.5/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_15/Utils.java b/Kotlin-Coroutines_1.5/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_15/Utils.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.logging.Level;
 
+import com.newrelic.agent.Transaction;
 import com.newrelic.agent.config.AgentConfig;
 import com.newrelic.agent.config.AgentConfigListener;
 import com.newrelic.agent.service.ServiceFactory;
@@ -222,4 +223,14 @@ public static <T> String getContinuationString(Continuation<T> continuation) {
 		
 		return null;
 	}
+	
+	public static boolean continueWithLink() {
+		Transaction transaction = Transaction.getTransaction(false);
+		if(transaction != null) {
+			return transaction.getTransactionTimer() != null;
+		}
+		return true;
+	}
+
+	
 }
diff --git a/Kotlin-Coroutines_1.7/build.gradle b/Kotlin-Coroutines_1.7/build.gradle
@@ -34,5 +34,6 @@ verifyInstrumentation {
 	excludeRegex '.*-rc'
 	excludeRegex '.*-RC'
 	excludeRegex '.*-RC[0-9]'
+	excludeRegex '.*-RC.[0-9]'
 	excludeRegex '.*-Beta'
 }
diff --git a/Kotlin-Coroutines_1.7/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRContinuationWrapper.java b/Kotlin-Coroutines_1.7/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRContinuationWrapper.java
@@ -41,7 +41,11 @@ public void resumeWith(Object p0) {
 		}
 		Token t = Utils.getToken(getContext());
 		if(t != null) {
-			t.link();
+			if(Utils.continueWithLink()) {
+				t.link();
+			} else {
+				NewRelic.recordMetric("Kotlin/Coroutines/ContinuationWrapper/TokenLinkFailed", 1.0F);
+			}
 		}
 		if(delegate != null) {
 			delegate.resumeWith(p0);
diff --git a/Kotlin-Coroutines_1.7/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/Utils.java b/Kotlin-Coroutines_1.7/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/Utils.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.logging.Level;
 
+import com.newrelic.agent.Transaction;
 import com.newrelic.agent.config.AgentConfig;
 import com.newrelic.agent.config.AgentConfigListener;
 import com.newrelic.agent.service.ServiceFactory;
@@ -222,4 +223,14 @@ public static <T> String getContinuationString(Continuation<T> continuation) {
 		
 		return null;
 	}
+	
+	public static boolean continueWithLink() {
+		Transaction transaction = Transaction.getTransaction(false);
+		if(transaction != null) {
+			return transaction.getTransactionTimer() != null;
+		}
+		return true;
+	}
+
+	
 }
diff --git a/kotlin-coroutines-reactor/build.gradle b/kotlin-coroutines-reactor/build.gradle
@@ -0,0 +1,34 @@
+
+// Build.gradle generated for instrumentation module Kotlin-Coroutines_1.2
+
+apply plugin: 'java'
+
+dependencies {
+  implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-reactor', version: '1.3.0'
+
+
+   // New Relic Java Agent dependencies
+   implementation 'com.newrelic.agent.java:newrelic-agent:6.0.0'
+   implementation 'com.newrelic.agent.java:newrelic-api:6.0.0'
+   implementation fileTree(include: ['*.jar'], dir: '../libs')
+}
+
+jar {
+  manifest {
+    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.kotlin-coroutines-reactor'
+    attributes 'Implementation-Vendor': 'New Relic Labs'
+    attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
+    attributes 'Implementation-Version': 1.0
+  }
+}
+
+verifyInstrumentation {
+	passes 'org.jetbrains.kotlinx:kotlinx-coroutines-core:[1.4.0,)'
+	passes 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:[1.4.0,)'
+	excludeRegex '.*SNAPSHOT'
+	excludeRegex '.*alpha'
+	excludeRegex '.*-eap-.*'
+	excludeRegex '.*-native-.*'
+	excludeRegex '.*-M[0-9]'
+	excludeRegex '.*-rc'
+}
diff --git a/settings.gradle b/settings.gradle
@@ -7,3 +7,4 @@ include 'Kotlin-Coroutines_1.5'
 include 'Kotlin-Coroutines_1.7'
 include 'kroto-plus-coroutines'
 include 'Kotlin-Coroutines-Suspends'
+include 'kotlin-coroutines-reactor'

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,9 @@`
`2`	`2`
`3`	`3`	`import com.newrelic.agent.Transaction;`
`4`	`4`	`import com.newrelic.agent.tracers.ClassMethodSignature;`
`5`		`-import com.newrelic.agent.tracers.DefaultTracer;`
`6`	`5`	`import com.newrelic.agent.tracers.Tracer;`
`7`	`6`	`import com.newrelic.agent.tracers.TracerFactory;`
`8`		`-import com.newrelic.agent.tracers.metricname.SimpleMetricNameFormat;`
`9`	`7`	`import com.newrelic.instrumentation.kotlin.coroutines.SuspendIgnores;`
`10`		`-import com.newrelic.instrumentation.kotlin.coroutines.Utils;`
`11`	`8`
`12`	`9`	`public class SuspendTracerFactory implements TracerFactory {`
`13`	`10`
`@@ -19,7 +16,7 @@ public Tracer getTracer(Transaction transaction, ClassMethodSignature sig, Objec`
`19`	`16`	`if(SuspendIgnores.ignoreSuspend(object)) {`
`20`	`17`	`return null;`
`21`	`18`	`}`
`22`		`- return new DefaultTracer(transaction, sig, object, new SimpleMetricNameFormat("Custom/SuspendFunction/"+Utils.getSuspendString(object.toString(), object)));`
	`19`	`+ return new KotlinCoroutineTracer(transaction, sig, object);`
`23`	`20`	`}`
`24`	`21`
`25`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,11 @@ public void resumeWith(Object p0) {`
`41`	`41`	`}`
`42`	`42`	`Token t = Utils.getToken(getContext());`
`43`	`43`	`if(t != null) {`
`44`		`- t.link();`
	`44`	`+ if(Utils.continueWithLink()) {`
	`45`	`+ t.link();`
	`46`	`+ } else {`
	`47`	`+ NewRelic.recordMetric("Kotlin/Coroutines/ContinuationWrapper/TokenLinkFailed", 1.0F);`
	`48`	`+ }`
`45`	`49`	`}`
`46`	`50`	`if(delegate != null) {`
`47`	`51`	`delegate.resumeWith(p0);`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,6 @@ verifyInstrumentation {`
`34`	`34`	`excludeRegex '.*-rc'`
`35`	`35`	`excludeRegex '.*-RC'`
`36`	`36`	`excludeRegex '.*-RC[0-9]'`
	`37`	`+ excludeRegex '.*-RC.[0-9]'`
`37`	`38`	`excludeRegex '.*-Beta'`
`38`	`39`	`}`