HPCC-33574 ActiveSpanScope false error message due to null spans

jpmcmu · jpmcmu · commit d0fc74be73e1 · 2025-04-02T09:06:21.000-04:00
- Modified ActiveSpanScope to convert nullptr to the cNullSpan

Signed-off-by: James McMullan James.McMullan@lexisnexis.com
diff --git a/system/jlib/jtrace.cpp b/system/jlib/jtrace.cpp
@@ -1585,7 +1585,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
`@@ -1585,7 +1585,10 @@ ISpan * CTraceManager::createServerSpan(const char * name, const IProperties * h`
`1585`	`1585`	`ActiveSpanScope::ActiveSpanScope(ISpan * _ptr) : ActiveSpanScope(_ptr, queryThreadedActiveSpan()) {}`
`1586`	`1586`	`ActiveSpanScope::ActiveSpanScope(ISpan * _ptr, ISpan * _prev) : span(_ptr), prevSpan(_prev)`
`1587`	`1587`	`{`
`1588`		`- setThreadedActiveSpan(_ptr);`
	`1588`	`+ if (span == nullptr)`
	`1589`	`+ span = queryNullSpan();`
	`1590`	`+`
	`1591`	`+ setThreadedActiveSpan(span);`
`1589`	`1592`	`}`
`1590`	`1593`
`1591`	`1594`	`ActiveSpanScope::~ActiveSpanScope()`