Feature: add Ktor support

instrumentation-test/src/main/java/com/newrelic/agent/introspec/internal/IntrospectorServiceManager.java

@@ -25,6 +25,7 @@
 import com.newrelic.agent.jfr.JfrService;
 import com.newrelic.agent.jmx.JmxService;
 import com.newrelic.agent.kotlincoroutines.KotlinCoroutinesService;
+import com.newrelic.agent.ktor.KtorService;
 import com.newrelic.agent.language.SourceLanguageService;
 import com.newrelic.agent.model.SpanEvent;
 import com.newrelic.agent.normalization.NormalizationService;
@@ -91,6 +92,7 @@ class IntrospectorServiceManager extends AbstractService implements ServiceManag
     private volatile ServerlessService serverlessService;
     private ExpirationService expirationService;
     private volatile KotlinCoroutinesService kotlinCoroutinesService;
+    private volatile KtorService ktorService;
 
     private IntrospectorServiceManager(String name) {
         super(name);
@@ -153,6 +155,7 @@ private void setup(Map<String, Object> config) {
         jarCollectorService = new IgnoringJarCollectorService();
         distributedTraceService = new DistributedTraceServiceImpl();
         kotlinCoroutinesService = new KotlinCoroutinesService(configService.getDefaultAgentConfig().getKotlinCoroutinesConfig());
+        ktorService = new KtorService();
 
         TransactionDataToDistributedTraceIntrinsics transactionDataToDistributedTraceIntrinsics = new TransactionDataToDistributedTraceIntrinsics(distributedTraceService);
         transactionEventsService = new TransactionEventsService(transactionDataToDistributedTraceIntrinsics);
@@ -450,6 +453,10 @@ public KotlinCoroutinesService getKotlinCoroutinesService() {
         return kotlinCoroutinesService;
     }
 
+    public KtorService getKtorService() {
+        return ktorService;
+    }
+
     @Override
     public void refreshDataForCRaCRestore() {}
 

instrumentation/kotlin-coroutines-1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/Utils.java

@@ -11,9 +11,8 @@
 import kotlinx.coroutines.CoroutineScope;
 import kotlinx.coroutines.DispatchedTask;
 import kotlinx.coroutines.AbstractCoroutine_Instrumentation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+
+import java.util.*;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
 
@@ -23,24 +22,20 @@ public class Utils implements CoroutineConfigListener {
 	private static final List<Pattern> ignoredContinuationPatterns = new ArrayList<>();
 	private static final List<String> ignoredScopes = new ArrayList<>();
 	private static final List<Pattern> ignoredScopePatterns = new ArrayList<>();
+	private static final Set<String> ignoredFrameworks = new HashSet<>();
 
 	public static final String CREATE_METHOD_1 = "Continuation at kotlin.coroutines.intrinsics.IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$4";
 	public static final String CREATE_METHOD_2 = "Continuation at kotlin.coroutines.intrinsics.IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$3";
 	private static final String CONT_LOC = "Continuation at";
 	public static boolean DELAYED_ENABLED = true;
-	private static final Utils INSTANCE = new Utils();
-
-	public static Utils getInstance() {
-		return INSTANCE;
-	}
 
 	static {
 		/*
-		 * Register this class with the KotlinCoroutinesService to initialize and update
-		 * the ignored items
-		 */
+		* Register this class with the KotlinCoroutinesService to initialize and update
+		* the ignored items
+		*/
 		KotlinCoroutinesService service = ServiceFactory.getKotlinCoroutinesService();
-		service.addCoroutineConfigListener(INSTANCE);
+		service.addCoroutineConfigListener(new Utils());
 		ignoredContinuations.add(CREATE_METHOD_1);
 		ignoredContinuations.add(CREATE_METHOD_2);
 
@@ -57,12 +52,12 @@ public static NRRunnable getRunnableWrapper(Runnable r) {
 		if(r instanceof DispatchedTask) {
 			DispatchedTask<?> task = (DispatchedTask<?>)r;
 			Continuation<?> cont = task.getDelegate$kotlinx_coroutines_core();
-			String cont_string = getContinuationString(cont);
-			if(cont_string == null || DispatchedTaskIgnores.ignoreDispatchedTask(cont_string)) {
-				return null;
-			}
-		}
-
+            String cont_string = getContinuationString(cont);
+            if(cont_string == null || DispatchedTaskIgnores.ignoreDispatchedTask(cont_string)) {
+                return null;
+            }
+        }
+		
 		Token t = NewRelic.getAgent().getTransaction().getToken();
 		if(t != null && t.isActive()) {
 			return new NRRunnable(r, t);
@@ -85,9 +80,9 @@ public static boolean continueWithScope(CoroutineScope scope) {
 	}
 
 	/*
-	 * Allows certain Coroutine scopes to be ignored
-	 * coroutineScope can be a Coroutine name or CoroutineScope class name
-	 */
+	* Allows certain Coroutine scopes to be ignored
+	* coroutineScope can be a Coroutine name or CoroutineScope class name
+	*/
 	public static boolean continueWithScope(String coroutineScope) {
 		if(coroutineScope == null) {
 			return true;
@@ -105,11 +100,13 @@ public static boolean continueWithContinuation(Continuation<?> continuation) {
 		 *	Don't trace internal Coroutines Continuations
 		 */
 		String className = continuation.getClass().getName();
-		if(className.startsWith("kotlin")) return false;
+		for(String framework : ignoredFrameworks) {
+			if(className.startsWith(framework)) return false;
+		}
 
 		/*
-		 * Get the continuation string and check if it should be ignored
-		 */
+		* Get the continuation string and check if it should be ignored
+		*/
 		String cont_string = getContinuationString(continuation);
 		if(cont_string == null) { return false; }
 
@@ -129,9 +126,9 @@ public static boolean continueWithContinuation(Continuation<?> continuation) {
 	public static String sub = "createCoroutineFromSuspendFunction";
 
 	/*
-	 * Set the async token in the CoroutineContext
-	 * Used to track the transaction across multiple threads
-	 */
+	* Set the async token in the CoroutineContext
+	* Used to track the transaction across multiple threads
+	*/
 	public static void setToken(CoroutineContext context) {
 		TokenContext tokenContext = NRTokenContextKt.getTokenContextOrNull(context);
 		if (tokenContext == null) {
@@ -165,11 +162,11 @@ public static void expireToken(CoroutineContext context) {
 		TokenContext tokenContext = NRTokenContextKt.getTokenContextOrNull(context);
 		if(tokenContext != null) {
 			Token token = tokenContext.getToken();
-			token.expire();
+            token.expire();
 			NRTokenContextKt.removeTokenContext(context);
-		}
+        }
 	}
-
+	
 	@SuppressWarnings("unchecked")
 	public static <T> String getCoroutineName(CoroutineContext context, Continuation<T> continuation) {
 
@@ -192,24 +189,24 @@ public static String getCoroutineName(CoroutineContext context) {
 
 	public static <T> String getContinuationString(Continuation<T> continuation) {
 		String contString = continuation.toString();
-
+		
 		if(contString.equals(CREATE_METHOD_1) || contString.equals(CREATE_METHOD_2)) {
 			return sub;
 		}
-
+		
 		if(contString.startsWith(CONT_LOC)) {
 			return contString;
 		}
-
+		
 		if(continuation instanceof AbstractCoroutine_Instrumentation) {
 			return ((AbstractCoroutine_Instrumentation<?>)continuation).nameString$kotlinx_coroutines_core();
 		}
-
+		
 		int index = contString.indexOf('@');
 		if(index > -1) {
 			return contString.substring(0, index);
 		}
-
+		
 		return null;
 	}
 
@@ -260,4 +257,12 @@ public void configureDispatchedTasksIgnores(String[] ignores, String[] ignoresRe
 	public void configureDelay(boolean enabled) {
 		DELAYED_ENABLED = enabled;
 	}
-}
+
+	@Override
+	public void configureIgnoredFrameworks(String[] ignores) {
+		if (ignores != null && ignores.length > 0) {
+			ignoredFrameworks.clear();
+			ignoredFrameworks.addAll(Arrays.asList(ignores));
+		}
+	}
+}

instrumentation/kotlin-coroutines-1.4/src/test/kotlin/coroutines/CoroutinesTest.kt

@@ -258,8 +258,7 @@ class CoroutinesTest {
     // test the flag for whether to capture a call to Delay as a segment or not.  This tests that it is captured
     @Test
     fun testDelayCaptured() {
-        val utils = Utils.getInstance()
-        utils.configureDelay(true)
+        Utils.DELAYED_ENABLED = true
         delayTransaction()
 
         assertEquals("Expected 1 finished transaction", 1, introspector.finishedTransactionCount)
@@ -276,8 +275,7 @@ class CoroutinesTest {
     // test the flag for whether to capture a call to Delay as a segment or not.  This tests that it is captured
     @Test
     fun testDelayIgnored() {
-        val utils = Utils.getInstance()
-        utils.configureDelay(false)
+        Utils.DELAYED_ENABLED = false
         delayTransaction()
 
         assertEquals("Expected 1 finished transaction", 1, introspector.finishedTransactionCount)
@@ -290,7 +288,7 @@ class CoroutinesTest {
         // ensure that the Delay segment metric is not included
         assertFalse(metrics.keys.contains("Custom/Delay"))
         // set back to default true value
-        utils.configureDelay(true)
+        Utils.DELAYED_ENABLED = true
     }
 
     @Test

instrumentation/kotlin-coroutines-1.7/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/Utils.java

@@ -11,9 +11,8 @@
 import kotlinx.coroutines.CoroutineScope;
 import kotlinx.coroutines.DispatchedTask;
 import kotlinx.coroutines.AbstractCoroutine_Instrumentation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+
+import java.util.*;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
 
@@ -23,24 +22,20 @@ public class Utils implements CoroutineConfigListener {
 	private static final List<Pattern> ignoredContinuationPatterns = new ArrayList<>();
 	private static final List<String> ignoredScopes = new ArrayList<>();
 	private static final List<Pattern> ignoredScopePatterns = new ArrayList<>();
+	private static final Set<String> ignoredFrameworks = new HashSet<>();
 
 	public static final String CREATE_METHOD_1 = "Continuation at kotlin.coroutines.intrinsics.IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$4";
 	public static final String CREATE_METHOD_2 = "Continuation at kotlin.coroutines.intrinsics.IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$3";
 	private static final String CONT_LOC = "Continuation at";
 	public static boolean DELAYED_ENABLED = true;
-	private static final Utils INSTANCE = new Utils();
-
-	public static Utils getInstance() {
-		return INSTANCE;
-	}
 
 	static {
 		/*
 		 * Register this class with the KotlinCoroutinesService to initialize and update
 		 * the ignored items
 		 */
 		KotlinCoroutinesService service = ServiceFactory.getKotlinCoroutinesService();
-		service.addCoroutineConfigListener(INSTANCE);
+		service.addCoroutineConfigListener(new Utils());
 		ignoredContinuations.add(CREATE_METHOD_1);
 		ignoredContinuations.add(CREATE_METHOD_2);
 
@@ -105,7 +100,9 @@ public static boolean continueWithContinuation(Continuation<?> continuation) {
 		 *	Don't trace internal Coroutines Continuations
 		 */
 		String className = continuation.getClass().getName();
-		if(className.startsWith("kotlin")) return false;
+		for(String framework : ignoredFrameworks) {
+			if(className.startsWith(framework)) return false;
+		}
 
 		/*
 		 * Get the continuation string and check if it should be ignored
@@ -223,4 +220,12 @@ public void configureDispatchedTasksIgnores(String[] ignores, String[] ignoresRe
 	public void configureDelay(boolean enabled) {
 		DELAYED_ENABLED = enabled;
 	}
-}
+
+	@Override
+	public void configureIgnoredFrameworks(String[] ignores) {
+		if(ignores != null && ignores.length > 0) {
+			ignoredFrameworks.clear();
+			ignoredFrameworks.addAll(Arrays.asList(ignores));
+		}
+	}
+}

instrumentation/kotlin-coroutines-1.7/src/test/kotlin/coroutines/CoroutinesTest.kt

@@ -7,7 +7,6 @@
 package coroutines
 
 import com.newrelic.agent.bridge.AgentBridge
-import com.newrelic.agent.deps.org.checkerframework.checker.units.qual.m
 import com.newrelic.agent.introspec.InstrumentationTestConfig
 import com.newrelic.agent.introspec.InstrumentationTestRunner
 import com.newrelic.agent.introspec.Introspector
@@ -259,8 +258,7 @@ class CoroutinesTest {
     // test the flag for whether to capture a call to Delay as a segment or not.  This tests that it is captured
     @Test
     fun testDelayCaptured() {
-        val utils = Utils.getInstance()
-        utils.configureDelay(true)
+        Utils.DELAYED_ENABLED = true
         delayTransaction()
 
         assertEquals("Expected 1 finished transaction", 1, introspector.finishedTransactionCount)
@@ -277,8 +275,7 @@ class CoroutinesTest {
     // test the flag for whether to capture a call to Delay as a segment or not.  This tests that it is captured
     @Test
     fun testDelayIgnored() {
-        val utils = Utils.getInstance()
-        utils.configureDelay(false)
+        Utils.DELAYED_ENABLED = false
         delayTransaction()
 
         assertEquals("Expected 1 finished transaction", 1, introspector.finishedTransactionCount)
@@ -291,7 +288,7 @@ class CoroutinesTest {
         // ensure that the Delay segment metric is not included
         assertFalse(metrics.keys.contains("Custom/Delay"))
         // set back to default true value
-        utils.configureDelay(true)
+        Utils.DELAYED_ENABLED = true
     }
 
     @Test

instrumentation/kotlin-coroutines-1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/Utils.java

@@ -11,9 +11,8 @@
 import kotlinx.coroutines.CoroutineScope;
 import kotlinx.coroutines.DispatchedTask;
 import kotlinx.coroutines.AbstractCoroutine_Instrumentation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+
+import java.util.*;
 import java.util.logging.Level;
 import java.util.regex.Pattern;
 
@@ -23,24 +22,20 @@ public class Utils implements CoroutineConfigListener {
 	private static final List<Pattern> ignoredContinuationPatterns = new ArrayList<>();
 	private static final List<String> ignoredScopes = new ArrayList<>();
 	private static final List<Pattern> ignoredScopePatterns = new ArrayList<>();
+	private static final Set<String> ignoredFrameworks = new HashSet<>();
 
 	public static final String CREATE_METHOD_1 = "Continuation at kotlin.coroutines.intrinsics.IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$4";
 	public static final String CREATE_METHOD_2 = "Continuation at kotlin.coroutines.intrinsics.IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$3";
 	private static final String CONT_LOC = "Continuation at";
 	public static boolean DELAYED_ENABLED = true;
-	private static final Utils INSTANCE = new Utils();
-
-	public static Utils getInstance() {
-		return INSTANCE;
-	}
 
 	static {
 		/*
 		 * Register this class with the KotlinCoroutinesService to initialize and update
 		 * the ignored items
 		 */
 		KotlinCoroutinesService service = ServiceFactory.getKotlinCoroutinesService();
-		service.addCoroutineConfigListener(INSTANCE);
+		service.addCoroutineConfigListener(new Utils());
 		ignoredContinuations.add(CREATE_METHOD_1);
 		ignoredContinuations.add(CREATE_METHOD_2);
 
@@ -105,7 +100,9 @@ public static boolean continueWithContinuation(Continuation<?> continuation) {
 		 *	Don't trace internal Coroutines Continuations
 		 */
 		String className = continuation.getClass().getName();
-		if(className.startsWith("kotlin")) return false;
+		for(String framework : ignoredFrameworks) {
+			if(className.startsWith(framework)) return false;
+		}
 
 		/*
 		 * Get the continuation string and check if it should be ignored
@@ -218,4 +215,12 @@ public void configureDispatchedTasksIgnores(String[] ignores, String[] ignoresRe
 	public void configureDelay(boolean enabled) {
 		DELAYED_ENABLED = enabled;
 	}
+
+	@Override
+	public void configureIgnoredFrameworks(String[] ignores) {
+		if(ignores != null &&  ignores.length > 0) {
+			ignoredFrameworks.clear();
+			ignoredFrameworks.addAll(Arrays.asList(ignores));
+		}
+	}
 }