Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BlockHound integration #1821

Merged
merged 15 commits into from
Mar 16, 2020
Merged

BlockHound integration #1821

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
edc388c
BlockHound integration POC
dkhalanskyjb Feb 3, 2020
ef33b34
Do not shadow ByteBuddy agent
dkhalanskyjb Feb 6, 2020
69f76dc
Fix tests not being run with the right dispatcher
dkhalanskyjb Feb 6, 2020
46bbf2a
Clean the stack traces from BlockHound artifacts
dkhalanskyjb Feb 6, 2020
d1e4798
Intermediate value
dkhalanskyjb Feb 18, 2020
5058081
Improve handling of stacktrace tests on JDK 8
dkhalanskyjb Feb 19, 2020
efb4720
Implement BlockHound integration properly
dkhalanskyjb Feb 19, 2020
6e5fe92
Up the BlockHound version
dkhalanskyjb Feb 19, 2020
7fc4a90
Fixes
dkhalanskyjb Mar 13, 2020
3fc6abc
Improve build configuration of integration tests
dkhalanskyjb Mar 16, 2020
76ab90f
Add an integration test for coroutine debugger java agent
dkhalanskyjb Mar 16, 2020
e16face
Document BlockHound integration better
dkhalanskyjb Mar 16, 2020
15b54c9
Do not exclude the ByteBuddy agent from shading
dkhalanskyjb Mar 16, 2020
e685384
Documentation improvement
qwwdfsad Mar 16, 2020
20cc2ff
Update kotlinx-coroutines-debug/README.md
qwwdfsad Mar 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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.
  • Loading branch information
@dkhalanskyjb
dkhalanskyjb committed Mar 13, 2020
commit ef33b348d82854e42b3782881306a0dc89c80ebf
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion kotlinx-coroutines-debug/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
qwwdfsad marked this conversation as resolved.
Show resolved Hide resolved
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 {
Expand Down
2 changes: 1 addition & 1 deletion kotlinx-coroutines-debug/src/internal/DebugProbesImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down