feat(logs): batching

examples/example.c

@@ -24,6 +24,7 @@
 #    define sleep_s(SECONDS) Sleep((SECONDS) * 1000)
 #else
 
+#    include <pthread.h>
 #    include <signal.h>
 #    include <unistd.h>
 
@@ -272,6 +273,32 @@ create_debug_crumb(const char *message)
     return debug_crumb;
 }
 
+#ifdef SENTRY_PLATFORM_WINDOWS
+DWORD WINAPI
+log_thread_func(LPVOID lpParam)
+{
+    (void)lpParam;
+    int LOG_COUNT = 100;
+    for (int i = 0; i < LOG_COUNT; i++) {
+        sentry_log_debug(
+            "thread log %d on thread %lu", i, get_current_thread_id());
+    }
+    return 0;
+}
+#else
+void *
+log_thread_func(void *arg)
+{
+    (void)arg;
+    int LOG_COUNT = 100;
+    for (int i = 0; i < LOG_COUNT; i++) {
+        sentry_log_debug(
+            "thread log %d on thread %llu", i, get_current_thread_id());
+    }
+    return NULL;
+}
+#endif
+
 int
 main(int argc, char **argv)
 {
@@ -395,28 +422,39 @@ main(int argc, char **argv)
 
     // TODO incorporate into test
     if (sentry_options_get_enable_logs(options)) {
-        sentry_log_warn(
-            "This is a big number %" PRIu64, 18446744073709551615ULL);
-        sentry_log_warn("This is a medium number as unsigned %" PRIu64,
-            9007199254740991ULL);
-        sentry_log_warn(
-            "This is a medium number as signed %" PRId64, 9007199254740991LL);
-        sentry_log_trace("We log it up  %i%%, %s style", 100, "trace");
-        sentry_log_debug("We log it up  %i%%, %s style", 100, "debug");
-        sentry_log_info("We log it up  %i%%, %s style", 100, "info");
-        sentry_log_warn("We log it up  %i%%, %s style", 100, "warn");
-        sentry_log_error("We log it up  %i%%, %s style", 100, "error");
-        sentry_log_fatal("We log it up  %i%%, %s style", 100, "fatal");
-
-        // Test the logger with various parameter types
-        sentry_log_info(
-            "API call to %s completed in %d ms with %f success rate",
-            "/api/products", 2500, 0.95);
-
-        sentry_log_warn("Processing %d items, found %u errors, pointer: %p",
-            100, 5u, (void *)0x12345678);
-
-        sentry_log_error("Character '%c' is invalid", 'X');
+        if (has_arg(argc, argv, "logs-timer")) {
+            for (int i = 0; i < 10; i++) {
+                sentry_log_info("Informational log nr.%d", i);
+            }
+            // sleep >5s to trigger logs timer
+            sleep_s(6);
+            // we should see two envelopes make its way to Sentry
+            sentry_log_debug("post-sleep log");
+        }
+        if (has_arg(argc, argv, "logs-threads")) {
+            // Spawn multiple threads to test concurrent logging
+            const int NUM_THREADS = 50;
+#ifdef SENTRY_PLATFORM_WINDOWS
+            HANDLE threads[NUM_THREADS];
+            for (int t = 0; t < NUM_THREADS; t++) {
+                threads[t]
+                    = CreateThread(NULL, 0, log_thread_func, NULL, 0, NULL);
+            }
+            sleep_s(3000);
+            for (int t = 0; t < NUM_THREADS; t++) {
+                CloseHandle(threads[t]);
+            }
+#else
+            pthread_t threads[NUM_THREADS];
+            for (int t = 0; t < NUM_THREADS; t++) {
+                pthread_create(&threads[t], NULL, log_thread_func, NULL);
+            }
+            sleep_s(3);
+            for (int t = 0; t < NUM_THREADS; t++) {
+                pthread_join(threads[t], NULL);
+            }
+#endif
+        }
     }
 
     if (!has_arg(argc, argv, "no-setup")) {

src/sentry_core.c

@@ -8,6 +8,7 @@
 #include "sentry_core.h"
 #include "sentry_database.h"
 #include "sentry_envelope.h"
+#include "sentry_logs.h"
 #include "sentry_options.h"
 #include "sentry_os.h"
 #include "sentry_path.h"
@@ -324,6 +325,9 @@ sentry_close(void)
             options->backend->shutdown_func(options->backend);
         }
 
+        // Shutdown logs system before transport to ensure logs are flushed
+        sentry__logs_shutdown(options->shutdown_timeout);
+
         if (options->transport) {
             if (sentry__transport_shutdown(
                     options->transport, options->shutdown_timeout)

src/sentry_envelope.c

@@ -420,9 +420,12 @@ sentry__envelope_add_logs(sentry_envelope_t *envelope, sentry_value_t logs)
     sentry__envelope_item_set_header(
         item, "type", sentry_value_new_string("log"));
     sentry__envelope_item_set_header(item, "item_count",
-        sentry_value_new_int32((int32_t)sentry_value_get_length(logs)));
+        sentry_value_new_int32((int32_t)sentry_value_get_length(
+            sentry_value_get_by_key(logs, "items"))));
     sentry__envelope_item_set_header(item, "content_type",
         sentry_value_new_string("application/vnd.sentry.items.log+json"));
+    sentry_value_t length = sentry_value_new_int32((int32_t)item->payload_len);
+    sentry__envelope_item_set_header(item, "length", length);
 
     return item;
 }