diff --git a/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/NRContinuationWrapper.java b/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/NRContinuationWrapper.java deleted file mode 100644 index 28ed281..0000000 --- a/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/NRContinuationWrapper.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.newrelic.instrumentation.kotlin.coroutines; - -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.CoroutineContext; - -public class NRContinuationWrapper implements Continuation { - - private Continuation delegate = null; - private String name = null; - private static boolean isTransformed = false; - - public NRContinuationWrapper(Continuation d, String n) { - delegate = d; - name = n; - if(!isTransformed) { - AgentBridge.instrumentation.retransformUninstrumentedClass(getClass()); - isTransformed = true; - } - } - - @Override - public CoroutineContext getContext() { - return delegate.getContext(); - } - - @Override - @Trace(async=true) - public void resumeWith(Object p0) { - - 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); - } - -} diff --git a/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/NRCoroutineToken.java b/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/NRCoroutineToken.java deleted file mode 100644 index 57f1b6f..0000000 --- a/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/NRCoroutineToken.java +++ /dev/null @@ -1,51 +0,0 @@ -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 { - 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"; - } - - -} diff --git a/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/NRFunction1Wrapper.java b/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/NRFunction1Wrapper.java deleted file mode 100644 index c516b7c..0000000 --- a/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/NRFunction1Wrapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.newrelic.instrumentation.kotlin.coroutines; - -import com.newrelic.agent.bridge.AgentBridge; -import com.newrelic.api.agent.NewRelic; -import com.newrelic.api.agent.Trace; - -import kotlin.jvm.functions.Function1; - -public class NRFunction1Wrapper implements Function1 { - - private Function1 delegate = null; - private String name = null; - private static boolean isTransformed = false; - - public NRFunction1Wrapper(Function1 d, String n) { - delegate = d; - name = n; - if(!isTransformed) { - isTransformed = true; - AgentBridge.instrumentation.retransformUninstrumentedClass(getClass()); - } - } - - @Override - @Trace(dispatcher=true) - public R invoke(P1 p1) { - if(name != null) NewRelic.getAgent().getTracedMethod().setMetricName("Custom","WrappedSuspend",name); - if(delegate != null) { - return delegate.invoke(p1); - } - return null; - } - -} diff --git a/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/NRFunction2Wrapper.java b/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/NRFunction2Wrapper.java deleted file mode 100644 index 967940e..0000000 --- a/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/NRFunction2Wrapper.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.newrelic.instrumentation.kotlin.coroutines; - -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.jvm.functions.Function2; - -public class NRFunction2Wrapper implements Function2 { - - private Function2 delegate = null; - private String name = null; - private static boolean isTransformed = false; - public Token token = null; - - public NRFunction2Wrapper(Function2 d,String n) { - delegate = d; - name = n; - if(!isTransformed) { - isTransformed = true; - AgentBridge.instrumentation.retransformUninstrumentedClass(getClass()); - } - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - @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; - - if (!Utils.ignoreContinuation(continuation.getClass(), continuation.getContext())) { - NRContinuationWrapper wrapper = new NRContinuationWrapper(continuation, name); - p2 = (P2) wrapper; - } - } - if(nameStr == null) { - nameStr = name; - } - if(nameStr != null) { - NewRelic.getAgent().getTracedMethod().setMetricName("Custom","WrappedSuspend",nameStr); - } - if(delegate != null) { - return delegate.invoke(p1, p2); - } - return null; - } - -} diff --git a/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/Utils.java b/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/Utils.java deleted file mode 100644 index 6f36330..0000000 --- a/Kotlin-Coroutines_1.4/java/com/newrelic/instrumentation/kotlin/coroutines/Utils.java +++ /dev/null @@ -1,175 +0,0 @@ -package com.newrelic.instrumentation.kotlin.coroutines; - -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; -import java.util.logging.Level; - -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; -import com.newrelic.api.agent.Token; - -import kotlin.coroutines.CoroutineContext; -import kotlinx.coroutines.CoroutineName; - -public class Utils implements AgentConfigListener { - - private static final List ignoredSuspends = new ArrayList(); - private static final List ignoredContinuations = new ArrayList(); - private static final List ignoredDispatchs = new ArrayList(); - private static final String SUSPENDSIGNORECONFIG = "Coroutines.ignores.suspends"; - private static final String CONTIGNORECONFIG = "Coroutines.ignores.continuations"; - private static final String DISPATCHEDIGNORECONFIG = "Coroutines.ignores.dispatched"; - - private static final Utils INSTANCE = new Utils(); - - static { - ServiceFactory.getConfigService().addIAgentConfigListener(INSTANCE); - Config config = NewRelic.getAgent().getConfig(); - String ignores = config.getValue(SUSPENDSIGNORECONFIG); - if (ignores != null && !ignores.isEmpty()) { - StringTokenizer st = new StringTokenizer(ignores, ","); - while (st.hasMoreTokens()) { - String token = st.nextToken(); - if (token != null && !token.isEmpty()) { - NewRelic.getAgent().getLogger().log(Level.INFO, "will ignore suspend: {0}", token); - ignoredSuspends.add(token); - } - } - } - ignores = config.getValue(CONTIGNORECONFIG); - if (ignores != null && !ignores.isEmpty()) { - StringTokenizer st = new StringTokenizer(ignores, ","); - while (st.hasMoreTokens()) { - String token = st.nextToken(); - if (token != null && !token.isEmpty()) { - NewRelic.getAgent().getLogger().log(Level.INFO, "will ignore continuation: {0}", token); - ignoredContinuations.add(token); - } - } - } - ignores = config.getValue(DISPATCHEDIGNORECONFIG); - if (ignores != null && !ignores.isEmpty()) { - StringTokenizer st = new StringTokenizer(ignores, ","); - while (st.hasMoreTokens()) { - String token = st.nextToken(); - if (token != null && !token.isEmpty()) { - NewRelic.getAgent().getLogger().log(Level.INFO, "will ignore dispatched continuation: {0}", token); - ignoredDispatchs.add(token); - } - } - } - - } - - public static boolean ignoreContinuation(String name) { - return ignoredContinuations.contains(name); - } - - public static boolean ignoreContinuation(Class continuation, CoroutineContext context) { - - String classname = continuation.getName(); - if(ignoredContinuations.contains(classname)) return true; - - if(context == null) return false; - - String name = getCoroutineName(context); - - if(ignoredContinuations.contains(name)) return true; - - return false; - } - - public static boolean ignoreDispatched(Class dispatched, CoroutineContext context) { - String classname = dispatched.getName(); - if(ignoredDispatchs.contains(classname)) return true; - - if(context == null) return false; - - String name = getCoroutineName(context); - - if(ignoredDispatchs.contains(name)) return true; - - return false; - } - - public static boolean ignoreSuspend(Class suspend, CoroutineContext context) { - - String classname = suspend.getName(); - - if(ignoredSuspends.contains(classname)) return true; - - if(context == null) return false; - - String name = getCoroutineName(context); - - if(ignoredSuspends.contains(name)) { - return true; - } - - return false; - } - - public static String sub = "createCoroutineFromSuspendFunction"; - - public static NRCoroutineToken setToken(CoroutineContext context) { - NRCoroutineToken coroutineToken = context.get(NRCoroutineToken.key); - if(coroutineToken == null) { - Token t = NewRelic.getAgent().getTransaction().getToken(); - if(t != null && t.isActive()) { - coroutineToken = new NRCoroutineToken(t); - return coroutineToken; - } else if(t != null) { - t.expire(); - t = null; - } - } - return null; - } - - public static Token getToken(CoroutineContext context) { - NRCoroutineToken coroutineToken = context.get(NRCoroutineToken.key); - Token token = null; - if(coroutineToken != null) { - token = coroutineToken.getToken(); - } - - return token; - } - - public static void expireToken(CoroutineContext context) { - NRCoroutineToken coroutineToken = context.get(NRCoroutineToken.key); - if(coroutineToken != null) { - Token token = coroutineToken.getToken(); - token.expire(); - context.minusKey(NRCoroutineToken.key); - } - } - - public static String getCoroutineName(CoroutineContext context, Class clazz) { - String name = getCoroutineName(context); - if(name != null) { - return name; - } - return clazz.getSimpleName(); - } - - public static String getCoroutineName(CoroutineContext context) { - CoroutineName cName = context.get(CoroutineName.Key); - if(cName != null) { - String name = cName.getName(); - if(name != null && !name.isEmpty()) return name; - } - - return null; - } - - @Override - public void configChanged(String appName, AgentConfig agentConfig) { - // TODO Auto-generated method stub - - } -} diff --git a/Kotlin-Coroutines_1.4/java/kotlin/coroutines/intrinsics/IntrinsicsKt__IntrinsicsJvmKt.java b/Kotlin-Coroutines_1.4/java/kotlin/coroutines/intrinsics/IntrinsicsKt__IntrinsicsJvmKt.java deleted file mode 100644 index 56219f6..0000000 --- a/Kotlin-Coroutines_1.4/java/kotlin/coroutines/intrinsics/IntrinsicsKt__IntrinsicsJvmKt.java +++ /dev/null @@ -1,38 +0,0 @@ -package kotlin.coroutines.intrinsics; - -import com.newrelic.api.agent.Trace; -import com.newrelic.api.agent.weaver.Weave; -import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines.NRContinuationWrapper; -import com.newrelic.instrumentation.kotlin.coroutines.Utils; - -import kotlin.Unit; -import kotlin.coroutines.Continuation; -import kotlin.jvm.functions.Function1; -import kotlin.jvm.functions.Function2; - -@Weave -abstract class IntrinsicsKt__IntrinsicsJvmKt { - - public static final Continuation createCoroutineUnintercepted(Function1, ? extends Object> f, Continuation c) { - String name = Utils.getCoroutineName(c.getContext(), c.getClass()); - Continuation result = Weaver.callOriginal(); - if(!Utils.ignoreContinuation(name)) { - NRContinuationWrapper wrapper = new NRContinuationWrapper(result, name); - result = wrapper; - } - return result; - } - - @Trace - public static final Continuation createCoroutineUnintercepted(Function2, ? extends Object> f, R r, Continuation c) { - String name = Utils.getCoroutineName(c.getContext(), c.getClass()); - Continuation result = Weaver.callOriginal(); - if(!Utils.ignoreContinuation(name)) { - NRContinuationWrapper wrapper = new NRContinuationWrapper(result, name); - result = wrapper; - } - return result; - } - -} diff --git a/Kotlin-Coroutines_1.4/java/kotlinx/coroutines/AbstractCoroutine.java b/Kotlin-Coroutines_1.4/java/kotlinx/coroutines/AbstractCoroutine.java deleted file mode 100644 index 8e95487..0000000 --- a/Kotlin-Coroutines_1.4/java/kotlinx/coroutines/AbstractCoroutine.java +++ /dev/null @@ -1,30 +0,0 @@ -package kotlinx.coroutines; - -import com.newrelic.api.agent.weaver.MatchType; -import com.newrelic.api.agent.weaver.Weave; -import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines.Utils; - -import kotlin.coroutines.CoroutineContext; - -@Weave(type=MatchType.BaseClass) -public abstract class AbstractCoroutine { - - public abstract CoroutineContext getContext(); - - protected void onCompleted(T value) { - Utils.expireToken(getContext()); - Weaver.callOriginal(); - } - - protected void onCancelled(Throwable t, boolean b) { - Utils.expireToken(getContext()); - Weaver.callOriginal(); - } - - public void handleOnCompletionException$kotlinx_coroutines_core(Throwable t) { - Utils.expireToken(getContext()); - Weaver.callOriginal(); - } - -} diff --git a/Kotlin-Coroutines_1.4/java/kotlinx/coroutines/BuildersKt.java b/Kotlin-Coroutines_1.4/java/kotlinx/coroutines/BuildersKt.java deleted file mode 100644 index 0edda99..0000000 --- a/Kotlin-Coroutines_1.4/java/kotlinx/coroutines/BuildersKt.java +++ /dev/null @@ -1,106 +0,0 @@ -package kotlinx.coroutines; - -import com.newrelic.api.agent.Trace; -import com.newrelic.api.agent.weaver.Weave; -import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines.NRCoroutineToken; -import com.newrelic.instrumentation.kotlin.coroutines.NRFunction2Wrapper; -import com.newrelic.instrumentation.kotlin.coroutines.Utils; - -import kotlin.Unit; -import kotlin.coroutines.Continuation; -import kotlin.coroutines.CoroutineContext; -import kotlin.jvm.functions.Function2; - -@SuppressWarnings({ "unchecked", "rawtypes" }) -@Weave -public class BuildersKt { - - @Trace - public static final T runBlocking(CoroutineContext context, Function2, ? extends Object> block) { - - if (!Utils.ignoreSuspend(block.getClass(), context)) { - if (!(block instanceof NRFunction2Wrapper)) { - String name = Utils.getCoroutineName(context); - if (name == null) - name = block.getClass().getName(); - NRFunction2Wrapper, ? extends Object> wrapper = new NRFunction2Wrapper( - block, name); - block = wrapper; - } - } - T t = Weaver.callOriginal(); - return t; - } - - @Trace - public static final Deferred async(CoroutineScope scope, CoroutineContext context, CoroutineStart cStart, Function2, ? extends Object> block) { - if(!Utils.ignoreSuspend(block.getClass(),context) && !Utils.ignoreSuspend(block.getClass(), scope.getCoroutineContext())) { - NRCoroutineToken nrContextToken = Utils.setToken(context); - if(nrContextToken != null) { - context = context.plus(nrContextToken); - } - if(!(block instanceof NRFunction2Wrapper)) { - String name = Utils.getCoroutineName(context); - if(name == null) { - name = Utils.getCoroutineName(scope.getCoroutineContext()); - } - if(name == null) name = block.getClass().getName(); - NRFunction2Wrapper, ? extends Object> wrapper = new NRFunction2Wrapper(block,name); - block = wrapper; - } - } - return Weaver.callOriginal(); - } - - @Trace - public static final Object invoke(CoroutineDispatcher dispatcher, Function2, ? extends Object> block, Continuation c) { - if(!Utils.ignoreSuspend(block.getClass(), null)) { - if(!(block instanceof NRFunction2Wrapper)) { - NRFunction2Wrapper, ? extends Object> wrapper = new NRFunction2Wrapper(block,block.getClass().getName()); - block = wrapper; - } - } - Object t = Weaver.callOriginal(); - return t; - } - - @Trace - public static final kotlinx.coroutines.Job launch(CoroutineScope scope, CoroutineContext context, CoroutineStart cStart, Function2, ? extends Object> block) { - if(!Utils.ignoreSuspend(block.getClass(), context) && !Utils.ignoreSuspend(block.getClass(), scope.getCoroutineContext())) { - NRCoroutineToken nrContextToken = Utils.setToken(context); - if(nrContextToken != null) { - context = context.plus(nrContextToken); - } - if(!(block instanceof NRFunction2Wrapper)) { - String name = Utils.getCoroutineName(context); - if(name == null) { - name = Utils.getCoroutineName(scope.getCoroutineContext()); - } - if(name == null) name = block.getClass().getName(); - NRFunction2Wrapper, ? extends Object> wrapper = new NRFunction2Wrapper(block,name); - block = wrapper; - } - } - Job j = Weaver.callOriginal(); - return j; - } - - @Trace - public static final Object withContext(CoroutineContext context,Function2, ? extends Object> block, Continuation completion) { - if(!Utils.ignoreSuspend(block.getClass(),context)) { - - NRCoroutineToken nrContextToken = Utils.setToken(context); - if(nrContextToken != null) { - context = context.plus(nrContextToken); - } - if(!(block instanceof NRFunction2Wrapper)) { - String name = Utils.getCoroutineName(context); - if(name == null) name = block.getClass().getName(); - NRFunction2Wrapper, ? extends Object> wrapper = new NRFunction2Wrapper(block,name); - block = wrapper; - } - } - return Weaver.callOriginal(); - } -} \ No newline at end of file diff --git a/Kotlin-Coroutines_1.4/java/kotlinx/coroutines/DispatchedTask.java b/Kotlin-Coroutines_1.4/java/kotlinx/coroutines/DispatchedTask.java deleted file mode 100644 index c561587..0000000 --- a/Kotlin-Coroutines_1.4/java/kotlinx/coroutines/DispatchedTask.java +++ /dev/null @@ -1,40 +0,0 @@ -package kotlinx.coroutines; - -import com.newrelic.api.agent.NewRelic; -import com.newrelic.api.agent.Token; -import com.newrelic.api.agent.Trace; -import com.newrelic.api.agent.weaver.MatchType; -import com.newrelic.api.agent.weaver.Weave; -import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines.Utils; - -import kotlin.coroutines.Continuation; -import kotlin.coroutines.CoroutineContext; - -@Weave(type=MatchType.BaseClass) -public abstract class DispatchedTask { - - public abstract Continuation getDelegate$kotlinx_coroutines_core(); - - @Trace(async=true) - public void run() { - Continuation continuation = getDelegate$kotlinx_coroutines_core(); - if(continuation != null) { - CoroutineContext context = continuation.getContext(); - if(continuation instanceof DispatchedContinuation) { - DispatchedContinuation dispatched = (DispatchedContinuation)continuation; - continuation = dispatched.continuation; - } - - if(context != null && !Utils.ignoreDispatched(continuation.getClass(), context)) { - Token t = Utils.getToken(context); - if(t != null) t.link(); - String cName = Utils.getCoroutineName(context, continuation.getClass()); - if(cName != null) - NewRelic.getAgent().getTracedMethod().setMetricName("Custom","DispatchedTask",cName); - } - } - Weaver.callOriginal(); - } - -} diff --git a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/DispatchedTaskIgnores.java b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/DispatchedTaskIgnores.java similarity index 95% rename from Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/DispatchedTaskIgnores.java rename to Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/DispatchedTaskIgnores.java index 3fafbce..bfad762 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/DispatchedTaskIgnores.java +++ b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/DispatchedTaskIgnores.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_14; import com.newrelic.api.agent.Config; import com.newrelic.api.agent.NewRelic; diff --git a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRContinuationWrapper.java b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRContinuationWrapper.java similarity index 96% rename from Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRContinuationWrapper.java rename to Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRContinuationWrapper.java index ab38e34..664f0e7 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRContinuationWrapper.java +++ b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRContinuationWrapper.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_14; import com.newrelic.agent.bridge.AgentBridge; import com.newrelic.api.agent.NewRelic; diff --git a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRDelayCancellableContinuation.java b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRDelayCancellableContinuation.java similarity index 98% rename from Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRDelayCancellableContinuation.java rename to Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRDelayCancellableContinuation.java index 6b60a06..45dbabc 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRDelayCancellableContinuation.java +++ b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRDelayCancellableContinuation.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_14; import com.newrelic.api.agent.NewRelic; import com.newrelic.api.agent.Segment; diff --git a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRDelayContinuation.java b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRDelayContinuation.java similarity index 95% rename from Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRDelayContinuation.java rename to Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRDelayContinuation.java index ad0ad39..cce560a 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRDelayContinuation.java +++ b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRDelayContinuation.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_14; import com.newrelic.api.agent.NewRelic; import com.newrelic.api.agent.Segment; diff --git a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRFunction1SuspendWrapper.java b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRFunction1SuspendWrapper.java similarity index 95% rename from Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRFunction1SuspendWrapper.java rename to Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRFunction1SuspendWrapper.java index 480c33e..e074a3a 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRFunction1SuspendWrapper.java +++ b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRFunction1SuspendWrapper.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_14; import com.newrelic.agent.bridge.AgentBridge; import com.newrelic.api.agent.NewRelic; diff --git a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRFunction1Wrapper.java b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRFunction1Wrapper.java similarity index 94% rename from Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRFunction1Wrapper.java rename to Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRFunction1Wrapper.java index d0232a6..a1d838d 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRFunction1Wrapper.java +++ b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRFunction1Wrapper.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_14; import com.newrelic.agent.bridge.AgentBridge; import kotlin.coroutines.Continuation; diff --git a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRFunction2SuspendWrapper.java b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRFunction2SuspendWrapper.java similarity index 97% rename from Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRFunction2SuspendWrapper.java rename to Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRFunction2SuspendWrapper.java index 8130e00..820b941 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRFunction2SuspendWrapper.java +++ b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRFunction2SuspendWrapper.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_14; import com.newrelic.agent.bridge.AgentBridge; import com.newrelic.api.agent.NewRelic; diff --git a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRRunnable.java b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRRunnable.java similarity index 96% rename from Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRRunnable.java rename to Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRRunnable.java index 5eee99b..88ab3eb 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/NRRunnable.java +++ b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/NRRunnable.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_14; import com.newrelic.agent.bridge.AgentBridge; import com.newrelic.api.agent.NewRelic; diff --git a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/Utils.java b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/Utils.java similarity index 99% rename from Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/Utils.java rename to Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/Utils.java index 5e2de63..92bed4e 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_17/Utils.java +++ b/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/Utils.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_14; import java.util.ArrayList; import java.util.List; diff --git a/Kotlin-Coroutines_1.4/src/main/java/kotlin/coroutines/ContinuationKt_Instrumentation.java b/Kotlin-Coroutines_1.4/src/main/java/kotlin/coroutines/ContinuationKt_Instrumentation.java index 300c483..a98077a 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/kotlin/coroutines/ContinuationKt_Instrumentation.java +++ b/Kotlin-Coroutines_1.4/src/main/java/kotlin/coroutines/ContinuationKt_Instrumentation.java @@ -3,8 +3,8 @@ import com.newrelic.api.agent.Trace; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRFunction1SuspendWrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRFunction2SuspendWrapper; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRFunction1SuspendWrapper; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRFunction2SuspendWrapper; import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function2; diff --git a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/AbstractCoroutine_Instrumentation.java b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/AbstractCoroutine_Instrumentation.java index a83b9b4..f758b30 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/AbstractCoroutine_Instrumentation.java +++ b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/AbstractCoroutine_Instrumentation.java @@ -7,8 +7,8 @@ import com.newrelic.api.agent.weaver.MatchType; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRFunction2SuspendWrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.Utils; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRFunction2SuspendWrapper; +import com.newrelic.instrumentation.kotlin.coroutines_14.Utils; import kotlin.coroutines.Continuation; import kotlin.coroutines.CoroutineContext; diff --git a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/BuildersKt_Instrumentation.java b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/BuildersKt_Instrumentation.java index 6a97c4c..c43463c 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/BuildersKt_Instrumentation.java +++ b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/BuildersKt_Instrumentation.java @@ -4,9 +4,9 @@ import com.newrelic.api.agent.Trace; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRContinuationWrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRFunction2SuspendWrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.Utils; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRContinuationWrapper; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRFunction2SuspendWrapper; +import com.newrelic.instrumentation.kotlin.coroutines_14.Utils; import kotlin.Unit; import kotlin.coroutines.Continuation; diff --git a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/CancellableContinuationImpl_Instrumentation.java b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/CancellableContinuationImpl_Instrumentation.java index 279800a..8dfb3b1 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/CancellableContinuationImpl_Instrumentation.java +++ b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/CancellableContinuationImpl_Instrumentation.java @@ -1,7 +1,6 @@ package kotlinx.coroutines; import com.newrelic.api.agent.Trace; -import com.newrelic.api.agent.weaver.MatchType; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; import kotlin.Unit; @@ -29,7 +28,7 @@ public Object tryResume(T t, Object o) { } @Trace - public java.lang.Object tryResume(R r, Object obj, Function3 function3) { + public java.lang.Object tryResume(T r, Object obj, Function1 function1) { return Weaver.callOriginal(); } @@ -59,7 +58,7 @@ public void resumeUndispatchedWithException(CoroutineDispatcher dispatcher, Thro } @Trace - public void resume(R r, Function3 function3) { + public void resume(T r, Function1 function3) { Weaver.callOriginal(); } } diff --git a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/CoroutineDispatcher_Instrumentation.java b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/CoroutineDispatcher_Instrumentation.java index 14b5365..fa7f448 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/CoroutineDispatcher_Instrumentation.java +++ b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/CoroutineDispatcher_Instrumentation.java @@ -3,8 +3,8 @@ import com.newrelic.api.agent.weaver.MatchType; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRRunnable; -import com.newrelic.instrumentation.kotlin.coroutines_17.Utils; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRRunnable; +import com.newrelic.instrumentation.kotlin.coroutines_14.Utils; import kotlin.coroutines.CoroutineContext; diff --git a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/DelayKt_Instrumentation.java b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/DelayKt_Instrumentation.java index 4a387d1..b37dd6f 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/DelayKt_Instrumentation.java +++ b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/DelayKt_Instrumentation.java @@ -3,8 +3,8 @@ import com.newrelic.api.agent.Trace; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRDelayContinuation; -import com.newrelic.instrumentation.kotlin.coroutines_17.Utils; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRDelayContinuation; +import com.newrelic.instrumentation.kotlin.coroutines_14.Utils; import kotlin.Unit; import kotlin.coroutines.Continuation; diff --git a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/Delay_Instrumentation.java b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/Delay_Instrumentation.java index aeee82e..3b57f1e 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/Delay_Instrumentation.java +++ b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/Delay_Instrumentation.java @@ -4,9 +4,9 @@ import com.newrelic.api.agent.weaver.MatchType; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRDelayCancellableContinuation; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRDelayContinuation; -import com.newrelic.instrumentation.kotlin.coroutines_17.Utils; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRDelayCancellableContinuation; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRDelayContinuation; +import com.newrelic.instrumentation.kotlin.coroutines_14.Utils; import kotlin.Unit; import kotlin.coroutines.Continuation; import kotlin.coroutines.CoroutineContext; diff --git a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/DispatcherExecutor_Instrumentation.java b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/DispatcherExecutor_Instrumentation.java index eb823ba..6f7cd3c 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/DispatcherExecutor_Instrumentation.java +++ b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/DispatcherExecutor_Instrumentation.java @@ -5,8 +5,8 @@ import com.newrelic.api.agent.weaver.MatchType; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRRunnable; -import com.newrelic.instrumentation.kotlin.coroutines_17.Utils; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRRunnable; +import com.newrelic.instrumentation.kotlin.coroutines_14.Utils; @Weave(type = MatchType.BaseClass, originalName = "kotlinx.coroutines.DispatcherExecutor") abstract class DispatcherExecutor_Instrumentation { diff --git a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/EventLoopImplBase_Instrumentation.java b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/EventLoopImplBase_Instrumentation.java index 95033d1..1a85bf5 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/EventLoopImplBase_Instrumentation.java +++ b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/EventLoopImplBase_Instrumentation.java @@ -7,7 +7,7 @@ import com.newrelic.api.agent.weaver.NewField; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines_17.Utils; +import com.newrelic.instrumentation.kotlin.coroutines_14.Utils; @Weave(originalName = "kotlinx.coroutines.EventLoopImplBase") public abstract class EventLoopImplBase_Instrumentation { diff --git a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/YieldKt_Instrumentation.java b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/YieldKt_Instrumentation.java index 3f8e573..7f57ee5 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/YieldKt_Instrumentation.java +++ b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/YieldKt_Instrumentation.java @@ -4,7 +4,7 @@ import com.newrelic.api.agent.Trace; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines_17.Utils; +import com.newrelic.instrumentation.kotlin.coroutines_14.Utils; import kotlin.Unit; import kotlin.coroutines.Continuation; diff --git a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/intrinsics/CancellableKt_Instrumentation.java b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/intrinsics/CancellableKt_Instrumentation.java index ead5823..a6b31d4 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/intrinsics/CancellableKt_Instrumentation.java +++ b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/intrinsics/CancellableKt_Instrumentation.java @@ -5,11 +5,11 @@ import com.newrelic.api.agent.TracedMethod; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRContinuationWrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRFunction1SuspendWrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRFunction1Wrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRFunction2SuspendWrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.Utils; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRContinuationWrapper; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRFunction1SuspendWrapper; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRFunction1Wrapper; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRFunction2SuspendWrapper; +import com.newrelic.instrumentation.kotlin.coroutines_14.Utils; import kotlin.coroutines.Continuation; import kotlin.coroutines.jvm.internal.SuspendFunction; diff --git a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/intrinsics/UndispatchedKt_Instrumentation.java b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/intrinsics/UndispatchedKt_Instrumentation.java index dcd4fd2..84823a1 100644 --- a/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/intrinsics/UndispatchedKt_Instrumentation.java +++ b/Kotlin-Coroutines_1.4/src/main/java/kotlinx/coroutines/intrinsics/UndispatchedKt_Instrumentation.java @@ -5,10 +5,10 @@ import com.newrelic.api.agent.TracedMethod; import com.newrelic.api.agent.weaver.Weave; import com.newrelic.api.agent.weaver.Weaver; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRContinuationWrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRFunction1SuspendWrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRFunction2SuspendWrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.Utils; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRContinuationWrapper; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRFunction1SuspendWrapper; +import com.newrelic.instrumentation.kotlin.coroutines_14.NRFunction2SuspendWrapper; +import com.newrelic.instrumentation.kotlin.coroutines_14.Utils; import kotlin.coroutines.Continuation; import kotlin.coroutines.jvm.internal.SuspendFunction; diff --git a/Kotlin-Coroutines_1.4/src/main/kotlin/com/newrelic/instrumentation/kotlin/coroutines_17/CoroutineNameUtils.kt b/Kotlin-Coroutines_1.4/src/main/kotlin/com/newrelic/instrumentation/kotlin/coroutines_14/CoroutineNameUtils.kt similarity index 73% rename from Kotlin-Coroutines_1.4/src/main/kotlin/com/newrelic/instrumentation/kotlin/coroutines_17/CoroutineNameUtils.kt rename to Kotlin-Coroutines_1.4/src/main/kotlin/com/newrelic/instrumentation/kotlin/coroutines_14/CoroutineNameUtils.kt index 355fcd8..5060d93 100644 --- a/Kotlin-Coroutines_1.4/src/main/kotlin/com/newrelic/instrumentation/kotlin/coroutines_17/CoroutineNameUtils.kt +++ b/Kotlin-Coroutines_1.4/src/main/kotlin/com/newrelic/instrumentation/kotlin/coroutines_14/CoroutineNameUtils.kt @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17 +package com.newrelic.instrumentation.kotlin.coroutines_14 import kotlinx.coroutines.CoroutineName import kotlin.coroutines.CoroutineContext diff --git a/Kotlin-Coroutines_1.4/src/main/kotlin/com/newrelic/instrumentation/kotlin/coroutines_17/NRTokenContext.kt b/Kotlin-Coroutines_1.4/src/main/kotlin/com/newrelic/instrumentation/kotlin/coroutines_14/NRTokenContext.kt similarity index 85% rename from Kotlin-Coroutines_1.4/src/main/kotlin/com/newrelic/instrumentation/kotlin/coroutines_17/NRTokenContext.kt rename to Kotlin-Coroutines_1.4/src/main/kotlin/com/newrelic/instrumentation/kotlin/coroutines_14/NRTokenContext.kt index 3c1b1ad..e05a2cf 100644 --- a/Kotlin-Coroutines_1.4/src/main/kotlin/com/newrelic/instrumentation/kotlin/coroutines_17/NRTokenContext.kt +++ b/Kotlin-Coroutines_1.4/src/main/kotlin/com/newrelic/instrumentation/kotlin/coroutines_14/NRTokenContext.kt @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17 +package com.newrelic.instrumentation.kotlin.coroutines_14 import kotlin.coroutines.* import com.newrelic.api.agent.Token @@ -25,7 +25,7 @@ fun removeTokenContext(context : CoroutineContext) : CoroutineContext { @Nullable var token = tokenContext.token token.expire() - return context.minusKey(com.newrelic.instrumentation.kotlin.coroutines_17.TokenContextElement.Key) + return context.minusKey(TokenContextElement.Key) } return context }