From 802fbb63a681dbc0a230cdce3bed06edbd935f04 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 26 May 2017 19:30:16 +0200 Subject: [PATCH] Added a NPE check for trace web aspect without this change if there's no tracing an NPE is thrown in TraceWebAspect fixes #596 --- .../cloud/sleuth/instrument/web/TraceWebAspect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java index 1950c495f..edd70abde 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java @@ -144,7 +144,7 @@ public class TraceWebAspect { HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Throwable { Span currentSpan = this.tracer.getCurrentSpan(); try { - if (!currentSpan.tags().containsKey(Span.SPAN_ERROR_TAG_NAME)) { + if (currentSpan != null && !currentSpan.tags().containsKey(Span.SPAN_ERROR_TAG_NAME)) { this.tracer.addTag(Span.SPAN_ERROR_TAG_NAME, ExceptionUtils.getExceptionMessage(ex)); } return pjp.proceed();