diff --git a/roxie/ccd/ccdlistener.cpp b/roxie/ccd/ccdlistener.cpp
index a0c014358b6..45eca11ab9a 100644
--- a/roxie/ccd/ccdlistener.cpp
+++ b/roxie/ccd/ccdlistener.cpp
@@ -1566,12 +1566,8 @@ class RoxieProtocolMsgContext : implements IHpccProtocolMsgContext, public CInte
 
         ensureContextLogger();
 
-        const char * spanQueryName = !isEmptyString(queryName) ? queryName : "run_query";
-        StringBuffer spanName(querySetName);
-        if (spanName.length())
-            spanName.append('/');
-        spanName.append(spanQueryName);
-        requestSpan.setown(queryTraceManager().createServerSpan(spanName, allHeaders, flags));
+        requestSpan.setown(queryTraceManager().createServerSpan(!isEmptyString(queryName) ? queryName : "run_query", allHeaders, flags));
+        requestSpan->setSpanAttribute("queryset.name", querySetName);
         logctx->setActiveSpan(requestSpan);
 
         const char * globalId = requestSpan->queryGlobalId();