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

Ensure Feign is sending complete set of headers

Browse Source 
Otherwise the span name is null and the downstream services can't
log the server annotations.

Fixes gh-38
This commit is contained in:
Dave Syer
2015-09-07 12:56:34 +01:00
parent f7930a10aa
commit 0b77e8abdd
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
View File

@@ -64,7 +64,7 @@ public class TraceWebAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public FilterRegistrationBean traceFilter(ApplicationEventPublisher publisher) {
public FilterRegistrationBean traceWebFilter(ApplicationEventPublisher publisher) {
Pattern pattern = StringUtils.hasText(this.skipPattern) ? Pattern.compile(this.skipPattern)
: TraceFilter.DEFAULT_SKIP_PATTERN;
TraceFilter filter = new TraceFilter(this.trace, pattern);

10
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceFeignClientAutoConfiguration.java
View File

@@ -17,10 +17,7 @@
package org.springframework.cloud.sleuth.instrument.web.client;
import static java.util.Collections.singletonList;
import static org.springframework.cloud.sleuth.Trace.NOT_SAMPLED_NAME;
import static org.springframework.cloud.sleuth.Trace.PARENT_ID_NAME;
import static org.springframework.cloud.sleuth.Trace.SPAN_ID_NAME;
import static org.springframework.cloud.sleuth.Trace.TRACE_ID_NAME;
import static org.springframework.cloud.sleuth.Trace.*;
import static org.springframework.cloud.sleuth.TraceContextHolder.getCurrentSpan;
import static org.springframework.cloud.sleuth.TraceContextHolder.isTracing;
@@ -97,10 +94,13 @@ public class TraceFeignClientAutoConfiguration {
Span span = getCurrentSpan();
if (span != null) {
template.header(TRACE_ID_NAME, span.getTraceId());
setHeader(template, TRACE_ID_NAME, span.getTraceId());
setHeader(template, SPAN_NAME_NAME, span.getName());
setHeader(template, SPAN_ID_NAME, span.getSpanId());
setHeader(template, PARENT_ID_NAME, getParentId(span));
setHeader(template, PROCESS_ID_NAME, span.getProcessId());
publish(new ClientSentEvent(this, span));
} else {
setHeader(template, NOT_SAMPLED_NAME, "");
}
}
};