Merge ab4d13a into d3f688d

apache · Oct 22, 2023 · 97c99de · 97c99de
2 parents d3f688d + ab4d13a
commit 97c99de
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/Trace.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/trace/Trace.java
@@ -22,6 +22,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -111,7 +112,17 @@ public Span addTraceInfoToSpan(ChannelHandlerContext ctx, CloudEvent cloudEvent)
         }
         Context context = ctx.channel().attr(AttributeKeys.SERVER_CONTEXT).get();
         Span span = context != null ? context.get(SpanKey.SERVER_KEY) : null;
-        return addTraceInfoToSpan(span, cloudEvent);
+
+        if (span == null) {
+            log.warn("span is null when finishSpan");
+            return null;
+        }
+
+        //add trace info
+        for (String entry : cloudEvent.getExtensionNames()) {
+            span.setAttribute(entry, cloudEvent.getExtension(entry) == null ? "" : Objects.requireNonNull(cloudEvent.getExtension(entry)).toString());
+        }
+        return span;
     }
 
     public Span addTraceInfoToSpan(Span span, CloudEvent cloudEvent) {
@@ -130,7 +141,7 @@ public Span addTraceInfoToSpan(Span span, CloudEvent cloudEvent) {
 
         // add trace info
         for (String entry : cloudEvent.getExtensionNames()) {
-            span.setAttribute(entry, cloudEvent.getExtension(entry) == null ? "" : cloudEvent.getExtension(entry).toString());
+            span.setAttribute(entry, cloudEvent.getExtension(entry) != null ? cloudEvent.getExtension(entry).toString() : "");
         }
         return span;
     }