SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stopped setting CS in pre zuul filter; fixes gh-849

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-02-14 14:33:18 +01:00
parent 1c1aca667a
commit 91d1bf89aa
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/zuul/TracePreZuulFilter.java
View File

@@ -71,7 +71,6 @@ public class TracePreZuulFilter extends ZuulFilter {
@Override
public Object run() {
getCurrentSpan().logEvent(Span.CLIENT_SEND);
return null;
}

10
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/zuul/TracePreZuulFilterTests.java
View File

@@ -16,6 +16,10 @@
package org.springframework.cloud.sleuth.instrument.zuul;
import java.util.Random;
import java.util.concurrent.atomic.AtomicReference;
import javax.servlet.http.HttpServletRequest;
import com.netflix.zuul.context.RequestContext;
import com.netflix.zuul.monitoring.MonitoringHelper;
import org.junit.After;
@@ -38,10 +42,6 @@ import org.springframework.cloud.sleuth.sampler.NeverSampler;
import org.springframework.cloud.sleuth.trace.DefaultTracer;
import org.springframework.cloud.sleuth.trace.TestSpanContextHolder;
import javax.servlet.http.HttpServletRequest;
import java.util.Random;
import java.util.concurrent.atomic.AtomicReference;
import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then;
/**
@@ -118,7 +118,6 @@ public class TracePreZuulFilterTests {
}.runFilter();
then(startedSpan).isNotEqualTo(span.get());
then(span.get().logs()).extracting("event").contains(Span.CLIENT_SEND);
then(span.get()).hasATag("http.method", "GET");
then(span.get()).hasATag("error", "foo");
then(this.tracer.getCurrentSpan()).isEqualTo(startedSpan);
@@ -139,7 +138,6 @@ public class TracePreZuulFilterTests {
}.runFilter();
then(startedSpan).isNotEqualTo(span.get());
then(span.get().logs()).extracting("event").contains(Span.CLIENT_SEND);
then(span.get().tags()).containsKey(Span.SPAN_LOCAL_COMPONENT_TAG_NAME);
then(this.tracer.getCurrentSpan()).isEqualTo(span.get());
}