Handle possible NPE

wso2 · Aug 20, 2024 · ca31ff3 · ca31ff3
1 parent e9c67ab
commit ca31ff3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...e/aspects/flow/statistics/tracing/opentelemetry/management/handling/span/SpanHandler.java b/...e/aspects/flow/statistics/tracing/opentelemetry/management/handling/span/SpanHandler.java
@@ -214,8 +214,10 @@ private void startSpan(StatisticDataUnit statisticDataUnit, MessageContext synCt
         if (isOuterLevelSpan(statisticDataUnit, spanStore)) {
             // Extract span context from headers
             context = extract(headersMap);
-        } else {
+        } else if (parentSpan != null) {
             context = Context.current().with(parentSpan);
+        } else {
+            context = Context.current();
         }
         span = tracer.spanBuilder(statisticDataUnit.getComponentName()).setParent(context).startSpan();