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

Customizable headers

Browse Source 
* Fixed the HttpServlet extractors
    (now the response can contain custom headers)
    * Changed header names to be Zipkin compatible
    * removed qualifiers and properties
    * updated the docs

fixes #19
This commit is contained in:
Marcin Grzejszczak
2016-03-16 16:10:28 +01:00
parent 7c5af8c84e
commit 3bb7916fff
34 changed files with 400 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/ServerPropertiesHostLocator.java
View File

@@ -26,7 +26,7 @@ import org.springframework.util.Assert;
* A {@link HostLocator} that retrieves:
*
* <ul>
* <li><b>service name</b> - either from {@link span#getProcessId()} or current application name</li>
* <li><b>service name</b> - either from {@link Span#getProcessId()} or current application name</li>
* <li><b>address</b> - from {@link ServerProperties}</li>
* <li><b>port</b> - from lazily assigned port or {@link ServerProperties}</li>
* </ul>

2
spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/StreamEnvironmentPostProcessor.java
View File

@@ -49,7 +49,7 @@ public class StreamEnvironmentPostProcessor implements EnvironmentPostProcessor
private static final String PROPERTY_SOURCE_NAME = "defaultProperties";
private static String[] headers = new String[] { Span.SPAN_ID_NAME,
Span.TRACE_ID_NAME, Span.PARENT_ID_NAME, Span.PROCESS_ID_NAME,
Span.NOT_SAMPLED_NAME, Span.SPAN_NAME_NAME };
Span.SAMPLED_NAME, Span.SPAN_NAME_NAME };
@Override
public void postProcessEnvironment(ConfigurableEnvironment environment,

2
spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/TracerIgnoringChannelInterceptor.java
View File

@@ -43,7 +43,7 @@ class TracerIgnoringChannelInterceptor extends ChannelInterceptorAdapter {
@Override
public Message<?> preSend(Message<?> message, MessageChannel channel) {
return MessageBuilder.fromMessage(message)
.setHeader(Span.NOT_SAMPLED_NAME, "true").build();
.setHeader(Span.SAMPLED_NAME, Span.SPAN_NOT_SAMPLED).build();
}
@Override

4
spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/TracerIgnoringChannelInterceptorTest.java
View File

@@ -49,8 +49,8 @@ public class TracerIgnoringChannelInterceptorTest {
Message interceptedMessage = this.tracerIgnoringChannelInterceptor.preSend(message, this.messageChannel);
then(interceptedMessage.getHeaders().containsKey(
Span.NOT_SAMPLED_NAME)).isTrue();
then(interceptedMessage.getHeaders().get(
Span.SAMPLED_NAME)).isEqualTo(Span.SPAN_NOT_SAMPLED);
}
@Test