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.

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

Fix possible deadlock #5585

Merged
merged 4 commits into from
Mar 17, 2022
Merged

Conversation

trask
Copy link
Member

@trask trask commented Mar 16, 2022

May want to consider a patch for this, I ran into deadlock locally.

private static class JdkHttpServerClassLoader extends ClassLoader {

static {
registerAsParallelCapable();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the fix

@trask trask marked this pull request as ready for review March 16, 2022 01:35
@trask trask requested a review from a team as a code owner March 16, 2022 01:35
…ootstrap/AgentClassLoader.java

Co-authored-by: Lauri Tulmin <tulmin@gmail.com>
@laurit laurit merged commit 531f18f into open-telemetry:main Mar 17, 2022
@trask trask deleted the fix-possible-deadlock branch March 17, 2022 15:57
trask added a commit that referenced this pull request Mar 17, 2022
* Fix possible deadlock

* don't break java 8

* try @laurit's idea

* Update javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/AgentClassLoader.java

Co-authored-by: Lauri Tulmin <tulmin@gmail.com>

Co-authored-by: Lauri Tulmin <tulmin@gmail.com>

Co-authored-by: Lauri Tulmin <tulmin@gmail.com>
RashmiRam pushed a commit to RashmiRam/opentelemetry-auto-instr-java that referenced this pull request May 23, 2022
* Fix possible deadlock

* don't break java 8

* try @laurit's idea

* Update javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/AgentClassLoader.java

Co-authored-by: Lauri Tulmin <tulmin@gmail.com>

Co-authored-by: Lauri Tulmin <tulmin@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants