Merge pull request #19600 from jpmcmu/HPCC-33574

ghalliday · web-flow · commit 52fb30c22900 · 2025-04-03T10:24:46.000+01:00
HPCC-33574 ActiveSpanScope false error message due to null spans

Reviewed-by: Gavin Halliday &lt;ghalliday@hpccsystems.com&gt;
Merged-by: Gavin Halliday &lt;ghalliday@hpccsystems.com&gt;
diff --git a/system/jlib/jtrace.cpp b/system/jlib/jtrace.cpp
@@ -1648,7 +1648,10 @@ ISpan * CTraceManager::createServerSpan(const char * name, const IProperties * h
 ActiveSpanScope::ActiveSpanScope(ISpan * _ptr) : ActiveSpanScope(_ptr, queryThreadedActiveSpan()) {}
 ActiveSpanScope::ActiveSpanScope(ISpan * _ptr, ISpan * _prev) : span(_ptr), prevSpan(_prev)
 {
-    setThreadedActiveSpan(_ptr);
+    if (span == nullptr)
+        span = queryNullSpan();
+
+    setThreadedActiveSpan(span);
 }
 
 ActiveSpanScope::~ActiveSpanScope()

Original file line number	Diff line number	Diff line change
`@@ -1648,7 +1648,10 @@ ISpan * CTraceManager::createServerSpan(const char * name, const IProperties * h`
`1648`	`1648`	`ActiveSpanScope::ActiveSpanScope(ISpan * _ptr) : ActiveSpanScope(_ptr, queryThreadedActiveSpan()) {}`
`1649`	`1649`	`ActiveSpanScope::ActiveSpanScope(ISpan * _ptr, ISpan * _prev) : span(_ptr), prevSpan(_prev)`
`1650`	`1650`	`{`
`1651`		`- setThreadedActiveSpan(_ptr);`
	`1651`	`+ if (span == nullptr)`
	`1652`	`+ span = queryNullSpan();`
	`1653`	`+`
	`1654`	`+ setThreadedActiveSpan(span);`
`1652`	`1655`	`}`
`1653`	`1656`
`1654`	`1657`	`ActiveSpanScope::~ActiveSpanScope()`