From 6f24c8866c3b1ef4e5c3e7a646573fa9a8522c17 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 4 Nov 2016 13:09:36 +0100 Subject: [PATCH] Polish --- .../instrument/web/ZipkinHttpSpanExtractor.java | 6 ++---- .../instrument/web/ZipkinHttpSpanInjector.java | 13 +------------ 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/ZipkinHttpSpanExtractor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/ZipkinHttpSpanExtractor.java index caaca81c1..a889be6a2 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/ZipkinHttpSpanExtractor.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/ZipkinHttpSpanExtractor.java @@ -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) { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/ZipkinHttpSpanInjector.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/ZipkinHttpSpanInjector.java index 8b19df931..a70c49177 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/ZipkinHttpSpanInjector.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/ZipkinHttpSpanInjector.java @@ -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 entry : carrier) { - if (entry.getKey().equals(name)) { - return true; - } - } - return false; - } - }