HPCC-30405 Code review 1.2

- Removes queryTraceManager::createNullSpan - Utilizes getNullSpan jlib function - Remove superfluous semicolons Signed-off-by: Rodrigo Pastrana <rodrigo.pastrana@lexisnexisrisk.com>
hpcc-systems · Oct 25, 2023 · 9d2e47e · 9d2e47e
1 parent 8f27049
commit 9d2e47e
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 15 deletions.
diff --git a/common/thorhelper/thorcommon.hpp b/common/thorhelper/thorcommon.hpp
@@ -678,7 +678,7 @@ class CStatsContextLogger : public CSimpleInterfaceOf<IContextLogger>
 protected:
     const LogMsgJobInfo job;
     unsigned traceLevel = 1;
-    Owned<ISpan> activeSpan = queryTraceManager().createNullSpan();
+    Owned<ISpan> activeSpan = getNullSpan();
     mutable CRuntimeStatisticCollection stats;
 public:
     CStatsContextLogger(const CRuntimeStatisticCollection  &_mapping, const LogMsgJobInfo & _job=unknownJob) : job(_job), stats(_mapping) {}

diff --git a/roxie/ccd/ccd.hpp b/roxie/ccd/ccd.hpp
@@ -589,7 +589,7 @@ class ContextLogger : implements IRoxieContextLogger, public CInterface
     mutable bool aborted;
     mutable CIArrayOf<LogItem> log;
 private:
-    Owned<ISpan> activeSpan = queryTraceManager().createNullSpan();
+    Owned<ISpan> activeSpan = getNullSpan();
     ContextLogger(const ContextLogger &);  // Disable copy constructor
 public:
     IMPLEMENT_IINTERFACE;

diff --git a/system/jlib/jlog.cpp b/system/jlib/jlog.cpp
@@ -2829,7 +2829,7 @@ class CRuntimeStatisticCollection;
 class DummyLogCtx : implements IContextLogger
 {
 private:
-    Owned<ISpan> activeSpan = queryTraceManager().createNullSpan();
+    Owned<ISpan> activeSpan = getNullSpan();
 
 public:
     DummyLogCtx() {}

diff --git a/system/jlib/jtrace.cpp b/system/jlib/jtrace.cpp
@@ -878,12 +878,7 @@ class CTraceManager : implements ITraceManager, public CInterface
             toXML(traceConfig, xml);
             DBGLOG("traceConfig tree: %s", xml.str());
 #endif
-            StringBuffer xml;
-            toXML(traceConfig, xml);
-            DBGLOG("^^traceConfig tree: %s", xml.str());
-
             bool disableTracing = traceConfig && traceConfig->getPropBool("@disable", false);
-            disableTracing = true;
 
             using namespace opentelemetry::trace;
             if (disableTracing)
@@ -960,11 +955,6 @@ class CTraceManager : implements ITraceManager, public CInterface
         return new CServerSpan(name, moduleName.get(), httpHeaders, flags);
     }
 
-    ISpan * createNullSpan() const override
-    {
-        return getNullSpan();
-    }
-
     const char * getTracedComponentName() const override
     {
         return moduleName.get();

diff --git a/system/jlib/jtrace.hpp b/system/jlib/jtrace.hpp
@@ -58,7 +58,6 @@ extern jlib_decl IProperties * getClientHeaders(const ISpan * span);
 
 interface ITraceManager : extends IInterface
 {
-    virtual ISpan * createNullSpan() const = 0;
     virtual ISpan * createServerSpan(const char * name, StringArray & httpHeaders, SpanFlags flags = SpanFlags::None) const = 0;
     virtual ISpan * createServerSpan(const char * name, const IProperties * httpHeaders, SpanFlags flags = SpanFlags::None) const = 0;
     virtual bool isTracingEnabled() const = 0;

diff --git a/testing/unittests/jlibtests.cpp b/testing/unittests/jlibtests.cpp
@@ -162,7 +162,7 @@ class JlibTraceTest : public CppUnit::TestFixture
             return;
         }
 
-        Owned<ISpan> nullSpan = queryTraceManager().createNullSpan();
+        Owned<ISpan> nullSpan = getNullSpan();
         CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected nullptr nullspan detected", true, nullSpan != nullptr);
 
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -162,7 +162,7 @@ class JlibTraceTest : public CppUnit::TestFixture @@
                 return;
             }
-            Owned<ISpan> nullSpan = queryTraceManager().createNullSpan();
+            Owned<ISpan> nullSpan = getNullSpan();
             CPPUNIT_ASSERT_EQUAL_MESSAGE("Unexpected nullptr nullspan detected", true, nullSpan != nullptr);
             {
@@ Expand Down @@