corrected errors in CancellableContinuationImpl in 1.4

dhilpipre · dhilpipre · commit fdf90cd24788 · 2025-09-11T09:04:32.000-05:00
diff --git a/Kotlin-Coroutines_1.4/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_14/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_14/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_14/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_14/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_14/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_14/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_14/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_14/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_14/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
@@ -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
@@ -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
@@ -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
@@ -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 <R extends T> java.lang.Object tryResume(R r, Object obj, Function3<? super Throwable, ? super R, ? super CoroutineContext, Unit> function3) {
+    public java.lang.Object tryResume(T r, Object obj, Function1<? super Throwable, Unit> function1) {
         return Weaver.callOriginal();
     }
 
@@ -59,7 +58,7 @@ public void resumeUndispatchedWithException(CoroutineDispatcher dispatcher, Thro
     }
 
     @Trace
-    public <R extends T> void resume(R r, Function3<? super Throwable, ? super R, ? super CoroutineContext, Unit> function3) {
+    public void resume(T r, Function1<? super Throwable,Unit> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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_14/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_14/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
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.newrelic.instrumentation.kotlin.coroutines_17;`
	`1`	`+package com.newrelic.instrumentation.kotlin.coroutines_14;`
`2`	`2`
`3`	`3`	`import com.newrelic.api.agent.Config;`
`4`	`4`	`import com.newrelic.api.agent.NewRelic;`