Merge remote-tracking branch 'origin/main' into feat/allow-conditional-esm-consumption

Author: NathanWalker

NativeScript/runtime/SymbolLoader.mm

@@ -1,10 +1,17 @@
 #include "SymbolLoader.h"
 #include <Foundation/Foundation.h>
 #include <dlfcn.h>
-#include "Helpers.h"
+#include <os/log.h>
 
 namespace tns {
 
+// Unified logging: create a dedicated log for the SymbolLoader
+static os_log_t ns_symbolloader_log() {
+    // Function-local static initialization is thread-safe in C++11+.
+    static os_log_t log = os_log_create("@nativescript/ios", "SymbolLoader");
+    return log;
+}
+
 class SymbolResolver {
  public:
   virtual void* loadFunctionSymbol(const char* symbolName) = 0;
@@ -37,7 +44,7 @@ virtual bool load() override {
     CFErrorRef error = nullptr;
     bool loaded = CFBundleLoadExecutableAndReturnError(this->_bundle, &error);
     if (error) {
-      Log("%s", [[(NSError*)error localizedDescription] UTF8String]);
+      os_log_error(ns_symbolloader_log(), "%{public}s", [[(NSError*)error localizedDescription] UTF8String]);
     }
 
     return loaded;
@@ -101,8 +108,6 @@ virtual bool load() override {
     NSURL* bundleUrl = [NSURL URLWithString:frameworkPathStr relativeToURL:baseUrl];
     if (CFBundleRef bundle = CFBundleCreate(kCFAllocatorDefault, (CFURLRef)bundleUrl)) {
       resolver = std::make_unique<CFBundleSymbolResolver>(bundle);
-    } else {
-      Log("NativeScript could not load bundle %s", bundleUrl.absoluteString.UTF8String);
     }
   } else if (module->libraries->count == 1) {
     if (module->isSystem()) {
@@ -113,11 +118,9 @@ virtual bool load() override {
                                      module->libraries->first()->value().getName()];
 
       if (void* library = dlopen(libraryPath.UTF8String, RTLD_LAZY | RTLD_LOCAL)) {
-        Log("NativeScript loaded library %s", libraryPath.UTF8String);
         resolver = std::make_unique<DlSymbolResolver>(library);
       } else if (const char* libraryError = dlerror()) {
-        Log("NativeScript could not load library %s, error: %s", libraryPath.UTF8String,
-            libraryError);
+        os_log_debug(ns_symbolloader_log(), "NativeScript could not load library %{public}s, error: %{public}s", libraryPath.UTF8String, libraryError);
       }
     }
   }