starting to move to zipkin model by default
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/FinishedSpan.java b/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/FinishedSpan.java
index 6349ee7..c707d27 100644
--- a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/FinishedSpan.java
+++ b/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/FinishedSpan.java
@@ -21,7 +21,7 @@
public class FinishedSpan {
private final Span span;
- FinishedSpan(final Span span) {
+ public FinishedSpan(final Span span) {
this.span = span;
}
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/GeronimoTracer.java b/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/GeronimoTracer.java
index c6d839e..791144e 100644
--- a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/GeronimoTracer.java
+++ b/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/GeronimoTracer.java
@@ -73,8 +73,8 @@
}
final TextMap textMap = TextMap.class.cast(carrier);
final SpanContextImpl context = SpanContextImpl.class.cast(spanContext);
- textMap.put("traceid", String.valueOf(context.getTraceId()));
- textMap.put("spanid", String.valueOf(context.getSpanId()));
+ textMap.put("X-B3-TraceId", String.valueOf(context.getTraceId()));
+ textMap.put("X-B3-SpanId", String.valueOf(context.getSpanId()));
context.getBaggageItems().forEach((k, v) -> textMap.put("baggage-" + k, v));
}
@@ -82,8 +82,8 @@
public <C> SpanContext extract(final Format<C> format, final C carrier) {
if (HeaderTextMap.class.isInstance(carrier)) {
final MultivaluedMap<String, ?> map = HeaderTextMap.class.cast(carrier).getMap();
- final String traceid = (String) map.getFirst("traceid");
- final String spanid = (String) map.getFirst("spanid");
+ final String traceid = (String) map.getFirst("X-B3-TraceId");
+ final String spanid = (String) map.getFirst("X-B3-SpanId");
if (traceid != null && spanid != null) {
return newContext(traceid, spanid, map.keySet().stream().filter(it -> it.startsWith("baggage-"))
.collect(toMap(identity(), k -> String.valueOf(map.getFirst(k)))));
@@ -101,9 +101,9 @@
final Map.Entry<String, String> next = textMap.next();
if (next.getKey().startsWith("baggage-")) {
baggages.put(next.getKey(), next.getValue());
- } else if ("spanid".equals(next.getKey())) {
+ } else if ("X-B3-SpanId".equals(next.getKey())) {
spanId = next.getValue();
- } else if ("traceid".equals(next.getKey())) {
+ } else if ("X-B3-TracedId".equals(next.getKey())) {
traceId = next.getValue();
}
}
diff --git a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanImpl.java b/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanImpl.java
index f2316a7..3d4a60f 100644
--- a/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanImpl.java
+++ b/geronimo-opentracing-impl/src/main/java/org/apache/geronimo/microprofile/opentracing/impl/SpanImpl.java
@@ -26,6 +26,7 @@
import io.opentracing.Span;
import io.opentracing.SpanContext;
+import io.opentracing.tag.Tags;
public class SpanImpl implements Span {
@@ -150,32 +151,38 @@
'}';
}
- public Collection<ReferenceImpl> getReferences() {
- return references;
+ public Object getId() {
+ return context.getSpanId();
}
- public Map<String, Object> getTags() {
- return tags;
- }
-
- public SpanContextImpl getContext() {
- return context;
- }
-
- public long getStartTimestamp() {
- return startTimestamp;
+ public Object getTraceId() {
+ return context.getTraceId();
}
public Object getParentId() {
return parentId;
}
- public String getOperationName() {
+ public String getName() {
return operationName;
}
- public long getFinishTimestamp() {
- return finishTimestamp;
+ public long getTimestamp() {
+ return startTimestamp;
+ }
+
+ public long getDuration() {
+ return finishTimestamp - startTimestamp;
+ }
+
+ public String getKind() {
+ return tags.entrySet().stream().filter(it -> Tags.SPAN_KIND.getKey().equals(it.getKey()))
+ .findFirst().map(Map.Entry::getValue)
+ .map(String::valueOf).orElse(null);
+ }
+
+ public Map<String, Object> getTags() {
+ return tags;
}
public Collection<Log> getLogs() {
diff --git a/geronimo-opentracing-impl/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/TckTracer.java b/geronimo-opentracing-impl/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/TckTracer.java
index cf9866d..ac47be2 100644
--- a/geronimo-opentracing-impl/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/TckTracer.java
+++ b/geronimo-opentracing-impl/src/test/java/org/apache/geronimo/microprofile/opentracing/tck/setup/TckTracer.java
@@ -136,15 +136,15 @@
}
public long startMicros() {
- return delegate.getStartTimestamp();
+ return delegate.getTimestamp();
}
public long finishMicros() {
- return delegate.getFinishTimestamp();
+ return delegate.getTimestamp() + delegate.getDuration();
}
public String operationName() {
- return delegate.getOperationName();
+ return delegate.getName();
}
public Object parentId() {
