HPCC-31355 Windows build failing in GH Actions

Older versions of MS STL is missing an implementation for "_Thrd_sleep_for" Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Feb 27, 2024 · 1077372 · 1077372
1 parent e58a275
commit 1077372
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/system/jlib/jtrace.cpp b/system/jlib/jtrace.cpp
@@ -15,7 +15,6 @@
     limitations under the License.
 ############################################################################## */
 
-
 #include "opentelemetry/trace/semantic_conventions.h" //known span defines
 #include "opentelemetry/context/propagation/global_propagator.h" // context::propagation::GlobalTextMapPropagator::GetGlobalPropagator
 #include "opentelemetry/sdk/trace/tracer_provider_factory.h" //opentelemetry::sdk::trace::TracerProviderFactory::Create(context)
@@ -1425,3 +1424,9 @@ ITraceManager & queryTraceManager()
 {
     return *theTraceManager.query([] () { return new CTraceManager; }); //throws if not initialized
 }
+
+#if WIN32 && _MSC_VER < 1939 // _MSC_VER < VS 2022 17.9
+extern "C" void __stdcall _Thrd_sleep_for(const unsigned long ms) noexcept { // suspend current thread for `ms` milliseconds
+    Sleep(ms);
+}
+#endif
diff --git a/vcpkg.json.in b/vcpkg.json.in
@@ -168,6 +168,15 @@
             "name": "openssl",
             "platform": "@VCPKG_OPENSSL@"
         },
+        {
+            "name": "opentelemetry-cpp",
+            "default-features": false,
+            "features": [
+                "otlp",
+                "otlp-http",
+                "otlp-grpc"
+            ]
+        },
         {
             "name": "python3",
             "platform": "@VCPKG_PYTHON3@ & windows"
@@ -192,14 +201,6 @@
         {
             "name": "zlib",
             "platform": "@VCPKG_ZLIB@"
-        },
-        {
-            "name": "opentelemetry-cpp",
-            "features": [
-                "otlp",
-                "otlp-http",
-                "otlp-grpc"
-            ]
         }
     ]
 }