Skip to content

Commit 4413231

Browse files
otelbot[bot]otelbot[bot]
authored
Review fixes for spring-webflux-5.0:javaagent (open-telemetry#17140)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
1 parent 3b85c9f commit 4413231

10 files changed

Lines changed: 14 additions & 25 deletions

File tree

‎instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ muzzle {
2727
group.set("io.projectreactor.netty")
2828
module.set("reactor-netty")
2929
versions.set("[0.8.0.RELEASE,)")
30+
assertInverse.set(true)
3031
extraDependency("org.springframework:spring-webflux:5.1.0.RELEASE")
3132
}
3233

‎instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/client/WebClientBuilderInstrumentation.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.implementsInterface;
10-
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
1110
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
1211
import static net.bytebuddy.matcher.ElementMatchers.named;
1312

@@ -33,7 +32,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
3332
@Override
3433
public void transform(TypeTransformer transformer) {
3534
transformer.applyAdviceToMethod(
36-
isMethod().and(isPublic()).and(named("build")), this.getClass().getName() + "$BuildAdvice");
35+
isPublic().and(named("build")), getClass().getName() + "$BuildAdvice");
3736
}
3837

3938
@SuppressWarnings("unused")

‎instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/AdviceUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private static void end(ServerWebExchange exchange, @Nullable Throwable throwabl
4141
}
4242
}
4343

44-
public static <T> Mono<T> wrapMono(Mono<T> mono, Context context) {
44+
public static <T> Mono<T> wrapMono(Mono<T> mono, @Nullable Context context) {
4545
if (context == null) {
4646
return mono;
4747
}

‎instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/DispatcherHandlerInstrumentation.java‎

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

66
package io.opentelemetry.javaagent.instrumentation.spring.webflux.v5_0.server;
77

8-
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
98
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
109
import static net.bytebuddy.matcher.ElementMatchers.named;
1110
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -30,17 +29,15 @@ public ElementMatcher<TypeDescription> typeMatcher() {
3029
@Override
3130
public void transform(TypeTransformer transformer) {
3231
transformer.applyAdviceToMethod(
33-
isMethod()
34-
.and(isPublic())
32+
isPublic()
3533
.and(named("handle"))
3634
.and(takesArgument(0, named("org.springframework.web.server.ServerWebExchange")))
3735
.and(takesArguments(1)),
38-
this.getClass().getName() + "$HandleAdvice");
36+
getClass().getName() + "$HandleAdvice");
3937
transformer.applyAdviceToMethod(
40-
isMethod()
41-
.and(named("handleResult"))
38+
named("handleResult")
4239
.and(takesArgument(0, named("org.springframework.web.server.ServerWebExchange"))),
43-
this.getClass().getName() + "$HandleResultAdvice");
40+
getClass().getName() + "$HandleResultAdvice");
4441
}
4542

4643
@SuppressWarnings("unused")

‎instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/HandlerAdapterInstrumentation.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import static io.opentelemetry.javaagent.instrumentation.spring.webflux.v5_0.server.WebfluxSingletons.httpRouteGetter;
1111
import static io.opentelemetry.javaagent.instrumentation.spring.webflux.v5_0.server.WebfluxSingletons.instrumenter;
1212
import static net.bytebuddy.matcher.ElementMatchers.isAbstract;
13-
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
1413
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
1514
import static net.bytebuddy.matcher.ElementMatchers.named;
1615
import static net.bytebuddy.matcher.ElementMatchers.not;
@@ -48,13 +47,12 @@ public ElementMatcher<TypeDescription> typeMatcher() {
4847
@Override
4948
public void transform(TypeTransformer transformer) {
5049
transformer.applyAdviceToMethod(
51-
isMethod()
52-
.and(isPublic())
50+
isPublic()
5351
.and(named("handle"))
5452
.and(takesArgument(0, named("org.springframework.web.server.ServerWebExchange")))
5553
.and(takesArgument(1, Object.class))
5654
.and(takesArguments(2)),
57-
this.getClass().getName() + "$HandleAdvice");
55+
getClass().getName() + "$HandleAdvice");
5856
}
5957

6058
@SuppressWarnings("unused")

‎instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/HandlerCodeAttributesGetter.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
66
package io.opentelemetry.javaagent.instrumentation.spring.webflux.v5_0.server;
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter;
9-
import javax.annotation.Nullable;
109
import org.springframework.web.method.HandlerMethod;
1110

1211
public class HandlerCodeAttributesGetter implements CodeAttributesGetter<Object> {
13-
@Nullable
1412
@Override
1513
public Class<?> getCodeClass(Object handler) {
1614
if (handler instanceof HandlerMethod) {
@@ -22,7 +20,6 @@ public Class<?> getCodeClass(Object handler) {
2220
}
2321
}
2422

25-
@Nullable
2623
@Override
2724
public String getMethodName(Object handler) {
2825
if (handler instanceof HandlerMethod) {

‎instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/RouterFunctionInstrumentation.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
1010
import static net.bytebuddy.matcher.ElementMatchers.isAbstract;
11-
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
1211
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
1312
import static net.bytebuddy.matcher.ElementMatchers.named;
1413
import static net.bytebuddy.matcher.ElementMatchers.not;
@@ -45,14 +44,13 @@ public ElementMatcher<TypeDescription> typeMatcher() {
4544
@Override
4645
public void transform(TypeTransformer transformer) {
4746
transformer.applyAdviceToMethod(
48-
isMethod()
49-
.and(isPublic())
47+
isPublic()
5048
.and(named("route"))
5149
.and(
5250
takesArgument(
5351
0, named("org.springframework.web.reactive.function.server.ServerRequest")))
5452
.and(takesArguments(1)),
55-
this.getClass().getName() + "$RouteAdvice");
53+
getClass().getName() + "$RouteAdvice");
5654
}
5755

5856
/**

‎instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/reactornetty/ContextHandlerInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
3030
public void transform(TypeTransformer transformer) {
3131
transformer.applyAdviceToMethod(
3232
named("createOperations").and(takesArgument(0, named("io.netty.channel.Channel"))),
33-
ContextHandlerInstrumentation.class.getName() + "$CreateOperationsAdvice");
33+
getClass().getName() + "$CreateOperationsAdvice");
3434
}
3535

3636
@SuppressWarnings("unused")

‎instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/reactornetty/HttpTrafficHandlerInstrumentation.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
2929
@Override
3030
public void transform(TypeTransformer transformer) {
3131
transformer.applyAdviceToMethod(
32-
named("run").and(takesNoArguments()),
33-
HttpTrafficHandlerInstrumentation.class.getName() + "$RunAdvice");
32+
named("run").and(takesNoArguments()), getClass().getName() + "$RunAdvice");
3433
}
3534

3635
@SuppressWarnings("unused")

‎instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/base/ServerTestRouteFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.springframework.web.reactive.function.server.ServerResponse.BodyBuilder;
2020
import reactor.core.publisher.Mono;
2121

22-
public abstract class ServerTestRouteFactory {
22+
abstract class ServerTestRouteFactory {
2323
public RouterFunction<ServerResponse> createRoutes() {
2424
return route(
2525
GET("/success"),

0 commit comments

Comments
 (0)