getsentry · JoshuaMoelans · Dec 2, 2025 · Aug 29, 2025 · Nov 18, 2025 · Nov 18, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+**Fixes**:
+
+- Removed the 10-item limit per envelope for non-session data. Sessions are now limited to 100 per envelope, while other items (e.g., attachments) have no limit in amount. ([#1347](https://github.com/getsentry/sentry-native/pull/1347))
+
 ## 0.12.2
 
 **Features**:

diff --git a/src/sentry_database.c b/src/sentry_database.c
@@ -264,7 +264,7 @@ sentry__process_old_runs(const sentry_options_t *options, uint64_t last_crash)
                     sentry__envelope_add_session(session_envelope, session);
 
                     sentry__session_free(session);
-                    if ((++session_num) >= SENTRY_MAX_ENVELOPE_ITEMS) {
+                    if ((++session_num) >= SENTRY_MAX_ENVELOPE_SESSIONS) {
                         sentry__capture_envelope(
                             options->transport, session_envelope);
                         session_envelope = NULL;

diff --git a/src/sentry_envelope.c b/src/sentry_envelope.c
@@ -18,14 +18,16 @@ struct sentry_envelope_item_s {
     sentry_value_t event;
     char *payload;
     size_t payload_len;
+    sentry_envelope_item_t *next;
 };
 
 struct sentry_envelope_s {
     bool is_raw;
     union {
         struct {
             sentry_value_t headers;
-            sentry_envelope_item_t items[SENTRY_MAX_ENVELOPE_ITEMS];
+            sentry_envelope_item_t *first_item;
+            sentry_envelope_item_t *last_item;
             size_t item_count;
         } items;
         struct {
@@ -41,21 +43,34 @@ envelope_add_item(sentry_envelope_t *envelope)
     if (envelope->is_raw) {
         return NULL;
     }
-    if (envelope->contents.items.item_count >= SENTRY_MAX_ENVELOPE_ITEMS) {
-        return NULL;
-    }
+
     // TODO: Envelopes may have at most one event item or one transaction item,
     // and not one of both. Some checking should be done here or in
     // `sentry__envelope_add_[transaction|event]` to ensure this can't happen.
 
-    sentry_envelope_item_t *rv
-        = &envelope->contents.items
-               .items[envelope->contents.items.item_count++];
-    rv->headers = sentry_value_new_object();
-    rv->event = sentry_value_new_null();
-    rv->payload = NULL;
-    rv->payload_len = 0;
-    return rv;
+    // Allocate new item
+    sentry_envelope_item_t *item = SENTRY_MAKE(sentry_envelope_item_t);
+    if (!item) {
+        return NULL;
+    }
+
+    // Initialize item
+    item->headers = sentry_value_new_object();
+    item->event = sentry_value_new_null();
+    item->payload = NULL;
+    item->payload_len = 0;
+    item->next = NULL;
+
+    // Append to linked list
+    if (envelope->contents.items.last_item) {
+        envelope->contents.items.last_item->next = item;
+    } else {
+        envelope->contents.items.first_item = item;
+    }
+    envelope->contents.items.last_item = item;
+    envelope->contents.items.item_count++;
+
+    return item;
 }
 
 static void
@@ -141,9 +156,16 @@ sentry_envelope_free(sentry_envelope_t *envelope)
         return;
     }
     sentry_value_decref(envelope->contents.items.headers);
-    for (size_t i = 0; i < envelope->contents.items.item_count; i++) {
-        envelope_item_cleanup(&envelope->contents.items.items[i]);
+
+    // Free all items in the linked list
+    sentry_envelope_item_t *item = envelope->contents.items.first_item;
+    while (item) {
+        sentry_envelope_item_t *next = item->next;
+        envelope_item_cleanup(item);
+        sentry_free(item);
+        item = next;
     }
+
     sentry_free(envelope);
 }
 
@@ -166,6 +188,8 @@ sentry__envelope_new(void)
     }
 
     rv->is_raw = false;
+    rv->contents.items.first_item = NULL;
+    rv->contents.items.last_item = NULL;
     rv->contents.items.item_count = 0;
     rv->contents.items.headers = sentry_value_new_object();
 
@@ -226,12 +250,13 @@ sentry_envelope_get_event(const sentry_envelope_t *envelope)
     if (envelope->is_raw) {
         return sentry_value_new_null();
     }
-    for (size_t i = 0; i < envelope->contents.items.item_count; i++) {
 
-        if (!sentry_value_is_null(envelope->contents.items.items[i].event)
-            && !sentry__event_is_transaction(
-                envelope->contents.items.items[i].event)) {
-            return envelope->contents.items.items[i].event;
+    for (const sentry_envelope_item_t *item
+        = envelope->contents.items.first_item;
+        item; item = item->next) {
+        if (!sentry_value_is_null(item->event)
+            && !sentry__event_is_transaction(item->event)) {
+            return item->event;
         }
     }
     return sentry_value_new_null();
@@ -243,11 +268,13 @@ sentry_envelope_get_transaction(const sentry_envelope_t *envelope)
     if (envelope->is_raw) {
         return sentry_value_new_null();
     }
-    for (size_t i = 0; i < envelope->contents.items.item_count; i++) {
-        if (!sentry_value_is_null(envelope->contents.items.items[i].event)
-            && sentry__event_is_transaction(
-                envelope->contents.items.items[i].event)) {
-            return envelope->contents.items.items[i].event;
+
+    for (const sentry_envelope_item_t *item
+        = envelope->contents.items.first_item;
+        item; item = item->next) {
+        if (!sentry_value_is_null(item->event)
+            && sentry__event_is_transaction(item->event)) {
+            return item->event;
         }
     }
     return sentry_value_new_null();
@@ -657,8 +684,9 @@ sentry__envelope_serialize_into_stringbuilder(
     SENTRY_DEBUG("serializing envelope into buffer");
     sentry__envelope_serialize_headers_into_stringbuilder(envelope, sb);
 
-    for (size_t i = 0; i < envelope->contents.items.item_count; i++) {
-        const sentry_envelope_item_t *item = &envelope->contents.items.items[i];
+    for (const sentry_envelope_item_t *item
+        = envelope->contents.items.first_item;
+        item; item = item->next) {
         sentry__envelope_serialize_item_into_stringbuilder(item, sb);
     }
 }
@@ -679,8 +707,9 @@ sentry_envelope_serialize_ratelimited(const sentry_envelope_t *envelope,
     sentry__envelope_serialize_headers_into_stringbuilder(envelope, &sb);
 
     size_t serialized_items = 0;
-    for (size_t i = 0; i < envelope->contents.items.item_count; i++) {
-        const sentry_envelope_item_t *item = &envelope->contents.items.items[i];
+    for (const sentry_envelope_item_t *item
+        = envelope->contents.items.first_item;
+        item; item = item->next) {
         if (rl) {
             int category = envelope_item_get_ratelimiter_category(item);
             if (sentry__rate_limiter_is_disabled(rl, category)) {
@@ -736,9 +765,9 @@ sentry_envelope_write_to_path(
         sentry__jsonwriter_write_value(jw, envelope->contents.items.headers);
         sentry__jsonwriter_reset(jw);
 
-        for (size_t i = 0; i < envelope->contents.items.item_count; i++) {
-            const sentry_envelope_item_t *item
-                = &envelope->contents.items.items[i];
+        for (const sentry_envelope_item_t *item
+            = envelope->contents.items.first_item;
+            item; item = item->next) {
             const char newline = '\n';
             sentry__filewriter_write(fw, &newline, sizeof(char));
 
@@ -967,9 +996,22 @@ sentry__envelope_get_item_count(const sentry_envelope_t *envelope)
 const sentry_envelope_item_t *
 sentry__envelope_get_item(const sentry_envelope_t *envelope, size_t idx)
 {
-    return !envelope->is_raw && idx < envelope->contents.items.item_count
-        ? &envelope->contents.items.items[idx]
-        : NULL;
+    if (envelope->is_raw) {
+        return NULL;
+    }
+
+    // Traverse linked list to find item at index
+    size_t current_idx = 0;
+    for (const sentry_envelope_item_t *item
+        = envelope->contents.items.first_item;
+        item; item = item->next) {
+        if (current_idx == idx) {
+            return item;
+        }
+        current_idx++;
+    }
+
+    return NULL;
 }
 
 sentry_value_t

diff --git a/src/sentry_envelope.h b/src/sentry_envelope.h
@@ -10,7 +10,8 @@
 #include "sentry_session.h"
 #include "sentry_string.h"
 
-#define SENTRY_MAX_ENVELOPE_ITEMS 10
+// https://develop.sentry.dev/sdk/data-model/envelopes/#size-limits
+#define SENTRY_MAX_ENVELOPE_SESSIONS 100
 
 typedef struct sentry_envelope_item_s sentry_envelope_item_t;
 

diff --git a/tests/test_integration_http.py b/tests/test_integration_http.py
@@ -321,8 +321,8 @@ def test_abnormal_session(cmake, httpserver):
     )
     db_dir = tmp_path.joinpath(".sentry-native")
     db_dir.mkdir(exist_ok=True)
-    # 15 exceeds the max envelope items
-    for i in range(15):
+    # 101 exceeds the max session items
+    for i in range(101):
         run_dir = db_dir.joinpath(f"foo-{i}.run")
         run_dir.mkdir()
         with open(run_dir.joinpath("session.json"), "w") as session_file:
@@ -343,7 +343,7 @@ def test_abnormal_session(cmake, httpserver):
     for item in itertools.chain(envelope1, envelope2):
         if item.headers.get("type") == "session":
             session_count += 1
-    assert session_count == 15
+    assert session_count == 101
 
     assert_session(envelope1, {"status": "abnormal", "errors": 0, "duration": 10})
 

diff --git a/tests/unit/test_attachments.c b/tests/unit/test_attachments.c
@@ -453,3 +453,72 @@ SENTRY_TEST(attachments_bytes)
 
     sentry_close();
 }
+
+#define ATTACHMENT_COUNT 15
+
+SENTRY_TEST(attachments_more_than_ten)
+{
+    sentry_attachments_testdata_t testdata;
+    testdata.called = 0;
+    sentry__stringbuilder_init(&testdata.serialized_envelope);
+
+    SENTRY_TEST_OPTIONS_NEW(options);
+    sentry_options_set_auto_session_tracking(options, false);
+    sentry_options_set_dsn(options, "https://[email protected]/42");
+    sentry_transport_t *transport
+        = sentry_transport_new(send_envelope_test_attachments);
+    sentry_transport_set_state(transport, &testdata);
+    sentry_options_set_transport(options, transport);
+
+    sentry_init(options);
+
+    // Create 15 unique attachment files (more than the old
+    // SENTRY_MAX_ENVELOPE_ITEMS of 10) to verify that the limit has been
+    // removed for attachments
+    sentry_path_t *attachment_paths[ATTACHMENT_COUNT];
+    for (int i = 0; i < ATTACHMENT_COUNT; i++) {
+        char filename[64];
+        snprintf(filename, sizeof(filename),
+            SENTRY_TEST_PATH_PREFIX ".attachment%d.txt", i);
+        attachment_paths[i] = sentry__path_from_str(filename);
+        sentry__path_write_buffer(attachment_paths[i], "content", 7);
+        sentry_attach_file(filename);
+    }
+
+    char message[128];
+    snprintf(message, sizeof(message), "Event with %d attachments",
+        ATTACHMENT_COUNT);
+    sentry_capture_event(
+        sentry_value_new_message_event(SENTRY_LEVEL_INFO, "root", message));
+
+    char *serialized
+        = sentry_stringbuilder_take_string(&testdata.serialized_envelope);
+
+    // Count the number of attachment items in the envelope
+    // Each attachment appears as: {"type":"attachment",...}
+    int attachment_count = 0;
+    const char *search_pos = serialized;
+    const char *pattern = "\"type\":\"attachment\"";
+    while ((search_pos = strstr(search_pos, pattern)) != NULL) {
+        attachment_count++;
+        search_pos += strlen(pattern);
+    }
+
+    // Verify we have all 15 attachments in the envelope
+    TEST_CHECK_INT_EQUAL(attachment_count, ATTACHMENT_COUNT);
+    // Verify the envelope also contains the event
+    TEST_CHECK(strstr(serialized, "\"type\":\"event\"") != NULL);
+    TEST_CHECK(strstr(serialized, message) != NULL);
+
+    sentry_free(serialized);
+
+    sentry_close();
+
+    // Clean up all attachment files
+    for (int i = 0; i < ATTACHMENT_COUNT; i++) {
+        sentry__path_remove(attachment_paths[i]);
+        sentry__path_free(attachment_paths[i]);
+    }
+
+    TEST_CHECK_INT_EQUAL(testdata.called, 1);
+}
diff --git a/tests/unit/tests.inc b/tests/unit/tests.inc
@@ -6,6 +6,7 @@ XX(attachments_add_dedupe)
 XX(attachments_add_remove)
 XX(attachments_bytes)
 XX(attachments_extend)
+XX(attachments_more_than_ten)
 XX(background_worker)
 XX(basic_consent_tracking)
 XX(basic_function_transport)