GERONIMO-6773 sanitize zipkin spans more
diff --git a/geronimo-opentracing-common/src/main/java/org/apache/geronimo/microprofile/opentracing/common/microprofile/zipkin/ZipkinConverter.java b/geronimo-opentracing-common/src/main/java/org/apache/geronimo/microprofile/opentracing/common/microprofile/zipkin/ZipkinConverter.java
index 4238844..f9b21db 100644
--- a/geronimo-opentracing-common/src/main/java/org/apache/geronimo/microprofile/opentracing/common/microprofile/zipkin/ZipkinConverter.java
+++ b/geronimo-opentracing-common/src/main/java/org/apache/geronimo/microprofile/opentracing/common/microprofile/zipkin/ZipkinConverter.java
@@ -96,9 +96,12 @@
final ZipkinSpan zipkin;
if (useV2) {
zipkin = new ZipkinSpan();
+ zipkin.setTags(span.getTags().entrySet().stream().filter(e -> !Tags.SPAN_KIND.getKey().equalsIgnoreCase(e.getKey()))
+ .collect(toMap(Map.Entry::getKey, e -> String.valueOf(e.getValue()))));
} else {
zipkin = new ZipkinV1Span();
((ZipkinV1Span) zipkin).setBinaryAnnotations(toBinaryAnnotations(span.getTags()));
+ zipkin.setAnnotations(toAnnotations(span));
}
if (idGenerator.isCounter()) {
@@ -114,16 +117,11 @@
zipkin.setKind(ofNullable(span.getKind()).map(s -> s.toUpperCase(ROOT)).orElse(null));
zipkin.setTimestamp(span.getTimestamp());
zipkin.setDuration(span.getDuration());
- zipkin.setAnnotations(toAnnotations(span));
-
- zipkin.setTags(span.getTags().entrySet().stream().filter(e -> !Tags.SPAN_KIND.getKey().equalsIgnoreCase(e.getKey()))
- .collect(toMap(Map.Entry::getKey, e -> String.valueOf(e.getValue()))));
if (Tags.SPAN_KIND_CLIENT.equals(String.valueOf(span.getTags().get(Tags.SPAN_KIND.getKey())))) {
zipkin.setRemoteEndpoint(endpoint);
- } else { // server
- zipkin.setLocalEndpoint(endpoint);
}
+ zipkin.setLocalEndpoint(endpoint); // must alway exist
return zipkin;
}
diff --git a/geronimo-opentracing/pom.xml b/geronimo-opentracing/pom.xml
index 0d752b3..7797a8a 100644
--- a/geronimo-opentracing/pom.xml
+++ b/geronimo-opentracing/pom.xml
@@ -126,6 +126,12 @@
<version>2.12.9</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+ <version>3.1.4</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/geronimo-opentracing/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/BasicZipkinTest.java b/geronimo-opentracing/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/BasicZipkinTest.java
index a6b909d..9e160b5 100644
--- a/geronimo-opentracing/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/BasicZipkinTest.java
+++ b/geronimo-opentracing/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/BasicZipkinTest.java
@@ -68,7 +68,6 @@
System.setProperty("geronimo.opentracing.span.converter.zipkin.http.maxSpansIteration","1");
System.setProperty("geronimo.opentracing.span.converter.zipkin.http.bufferSize","1");
System.setProperty("geronimo.opentracing.span.converter.zipkin.http.useV2","true");
-
}
@@ -78,8 +77,6 @@
@Test
@RunAsClient
public void testSimpleService() throws Exception {
- System.out.println(zipkin.httpUrl());
-
Client client = ClientBuilder.newClient();
String url = serviceUrl.toExternalForm() + "hello";
diff --git a/pom.xml b/pom.xml
index a3efbe6..3df18b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>18</version>
+ <version>21</version>
</parent>
<groupId>org.apache.geronimo</groupId>
