Skip to content

Commit 289c1c1

Browse files
committed
add nullaway to spring
1 parent c6b1390 commit 289c1c1

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/semconv/http/HttpServerRoute.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ private HttpServerRoute() {}
5757
* strictly lower priority than the provided {@link HttpServerRouteSource}, and the passed value
5858
* is non-null.
5959
*/
60-
public static void update(Context context, HttpServerRouteSource source,
61-
@Nullable String httpRoute) {
60+
public static void update(
61+
Context context, HttpServerRouteSource source, @Nullable String httpRoute) {
6262
update(context, source, ConstantAdapter.INSTANCE, httpRoute);
6363
}
6464

instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/JakartaHttpServletRequestGetter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import io.opentelemetry.context.propagation.TextMapGetter;
99
import io.opentelemetry.instrumentation.api.internal.EnumerationUtil;
1010
import jakarta.servlet.http.HttpServletRequest;
11-
import javax.annotation.Nullable;
1211
import java.util.Collections;
1312
import java.util.Iterator;
13+
import javax.annotation.Nullable;
1414

1515
enum JakartaHttpServletRequestGetter implements TextMapGetter<HttpServletRequest> {
1616
INSTANCE;

instrumentation/spring/spring-ws-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/ws/v2_0/AnnotatedMethodInstrumentation.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ public static class AdviceScope {
5959
@Nullable private final Scope scope;
6060

6161
private AdviceScope(
62-
CallDepth callDepth, @Nullable SpringWsRequest request, @Nullable Context context, @Nullable Scope scope) {
62+
CallDepth callDepth,
63+
@Nullable SpringWsRequest request,
64+
@Nullable Context context,
65+
@Nullable Scope scope) {
6366
this.callDepth = callDepth;
6467
this.request = request;
6568
this.context = context;

0 commit comments

Comments
 (0)