fix: Prevent Darwin log message redaction by using os_log_with_type via a new cinterop and improve marker handling.

Author: oshai

build.gradle.kts

@@ -271,6 +271,10 @@ kotlin {
             getByName("${it.targetName}Test") {
                 dependsOn(darwinTest)
             }
+            val main by it.compilations.getting
+            val oslog by main.cinterops.creating {
+                defFile(project.file("src/darwinMain/cinterop/oslog.def"))
+            }
         }
     }
 }

src/darwinMain/cinterop/oslog.def

@@ -0,0 +1,10 @@
+package = io.github.oshai.kotlinlogging.cinterop
+language = Objective-C
+headers = os/log.h
+
+---
+#include <os/log.h>
+
+static inline void kotlin_logging_os_log(os_log_t log, os_log_type_t type, const char* message) {
+    os_log_with_type(log, type, "%{public}s", message);
+}

src/darwinMain/kotlin/io/github/oshai/kotlinlogging/DarwinKLogger.kt

@@ -2,9 +2,9 @@
 
 package io.github.oshai.kotlinlogging
 
+import io.github.oshai.kotlinlogging.cinterop.kotlin_logging_os_log
 import io.github.oshai.kotlinlogging.internal.DarwinFormatter
 import kotlinx.cinterop.ExperimentalForeignApi
-import kotlinx.cinterop.ptr
 import platform.darwin.OS_LOG_TYPE_DEBUG
 import platform.darwin.OS_LOG_TYPE_DEFAULT
 import platform.darwin.OS_LOG_TYPE_ERROR
@@ -21,14 +21,17 @@ public class DarwinKLogger(override val name: String, override val underlyingLog
   override fun at(level: Level, marker: Marker?, block: KLoggingEventBuilder.() -> Unit) {
     if (isLoggingEnabledFor(level, marker)) {
       KLoggingEventBuilder().apply(block).run {
-        val formattedMessage: String = DarwinFormatter.getFormattedMessage(this, marker)
-        _os_log_internal(
-          __dso_handle.ptr,
+        val message = DarwinFormatter.getFormattedMessage(this, marker)
+        val formattedMessage = if (marker != null) {
+          // Separating marker and message because OSLog doesn't have a way to pass marker as a separate argument
+          // formatting manually to string for now
+          marker.toString() + " " + message
+        } else {
+          message
+        }
+        kotlin_logging_os_log(
           underlyingLogger,
           level.toDarwinLevel(),
-          // Use %{public}s to prevent redaction of the log message in historical logs (log show)
-          // See https://github.com/oshai/kotlin-logging/issues/588
-          "%{public}s",
           formattedMessage,
         )
       }

src/darwinTest/kotlin/io/github/oshai/kotlinlogging/Issue588Test.kt

@@ -2,13 +2,16 @@ package io.github.oshai.kotlinlogging
 
 import platform.Foundation.NSUUID
 import kotlin.test.Test
+import kotlin.test.assertTrue
 
 class Issue588Test {
   @Test
   fun testHistoricalLogging() {
     val uuid = NSUUID().UUIDString
     val logger = KotlinLogging.logger("issue588.repro")
+
     logger.info { "Test message execution $uuid" }
-    println("Logged message with UUID: $uuid")
+    logger.error { "Test error execution $uuid" }
+  }
   }
 }