Merge remote-tracking branch 'origin/candidate-9.4.x'

Signed-off-by: Jake Smith <[email protected]>
AttilaVamos · Nov 30, 2023 · 1850d9c · 1850d9c
2 parents 71e52e2 + 32c22a2
commit 1850d9c
Show file tree

Hide file tree

Showing 54 changed files with 3,577 additions and 5,681 deletions.
diff --git a/common/thorhelper/thorcommon.hpp b/common/thorhelper/thorcommon.hpp
@@ -717,6 +717,10 @@ class CStatsContextLogger : public CSimpleInterfaceOf<IContextLogger>
     {
         return traceLevel;
     }
+    virtual ISpan * queryActiveSpan() const override
+    {
+        return activeSpan;
+    }
     virtual void setActiveSpan(ISpan * span) override
     {
         activeSpan.set(span);
@@ -725,6 +729,14 @@ class CStatsContextLogger : public CSimpleInterfaceOf<IContextLogger>
     {
         return ::getClientHeaders(activeSpan);
     }
+    virtual IProperties * getSpanContext() const override
+    {
+        return ::getSpanContext(activeSpan);
+    }
+    virtual void setSpanAttribute(const char *name, const char *value) const override
+    {
+        activeSpan->setSpanAttribute(name, value);
+    }
     virtual const char *queryGlobalId() const override
     {
         return activeSpan->queryGlobalId();

diff --git a/docs/EN_US/CMakeLists.txt b/docs/EN_US/CMakeLists.txt
@@ -18,11 +18,13 @@
 #  This CMakeLists intended to be used in docs/EN
 #    Refactored for internationalization
 ###
-# Last Mod GP 12/2022
+# Last Mod GP 11/2023
+###
+#  Removed AWS
 #  Removed HPCC in a VM
 #  Removed Monitoring  
 #  Removed ECLWatch  
-####################
+#########################################
 #
 # Doc dirs to include.
 #
@@ -77,7 +79,6 @@ add_subdirectory(HPCCDataTutorial)
 add_subdirectory(HPCCSystemAdmin)
 add_subdirectory(HPCCSpark)
 add_subdirectory(HPCC4J)
-add_subdirectory(InstantCloud)
 add_subdirectory(Installing_and_RunningTheHPCCPlatform)
 add_subdirectory(JDBC-driver)
 add_subdirectory(RoxieReference)

diff --git a/docs/EN_US/InstantCloud/AWS-Mods/AWSIncludes.xml b/docs/EN_US/InstantCloud/AWS-Mods/AWSIncludes.xml
diff --git a/docs/EN_US/InstantCloud/CMakeLists.txt b/docs/EN_US/InstantCloud/CMakeLists.txt