refactor(envelope): move TUS resolve logic from transport to envelope

Rename sentry__envelope_item_set_attachment_ref to
sentry__envelope_item_set_attachment_ref_path for consistency with the
existing getter. Add sentry__envelope_item_set_attachment_ref_location
in the envelope module, replacing tus_resolve_item in the transport.
This keeps JSON payload manipulation encapsulated in the envelope layer.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: jpnurmi

src/sentry_database.c

@@ -225,7 +225,7 @@ write_large_attachment(sentry_envelope_item_t *item,
     }
 
     if (rv == 0) {
-        sentry__envelope_item_set_attachment_ref(item, dst);
+        sentry__envelope_item_set_attachment_ref_path(item, dst);
         if (is_inline) {
             sentry__envelope_item_set_header(
                 item, "inline", sentry_value_new_bool(false));

src/sentry_envelope.c

@@ -672,7 +672,7 @@ envelope_add_attachment_ref(sentry_envelope_t *envelope,
 }
 
 void
-sentry__envelope_item_set_attachment_ref(
+sentry__envelope_item_set_attachment_ref_path(
     sentry_envelope_item_t *item, const sentry_path_t *path)
 {
     size_t old_len = 0;
@@ -709,6 +709,46 @@ sentry__envelope_item_is_attachment_ref(const sentry_envelope_item_t *item)
     return ct && strcmp(ct, "application/vnd.sentry.attachment-ref") == 0;
 }
 
+void
+sentry__envelope_item_set_attachment_ref_location(
+    sentry_envelope_item_t *item, const char *location)
+{
+    bool is_inline = sentry_value_is_true(
+        sentry__envelope_item_get_header(item, "inline"));
+
+    sentry_value_t obj;
+    if (is_inline) {
+        obj = sentry_value_new_object();
+    } else {
+        size_t old_len = 0;
+        const char *old_payload
+            = sentry__envelope_item_get_payload(item, &old_len);
+        obj = (old_payload && old_len > 0)
+            ? sentry__value_from_json(old_payload, old_len)
+            : sentry_value_new_object();
+        if (sentry_value_is_null(obj)) {
+            obj = sentry_value_new_object();
+        }
+        sentry_value_remove_by_key(obj, "path");
+    }
+
+    const char *ref_ct = sentry_value_as_string(
+        sentry__envelope_item_get_header(item, "ref_content_type"));
+    if (ref_ct && *ref_ct != '\0') {
+        sentry_value_set_by_key(
+            obj, "content_type", sentry_value_new_string(ref_ct));
+    }
+
+    sentry_value_set_by_key(obj, "location", sentry_value_new_string(location));
+
+    sentry_jsonwriter_t *jw = sentry__jsonwriter_new_sb(NULL);
+    sentry__jsonwriter_write_value(jw, obj);
+    sentry_value_decref(obj);
+    size_t json_len = 0;
+    char *json = sentry__jsonwriter_into_string(jw, &json_len);
+    sentry__envelope_item_set_payload(item, json, json_len);
+}
+
 bool
 sentry__envelope_has_attachment_refs(const sentry_envelope_t *envelope)
 {

src/sentry_envelope.h

@@ -164,8 +164,10 @@ const char *sentry__envelope_item_get_payload(
     const sentry_envelope_item_t *item, size_t *payload_len_out);
 void sentry__envelope_item_set_payload(
     sentry_envelope_item_t *item, char *payload, size_t payload_len);
-void sentry__envelope_item_set_attachment_ref(
+void sentry__envelope_item_set_attachment_ref_path(
     sentry_envelope_item_t *item, const sentry_path_t *path);
+void sentry__envelope_item_set_attachment_ref_location(
+    sentry_envelope_item_t *item, const char *location);
 
 bool sentry__envelope_item_is_attachment_ref(
     const sentry_envelope_item_t *item);

src/transports/sentry_http_transport.c

@@ -2,14 +2,12 @@
 #include "sentry_alloc.h"
 #include "sentry_database.h"
 #include "sentry_envelope.h"
-#include "sentry_json.h"
 #include "sentry_options.h"
 #include "sentry_ratelimiter.h"
 #include "sentry_retry.h"
 #include "sentry_string.h"
 #include "sentry_transport.h"
 #include "sentry_utils.h"
-#include "sentry_value.h"
 
 #ifdef SENTRY_TRANSPORT_COMPRESSION
 #    include "zlib.h"
@@ -289,37 +287,6 @@ http_send_request(
     return resp.status_code;
 }
 
-static void
-tus_resolve_item(
-    sentry_envelope_item_t *item, const char *location, bool is_inline)
-{
-    sentry_value_t loc_json;
-    if (is_inline) {
-        loc_json = sentry_value_new_object();
-        const char *ref_ct = sentry_value_as_string(
-            sentry__envelope_item_get_header(item, "ref_content_type"));
-        if (ref_ct && *ref_ct != '\0') {
-            sentry_value_set_by_key(
-                loc_json, "content_type", sentry_value_new_string(ref_ct));
-        }
-    } else {
-        size_t old_len = 0;
-        const char *old_payload
-            = sentry__envelope_item_get_payload(item, &old_len);
-        loc_json = sentry__value_from_json(old_payload, old_len);
-        sentry_value_remove_by_key(loc_json, "path");
-    }
-    sentry_value_set_by_key(
-        loc_json, "location", sentry_value_new_string(location));
-
-    sentry_jsonwriter_t *jw = sentry__jsonwriter_new_sb(NULL);
-    sentry__jsonwriter_write_value(jw, loc_json);
-    sentry_value_decref(loc_json);
-    size_t new_len = 0;
-    char *new_payload = sentry__jsonwriter_into_string(jw, &new_len);
-    sentry__envelope_item_set_payload(item, new_payload, new_len);
-}
-
 // TODO: with future creation-only TUS, this becomes a creation-only request
 // (prepare_tus_request_common without a body) that obtains the location, and
 // the actual data upload is queued as a separate bgworker task
@@ -381,7 +348,7 @@ tus_upload_item(http_transport_state_t *state, sentry_envelope_item_t *item)
     int status_code = ok ? resp.status_code : -1;
 
     if (ok && resp.status_code == 201 && resp.location) {
-        tus_resolve_item(item, resp.location, is_inline);
+        sentry__envelope_item_set_attachment_ref_location(item, resp.location);
     }
 
     http_response_cleanup(&resp);

tests/unit/test_envelopes.c

@@ -804,7 +804,7 @@ SENTRY_TEST(attachment_ref_inline)
         item, "ref_content_type", sentry_value_new_string("application/x-dmp"));
 
     sentry_path_t *path = sentry__path_from_str("/tmp/test.dmp");
-    sentry__envelope_item_set_attachment_ref(item, path);
+    sentry__envelope_item_set_attachment_ref_path(item, path);
 
     // verify the payload is valid JSON with correct keys
     size_t payload_len = 0;