Merge branch '8.x.x' into feat/respect-ignored-span-types-in-start-child

CHANGELOG.md

@@ -36,6 +36,8 @@
   - redact/ignore `View`s of a certain type by adding fully-qualified classname to one of the lists `options.experimental.sessionReplay.addRedactViewClass()` or `options.experimental.sessionReplay.addIgnoreViewClass()`. Note, that all of the view subclasses/subtypes will be redacted/ignored as well
     - For example, (this is already a default behavior) to redact all `TextView`s and their subclasses (`RadioButton`, `EditText`, etc.): `options.experimental.sessionReplay.addRedactViewClass("android.widget.TextView")`
     - If you're using code obfuscation, adjust your proguard-rules accordingly, so your custom view class name is not minified
+- Set span origin in `ActivityLifecycleIntegration` on span options instead of after creating the span / transaction ([#3702](https://github.com/getsentry/sentry-java/pull/3702))
+  - This allows spans to be filtered by span origin on creation
 
 ### Dependencies
 

sentry-opentelemetry/sentry-opentelemetry-extra/src/main/java/io/sentry/opentelemetry/OtelSpanWrapper.java

@@ -26,7 +26,6 @@
 import io.sentry.protocol.MeasurementValue;
 import io.sentry.protocol.SentryId;
 import io.sentry.protocol.TransactionNameSource;
-import io.sentry.protocol.User;
 import io.sentry.util.LazyEvaluator;
 import io.sentry.util.Objects;
 import java.lang.ref.WeakReference;
@@ -210,14 +209,14 @@ public OtelSpanWrapper(
   private void updateBaggageValues() {
     synchronized (this) {
       if (baggage != null && baggage.isMutable()) {
-        final AtomicReference<User> userAtomicReference = new AtomicReference<>();
+        final AtomicReference<SentryId> replayIdAtomicReference = new AtomicReference<>();
         scopes.configureScope(
             scope -> {
-              userAtomicReference.set(scope.getUser());
+              replayIdAtomicReference.set(scope.getReplayId());
             });
         baggage.setValuesFromTransaction(
             getSpanContext().getTraceId(),
-            null,
+            replayIdAtomicReference.get(),
             scopes.getOptions(),
             this.getSamplingDecision(),
             getTransactionName(),

sentry/src/test/java/io/sentry/ScopesTest.kt

@@ -2264,6 +2264,19 @@ class ScopesTest {
         scopes.configureScope { assertSame(transaction, it.transaction) }
     }
 
+    @Test
+    fun `creating a transaction with origin sets the origin on the transaction context`() {
+        val scopes = generateScopes()
+
+        val transactionContext = TransactionContext("transaction-name", "transaction-op")
+        val transactionOptions = TransactionOptions().also {
+            it.origin = "other.span.origin"
+        }
+
+        val transaction = scopes.startTransaction(transactionContext, transactionOptions)
+        assertEquals("other.span.origin", transaction.spanContext.origin)
+    }
+
     private val dsnTest = "https://[email protected]/proj"
 
     private fun generateScopes(optionsConfiguration: Sentry.OptionsConfiguration<SentryOptions>? = null): IScopes {