Merge pull request #551 from zalando/fix_npe

fix NullPointerException
zalando · Apr 26, 2021 · 3d11a7a · 3d11a7a
2 parents 314c659 + 9f9e135
commit 3d11a7a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/...on/src/main/java/org/zalando/opentracing/spring/webflux/extension/ErrorSpanDecorator.java b/...on/src/main/java/org/zalando/opentracing/spring/webflux/extension/ErrorSpanDecorator.java
@@ -1,19 +1,19 @@
 package org.zalando.opentracing.spring.webflux.extension;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Predicate;
+
 import io.opentracing.Span;
 import io.opentracing.log.Fields;
 import io.opentracing.tag.Tags;
 import lombok.AllArgsConstructor;
 import org.apiguardian.api.API;
+import static org.apiguardian.api.API.Status.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.server.ServerWebExchange;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Predicate;
-
-import static org.apiguardian.api.API.Status.EXPERIMENTAL;
-
 @API(status = EXPERIMENTAL)
 @AllArgsConstructor
 public final class ErrorSpanDecorator
@@ -30,7 +30,8 @@ public void onResponse(
             final ServerWebExchange exchange,
             final Span span) {
 
-        if (predicate.test(exchange.getResponse().getStatusCode())) {
+        HttpStatus statusCode = exchange.getResponse().getStatusCode();
+        if (statusCode == null || predicate.test(statusCode)) {
             span.setTag(Tags.ERROR, true);
         }
     }

diff --git a/...rc/test/java/org/zalando/opentracing/spring/webflux/extension/ErrorSpanDecoratorTest.java b/...rc/test/java/org/zalando/opentracing/spring/webflux/extension/ErrorSpanDecoratorTest.java
@@ -0,0 +1,23 @@
+package org.zalando.opentracing.spring.webflux.extension;
+
+import io.opentracing.mock.MockSpan;
+import io.opentracing.mock.MockTracer;
+import static org.assertj.core.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import static org.mockito.Mockito.*;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.web.server.ServerWebExchange;
+
+class ErrorSpanDecoratorTest {
+
+    @Test
+    void onTagNullStatusCode() {
+        ServerWebExchange exchange = mock(ServerWebExchange.class);
+        when(exchange.getResponse()).thenReturn(mock(ServerHttpResponse.class));
+
+        MockSpan span = new MockTracer().buildSpan("span").start();
+        new ErrorSpanDecorator().onResponse(exchange, span);
+
+        assertThat(span.tags().get("error")).isEqualTo(true);
+    }
+}