Sept 12 baseline

Author: dhilpipre

Kotlin-Coroutines-Suspends/src/main/java/com/newrelic/instrumentation/kotlin/coroutines/Utils.java

@@ -1,5 +1,7 @@
 package com.newrelic.instrumentation.kotlin.coroutines;
 
+import com.newrelic.agent.Transaction;
+import com.newrelic.agent.TransactionActivity;
 import com.newrelic.agent.config.AgentConfig;
 import com.newrelic.agent.config.AgentConfigListener;
 import com.newrelic.agent.service.ServiceFactory;
@@ -38,4 +40,10 @@ public static String getSuspendString(String cont_string, Object obj) {
 
 		return obj.getClass().getName();
 	}
+	
+	public static boolean tracerCheck(Transaction transaction) {
+		TransactionActivity txn = transaction.getTransactionActivity();
+		
+		return !(txn.getTracers().isEmpty());
+	}
 }

Kotlin-Coroutines-Suspends/src/main/java/com/newrelic/instrumentation/kotlin/coroutines/tracing/SuspendTracerFactory.java

@@ -19,6 +19,9 @@ public Tracer getTracer(Transaction transaction, ClassMethodSignature sig, Objec
 		if(SuspendIgnores.ignoreSuspend(object)) {
 			return null;
 		}
+		if(!transaction.shouldGenerateTransactionSegment()) {
+			return null;
+		}
 		return new DefaultTracer(transaction, sig, object, new SimpleMetricNameFormat("Custom/SuspendFunction/"+Utils.getSuspendString(object.toString(), object)));
 	}
 

Kotlin-Coroutines_1.0/src/main/java/kotlinx/coroutines/CancellableContinuation.java

@@ -16,7 +16,9 @@ public void resumeUndispatched(CoroutineDispatcher d, T t) {
 
 	@Trace
 	public void resumeUndispatchedWithException(CoroutineDispatcher d, java.lang.Throwable t) {
-		NewRelic.noticeError(t);
+		if(!(t instanceof JobCancellationException)) {
+			NewRelic.noticeError(t);
+		}
 		Weaver.callOriginal();
 	}
 

Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/CoroutineExceptionHandler.java

@@ -11,7 +11,9 @@ public abstract class CoroutineExceptionHandler {
 
 	@Trace
 	public void handleException(kotlin.coroutines.CoroutineContext ctx, java.lang.Throwable t) {
-		NewRelic.noticeError(t);
+		if (!(t instanceof JobCancellationException)) {
+			NewRelic.noticeError(t);
+		}
 		Weaver.callOriginal();
 	}
 }

Kotlin-Coroutines_1.5/src/main/java/kotlinx/coroutines/CoroutineExceptionHandler.java

@@ -14,15 +14,20 @@ public abstract class CoroutineExceptionHandler {
 
 	@Trace
 	public void handleException(kotlin.coroutines.CoroutineContext ctx, java.lang.Throwable t) {
-		String cName = Utils.getCoroutineName(ctx);
-		if(cName != null && !cName.isEmpty()) {
-			HashMap<String, String> attributes = new HashMap<>();
-			attributes.put("Coroutine-Name", cName);
-			NewRelic.noticeError(t, attributes);
-		} else {
-			NewRelic.noticeError(t);
-		}
-		
+		if (!(t instanceof JobCancellationException)) {
+			String cName = Utils.getCoroutineName(ctx);
+			if(cName != null && !cName.isEmpty()) {
+				HashMap<String, String> attributes = new HashMap<>();
+				attributes.put("Coroutine-Name", cName);
+				if (!(t instanceof JobCancellationException)) {
+					NewRelic.noticeError(t, attributes);
+				}
+			} else {
+				if (!(t instanceof JobCancellationException)) {
+					NewRelic.noticeError(t);
+				}
+			}
+		}		
 		Weaver.callOriginal();
 	}
 }

Kotlin-Coroutines_1.7/build.gradle

@@ -3,7 +3,7 @@
 
 apply plugin: 'java'
 
-targetCompatibility = JavaVersion.VERSION_1_9
+//targetCompatibility = JavaVersion.VERSION_1_9
 
 dependencies {
   implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '1.7.3'

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

@@ -31,11 +31,13 @@ protected void onCancelled(Throwable t, boolean b) {
 	}
 
 	public void handleOnCompletionException$kotlinx_coroutines_core(Throwable t) {
-		NewRelic.noticeError(t);
+		if (!(t instanceof JobCancellationException)) {
+			NewRelic.noticeError(t);
+		}
 		Weaver.callOriginal();
 	}
-	
-	
+
+
 
 	@Trace
 	public <R> void start(CoroutineStart start, R receiver, Function2<? super R, ? super Continuation<? super T>, ? extends Object> block) {
@@ -44,7 +46,7 @@ public <R> void start(CoroutineStart start, R receiver, Function2<? super R, ? s
 		TracedMethod traced = NewRelic.getAgent().getTracedMethod();
 		traced.addCustomAttribute("Coroutine-Name", name);
 		traced.addCustomAttribute("Block", block.toString());
-		
+
 		if(name != null && !name.isEmpty()) {
 			NewRelic.getAgent().getTransaction().setTransactionName(TransactionNamePriority.FRAMEWORK_HIGH, false, "Coroutine", "Kotlin","Coroutine",name);
 			traced.setMetricName("Custom","Kotlin","Coroutines",getClass().getSimpleName(),"start",name);

Kotlin-Coroutines_1.7/src/main/java/kotlinx/coroutines/CoroutineExceptionHandler.java

@@ -11,7 +11,9 @@ public abstract class CoroutineExceptionHandler {
 
 	@Trace
 	public void handleException(kotlin.coroutines.CoroutineContext ctx, java.lang.Throwable t) {
-		NewRelic.noticeError(t);
+		if (!(t instanceof JobCancellationException)) {
+			NewRelic.noticeError(t);
+		}
 		Weaver.callOriginal();
 	}
 }

Kotlin-Coroutines_1.7/src/main/java/kotlinx/coroutines/CoroutineExceptionHandlerKt.java

@@ -13,15 +13,16 @@ public abstract class CoroutineExceptionHandlerKt {
 
 	@Trace
 	public static void handleCoroutineException(kotlin.coroutines.CoroutineContext ctx,Throwable t) {
-		String cName = Utils.getCoroutineName(ctx);
-		if(cName != null && !cName.isEmpty()) {
-			HashMap<String, String> attributes = new HashMap<>();
-			attributes.put("Coroutine-Name", cName);
-			NewRelic.noticeError(t, attributes);
-		} else {
-			NewRelic.noticeError(t);
+		if (!(t instanceof JobCancellationException)) {
+			String cName = Utils.getCoroutineName(ctx);
+			if (cName != null && !cName.isEmpty()) {
+				HashMap<String, String> attributes = new HashMap<>();
+				attributes.put("Coroutine-Name", cName);
+				NewRelic.noticeError(t, attributes);
+			} else {
+				NewRelic.noticeError(t);
+			} 
 		}
-		
 		Weaver.callOriginal();
 	}
 }