Skip to content

move internal virtual field for indy migration #15198

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −3
Open

move internal virtual field for indy migration #15198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions .../javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,20 @@ public List<String> getAdditionalHelperClassNames() {
return Arrays.asList("instrumentation.TestHelperClass");
}

@Override
public boolean isHelperClass(String className) {
return "instrumentation.TestSingletons".equals(className);
}

@Override
public void injectClasses(ClassInjector injector) {
injector
.proxyBuilder("instrumentation.TestHelperClass")
.inject(InjectionMode.CLASS_AND_RESOURCE);
}

@Override
public boolean isIndyReady() {
return true;
}
}
16 changes: 16 additions & 0 deletions ...-reflection/javaagent-integration-tests/src/main/java/instrumentation/TestSingletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package instrumentation;

import io.opentelemetry.instrumentation.api.util.VirtualField;

public class TestSingletons {

public static final VirtualField<Runnable, String> STRING =
VirtualField.find(Runnable.class, String.class);

private TestSingletons() {}
}
6 changes: 3 additions & 3 deletions ...on/javaagent-integration-tests/src/main/java/instrumentation/TestTypeInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

package instrumentation;

import static instrumentation.TestSingletons.STRING;
import static net.bytebuddy.matcher.ElementMatchers.named;

import io.opentelemetry.instrumentation.api.util.VirtualField;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import net.bytebuddy.asm.Advice;
Expand Down Expand Up @@ -36,7 +36,7 @@ public static class TestAdvice {
@AssignReturned.ToReturned
@Advice.OnMethodExit
public static String methodExit(@Advice.This Runnable test) {
VirtualField.find(Runnable.class, String.class).set(test, "instrumented");
STRING.set(test, "instrumented");
return "instrumented";
}
}
Expand All @@ -47,7 +47,7 @@ public static class Test2Advice {
@AssignReturned.ToReturned
@Advice.OnMethodExit
public static String methodExit(@Advice.This Runnable test) {
return VirtualField.find(Runnable.class, String.class).get(test);
return STRING.get(test);
}
}
}
Loading