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

Merge branch 'master' into 2.0.x

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-08-25 12:04:41 +02:00
parent 76d7dfb5b3 b83caf4ac0
commit db5e16f998
36 changed files with 92 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ import org.springframework.core.io.support.PropertiesLoaderUtils;
public class StreamEnvironmentPostProcessor implements EnvironmentPostProcessor {
private static final String PROPERTY_SOURCE_NAME = "defaultProperties";
static String[] headers = new String[] { TraceMessageHeaders.SPAN_ID_NAME,
static final String[] HEADERS = new String[] { TraceMessageHeaders.SPAN_ID_NAME,
TraceMessageHeaders.TRACE_ID_NAME, TraceMessageHeaders.PARENT_ID_NAME, TraceMessageHeaders.PROCESS_ID_NAME,
TraceMessageHeaders.SAMPLED_NAME, TraceMessageHeaders.SPAN_NAME_NAME };
@@ -82,7 +82,7 @@ public class StreamEnvironmentPostProcessor implements EnvironmentPostProcessor
}
private int findStartIndex(ConfigurableEnvironment environment, String binder) {
String prefix = "spring.cloud.stream." + binder + ".binder.headers";
String prefix = "spring.cloud.stream." + binder + ".binder.HEADERS";
int i = 0;
while (environment.getProperty(prefix + "[" + i + "]")!=null) {
i++;
@@ -127,10 +127,10 @@ public class StreamEnvironmentPostProcessor implements EnvironmentPostProcessor
private void addHeaders(Map<String, Object> map, MutablePropertySources propertySources,
String binder, int startIndex) {
String stem = "spring.cloud.stream." + binder + ".binder.headers";
for (int i = 0; i < headers.length; i++) {
if (!hasTracingHeadersValue(propertySources, headers[i])) {
map.put(stem + "[" + (i + startIndex) + "]", headers[i]);
String stem = "spring.cloud.stream." + binder + ".binder.HEADERS";
for (int i = 0; i < HEADERS.length; i++) {
if (!hasTracingHeadersValue(propertySources, HEADERS[i])) {
map.put(stem + "[" + (i + startIndex) + "]", HEADERS[i]);
}
}
}

12
spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamEnvironmentPostProcessorTests.java
View File

@@ -42,18 +42,18 @@ public class StreamEnvironmentPostProcessorTests {
public void should_append_tracing_headers() {
postProcess();
assertThat(this.environment
.getProperty("spring.cloud.stream.test.binder.headers[0]"))
.getProperty("spring.cloud.stream.test.binder.HEADERS[0]"))
.isEqualTo(TraceMessageHeaders.SPAN_ID_NAME);
}
@Test
public void should_append_tracing_headers_to_existing_ones() {
EnvironmentTestUtils.addEnvironment(this.environment,
"spring.cloud.stream.test.binder.headers[0]=X-Custom",
"spring.cloud.stream.test.binder.headers[1]=X-Mine");
"spring.cloud.stream.test.binder.HEADERS[0]=X-Custom",
"spring.cloud.stream.test.binder.HEADERS[1]=X-Mine");
postProcess();
assertThat(this.environment
.getProperty("spring.cloud.stream.test.binder.headers[2]"))
.getProperty("spring.cloud.stream.test.binder.HEADERS[2]"))
.isEqualTo(TraceMessageHeaders.SPAN_ID_NAME);
}
@@ -71,9 +71,9 @@ public class StreamEnvironmentPostProcessorTests {
assertThat(traceIds).hasSize(1);
assertThat(defaultPropertiesSource().keySet().stream()
.filter(input -> input
.startsWith("spring.cloud.stream.test.binder.headers"))
.startsWith("spring.cloud.stream.test.binder.HEADERS"))
.collect(Collectors.toList()))
.hasSize(StreamEnvironmentPostProcessor.headers.length);
.hasSize(StreamEnvironmentPostProcessor.HEADERS.length);
}
private void postProcess() {