Do not shadow ByteBuddy agent

This way, it can work even with BlockHound on JDK8, which also uses ByteBuddy and thus was in conflict. Kind of solves #1060, but since now the debugging routine depends on BlockHound, where, it seems, the same problem was not fixed, the original cause for concern probably still stands.
Kotlin · Mar 27, 2020 · 55231aa · 55231aa
1 parent 5f1e27e
commit 55231aa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -14,7 +14,7 @@ knit_version=0.1.3
 html_version=0.6.8
 lincheck_version=2.5.3
 dokka_version=0.9.16-rdev-2-mpp-hacks
-byte_buddy_version=1.9.3
+byte_buddy_version=1.10.7
 reactor_vesion=3.2.5.RELEASE
 reactive_streams_version=1.0.2
 rxjava2_version=2.2.8

diff --git a/kotlinx-coroutines-debug/build.gradle b/kotlinx-coroutines-debug/build.gradle
@@ -21,9 +21,11 @@ configurations {
 dependencies {
     compileOnly "junit:junit:$junit_version"
     shadowDeps "net.bytebuddy:byte-buddy:$byte_buddy_version"
-    shadowDeps "net.bytebuddy:byte-buddy-agent:$byte_buddy_version"
+    compile "net.bytebuddy:byte-buddy-agent:$byte_buddy_version"
     compile 'io.projectreactor.tools:blockhound:1.0.1.BUILD-SNAPSHOT'
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    runtime "net.java.dev.jna:jna:5.5.0"
+    runtime "net.java.dev.jna:jna-platform:5.5.0"
 }
 
 jar {

diff --git a/kotlinx-coroutines-debug/src/internal/DebugProbesImpl.kt b/kotlinx-coroutines-debug/src/internal/DebugProbesImpl.kt
@@ -57,7 +57,7 @@ internal object DebugProbesImpl {
     public fun install(): Unit = coroutineStateLock.write {
         if (++installations > 1) return
 
-        ByteBuddyAgent.install()
+        ByteBuddyAgent.install(ByteBuddyAgent.AttachmentProvider.ForEmulatedAttachment.INSTANCE)
         val cl = Class.forName("kotlin.coroutines.jvm.internal.DebugProbesKt")
         val cl2 = Class.forName("kotlinx.coroutines.debug.DebugProbesKt")