Skip to content

Commit 2107d0f

Browse files
Ashish AggarwalAshish Aggarwal
authored andcommitted
various fixes for null parentId
1 parent 74a2b93 commit 2107d0f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

core/src/main/java/com/expedia/www/haystack/client/propagation/TextMapCodex.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ public class TextMapCodex implements Codex<String,Object> {
2323

2424
@Override
2525
public String encode(Object value) {
26-
return value.toString();
26+
return value == null ? null : value.toString();
2727
}
2828

2929
@Override
3030
public String decode(Object value) {
31-
return value.toString();
31+
return value == null ? null : value.toString();
3232
}
3333
}

core/src/main/java/com/expedia/www/haystack/client/propagation/TextMapPropagator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public SpanContext extract(TextMap carrier) {
106106

107107
SpanContext context = new SpanContext(UUID.fromString(traceId),
108108
UUID.fromString(spanId),
109-
UUID.fromString(parentId));
109+
parentId == null ? null : UUID.fromString(parentId));
110110
return context.addBaggage(baggage);
111111
}
112112

0 commit comments

Comments
 (0)