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

Spring Cloud Sleuth is treating comma separated Stream headers in an invalid way

Browse Source 
without this change when you pass Stream message headers that are comma separated, Sleuth fails to add proper binding properties for them
with this change we try to first split the headers (assuming that they might be comma based) and then we generate the proper header binding properties

fixes #742
This commit is contained in:
Marcin Grzejszczak
2017-10-16 09:53:34 +02:00
parent 5ec3ca53bf
commit 9ec8283101
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,11 @@ public class StreamEnvironmentPostProcessor implements EnvironmentPostProcessor
private int findStartIndex(ConfigurableEnvironment environment, String binder) {
String prefix = "spring.cloud.stream." + binder + ".binder.headers";
int i = 0;
while (environment.getProperty(prefix + "[" + i + "]")!=null) {
String oldHeaders = environment.getProperty(prefix);
if (oldHeaders != null) {
i = oldHeaders.split(",").length;
}
while (environment.getProperty(prefix + "[" + i + "]") != null) {
i++;
}
return i;

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

@@ -16,6 +16,8 @@
package org.springframework.cloud.sleuth.stream;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Collection;
import java.util.Map;
import java.util.stream.Collectors;
@@ -27,8 +29,6 @@ import org.springframework.cloud.sleuth.instrument.messaging.TraceMessageHeaders
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.StandardEnvironment;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Dave Syer
*
@@ -57,6 +57,16 @@ public class StreamEnvironmentPostProcessorTests {
.isEqualTo(TraceMessageHeaders.SPAN_ID_NAME);
}
@Test
public void should_append_tracing_headers_to_existing_ones_in_single_line() {
EnvironmentTestUtils.addEnvironment(this.environment,
"spring.cloud.stream.test.binder.headers=foo,bar");
postProcess();
assertThat(this.environment
.getProperty("spring.cloud.stream.test.binder.headers[2]"))
.isEqualTo(TraceMessageHeaders.SPAN_ID_NAME);
}
@Test
public void should_not_append_tracing_headers_if_they_are_already_appended() {
postProcess();