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

Polish

Browse Source
This commit is contained in:
Marcin Grzejszczak
2016-11-04 13:09:36 +01:00
parent 83012a5aa6
commit 6f24c8866c
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,16 +71,14 @@ public class ZipkinHttpSpanExtractor implements HttpSpanExtractor {
String parentName = carrier.get(Span.SPAN_NAME_NAME);
if (StringUtils.hasText(parentName)) {
span.name(parentName);
}
else {
} else {
span.name(HTTP_COMPONENT + ":/parent" + uri);
}
if (StringUtils.hasText(processId)) {
span.processId(processId);
}
if (carrier.containsKey(Span.PARENT_ID_NAME)) {
span.parent(Span
.hexToId(carrier.get(Span.PARENT_ID_NAME)));
span.parent(Span.hexToId(carrier.get(Span.PARENT_ID_NAME)));
}
span.remote(true);
if (skip) {

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

@@ -1,7 +1,5 @@
package org.springframework.cloud.sleuth.instrument.web;
import java.util.Map;
import org.springframework.cloud.sleuth.HttpSpanInjector;
import org.springframework.cloud.sleuth.Span;
import org.springframework.cloud.sleuth.SpanTextMap;
@@ -30,7 +28,7 @@ public class ZipkinHttpSpanInjector implements HttpSpanInjector {
}
private void setHeader(SpanTextMap carrier, String name, String value) {
if (StringUtils.hasText(value) && !entryPresent(carrier, name)) {
if (StringUtils.hasText(value)) {
carrier.put(name, value);
}
}
@@ -41,13 +39,4 @@ public class ZipkinHttpSpanInjector implements HttpSpanInjector {
}
}
private boolean entryPresent(SpanTextMap carrier, String name) {
for (Map.Entry<String, String> entry : carrier) {
if (entry.getKey().equals(name)) {
return true;
}
}
return false;
}
}