Skip to content

Commit c7e5d8b

Browse files
committed
(chore) remove indy specific inlining per review
1 parent 093aeaa commit c7e5d8b

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/DefaultExecControllerInstrumentation.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void transform(TypeTransformer transformer) {
4848

4949
@SuppressWarnings("unused")
5050
public static class SetInitializersAdvice {
51-
@Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
51+
@Advice.OnMethodEnter(suppress = Throwable.class)
5252
@Advice.AssignReturned.ToArguments(@ToArgument(0))
5353
public static ImmutableList<? extends ExecInitializer> enter(
5454
@Advice.Argument(0) ImmutableList<? extends ExecInitializer> initializers) {
@@ -61,7 +61,7 @@ public static ImmutableList<? extends ExecInitializer> enter(
6161

6262
@SuppressWarnings("unused")
6363
public static class SetInterceptorsAdvice {
64-
@Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
64+
@Advice.OnMethodEnter(suppress = Throwable.class)
6565
@Advice.AssignReturned.ToArguments(@ToArgument(0))
6666
public static ImmutableList<? extends ExecInterceptor> enter(
6767
@Advice.Argument(0) ImmutableList<? extends ExecInterceptor> interceptors) {
@@ -76,7 +76,7 @@ public static ImmutableList<? extends ExecInterceptor> enter(
7676
public static class ConstructorAdvice {
7777

7878
@SuppressWarnings("UnusedVariable")
79-
@Advice.OnMethodExit(suppress = Throwable.class, inline = false)
79+
@Advice.OnMethodExit(suppress = Throwable.class)
8080
@Advice.AssignReturned.ToFields({
8181
@ToField(value = "initializers", index = 0),
8282
@ToField(value = "interceptors", index = 1)

instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/HttpClientInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void transform(TypeTransformer transformer) {
3737
@SuppressWarnings("unused")
3838
public static class OfAdvice {
3939

40-
@Advice.OnMethodExit(suppress = Throwable.class, inline = false)
40+
@Advice.OnMethodExit(suppress = Throwable.class)
4141
@Advice.AssignReturned.ToReturned
4242
public static HttpClient injectTracing(@Advice.Return HttpClient httpClient) throws Exception {
4343
return RatpackSingletons.telemetry().instrumentHttpClient(httpClient);

instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RatpackInstrumentationModule.java

-5
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ public String getModuleGroup() {
2828
return "netty";
2929
}
3030

31-
@Override
32-
public boolean isIndyModule() {
33-
return true;
34-
}
35-
3631
@Override
3732
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
3833
// Only activate when running ratpack 1.7 or later

instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/RequestActionSupportInstrumentation.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static void injectChannelAttribute(
6161
@SuppressWarnings("unused")
6262
public static class ConnectDownstreamAdvice {
6363

64-
@Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
64+
@Advice.OnMethodEnter(suppress = Throwable.class)
6565
@Advice.AssignReturned.ToArguments(@ToArgument(0))
6666
public static Object wrapDownstream(@Advice.Argument(0) Downstream<?> downstream) {
6767
// Propagate the current context to downstream
@@ -73,7 +73,7 @@ public static Object wrapDownstream(@Advice.Argument(0) Downstream<?> downstream
7373
@SuppressWarnings("unused")
7474
public static class ContextAdvice {
7575

76-
@Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
76+
@Advice.OnMethodEnter(suppress = Throwable.class)
7777
public static Scope injectChannelAttribute(
7878
@Advice.FieldValue("execution") Execution execution) {
7979

@@ -85,7 +85,7 @@ public static Scope injectChannelAttribute(
8585
.orElse(null);
8686
}
8787

88-
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
88+
@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
8989
public static void exit(@Advice.Enter Scope scope) {
9090
if (scope != null) {
9191
scope.close();

instrumentation/ratpack/ratpack-1.7/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/ServerRegistryInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void transform(TypeTransformer transformer) {
3434
@SuppressWarnings("unused")
3535
public static class BuildAdvice {
3636

37-
@Advice.OnMethodExit(suppress = Throwable.class, inline = false)
37+
@Advice.OnMethodExit(suppress = Throwable.class)
3838
@Advice.AssignReturned.ToReturned
3939
public static Registry injectTracing(@Advice.Return Registry registry) {
4040
return registry.join(

0 commit comments

Comments
 (0)