Merge branch 'main' into fix/sentry-traced-one-composition-span

Author: 0xadam-brown

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## 8.55.0
 
 ### Features
 

gradle.properties

@@ -16,7 +16,7 @@ android.newDsl=false
 android.experimental.lint.version=9.2.1
 
 # Release information
-versionName=8.54.0
+versionName=8.55.0
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

gradle/wrapper/gradle-wrapper.properties

@@ -107,6 +107,13 @@ public fun SentryTraced(
   val compositionStart =
     if (!alreadyComposed.value) parentCompositionSpan?.let { dateProvider.now() } else null
 
+  val parentCompositionSpan = localSentryCompositionParentSpan.current.item
+  val parentRenderingSpan = localSentryRenderingParentSpan.current.item
+  val dateProvider = Sentry.getCurrentScopes().options.dateProvider
+
+  // Only record spans if we have a parent for them.
+  val compositionStart = parentCompositionSpan?.let { dateProvider.now() }
+
   Box(
     modifier =
       baseModifier.drawWithContent {

sentry-compose/src/androidMain/kotlin/io/sentry/compose/SentryComposeTracing.kt

@@ -18,8 +18,8 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gradle.develocity") version "4.4.2"
-    id("com.gradle.common-custom-user-data-gradle-plugin") version "2.6.0"
+    id("com.gradle.develocity") version "4.5.0"
+    id("com.gradle.common-custom-user-data-gradle-plugin") version "2.8.0"
 }
 
 develocity {