merged with suspend_fixes

Author: dhilpipre

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

@@ -0,0 +1,41 @@
+package com.newrelic.instrumentation.kotlin.coroutines;
+
+import com.newrelic.agent.config.AgentConfig;
+import com.newrelic.agent.config.AgentConfigListener;
+import com.newrelic.agent.service.ServiceFactory;
+import com.newrelic.api.agent.Config;
+import com.newrelic.api.agent.NewRelic;
+
+public class Utils implements AgentConfigListener {
+
+	private static final Utils INSTANCE = new Utils();
+	public static final String CREATEMETHOD1 = "Continuation at kotlin.coroutines.intrinsics.IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$4";
+	public static final String CREATEMETHOD2 = "Continuation at kotlin.coroutines.intrinsics.IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$3";
+	public static String sub = "createCoroutineFromSuspendFunction";
+	private static final String CONT_LOC = "Continuation at";
+	
+	static {
+		ServiceFactory.getConfigService().addIAgentConfigListener(INSTANCE);
+		Config config = NewRelic.getAgent().getConfig();
+		SuspendIgnores.reset(config);
+	}
+	
+	@Override
+	public void configChanged(String appName, AgentConfig agentConfig) {
+		SuspendIgnores.reset(agentConfig);
+	}
+
+	public static String getSuspendString(String cont_string, Object obj) {
+		if(cont_string.equals(CREATEMETHOD1) || cont_string.equals(CREATEMETHOD2)) return sub;
+		if(cont_string.startsWith(CONT_LOC)) {
+			return cont_string;
+		}
+
+		int index = cont_string.indexOf('@');
+		if(index > -1) {
+			return cont_string.substring(0, index);
+		}
+		
+		return obj.getClass().getName();
+	}
+}

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

@@ -0,0 +1,66 @@
+package com.newrelic.instrumentation.kotlin.coroutines.tracing;
+
+import java.lang.instrument.IllegalClassFormatException;
+import java.security.ProtectionDomain;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+
+import com.newrelic.agent.deps.org.objectweb.asm.commons.Method;
+import com.newrelic.agent.instrumentation.InstrumentationType;
+import com.newrelic.agent.instrumentation.classmatchers.ClassAndMethodMatcher;
+import com.newrelic.agent.instrumentation.classmatchers.OptimizedClassMatcher.Match;
+import com.newrelic.agent.instrumentation.classmatchers.OptimizedClassMatcherBuilder;
+import com.newrelic.agent.instrumentation.context.ClassMatchVisitorFactory;
+import com.newrelic.agent.instrumentation.context.ContextClassTransformer;
+import com.newrelic.agent.instrumentation.context.InstrumentationContext;
+import com.newrelic.agent.instrumentation.context.InstrumentationContextManager;
+import com.newrelic.agent.instrumentation.methodmatchers.MethodMatcher;
+import com.newrelic.agent.instrumentation.tracing.TraceDetailsBuilder;
+import com.newrelic.api.agent.NewRelic;
+
+public class SuspendClassTransformer implements ContextClassTransformer {
+	
+	private Map<String, ClassMatchVisitorFactory> matchers = null;
+	private final InstrumentationContextManager contextMgr;
+	
+	public SuspendClassTransformer(InstrumentationContextManager mgr) {
+		contextMgr = mgr;
+		matchers = new HashMap<>();
+	}
+	
+	protected ClassMatchVisitorFactory addMatcher(ClassAndMethodMatcher matcher) {
+		NewRelic.getAgent().getLogger().log(Level.FINE, "Adding matcher {0} to service classtransformer", matcher);
+		OptimizedClassMatcherBuilder builder = OptimizedClassMatcherBuilder.newBuilder();
+		builder.addClassMethodMatcher(matcher);
+		ClassMatchVisitorFactory matchVistor = builder.build();
+		matchers.put(matcher.getClass().getSimpleName(), matchVistor);
+		contextMgr.addContextClassTransformer(matchVistor, this);
+		return matchVistor;
+	}
+	
+    protected void removeMatcher(ClassAndMethodMatcher matcher) {
+    	ClassMatchVisitorFactory matchVisitor = matchers.remove(matcher.getClass().getSimpleName());
+    	if(matchVisitor != null) {
+    		contextMgr.removeMatchVisitor(matchVisitor);
+    	}
+    }
+
+	@Override
+	public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
+			ProtectionDomain protectionDomain, byte[] classfileBuffer, InstrumentationContext context, Match match)
+			throws IllegalClassFormatException {
+		for(Method method : match.getMethods()) {
+			for(ClassAndMethodMatcher matcher : match.getClassMatches().keySet()) {
+				if (matcher.getMethodMatcher().matches(MethodMatcher.UNSPECIFIED_ACCESS, method.getName(),
+						method.getDescriptor(), match.getMethodAnnotations(method))) {
+					
+//					context.putTraceAnnotation(method, TraceDetailsBuilder.newBuilder().setTracerFactoryName(SuspendTracerFactory.TRACER_FACTORY_NAME).setDispatcher(true).setInstrumentationSourceName("CoroutinesCore").setInstrumentationType(InstrumentationType.TraceAnnotation).build());
+				}
+
+			}
+		}
+		return null;
+	}
+
+}

settings.gradle

@@ -7,3 +7,4 @@ include 'Kotlin-Coroutines_1.5'
 include 'Kotlin-Coroutines_1.7'
 include 'Kotlin-Coroutines_1.9'
 include 'kroto-plus-coroutines'
+include 'Kotlin-Coroutines-Suspends'