make internal indy-ready #14646
Merged
make internal indy-ready #14646
Conversation
This file contains hidden or 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
…nstrumentation into indy-internal
…nstrumentation into indy-internal
JonasKunz
reviewed
Sep 22, 2025
| return null; | ||
| } | ||
|
|
||
| @AssignReturned.ToReturned |
There was a problem hiding this comment.
Both the BootDelegationInstrumentation and LoadInjectedClassInstrumentation enforce inlining, even if indy is enabled. This is done in the transform method above. We do this, to avoid recursion problems with the indy bootstrap.
For this reason they should not be converted to the @AssignReturned notation.
Interesting that your change doesn't cause a test failure though, I would have expected the @AssignReturned annotations to not work, but apparently they do.
There was a problem hiding this comment.
From what I remember, @AssignReturned usage is completely independent of inlining the code or not, so this is more about code style and consistency here.
...lemetry/javaagent/instrumentation/internal/classloader/ClassLoaderInstrumentationModule.java
Show resolved
Hide resolved
…nstrumentation into indy-internal
JonasKunz
approved these changes
Sep 23, 2025
laurit
reviewed
Sep 24, 2025
...lemetry/javaagent/instrumentation/internal/classloader/LoadInjectedClassInstrumentation.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
Sep 24, 2025
...ava/io/opentelemetry/javaagent/instrumentation/internal/osgi/EclipseOsgiInstrumentation.java
Outdated
Show resolved
Hide resolved
laurit
approved these changes
Sep 24, 2025
…nstrumentation into indy-internal
mznet
pushed a commit
to mznet/opentelemetry-java-instrumentation
that referenced
this pull request
Sep 26, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Part of #13031
For reviewer: there is still a couple of visibility/virtual fields issues that we can deal with later when removing inlined advices
instrumentation/internal/internal-reflection/javaagent-integration-tests/src/main/java/instrumentation/TestTypeInstrumentation.javastill has directVirtualField.findcallsinstrumentation/internal/internal-reflection/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.javadoes not yet implementisIndyReadymethod.