Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Remove distributed tracing of the 'timeline loading' flow (#6644)

Browse source 
* Remove distributed tracing of the 'timeline loading' flow. This is causing crashes in the app when a debug SDK build is used

* Discourage using the APIs related with distributed tracing, explaining the problem
This commit is contained in:
Jorge Martin Espinosa 2026-04-22 17:51:51 +02:00 • committed by GitHub
parent 3a93e882c8
commit e70e5f31a5
3 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
View file

@ -25,7 +25,6 @@ import io.element.android.libraries.matrix.impl.room.preview.RoomPreviewInfoMapp
import io.element.android.libraries.matrix.impl.roomlist.roomOrNull import io.element.android.libraries.matrix.impl.roomlist.roomOrNull
import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction import io.element.android.services.analytics.api.AnalyticsLongRunningTransaction
import io.element.android.services.analytics.api.AnalyticsService import io.element.android.services.analytics.api.AnalyticsService
import io.element.android.services.analytics.api.inBridgeSdkSpan
import io.element.android.services.analytics.api.recordTransaction import io.element.android.services.analytics.api.recordTransaction
import io.element.android.services.analyticsproviders.api.recordChildTransaction import io.element.android.services.analyticsproviders.api.recordChildTransaction
import io.element.android.services.toolbox.api.systemclock.SystemClock import io.element.android.services.toolbox.api.systemclock.SystemClock
@ -128,19 +127,17 @@ class RustRoomFactory(
val timeline = transaction.recordChildTransaction( val timeline = transaction.recordChildTransaction(
operation = "sdkRoom.timelineWithConfiguration", operation = "sdkRoom.timelineWithConfiguration",
description = "Get timeline from the SDK", description = "Get timeline from the SDK",
) { timelineTransaction -> ) {
analyticsService.inBridgeSdkSpan(parentTraceId = timelineTransaction.traceId()) { sdkRoom.timelineWithConfiguration(
sdkRoom.timelineWithConfiguration( TimelineConfiguration(
TimelineConfiguration( focus = TimelineFocus.Live(hideThreadedEvents = hideThreadedEvents),
focus = TimelineFocus.Live(hideThreadedEvents = hideThreadedEvents), filter = eventFilters?.let(TimelineFilter::EventFilter) ?: TimelineFilter.All,
filter = eventFilters?.let(TimelineFilter::EventFilter) ?: TimelineFilter.All, internalIdPrefix = "live",
internalIdPrefix = "live", dateDividerMode = DateDividerMode.DAILY,
dateDividerMode = DateDividerMode.DAILY, trackReadReceipts = TimelineReadReceiptTracking.ALL_EVENTS,
trackReadReceipts = TimelineReadReceiptTracking.ALL_EVENTS, reportUtds = true,
reportUtds = true,
)
) )
} )
} }
GetRoomResult.Joined( GetRoomResult.Joined(

3
services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsSdkSpan.kt
View file

@ -7,9 +7,12 @@
package io.element.android.services.analytics.api package io.element.android.services.analytics.api
import androidx.annotation.Discouraged
/** /**
* Represents an analytics span in the Rust SDK. * Represents an analytics span in the Rust SDK.
*/ */
@Discouraged("This component can cause crashes of the app when using debug builds of the Rust SDK.")
interface AnalyticsSdkSpan { interface AnalyticsSdkSpan {
/** Enters the span and starts collecting metrics. */ /** Enters the span and starts collecting metrics. */
fun enter() fun enter()

3
services/analytics/api/src/main/kotlin/io/element/android/services/analytics/api/AnalyticsService.kt
View file

@ -8,6 +8,7 @@
package io.element.android.services.analytics.api package io.element.android.services.analytics.api
import androidx.annotation.Discouraged
import io.element.android.services.analyticsproviders.api.AnalyticsProvider import io.element.android.services.analyticsproviders.api.AnalyticsProvider
import io.element.android.services.analyticsproviders.api.AnalyticsTransaction import io.element.android.services.analyticsproviders.api.AnalyticsTransaction
import io.element.android.services.analyticsproviders.api.trackers.AnalyticsTracker import io.element.android.services.analyticsproviders.api.trackers.AnalyticsTracker
@ -74,6 +75,7 @@ interface AnalyticsService : AnalyticsTracker, ErrorTracker {
fun removeLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction? fun removeLongRunningTransaction(longRunningTransaction: AnalyticsLongRunningTransaction): AnalyticsTransaction?
/** Enter a span inside the Rust SDK tracing system. If a [parentTraceId] is provided, the SDK trace will be added as a child of that trace. */ /** Enter a span inside the Rust SDK tracing system. If a [parentTraceId] is provided, the SDK trace will be added as a child of that trace. */
@Discouraged("This method can cause crashes of the app when using debug builds of the Rust SDK.")
fun enterSdkSpan(name: String?, parentTraceId: String?): AnalyticsSdkSpan fun enterSdkSpan(name: String?, parentTraceId: String?): AnalyticsSdkSpan
} }
@ -116,6 +118,7 @@ fun AnalyticsService.finishLongRunningTransaction(
} ?: false } ?: false
} }
@Discouraged("This method can cause crashes of the app when using debug builds of the Rust SDK.")
inline fun <T> AnalyticsService.inBridgeSdkSpan(parentTraceId: String?, block: (AnalyticsSdkSpan) -> T): T { inline fun <T> AnalyticsService.inBridgeSdkSpan(parentTraceId: String?, block: (AnalyticsSdkSpan) -> T): T {
val span = enterSdkSpan(name = null, parentTraceId = parentTraceId) val span = enterSdkSpan(name = null, parentTraceId = parentTraceId)
return try { return try {