Skip to content

Commit 9def1a6

Browse files
SylvainJugeSylvainJuge
committed
IndyProxy > InstrumentationProxy
1 parent bf1beca commit 9def1a6

File tree

9 files changed

+36
-31
lines changed

9 files changed

+36
-31
lines changed

‎instrumentation/internal/internal-reflection/javaagent-integration-tests/src/test/java/ReflectionTest.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import static org.assertj.core.api.Assertions.assertThat;
77

88
import instrumentation.TestHelperClass;
9-
import io.opentelemetry.javaagent.bootstrap.IndyProxy;
9+
import io.opentelemetry.javaagent.bootstrap.InstrumentationProxy;
1010
import io.opentelemetry.javaagent.bootstrap.VirtualFieldAccessorMarker;
1111
import io.opentelemetry.javaagent.bootstrap.VirtualFieldInstalledMarker;
1212
import java.io.ObjectStreamClass;
@@ -57,7 +57,7 @@ void testInjectedClassProxyUnwrap() throws Exception {
5757
.isNotNull();
5858

5959
Object instance = helperType.getConstructor().newInstance();
60-
if (IndyProxy.class.isAssignableFrom(helperType)) {
60+
if (InstrumentationProxy.class.isAssignableFrom(helperType)) {
6161
// indy advice: must be an indy proxy
6262

6363
for (Method method : helperType.getMethods()) {
@@ -69,18 +69,20 @@ void testInjectedClassProxyUnwrap() throws Exception {
6969
for (Class<?> interfaceType : helperType.getInterfaces()) {
7070
assertThat(interfaceType)
7171
.describedAs("indy proxy interface must be hidden from reflection")
72-
.isNotEqualTo(IndyProxy.class);
72+
.isNotEqualTo(InstrumentationProxy.class);
7373
}
7474

75-
assertThat(instance).isInstanceOf(IndyProxy.class);
75+
assertThat(instance).isInstanceOf(InstrumentationProxy.class);
7676

77-
Object proxyDelegate = ((IndyProxy) instance).__getIndyProxyDelegate();
78-
assertThat(proxyDelegate).isNotInstanceOf(IndyProxy.class);
77+
Object proxyDelegate = ((InstrumentationProxy) instance).__getIndyProxyDelegate();
78+
assertThat(proxyDelegate).isNotInstanceOf(InstrumentationProxy.class);
7979

8080
} else {
8181
// inline advice: must be of the expected type
8282
assertThat(helperType).isEqualTo(TestHelperClass.class);
83-
assertThat(instance).isInstanceOf(TestHelperClass.class).isNotInstanceOf(IndyProxy.class);
83+
assertThat(instance)
84+
.isInstanceOf(TestHelperClass.class)
85+
.isNotInstanceOf(InstrumentationProxy.class);
8486
}
8587
}
8688
}

‎instrumentation/internal/internal-reflection/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionHelper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.javaagent.instrumentation.internal.reflection;
77

8-
import io.opentelemetry.javaagent.bootstrap.IndyProxy;
8+
import io.opentelemetry.javaagent.bootstrap.InstrumentationProxy;
99
import io.opentelemetry.javaagent.bootstrap.VirtualFieldAccessorMarker;
1010
import io.opentelemetry.javaagent.bootstrap.VirtualFieldDetector;
1111
import io.opentelemetry.javaagent.bootstrap.VirtualFieldInstalledMarker;
@@ -71,7 +71,7 @@ public static Class<?>[] filterInterfaces(Class<?>[] interfaces, Class<?> contai
7171
// filter out virtual field marker and accessor interfaces
7272
if (interfaceClass == VirtualFieldInstalledMarker.class) {
7373
continue;
74-
} else if (interfaceClass == IndyProxy.class) {
74+
} else if (interfaceClass == InstrumentationProxy.class) {
7575
continue;
7676
} else if (VirtualFieldAccessorMarker.class.isAssignableFrom(interfaceClass)
7777
&& interfaceClass.isSynthetic()
@@ -89,6 +89,6 @@ public static Class<?>[] filterInterfaces(Class<?>[] interfaces, Class<?> contai
8989

9090
private static boolean noInterfaceToHide(Class<?> containingClass) {
9191
return !VirtualFieldInstalledMarker.class.isAssignableFrom(containingClass)
92-
&& !IndyProxy.class.isAssignableFrom(containingClass);
92+
&& !InstrumentationProxy.class.isAssignableFrom(containingClass);
9393
}
9494
}

‎instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v3_1/DispatcherServletInstrumentation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import io.opentelemetry.context.Context;
1717
import io.opentelemetry.context.Scope;
18-
import io.opentelemetry.javaagent.bootstrap.IndyProxyHelper;
18+
import io.opentelemetry.javaagent.bootstrap.InstrumentationProxyHelper;
1919
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2020
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
2121
import java.util.List;
@@ -68,7 +68,7 @@ public static void afterRefresh(
6868
}
6969
Object bean = springCtx.getBean("otelAutoDispatcherFilter");
7070
OpenTelemetryHandlerMappingFilter filter =
71-
IndyProxyHelper.unwrapIfNeeded(bean, OpenTelemetryHandlerMappingFilter.class);
71+
InstrumentationProxyHelper.unwrapIfNeeded(bean, OpenTelemetryHandlerMappingFilter.class);
7272
filter.setHandlerMappings(handlerMappings);
7373
}
7474
}

‎instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/DispatcherServletInstrumentation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
import io.opentelemetry.context.Context;
1717
import io.opentelemetry.context.Scope;
18-
import io.opentelemetry.javaagent.bootstrap.IndyProxyHelper;
18+
import io.opentelemetry.javaagent.bootstrap.InstrumentationProxyHelper;
1919
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2020
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
2121
import java.util.List;
@@ -69,7 +69,7 @@ public static void afterRefresh(
6969

7070
Object bean = springCtx.getBean("otelAutoDispatcherFilter");
7171
OpenTelemetryHandlerMappingFilter filter =
72-
IndyProxyHelper.unwrapIfNeeded(bean, OpenTelemetryHandlerMappingFilter.class);
72+
InstrumentationProxyHelper.unwrapIfNeeded(bean, OpenTelemetryHandlerMappingFilter.class);
7373
filter.setHandlerMappings(handlerMappings);
7474
}
7575
}

‎javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/IndyProxy.java‎ renamed to ‎javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/InstrumentationProxy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package io.opentelemetry.javaagent.bootstrap;
77

88
/** Interface added to indy proxies to allow unwrapping the proxy object */
9-
public interface IndyProxy {
9+
public interface InstrumentationProxy {
1010

1111
/**
1212
* Unwraps the proxy delegate instance

‎javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/IndyProxyHelper.java‎ renamed to ‎javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/InstrumentationProxyHelper.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
package io.opentelemetry.javaagent.bootstrap;
77

8-
public class IndyProxyHelper {
8+
public class InstrumentationProxyHelper {
99

10-
private IndyProxyHelper() {}
10+
private InstrumentationProxyHelper() {}
1111

1212
/**
1313
* Unwraps and casts an indy proxy, or just casts if it's not an indy proxy.
@@ -21,8 +21,8 @@ private IndyProxyHelper() {}
2121
* expected type
2222
*/
2323
public static <T> T unwrapIfNeeded(Object o, Class<T> type) {
24-
if (o instanceof IndyProxy) {
25-
Object delegate = ((IndyProxy) o).__getIndyProxyDelegate();
24+
if (o instanceof InstrumentationProxy) {
25+
Object delegate = ((InstrumentationProxy) o).__getIndyProxyDelegate();
2626
if (type.isAssignableFrom(delegate.getClass())) {
2727
return type.cast(delegate);
2828
}

‎javaagent-bootstrap/src/test/java/io/opentelemetry/javaagent/bootstrap/IndyProxyHelperTest.java‎ renamed to ‎javaagent-bootstrap/src/test/java/io/opentelemetry/javaagent/bootstrap/InstrumentationProxyHelperTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,31 @@
1010

1111
import org.junit.jupiter.api.Test;
1212

13-
class IndyProxyHelperTest {
13+
class InstrumentationProxyHelperTest {
1414

1515
@Test
1616
void wrongType() {
1717
assertThrows(
18-
IllegalArgumentException.class, () -> IndyProxyHelper.unwrapIfNeeded("", Integer.class));
18+
IllegalArgumentException.class,
19+
() -> InstrumentationProxyHelper.unwrapIfNeeded("", Integer.class));
1920
assertThrows(
2021
IllegalArgumentException.class,
21-
() -> IndyProxyHelper.unwrapIfNeeded(proxy(""), Integer.class));
22+
() -> InstrumentationProxyHelper.unwrapIfNeeded(proxy(""), Integer.class));
2223
}
2324

2425
@Test
2526
void unwrap() {
2627

2728
// no wrapping
28-
Number number = IndyProxyHelper.unwrapIfNeeded(42, Number.class);
29+
Number number = InstrumentationProxyHelper.unwrapIfNeeded(42, Number.class);
2930
assertThat(number).isEqualTo(42);
3031

3132
// unwrap needed
32-
String string = IndyProxyHelper.unwrapIfNeeded(proxy("hello"), String.class);
33+
String string = InstrumentationProxyHelper.unwrapIfNeeded(proxy("hello"), String.class);
3334
assertThat(string).isEqualTo("hello");
3435
}
3536

36-
private static IndyProxy proxy(Object delegate) {
37+
private static InstrumentationProxy proxy(Object delegate) {
3738
return () -> delegate;
3839
}
3940
}

‎javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/IndyProxyFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.javaagent.tooling.instrumentation.indy;
77

8-
import io.opentelemetry.javaagent.bootstrap.IndyProxy;
8+
import io.opentelemetry.javaagent.bootstrap.InstrumentationProxy;
99
import java.lang.reflect.Method;
1010
import java.lang.reflect.Modifier;
1111
import java.util.ArrayList;
@@ -96,7 +96,7 @@ public DynamicType.Unloaded<?> generateProxy(
9696
TypeDescription classToProxy, String proxyClassName) {
9797
TypeDescription.Generic superClass = classToProxy.getSuperClass();
9898
List<TypeDefinition> interfaces = new ArrayList<>(classToProxy.getInterfaces());
99-
interfaces.add(TypeDescription.ForLoadedType.of(IndyProxy.class));
99+
interfaces.add(TypeDescription.ForLoadedType.of(InstrumentationProxy.class));
100100
DynamicType.Builder<?> builder =
101101
new ByteBuddy()
102102
.subclass(superClass, ConstructorStrategy.Default.NO_CONSTRUCTORS)

‎javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/instrumentation/indy/IndyProxyFactoryTest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import static org.assertj.core.api.Assertions.assertThat;
99

10-
import io.opentelemetry.javaagent.bootstrap.IndyProxy;
10+
import io.opentelemetry.javaagent.bootstrap.InstrumentationProxy;
1111
import io.opentelemetry.javaagent.tooling.instrumentation.indy.dummies.DummyAnnotation;
1212
import java.lang.invoke.CallSite;
1313
import java.lang.invoke.ConstantCallSite;
@@ -329,14 +329,16 @@ void verifyNonPublicMembersIgnored() {
329329
@Test
330330
void verifyProxyClass() throws Exception {
331331
Class<?> proxyType = generateProxy(ProxyUnwrapTest.class);
332-
assertThat(proxyType).isNotInstanceOf(IndyProxy.class).isNotInstanceOf(ProxyUnwrapTest.class);
332+
assertThat(proxyType)
333+
.isNotInstanceOf(InstrumentationProxy.class)
334+
.isNotInstanceOf(ProxyUnwrapTest.class);
333335

334-
assertThat(IndyProxy.class.isAssignableFrom(proxyType))
336+
assertThat(InstrumentationProxy.class.isAssignableFrom(proxyType))
335337
.describedAs("proxy class can be cast to IndyProxy")
336338
.isTrue();
337339

338340
Object proxyInstance = proxyType.getConstructor().newInstance();
339-
Object proxyDelegate = ((IndyProxy) proxyInstance).__getIndyProxyDelegate();
341+
Object proxyDelegate = ((InstrumentationProxy) proxyInstance).__getIndyProxyDelegate();
340342
assertThat(proxyDelegate).isInstanceOf(ProxyUnwrapTest.class);
341343
}
342344

0 commit comments

Comments
 (0)