HPCC-31343 Code review changes

- Remove unnecessary logcontext methods - Pass struc param by ref - Remove debug code Signed-off-by: Rodrigo Pastrana <[email protected]>
hpcc-systems · Mar 1, 2024 · f1d5b08 · f1d5b08
1 parent 0fe725e
commit f1d5b08
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 78 deletions.
diff --git a/common/thorhelper/thorcommon.hpp b/common/thorhelper/thorcommon.hpp
@@ -744,18 +744,6 @@ class CStatsContextLogger : public CSimpleInterfaceOf<IContextLogger>
     {
         activeSpan->setSpanAttribute(name, value);
     }
-    virtual void recordSpanException(IException * e, bool failed) const override
-    {
-        activeSpan->recordException(e, failed);
-    }
-    virtual void recordSpanError(const SpanError error, bool spanFailed) const override
-    {
-        activeSpan->recordError(error, spanFailed);
-    }
-    virtual void setSpanStatus(bool spanFailed, const char * statusMessage) const override
-    {
-        activeSpan->setSpanStatus(spanFailed, statusMessage);
-    }
     virtual const char *queryGlobalId() const override
     {
         return activeSpan->queryGlobalId();

diff --git a/roxie/ccd/ccd.hpp b/roxie/ccd/ccd.hpp
@@ -766,18 +766,6 @@ class ContextLogger : implements IRoxieContextLogger, public CInterface
     {
         activeSpan->setSpanAttribute(name, value);
     }
-    virtual void recordSpanException(IException * e, bool failed) const override
-    {
-        activeSpan->recordException(e, failed);
-    }
-    virtual void recordSpanError(const SpanError error, bool spanFailed) const override
-    {
-        activeSpan->recordError(error, spanFailed);
-    }
-    virtual void setSpanStatus(bool spanFailed, const char * statusMessage) const override
-    {
-        activeSpan->setSpanStatus(spanFailed, statusMessage);
-    }
     virtual const char *queryGlobalId() const override
     {
         return activeSpan->queryGlobalId();

diff --git a/roxie/ccd/ccdcontext.cpp b/roxie/ccd/ccdcontext.cpp
@@ -1406,18 +1406,6 @@ class CRoxieContextBase : implements IRoxieAgentContext, implements ICodeContext
     {
         logctx.setSpanAttribute(name, value);
     }
-    virtual void recordSpanException(IException * e, bool failed) const override
-    {
-        logctx.recordSpanException(e, failed);
-    }
-    virtual void recordSpanError(const SpanError error, bool spanFailed) const override
-    {
-        logctx.recordSpanError(error, spanFailed);
-    }
-    virtual void setSpanStatus(bool spanFailed, const char * statusMessage) const override
-    {
-        logctx.setSpanStatus(spanFailed, statusMessage);
-    }
     virtual const char *queryGlobalId() const override
     {
         return logctx.queryGlobalId();

diff --git a/roxie/ccd/ccdserver.cpp b/roxie/ccd/ccdserver.cpp
@@ -300,18 +300,6 @@ class IndirectAgentContext : implements IRoxieAgentContext, public CInterface
     {
         ctx->setSpanAttribute(name, value);
     }
-    virtual void recordSpanException(IException * e, bool failed) const override
-    {
-        ctx->recordSpanException(e, failed);
-    }
-    virtual void recordSpanError(const SpanError error, bool spanFailed) const override
-    {
-        ctx->recordSpanError(error, spanFailed);
-    }
-    virtual void setSpanStatus(bool spanFailed, const char * statusMessage) const override
-    {
-        ctx->setSpanStatus(spanFailed, statusMessage);
-    }
     virtual const char *queryGlobalId() const
     {
         return ctx->queryGlobalId();
@@ -1464,7 +1452,7 @@ class CRoxieServerActivity : implements CInterfaceOf<IRoxieServerActivity>, impl
     {
         ctx->setSpanAttribute(name, value);
     }
-    virtual void recordSpanException(IException * e, bool failed = true) const override
+    /*virtual void recordSpanException(IException * e, bool failed = true) const override
     {
         ctx->recordSpanException(e, failed);
     }
@@ -1475,7 +1463,7 @@ class CRoxieServerActivity : implements CInterfaceOf<IRoxieServerActivity>, impl
     virtual void setSpanStatus(bool spanFailed, const char * statusMessage) const override
     {
         ctx->setSpanStatus(spanFailed, statusMessage);
-    }
+    }*/
     virtual const char *queryGlobalId() const override
     {
         return ctx ? ctx->queryGlobalId() : nullptr;

diff --git a/system/jlib/jlog.cpp b/system/jlib/jlog.cpp
@@ -2897,18 +2897,6 @@ class DummyLogCtx : implements IContextLogger
     {
         activeSpan->setSpanAttribute(name, value);
     }
-    virtual void recordSpanException(IException * e, bool failed) const override
-    {
-        activeSpan->recordException(e, failed);
-    }
-    virtual void recordSpanError(const SpanError error, bool spanFailed) const override
-    {
-        activeSpan->recordError(error, spanFailed);
-    }
-    virtual void setSpanStatus(bool spanFailed, const char * statusMessage) const override
-    {
-        activeSpan->setSpanStatus(spanFailed, statusMessage);
-    }
     virtual const char *queryGlobalId() const override
     {
         return activeSpan->queryGlobalId();

diff --git a/system/jlib/jlog.hpp b/system/jlib/jlog.hpp
@@ -1277,9 +1277,6 @@ interface jlib_decl IContextLogger : extends IInterface
     virtual IProperties * getClientHeaders() const = 0;
     virtual void setSpanAttribute(const char *name, const char *value) const = 0;
     virtual void setSpanAttribute(const char *name, __uint64 value) const = 0;
-    virtual void recordSpanException(IException * e, bool failed = true) const = 0;
-    virtual void recordSpanError(const SpanError error = SpanError(), bool spanFailed = true) const = 0;
-    virtual void setSpanStatus(bool spanFailed, const char * statusMessage = NO_STATUS_MESSAGE) const = 0;
 
     virtual void recordStatistics(IStatisticGatherer &progress) const = 0;
     virtual const LogMsgJobInfo & queryJob() const { return unknownJob; }

diff --git a/system/jlib/jtrace.cpp b/system/jlib/jtrace.cpp
@@ -204,14 +204,6 @@ class JLogSpanExporter final : public opentelemetry::sdk::trace::SpanExporter
                 out.appendf(", \"start\": %lld", (long long)(span->GetStartTime().time_since_epoch()).count());
                 out.appendf(", \"duration\": %lld", (long long)span->GetDuration().count());
                 out.appendf(", \"status\": \"%s\"", spanStatusToString(span->GetStatus()));
-                auto description = span->GetDescription().data();
-                if (!isEmptyString(description))
-                {
-                    StringBuffer encoded;
-                    encodeJSON(encoded, description);
-                    out.appendf(", \"description\": \"%s\"", encoded.str());
-                }
-                out.appendf(", \"kind\": \"%s\"", spanKindToString(span->GetSpanKind()));
 
                 if (hasMask(logFlags, SpanLogFlags::LogParentInfo))
                 {
@@ -229,7 +221,7 @@ class JLogSpanExporter final : public opentelemetry::sdk::trace::SpanExporter
 
                 if (hasMask(logFlags, SpanLogFlags::LogSpanDetails))
                 {
-
+                    out.appendf(", \"kind\": \"%s\"", spanKindToString(span->GetSpanKind()));
                     const char * description = span->GetDescription().data();
                     if (!isEmptyString(description))
                     {
@@ -243,7 +235,7 @@ class JLogSpanExporter final : public opentelemetry::sdk::trace::SpanExporter
                 if (hasMask(logFlags, SpanLogFlags::LogAttributes))
                     printAttributes(out, span->GetAttributes());
 
-                //if (hasMask(logFlags, SpanLogFlags::LogEvents))
+                if (hasMask(logFlags, SpanLogFlags::LogEvents))
                     printEvents(out, span->GetEvents());
 
                 if (hasMask(logFlags, SpanLogFlags::LogLinks))
@@ -750,7 +742,7 @@ class CSpan : public CInterfaceOf<ISpan>
         }
     }
 
-    virtual void recordError(const SpanError error, bool spanFailed)
+    virtual void recordError(const SpanError & error, bool spanFailed)
     {
         if (span != nullptr)
         {
@@ -886,7 +878,7 @@ class CNullSpan : public CInterfaceOf<ISpan>
     virtual bool isRecording() const { return false; }
 
     virtual void recordException(IException * e, bool spanFailed) override {}
-    virtual void recordError(const SpanError error, bool spanFailed = true) override {};
+    virtual void recordError(const SpanError & error, bool spanFailed = true) override {};
     virtual void setSpanStatus(bool spanFailed, const char * statusMessage) override {}
 
     virtual const char* queryGlobalId() const override { return nullptr; }

diff --git a/system/jlib/jtrace.hpp b/system/jlib/jtrace.hpp
@@ -81,7 +81,7 @@ interface ISpan : extends IInterface
     virtual void getLogPrefix(StringBuffer & out) const = 0;
     virtual bool isRecording() const = 0;   // Is it worth adding any events/attributes to this span?
     virtual void recordException(IException * e, bool spanFailed = true) = 0;
-    virtual void recordError(const SpanError error = SpanError(), bool spanFailed = true) = 0;
+    virtual void recordError(const SpanError & error = SpanError(), bool spanFailed = true) = 0;
     virtual void setSpanStatus(bool spanFailed, const char * statusMessage = NO_STATUS_MESSAGE) = 0;
 
     virtual ISpan * createClientSpan(const char * name) = 0;