Recover from duplicate class definition errors #5185
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mateuszrzeszutek
approved these changes
Jan 20, 2022
trask
approved these changes
Jan 22, 2022
mateuszrzeszutek
approved these changes
Jan 24, 2022
trask
approved these changes
Jan 25, 2022
Comment on lines
+97
to
+102
| mv.visitMethodInsn( | ||
| Opcodes.INVOKESTATIC, | ||
| Type.getInternalName(DefineClassContext.class), | ||
| "enter", | ||
| "()V", | ||
| false); |
There was a problem hiding this comment.
can you update the pseudo code above (which is really helpful) with the new enter/exit/exitAndGet?
trask
approved these changes
Jan 25, 2022
Comment on lines
+87
to
+89
| } catch (Throwable throwable) { | ||
| DefineClassContext.exit(); | ||
| throw throwable; |
This was referenced Jan 25, 2022
trask
added a commit
that referenced
this pull request
Jan 26, 2022
* Recover from duplicate class definition errors * fix hotspot8 * Suppress dupicate class definiton errors only when helper classes were injected * exit define class context when there is an exception, update pseudocode in comment Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
RashmiRam
pushed a commit
to RashmiRam/opentelemetry-auto-instr-java
that referenced
this pull request
May 23, 2022
* Recover from duplicate class definition errors * fix hotspot8 * Suppress dupicate class definiton errors only when helper classes were injected * exit define class context when there is an exception, update pseudocode in comment
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #5155
If there is a duplicate class definition find the class with
findLoadedClassand return it instead of throwing aLinkageError. Currently no attempt is made to detect where the duplicate definition was caused by us or not. If needed we could add aThreadLocalto detect whether helper classes were injected while defining a class and only suppress duplicate class definition errors then.