Fix using WithSpan annotation in java6 class - #2699
Merged
Merged
Conversation
laurit
requested review from
anuraaga,
iNikem,
jkwatson,
mateuszrzeszutek,
pavolloffay,
trask and
tylerbenson
as code owners
April 2, 2021 11:25
ghost
reviewed
Apr 2, 2021
ghost
left a comment
ghost
left a comment
There was a problem hiding this comment.
LGTM. We could probably make the java6 test more readable by moving it to a separate test module with maxJavaVersionForTests set to 6.
mateuszrzeszutek
approved these changes
Apr 2, 2021
Member
Unfortunately I don't think this'd work: tests Java process runs with our javaagent, which does not support Java <8. |
trask
approved these changes
Apr 2, 2021
Comment on lines
+386
to
+410
| setup: | ||
| /* | ||
| class GeneratedJava6TestClass implements Runnable { | ||
| @WithSpan | ||
| public void run() { | ||
| TraceUtils.runUnderTrace("intercept", {}) | ||
| } | ||
| } | ||
| */ | ||
| Class<?> generatedClass = new ByteBuddy(ClassFileVersion.JAVA_V6) | ||
| .subclass(Object) | ||
| .name("GeneratedJava6TestClass") | ||
| .implement(Runnable) | ||
| .defineMethod("run", void.class, Modifier.PUBLIC).intercept(MethodDelegation.to(new Object() { | ||
| @RuntimeType | ||
| void intercept(@This Object o) { | ||
| TraceUtils.runUnderTrace("intercept", {}) | ||
| } | ||
| })) | ||
| .visit(new MemberAttributeExtension.ForMethod() | ||
| .annotateMethod(AnnotationDescription.Builder.ofType(WithSpan).build()) | ||
| .on(ElementMatchers.named("run"))) | ||
| .make() | ||
| .load(getClass().getClassLoader()) | ||
| .getLoaded() |
Member
There was a problem hiding this comment.
nice, I would have found a (random old) library that was compiled to Java 6 and tested instrumentation of that library, but this is better 👍
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
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.
No description provided.