Skip to content

Commit 0c0e37f

Browse files
committed
add nullaway to new module
1 parent 5bf09b1 commit 0c0e37f

File tree

2 files changed

+3
-8
lines changed
  • instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webmvc-4.3/javaagent

2 files changed

+3
-8
lines changed

instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webmvc-4.3/javaagent/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id("otel.javaagent-instrumentation")
3+
id("otel.nullaway-conventions")
34
}
45

56
muzzle {

instrumentation/spring/spring-cloud-gateway/spring-cloud-gateway-webmvc-4.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/gateway/webmvc/v5_0/ServerRequestHelper.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan;
1414
import io.opentelemetry.javaagent.instrumentation.spring.gateway.common.GatewayRouteHelper;
1515
import java.lang.reflect.Field;
16+
import javax.annotation.Nullable;
1617
import org.springframework.cloud.gateway.server.mvc.common.MvcUtils;
1718
import org.springframework.cloud.gateway.server.mvc.handler.GatewayDelegatingRouterFunction;
1819
import org.springframework.web.servlet.function.ServerRequest;
@@ -22,7 +23,7 @@
2223
* ServerRequest and adding it to spans.
2324
*/
2425
public final class ServerRequestHelper {
25-
private static final Field routeIdField;
26+
@Nullable private static final Field routeIdField;
2627

2728
static {
2829
Field routeIdField1 = null;
@@ -47,11 +48,6 @@ public static void extractAttributes(
4748
return;
4849
}
4950

50-
setRouteIdAttribute(gatewayRouterFunction, serverSpan);
51-
setRouteUriAttribute(request, serverSpan);
52-
}
53-
54-
private static void setRouteIdAttribute(Object gatewayRouterFunction, Span serverSpan) {
5551
try {
5652
String routeId = (String) routeIdField.get(gatewayRouterFunction);
5753
String convergedRouteId = GatewayRouteHelper.convergeRouteId(routeId);
@@ -61,9 +57,7 @@ private static void setRouteIdAttribute(Object gatewayRouterFunction, Span serve
6157
} catch (Exception e) {
6258
// Silently ignore
6359
}
64-
}
6560

66-
private static void setRouteUriAttribute(ServerRequest request, Span serverSpan) {
6761
request
6862
.attribute(MvcUtils.GATEWAY_REQUEST_URL_ATTR)
6963
.ifPresent(uri -> serverSpan.setAttribute(ROUTE_URI_ATTRIBUTE, uri.toString()));

0 commit comments

Comments
 (0)