combine into one module

newrelic · Nov 10, 2022 · cf3007c · cf3007c
1 parent f137f4f
commit cf3007c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 365 deletions.
diff --git a/instrumentation/slick-2.12_3.2.0/build.gradle b/instrumentation/slick-2.12_3.2.0/build.gradle
@@ -25,7 +25,10 @@ verifyInstrumentation {
     fails 'com.typesafe.slick:slick_2.11:[3.2.0,)'
 
     // scala 12
-    passesOnly 'com.typesafe.slick:slick_2.12:[3.2.0,3.4.0)'
+    passesOnly 'com.typesafe.slick:slick_2.12:[3.2.0,)'
+
+    // scala 13
+    passesOnly 'com.typesafe.slick:slick_2.13:[3.3.2,)'
 
     excludeRegex ".*(RC|M)[0-9].*"
 }

diff --git a/instrumentation/slick-2.12_3.2.0/src/main/scala/slick/util/AsyncExecutor.scala b/instrumentation/slick-2.12_3.2.0/src/main/scala/slick/util/AsyncExecutor.scala
@@ -26,8 +26,8 @@ import slick.util.AsyncExecutor
 
 @ScalaWeave(`type` = ScalaMatchType.Object, originalName="slick.util.AsyncExecutor")
 class WeavedAsyncExecutor {
-  def apply(name: String, minThreads: Int, maxThreads: Int, queueSize: Int, maxConnections: Int = Integer.MAX_VALUE, keepAliveTime: Duration = 1.minute,
-registerMbeans: Boolean = false): AsyncExecutor = {
+  def apply(name: String, minThreads: Int, maxThreads: Int, queueSize: Int, maxConnections: Int, keepAliveTime: Duration,
+            registerMbeans: Boolean): AsyncExecutor = {
     val original :AsyncExecutor = Weaver.callOriginal()
     new NewRelicAsyncExecutor(original)
   }

diff --git a/instrumentation/slick-2.13_3.4.0/.snyk b/instrumentation/slick-2.13_3.4.0/.snyk
diff --git a/instrumentation/slick-2.13_3.4.0/build.gradle b/instrumentation/slick-2.13_3.4.0/build.gradle
diff --git a/instrumentation/slick-2.13_3.4.0/src/main/scala/slick/util/AsyncExecutor.scala b/instrumentation/slick-2.13_3.4.0/src/main/scala/slick/util/AsyncExecutor.scala
diff --git a/...tion/slick-2.13_3.4.0/src/test/scala/com/nr/agent/instrumentation/slickdb/SlickTest.scala b/...tion/slick-2.13_3.4.0/src/test/scala/com/nr/agent/instrumentation/slickdb/SlickTest.scala
diff --git a/settings.gradle b/settings.gradle
@@ -303,7 +303,6 @@ include 'instrumentation:servlet-user-5.0'
 include 'instrumentation:slick-3.0.0'
 include 'instrumentation:slick-2.11_3.2.0'
 include 'instrumentation:slick-2.12_3.2.0'
-include 'instrumentation:slick-2.13_3.4.0'
 include 'instrumentation:solr-4.0.0'
 include 'instrumentation:solr-5.0.0'
 include 'instrumentation:solr-5.1.0'