From 0fd0008e5fc5d28da7fbd915f9ce5264254cc5b0 Mon Sep 17 00:00:00 2001 From: Doug Hilpipre Date: Fri, 17 Jan 2025 10:48:00 -0600 Subject: [PATCH] added regex ignore capabilities --- Kotlin-Coroutines_1.7/build.gradle | 2 +- .../kotlin/coroutines_19/DispatchedTaskIgnores.java | 2 +- .../kotlin/coroutines_19/NRContinuationWrapper.java | 2 +- .../kotlin/coroutines_19/NRCoroutineToken.java | 2 +- .../kotlin/coroutines_19/NRFunction1Wrapper.java | 2 +- .../kotlin/coroutines_19/NRFunction2Wrapper.java | 2 +- .../instrumentation/kotlin/coroutines_19/NRRunnable.java | 2 +- .../instrumentation/kotlin/coroutines_19/Utils.java | 2 +- .../src/main/java/kotlin/coroutines/ContinuationKt.java | 4 ++-- .../main/java/kotlinx/coroutines/AbstractCoroutine.java | 4 ++-- .../src/main/java/kotlinx/coroutines/BuildersKt.java | 8 ++++---- .../main/java/kotlinx/coroutines/CoroutineDispatcher.java | 4 ++-- .../main/java/kotlinx/coroutines/DispatcherExecutor.java | 4 ++-- .../main/java/kotlinx/coroutines/EventLoopImplBase.java | 2 +- .../src/main/java/kotlinx/coroutines/YieldKt.java | 2 +- .../java/kotlinx/coroutines/intrinsics/CancellableKt.java | 8 ++++---- .../kotlinx/coroutines/intrinsics/UndispatchedKt.java | 6 +++--- 17 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Kotlin-Coroutines_1.7/build.gradle b/Kotlin-Coroutines_1.7/build.gradle index 83103c3..cac13f8 100644 --- a/Kotlin-Coroutines_1.7/build.gradle +++ b/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' diff --git a/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/DispatchedTaskIgnores.java b/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/DispatchedTaskIgnores.java index 5d239d3..25547fa 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/DispatchedTaskIgnores.java +++ b/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/DispatchedTaskIgnores.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_19; import java.util.ArrayList; import java.util.List; diff --git a/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRContinuationWrapper.java b/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRContinuationWrapper.java index 5a016fa..9773d3b 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRContinuationWrapper.java +++ b/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRContinuationWrapper.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_19; import com.newrelic.agent.bridge.AgentBridge; import com.newrelic.api.agent.NewRelic; diff --git a/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRCoroutineToken.java b/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRCoroutineToken.java index d6a63da..93dcdac 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRCoroutineToken.java +++ b/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRCoroutineToken.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_19; import com.newrelic.api.agent.Token; diff --git a/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRFunction1Wrapper.java b/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRFunction1Wrapper.java index 37bc3bc..f3f3038 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRFunction1Wrapper.java +++ b/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRFunction1Wrapper.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_19; import com.newrelic.agent.bridge.AgentBridge; diff --git a/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRFunction2Wrapper.java b/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRFunction2Wrapper.java index d81eb8e..fce671a 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRFunction2Wrapper.java +++ b/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRFunction2Wrapper.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_19; import com.newrelic.agent.bridge.AgentBridge; diff --git a/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRRunnable.java b/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRRunnable.java index 7d9cdb3..233dd62 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRRunnable.java +++ b/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/NRRunnable.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_19; import com.newrelic.agent.bridge.AgentBridge; import com.newrelic.api.agent.NewRelic; diff --git a/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/Utils.java b/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/Utils.java index 94850ff..2029f33 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/Utils.java +++ b/Kotlin-Coroutines_1.9/src/main/java/com/newrelic/instrumentation/kotlin/coroutines_19/Utils.java @@ -1,4 +1,4 @@ -package com.newrelic.instrumentation.kotlin.coroutines_17; +package com.newrelic.instrumentation.kotlin.coroutines_19; import java.util.ArrayList; import java.util.List; diff --git a/Kotlin-Coroutines_1.9/src/main/java/kotlin/coroutines/ContinuationKt.java b/Kotlin-Coroutines_1.9/src/main/java/kotlin/coroutines/ContinuationKt.java index 1cf16ae..16b73ad 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/kotlin/coroutines/ContinuationKt.java +++ b/Kotlin-Coroutines_1.9/src/main/java/kotlin/coroutines/ContinuationKt.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.NRFunction1Wrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRFunction2Wrapper; +import com.newrelic.instrumentation.kotlin.coroutines_19.NRFunction1Wrapper; +import com.newrelic.instrumentation.kotlin.coroutines_19.NRFunction2Wrapper; import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function2; diff --git a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/AbstractCoroutine.java b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/AbstractCoroutine.java index a600fe7..54c8e52 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/AbstractCoroutine.java +++ b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/AbstractCoroutine.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.NRFunction2Wrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.Utils; +import com.newrelic.instrumentation.kotlin.coroutines_19.NRFunction2Wrapper; +import com.newrelic.instrumentation.kotlin.coroutines_19.Utils; import kotlin.coroutines.Continuation; import kotlin.coroutines.CoroutineContext; diff --git a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/BuildersKt.java b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/BuildersKt.java index 9f2ac41..e61df65 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/BuildersKt.java +++ b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/BuildersKt.java @@ -5,10 +5,10 @@ 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.NRCoroutineToken; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRFunction2Wrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.Utils; +import com.newrelic.instrumentation.kotlin.coroutines_19.NRContinuationWrapper; +import com.newrelic.instrumentation.kotlin.coroutines_19.NRCoroutineToken; +import com.newrelic.instrumentation.kotlin.coroutines_19.NRFunction2Wrapper; +import com.newrelic.instrumentation.kotlin.coroutines_19.Utils; import kotlin.Unit; import kotlin.coroutines.Continuation; diff --git a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/CoroutineDispatcher.java b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/CoroutineDispatcher.java index a28b871..8e0220f 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/CoroutineDispatcher.java +++ b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/CoroutineDispatcher.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_19.NRRunnable; +import com.newrelic.instrumentation.kotlin.coroutines_19.Utils; import kotlin.coroutines.CoroutineContext; diff --git a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/DispatcherExecutor.java b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/DispatcherExecutor.java index 034b646..939567d 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/DispatcherExecutor.java +++ b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/DispatcherExecutor.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_19.NRRunnable; +import com.newrelic.instrumentation.kotlin.coroutines_19.Utils; @Weave(type = MatchType.BaseClass) abstract class DispatcherExecutor { diff --git a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/EventLoopImplBase.java b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/EventLoopImplBase.java index 3baf1dc..2847ecb 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/EventLoopImplBase.java +++ b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/EventLoopImplBase.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_19.Utils; @Weave public abstract class EventLoopImplBase { diff --git a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/YieldKt.java b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/YieldKt.java index 9f35049..4d4900a 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/YieldKt.java +++ b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/YieldKt.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_19.Utils; import kotlin.Unit; import kotlin.coroutines.Continuation; diff --git a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/intrinsics/CancellableKt.java b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/intrinsics/CancellableKt.java index b564669..23efac0 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/intrinsics/CancellableKt.java +++ b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/intrinsics/CancellableKt.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.NRFunction1Wrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.NRFunction2Wrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.Utils; +import com.newrelic.instrumentation.kotlin.coroutines_19.NRContinuationWrapper; +import com.newrelic.instrumentation.kotlin.coroutines_19.NRFunction1Wrapper; +import com.newrelic.instrumentation.kotlin.coroutines_19.NRFunction2Wrapper; +import com.newrelic.instrumentation.kotlin.coroutines_19.Utils; import kotlin.coroutines.Continuation; import kotlin.coroutines.jvm.internal.SuspendFunction; diff --git a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/intrinsics/UndispatchedKt.java b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/intrinsics/UndispatchedKt.java index af2928c..12977d0 100644 --- a/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/intrinsics/UndispatchedKt.java +++ b/Kotlin-Coroutines_1.9/src/main/java/kotlinx/coroutines/intrinsics/UndispatchedKt.java @@ -5,9 +5,9 @@ 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.NRFunction2Wrapper; -import com.newrelic.instrumentation.kotlin.coroutines_17.Utils; +import com.newrelic.instrumentation.kotlin.coroutines_19.NRContinuationWrapper; +import com.newrelic.instrumentation.kotlin.coroutines_19.NRFunction2Wrapper; +import com.newrelic.instrumentation.kotlin.coroutines_19.Utils; import kotlin.coroutines.Continuation; import kotlin.coroutines.jvm.internal.SuspendFunction;