Revert sentry_scope_set_trace/transaction

> Transactions/spans do not make sense in this setup since they aren't
> cloned and cannot be retrieved to create children.

Author: jpnurmi

examples/example.c

@@ -417,8 +417,6 @@ main(int argc, char **argv)
         sentry_value_t event = sentry_value_new_message_event(
             SENTRY_LEVEL_INFO, NULL, "Hello Scope!");
 
-        sentry_scope_set_transaction(scope, "scoped-transaction");
-
         sentry_value_t default_crumb
             = sentry_value_new_breadcrumb(NULL, "default level is info");
         sentry_scope_add_breadcrumb(scope, default_crumb);

include/sentry.h

@@ -1678,22 +1678,13 @@ 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.
  */
 SENTRY_API void sentry_set_transaction(const char *transaction);
 SENTRY_API void sentry_set_transaction_n(
     const char *transaction, size_t transaction_len);
-SENTRY_API void sentry_scope_set_transaction(
-    sentry_scope_t *scope, const char *transaction);
-SENTRY_API void sentry_scope_set_transaction_n(
-    sentry_scope_t *scope, const char *transaction, size_t transaction_len);
 
 /**
  * Sets the event level.

src/sentry_core.c

@@ -858,6 +858,14 @@ 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)
 {
@@ -913,34 +921,58 @@ sentry_remove_fingerprint(void)
 void
 sentry_set_trace(const char *trace_id, const char *parent_span_id)
 {
-    SENTRY_WITH_SCOPE_MUT (scope) {
-        sentry_scope_set_trace(scope, trace_id, parent_span_id);
-    }
+    sentry_set_trace_n(trace_id, sentry__guarded_strlen(trace_id),
+        parent_span_id, sentry__guarded_strlen(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_scope_set_trace_n(
-            scope, trace_id, trace_id_len, parent_span_id, 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__set_propagation_context("trace", context);
     }
 }
 
 void
 sentry_set_transaction(const char *transaction)
 {
     SENTRY_WITH_SCOPE_MUT (scope) {
-        sentry_scope_set_transaction(scope, transaction);
+        sentry_free(scope->transaction);
+        scope->transaction = sentry__string_clone(transaction);
+
+        if (scope->transaction_object) {
+            sentry_transaction_set_name(scope->transaction_object, transaction);
+        }
     }
 }
 
 void
 sentry_set_transaction_n(const char *transaction, size_t transaction_len)
 {
     SENTRY_WITH_SCOPE_MUT (scope) {
-        sentry_scope_set_transaction_n(scope, transaction, transaction_len);
+        sentry_free(scope->transaction);
+        scope->transaction
+            = sentry__string_clone_n(transaction, transaction_len);
+
+        if (scope->transaction_object) {
+            sentry_transaction_set_name_n(
+                scope->transaction_object, transaction, transaction_len);
+        }
     }
 }
 

src/sentry_core.h

@@ -120,6 +120,8 @@ 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

@@ -636,65 +636,6 @@ sentry_scope_set_fingerprints(
     scope->fingerprint = fingerprints;
 }
 
-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)
-{
-    sentry_free(scope->transaction);
-    scope->transaction = sentry__string_clone(transaction);
-
-    if (scope->transaction_object) {
-        sentry_transaction_set_name(scope->transaction_object, transaction);
-    }
-}
-
-void
-sentry_scope_set_transaction_n(
-    sentry_scope_t *scope, const char *transaction, size_t transaction_len)
-{
-    sentry_free(scope->transaction);
-    scope->transaction = sentry__string_clone_n(transaction, transaction_len);
-
-    if (scope->transaction_object) {
-        sentry_transaction_set_name_n(
-            scope->transaction_object, transaction, transaction_len);
-    }
-}
-
 void
 sentry_scope_set_level(sentry_scope_t *scope, sentry_level_t level)
 {

src/sentry_scope.h

@@ -85,8 +85,6 @@ 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

tests/test_integration_http.py

@@ -1187,5 +1187,3 @@ def test_capture_with_scope(cmake, httpserver):
 
     assert_breadcrumb(envelope, "scoped crumb")
     assert_attachment(envelope)
-
-    assert_meta(envelope, transaction="scoped-transaction")

tests/unit/test_scope.c

@@ -420,76 +420,6 @@ SENTRY_TEST(scope_user)
     sentry_close();
 }
 
-SENTRY_TEST(scope_transaction)
-{
-    SENTRY_TEST_OPTIONS_NEW(options);
-    sentry_init(options);
-
-#define TEST_CHECK_TRANSACTION_EQUAL(event, value)                             \
-    do {                                                                       \
-        sentry_value_t transaction                                             \
-            = sentry_value_get_by_key(event, "transaction");                   \
-        TEST_CHECK_STRING_EQUAL(sentry_value_as_string(transaction), value);   \
-    } while (0)
-
-    // global: "global"
-    sentry_set_transaction("global");
-
-    SENTRY_WITH_SCOPE (global_scope) {
-        // event: null
-        sentry_value_t event = sentry_value_new_object();
-
-        // event <- global: "global"
-        sentry__scope_apply_to_event(
-            global_scope, options, event, SENTRY_SCOPE_NONE);
-        TEST_CHECK_TRANSACTION_EQUAL(event, "global");
-
-        sentry_value_decref(event);
-    }
-
-    SENTRY_WITH_SCOPE (global_scope) {
-        // event: "event"
-        sentry_value_t event = sentry_value_new_object();
-        sentry_value_set_by_key(
-            event, "transaction", sentry_value_new_string("event"));
-
-        // event <- global: "event"
-        sentry__scope_apply_to_event(
-            global_scope, options, event, SENTRY_SCOPE_NONE);
-        TEST_CHECK_TRANSACTION_EQUAL(event, "event");
-
-        sentry_value_decref(event);
-    }
-
-    SENTRY_WITH_SCOPE (global_scope) {
-        // local: "local"
-        sentry_scope_t *local_scope = sentry_local_scope_new();
-        sentry_scope_set_transaction(local_scope, "local");
-
-        // event: "event"
-        sentry_value_t event = sentry_value_new_object();
-        sentry_value_set_by_key(
-            event, "transaction", sentry_value_new_string("event"));
-
-        // event <- local: "event"
-        sentry__scope_apply_to_event(
-            local_scope, options, event, SENTRY_SCOPE_NONE);
-        TEST_CHECK_TRANSACTION_EQUAL(event, "event");
-
-        // event <- global: "event"
-        sentry__scope_apply_to_event(
-            local_scope, options, event, SENTRY_SCOPE_NONE);
-        TEST_CHECK_TRANSACTION_EQUAL(event, "event");
-
-        sentry_scope_free(local_scope);
-        sentry_value_decref(event);
-    }
-
-#undef TEST_CHECK_TRANSACTION_EQUAL
-
-    sentry_close();
-}
-
 SENTRY_TEST(scope_level)
 {
     SENTRY_TEST_OPTIONS_NEW(options);
@@ -672,113 +602,3 @@ SENTRY_TEST(scope_breadcrumbs)
 
     sentry_close();
 }
-
-static sentry_value_t
-event_with_trace(const char *trace_id, const char *parent_span_id)
-{
-    sentry_value_t event = sentry_value_new_object();
-    sentry_value_t trace = sentry_value_new_object();
-    sentry_value_set_by_key(
-        trace, "trace_id", sentry_value_new_string(trace_id));
-    sentry_value_set_by_key(
-        trace, "parent_span_id", sentry_value_new_string(parent_span_id));
-
-    sentry_value_t contexts = sentry_value_new_object();
-    sentry_value_set_by_key(contexts, "trace", trace);
-    sentry_value_set_by_key(event, "contexts", contexts);
-    return event;
-}
-
-SENTRY_TEST(scope_trace)
-{
-    SENTRY_TEST_OPTIONS_NEW(options);
-    sentry_init(options);
-
-#define TEST_CHECK_TRACE_EQUAL(event, trace_id, parent_span_id)                \
-    do {                                                                       \
-        sentry_value_t contexts = sentry_value_get_by_key(event, "contexts");  \
-        sentry_value_t trace = sentry_value_get_by_key(contexts, "trace");     \
-        TEST_CHECK_STRING_EQUAL(                                               \
-            sentry_value_as_string(                                            \
-                sentry_value_get_by_key(trace, "trace_id")),                   \
-            trace_id);                                                         \
-        TEST_CHECK_STRING_EQUAL(                                               \
-            sentry_value_as_string(                                            \
-                sentry_value_get_by_key(trace, "parent_span_id")),             \
-            parent_span_id);                                                   \
-    } while (0)
-
-    // global: "global-xid"
-    sentry_set_trace("global-tid", "global-psid");
-
-    SENTRY_WITH_SCOPE (global_scope) {
-        // event: null
-        sentry_value_t event = sentry_value_new_object();
-
-        // event <- global: "global-xid"
-        sentry__scope_apply_to_event(
-            global_scope, options, event, SENTRY_SCOPE_NONE);
-        TEST_CHECK_TRACE_EQUAL(event, "global-tid", "global-psid");
-
-        sentry_value_decref(event);
-    }
-
-    SENTRY_WITH_SCOPE (global_scope) {
-        // event: "event-xid"
-        sentry_value_t event = event_with_trace("event-tid", "event-psid");
-
-        // event <- global: "event-xid"
-        sentry__scope_apply_to_event(
-            global_scope, options, event, SENTRY_SCOPE_NONE);
-        TEST_CHECK_TRACE_EQUAL(event, "event-tid", "event-psid");
-
-        sentry_value_decref(event);
-    }
-
-    SENTRY_WITH_SCOPE (global_scope) {
-        // local: null
-        sentry_scope_t *local_scope = sentry_local_scope_new();
-
-        // event: null
-        sentry_value_t event = sentry_value_new_object();
-
-        // event <- local: ""
-        sentry__scope_apply_to_event(
-            local_scope, options, event, SENTRY_SCOPE_NONE);
-        TEST_CHECK_TRACE_EQUAL(event, "", "");
-
-        // event <- global: ""
-        sentry__scope_apply_to_event(
-            global_scope, options, event, SENTRY_SCOPE_NONE);
-        TEST_CHECK_TRACE_EQUAL(event, "", "");
-
-        sentry_scope_free(local_scope);
-        sentry_value_decref(event);
-    }
-
-    SENTRY_WITH_SCOPE (global_scope) {
-        // local: "local-xid"
-        sentry_scope_t *local_scope = sentry_local_scope_new();
-        sentry_scope_set_trace(local_scope, "local-tid", "local-psid");
-
-        // event: "event-xid"
-        sentry_value_t event = event_with_trace("event-tid", "event-psid");
-
-        // event <- local: "event-xid"
-        sentry__scope_apply_to_event(
-            local_scope, options, event, SENTRY_SCOPE_NONE);
-        TEST_CHECK_TRACE_EQUAL(event, "event-tid", "event-psid");
-
-        // event <- global: "event-xid"
-        sentry__scope_apply_to_event(
-            local_scope, options, event, SENTRY_SCOPE_NONE);
-        TEST_CHECK_TRACE_EQUAL(event, "event-tid", "event-psid");
-
-        sentry_scope_free(local_scope);
-        sentry_value_decref(event);
-    }
-
-#undef TEST_CHECK_TRACE_EQUAL
-
-    sentry_close();
-}