added regex ignore capabilities

dhilpipre · dhilpipre · commit 0fd0008e5fc5 · 2025-01-17T10:48:00.000-06:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;

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_19;`
`2`	`2`
`3`	`3`	`import java.util.ArrayList;`
`4`	`4`	`import java.util.List;`