HPCC-30403 Code review1

- Removes accidental return statements - Abbreviates logging.cpp logic Signed-off-by: Rodrigo Pastrana <[email protected]>
hpcc-systems · Nov 21, 2023 · 24b8967 · 24b8967
1 parent e706bab
commit 24b8967
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 27 deletions.
diff --git a/common/thorhelper/thorcommon.hpp b/common/thorhelper/thorcommon.hpp
@@ -731,7 +731,7 @@ class CStatsContextLogger : public CSimpleInterfaceOf<IContextLogger>
     }
     virtual void setSpanAttribute(const char *name, const char *value) const override
     {
-        return ::setSpanAttribute(activeSpan, name, value);
+        ::setSpanAttribute(activeSpan, name, value);
     }
     virtual const char *queryGlobalId() const override
     {

diff --git a/plugins/logging/logging.cpp b/plugins/logging/logging.cpp
@@ -125,41 +125,25 @@ LOGGING_API unsigned int LOGGING_CALL logGetElapsedMs(ICodeContext *ctx)
 
 LOGGING_API char * LOGGING_CALL getTraceID(ICodeContext *ctx)
 {
-    StringBuffer ret;
-    Owned<IProperties> httpHeaders = ctx->queryContextLogger().getSpanContext();
-    if (httpHeaders)
-        ret.set(httpHeaders->queryProp("traceID"));
-
+    StringBuffer ret(ctx->queryContextLogger().getSpanContext()->queryProp("traceID"));
     return ret.detach();
 }
 
 LOGGING_API char * LOGGING_CALL getSpanID(ICodeContext *ctx)
 {
-    StringBuffer ret;
-    Owned<IProperties> httpHeaders = ctx->queryContextLogger().getSpanContext();
-    if (httpHeaders)
-        ret.set(httpHeaders->queryProp("spanID"));
-
+    StringBuffer ret(ctx->queryContextLogger().getSpanContext()->queryProp("spanID"));
     return ret.detach();
 }
 
 LOGGING_API char * LOGGING_CALL getTraceSpanHeader(ICodeContext *ctx)
 {
-    StringBuffer ret;
-    Owned<IProperties> httpHeaders = ctx->queryContextLogger().getClientHeaders();
-    if (httpHeaders)
-        ret.set(httpHeaders->queryProp("traceparent"));
-
+    StringBuffer ret(ctx->queryContextLogger().getClientHeaders()->queryProp("traceparent"));
     return ret.detach();
 }
 
 LOGGING_API char * LOGGING_CALL getTraceStateHeader(ICodeContext *ctx)
 {
-    StringBuffer ret;
-    Owned<IProperties> httpHeaders = ctx->queryContextLogger().getClientHeaders();
-    if (httpHeaders)
-        ret.set(httpHeaders->queryProp("tracestate"));
-
+    StringBuffer ret(ctx->queryContextLogger().getClientHeaders()->queryProp("tracestate"));
     return ret.detach();
 }
 
@@ -170,4 +154,4 @@ LOGGING_API void LOGGING_CALL setSpanAttribute(ICodeContext *ctx,
     StringBuffer attVal(valueLen, value);
 
     ctx->queryContextLogger().setSpanAttribute(attName.str(), attVal.str());
-}
+}
diff --git a/roxie/ccd/ccd.hpp b/roxie/ccd/ccd.hpp
@@ -756,7 +756,7 @@ class ContextLogger : implements IRoxieContextLogger, public CInterface
     }
     virtual void setSpanAttribute(const char *name, const char *value) const override
     {
-        return ::setSpanAttribute(activeSpan, name, value);
+        ::setSpanAttribute(activeSpan, name, value);
     }
     virtual const char *queryGlobalId() const override
     {

diff --git a/roxie/ccd/ccdcontext.cpp b/roxie/ccd/ccdcontext.cpp
@@ -1396,7 +1396,7 @@ class CRoxieContextBase : implements IRoxieAgentContext, implements ICodeContext
     }
     virtual void setSpanAttribute(const char *name, const char *value) const override
     {
-        return logctx.setSpanAttribute(name, value);
+        logctx.setSpanAttribute(name, value);
     }
     virtual const char *queryGlobalId() const override
     {

diff --git a/roxie/ccd/ccdserver.cpp b/roxie/ccd/ccdserver.cpp
@@ -290,7 +290,7 @@ class IndirectAgentContext : implements IRoxieAgentContext, public CInterface
     }
     virtual void setSpanAttribute(const char *name, const char *value) const override
     {
-        return ctx->setSpanAttribute(name, value);
+        ctx->setSpanAttribute(name, value);
     }
     virtual const char *queryGlobalId() const
     {
@@ -1376,7 +1376,7 @@ class CRoxieServerActivity : implements CInterfaceOf<IRoxieServerActivity>, impl
     }
     virtual void setSpanAttribute(const char *name, const char *value) const override
     {
-        return ctx->setSpanAttribute(name, value);
+        ctx->setSpanAttribute(name, value);
     }
     virtual const char *queryGlobalId() const override
     {

diff --git a/system/jlib/jlog.cpp b/system/jlib/jlog.cpp
@@ -2882,7 +2882,7 @@ class DummyLogCtx : implements IContextLogger
     }
     virtual void setSpanAttribute(const char *name, const char *value) const override
     {
-        return ::setSpanAttribute(activeSpan, name, value);
+        ::setSpanAttribute(activeSpan, name, value);
     }
     virtual const char *queryGlobalId() const override
     {