add sentry_scope_set_trace + _n

Author: jpnurmi

include/sentry.h

@@ -1670,6 +1670,11 @@ SENTRY_API void sentry_set_trace(
     const char *trace_id, const char *parent_span_id);
 SENTRY_API void sentry_set_trace_n(const char *trace_id, size_t trace_id_len,
     const char *parent_span_id, size_t parent_span_id_len);
+SENTRY_API void sentry_scope_set_trace(
+    sentry_scope_t *scope, const char *trace_id, const char *parent_span_id);
+SENTRY_API void sentry_scope_set_trace_n(sentry_scope_t *scope,
+    const char *trace_id, size_t trace_id_len, const char *parent_span_id,
+    size_t parent_span_id_len);
 
 /**
  * Sets the transaction.

src/sentry_core.c

@@ -858,14 +858,6 @@ sentry_set_context_n(const char *key, size_t key_len, sentry_value_t value)
     }
 }
 
-void
-sentry__set_propagation_context(const char *key, sentry_value_t value)
-{
-    SENTRY_WITH_SCOPE_MUT (scope) {
-        sentry_value_set_by_key(scope->propagation_context, key, value);
-    }
-}
-
 void
 sentry_remove_context(const char *key)
 {
@@ -921,30 +913,18 @@ sentry_remove_fingerprint(void)
 void
 sentry_set_trace(const char *trace_id, const char *parent_span_id)
 {
-    sentry_set_trace_n(trace_id, sentry__guarded_strlen(trace_id),
-        parent_span_id, sentry__guarded_strlen(parent_span_id));
+    SENTRY_WITH_SCOPE_MUT (scope) {
+        sentry_scope_set_trace(scope, trace_id, parent_span_id);
+    }
 }
 
 void
 sentry_set_trace_n(const char *trace_id, size_t trace_id_len,
     const char *parent_span_id, size_t parent_span_id_len)
 {
     SENTRY_WITH_SCOPE_MUT (scope) {
-        sentry_value_t context = sentry_value_new_object();
-
-        sentry_value_set_by_key(
-            context, "type", sentry_value_new_string("trace"));
-
-        sentry_value_set_by_key(context, "trace_id",
-            sentry_value_new_string_n(trace_id, trace_id_len));
-        sentry_value_set_by_key(context, "parent_span_id",
-            sentry_value_new_string_n(parent_span_id, parent_span_id_len));
-
-        sentry_uuid_t span_id = sentry_uuid_new_v4();
-        sentry_value_set_by_key(
-            context, "span_id", sentry__value_new_span_uuid(&span_id));
-
-        sentry__set_propagation_context("trace", context);
+        sentry_scope_set_trace_n(
+            scope, trace_id, trace_id_len, parent_span_id, parent_span_id_len);
     }
 }
 

src/sentry_core.h

@@ -120,8 +120,6 @@ sentry_options_t *sentry__options_lock(void);
  */
 void sentry__options_unlock(void);
 
-void sentry__set_propagation_context(const char *key, sentry_value_t value);
-
 #define SENTRY_WITH_OPTIONS(Options)                                           \
     for (const sentry_options_t *Options = sentry__options_getref(); Options;  \
         sentry_options_free((sentry_options_t *)Options), Options = NULL)

src/sentry_scope.c

@@ -624,6 +624,41 @@ sentry_scope_set_fingerprint_n(
     va_end(va);
 }
 
+void
+sentry__scope_set_propagation_context(
+    sentry_scope_t *scope, const char *key, sentry_value_t value)
+{
+    sentry_value_set_by_key(scope->propagation_context, key, value);
+}
+
+void
+sentry_scope_set_trace(
+    sentry_scope_t *scope, const char *trace_id, const char *parent_span_id)
+{
+    sentry_scope_set_trace_n(scope, trace_id, sentry__guarded_strlen(trace_id),
+        parent_span_id, sentry__guarded_strlen(parent_span_id));
+}
+
+void
+sentry_scope_set_trace_n(sentry_scope_t *scope, const char *trace_id,
+    size_t trace_id_len, const char *parent_span_id, size_t parent_span_id_len)
+{
+    sentry_value_t context = sentry_value_new_object();
+
+    sentry_value_set_by_key(context, "type", sentry_value_new_string("trace"));
+
+    sentry_value_set_by_key(
+        context, "trace_id", sentry_value_new_string_n(trace_id, trace_id_len));
+    sentry_value_set_by_key(context, "parent_span_id",
+        sentry_value_new_string_n(parent_span_id, parent_span_id_len));
+
+    sentry_uuid_t span_id = sentry_uuid_new_v4();
+    sentry_value_set_by_key(
+        context, "span_id", sentry__value_new_span_uuid(&span_id));
+
+    sentry__scope_set_propagation_context(scope, "trace", context);
+}
+
 void
 sentry_scope_set_transaction(sentry_scope_t *scope, const char *transaction)
 {

src/sentry_scope.h

@@ -85,6 +85,8 @@ void sentry__scope_set_fingerprint_va(
     sentry_scope_t *scope, const char *fingerprint, va_list va);
 void sentry__scope_set_fingerprint_nva(sentry_scope_t *scope,
     const char *fingerprint, size_t fingerprint_len, va_list va);
+void sentry__scope_set_propagation_context(
+    sentry_scope_t *scope, const char *type, sentry_value_t context);
 
 /**
  * These are convenience macros to automatically lock/unlock the global scope