Prepare to be able to disable `SyncDurationMetricPlugin` for regular sync.
This commit is contained in:
parent
e9e391d1cd
commit
2e8ed1bef2
|
@ -43,6 +43,27 @@ inline fun List<MetricPlugin>.measureMetric(block: () -> Unit) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Executes the given [block] while measuring the transaction.
|
||||||
|
*
|
||||||
|
* @param block Action/Task to be executed within this span.
|
||||||
|
*/
|
||||||
|
@OptIn(ExperimentalContracts::class)
|
||||||
|
inline fun List<SpannableMetricPlugin>.measureSpannableMetric(block: List<SpannableMetricPlugin>.() -> Unit) {
|
||||||
|
contract {
|
||||||
|
callsInPlace(block, InvocationKind.EXACTLY_ONCE)
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
this.forEach { plugin -> plugin.startTransaction() } // Start the transaction.
|
||||||
|
block()
|
||||||
|
} catch (throwable: Throwable) {
|
||||||
|
this.forEach { plugin -> plugin.onError(throwable) } // Capture if there is any exception thrown.
|
||||||
|
throw throwable
|
||||||
|
} finally {
|
||||||
|
this.forEach { plugin -> plugin.finishTransaction() } // Finally, finish this transaction.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Executes the given [block] while measuring a span.
|
* Executes the given [block] while measuring a span.
|
||||||
*
|
*
|
||||||
|
|
|
@ -19,8 +19,9 @@ package org.matrix.android.sdk.internal.session.sync
|
||||||
import com.zhuinden.monarchy.Monarchy
|
import com.zhuinden.monarchy.Monarchy
|
||||||
import io.realm.Realm
|
import io.realm.Realm
|
||||||
import org.matrix.android.sdk.api.MatrixConfiguration
|
import org.matrix.android.sdk.api.MatrixConfiguration
|
||||||
import org.matrix.android.sdk.api.extensions.measureMetric
|
|
||||||
import org.matrix.android.sdk.api.extensions.measureSpan
|
import org.matrix.android.sdk.api.extensions.measureSpan
|
||||||
|
import org.matrix.android.sdk.api.extensions.measureSpannableMetric
|
||||||
|
import org.matrix.android.sdk.api.metrics.SpannableMetricPlugin
|
||||||
import org.matrix.android.sdk.api.metrics.SyncDurationMetricPlugin
|
import org.matrix.android.sdk.api.metrics.SyncDurationMetricPlugin
|
||||||
import org.matrix.android.sdk.api.session.pushrules.PushRuleService
|
import org.matrix.android.sdk.api.session.pushrules.PushRuleService
|
||||||
import org.matrix.android.sdk.api.session.pushrules.RuleScope
|
import org.matrix.android.sdk.api.session.pushrules.RuleScope
|
||||||
|
@ -72,7 +73,7 @@ internal class SyncResponseHandler @Inject constructor(
|
||||||
val isInitialSync = fromToken == null
|
val isInitialSync = fromToken == null
|
||||||
Timber.v("Start handling sync, is InitialSync: $isInitialSync")
|
Timber.v("Start handling sync, is InitialSync: $isInitialSync")
|
||||||
|
|
||||||
relevantPlugins.measureMetric {
|
relevantPlugins.measureSpannableMetric {
|
||||||
startCryptoService(isInitialSync)
|
startCryptoService(isInitialSync)
|
||||||
|
|
||||||
// Handle the to device events before the room ones
|
// Handle the to device events before the room ones
|
||||||
|
@ -101,8 +102,8 @@ internal class SyncResponseHandler @Inject constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun startCryptoService(isInitialSync: Boolean) {
|
private fun List<SpannableMetricPlugin>.startCryptoService(isInitialSync: Boolean) {
|
||||||
relevantPlugins.measureSpan("task", "start_crypto_service") {
|
measureSpan("task", "start_crypto_service") {
|
||||||
measureTimeMillis {
|
measureTimeMillis {
|
||||||
if (!cryptoService.isStarted()) {
|
if (!cryptoService.isStarted()) {
|
||||||
Timber.v("Should start cryptoService")
|
Timber.v("Should start cryptoService")
|
||||||
|
@ -115,8 +116,8 @@ internal class SyncResponseHandler @Inject constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun handleToDevice(syncResponse: SyncResponse, reporter: ProgressReporter?) {
|
private suspend fun List<SpannableMetricPlugin>.handleToDevice(syncResponse: SyncResponse, reporter: ProgressReporter?) {
|
||||||
relevantPlugins.measureSpan("task", "handle_to_device") {
|
measureSpan("task", "handle_to_device") {
|
||||||
measureTimeMillis {
|
measureTimeMillis {
|
||||||
Timber.v("Handle toDevice")
|
Timber.v("Handle toDevice")
|
||||||
reportSubtask(reporter, InitialSyncStep.ImportingAccountCrypto, 100, 0.1f) {
|
reportSubtask(reporter, InitialSyncStep.ImportingAccountCrypto, 100, 0.1f) {
|
||||||
|
@ -130,14 +131,14 @@ internal class SyncResponseHandler @Inject constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun startMonarchyTransaction(
|
private suspend fun List<SpannableMetricPlugin>.startMonarchyTransaction(
|
||||||
syncResponse: SyncResponse,
|
syncResponse: SyncResponse,
|
||||||
isInitialSync: Boolean,
|
isInitialSync: Boolean,
|
||||||
reporter: ProgressReporter?,
|
reporter: ProgressReporter?,
|
||||||
aggregator: SyncResponsePostTreatmentAggregator
|
aggregator: SyncResponsePostTreatmentAggregator
|
||||||
) {
|
) {
|
||||||
// Start one big transaction
|
// Start one big transaction
|
||||||
relevantPlugins.measureSpan("task", "monarchy_transaction") {
|
measureSpan("task", "monarchy_transaction") {
|
||||||
monarchy.awaitTransaction { realm ->
|
monarchy.awaitTransaction { realm ->
|
||||||
// IMPORTANT nothing should be suspend here as we are accessing the realm instance (thread local)
|
// IMPORTANT nothing should be suspend here as we are accessing the realm instance (thread local)
|
||||||
handleRooms(reporter, syncResponse, realm, isInitialSync, aggregator)
|
handleRooms(reporter, syncResponse, realm, isInitialSync, aggregator)
|
||||||
|
@ -149,14 +150,14 @@ internal class SyncResponseHandler @Inject constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun handleRooms(
|
private fun List<SpannableMetricPlugin>.handleRooms(
|
||||||
reporter: ProgressReporter?,
|
reporter: ProgressReporter?,
|
||||||
syncResponse: SyncResponse,
|
syncResponse: SyncResponse,
|
||||||
realm: Realm,
|
realm: Realm,
|
||||||
isInitialSync: Boolean,
|
isInitialSync: Boolean,
|
||||||
aggregator: SyncResponsePostTreatmentAggregator
|
aggregator: SyncResponsePostTreatmentAggregator
|
||||||
) {
|
) {
|
||||||
relevantPlugins.measureSpan("task", "handle_rooms") {
|
measureSpan("task", "handle_rooms") {
|
||||||
measureTimeMillis {
|
measureTimeMillis {
|
||||||
Timber.v("Handle rooms")
|
Timber.v("Handle rooms")
|
||||||
reportSubtask(reporter, InitialSyncStep.ImportingAccountRoom, 1, 0.8f) {
|
reportSubtask(reporter, InitialSyncStep.ImportingAccountRoom, 1, 0.8f) {
|
||||||
|
@ -170,8 +171,8 @@ internal class SyncResponseHandler @Inject constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun handleAccountData(reporter: ProgressReporter?, realm: Realm, syncResponse: SyncResponse) {
|
private fun List<SpannableMetricPlugin>.handleAccountData(reporter: ProgressReporter?, realm: Realm, syncResponse: SyncResponse) {
|
||||||
relevantPlugins.measureSpan("task", "handle_account_data") {
|
measureSpan("task", "handle_account_data") {
|
||||||
measureTimeMillis {
|
measureTimeMillis {
|
||||||
reportSubtask(reporter, InitialSyncStep.ImportingAccountData, 1, 0.1f) {
|
reportSubtask(reporter, InitialSyncStep.ImportingAccountData, 1, 0.1f) {
|
||||||
Timber.v("Handle accountData")
|
Timber.v("Handle accountData")
|
||||||
|
@ -183,8 +184,8 @@ internal class SyncResponseHandler @Inject constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun handlePresence(realm: Realm, syncResponse: SyncResponse) {
|
private fun List<SpannableMetricPlugin>.handlePresence(realm: Realm, syncResponse: SyncResponse) {
|
||||||
relevantPlugins.measureSpan("task", "handle_presence") {
|
measureSpan("task", "handle_presence") {
|
||||||
measureTimeMillis {
|
measureTimeMillis {
|
||||||
Timber.v("Handle Presence")
|
Timber.v("Handle Presence")
|
||||||
presenceSyncHandler.handle(realm, syncResponse.presence)
|
presenceSyncHandler.handle(realm, syncResponse.presence)
|
||||||
|
@ -194,8 +195,8 @@ internal class SyncResponseHandler @Inject constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun aggregateSyncResponse(aggregator: SyncResponsePostTreatmentAggregator) {
|
private suspend fun List<SpannableMetricPlugin>.aggregateSyncResponse(aggregator: SyncResponsePostTreatmentAggregator) {
|
||||||
relevantPlugins.measureSpan("task", "aggregator_management") {
|
measureSpan("task", "aggregator_management") {
|
||||||
// Everything else we need to do outside the transaction
|
// Everything else we need to do outside the transaction
|
||||||
measureTimeMillis {
|
measureTimeMillis {
|
||||||
aggregatorHandler.handle(aggregator)
|
aggregatorHandler.handle(aggregator)
|
||||||
|
@ -205,8 +206,8 @@ internal class SyncResponseHandler @Inject constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun postTreatmentSyncResponse(syncResponse: SyncResponse, isInitialSync: Boolean) {
|
private suspend fun List<SpannableMetricPlugin>.postTreatmentSyncResponse(syncResponse: SyncResponse, isInitialSync: Boolean) {
|
||||||
relevantPlugins.measureSpan("task", "sync_response_post_treatment") {
|
measureSpan("task", "sync_response_post_treatment") {
|
||||||
measureTimeMillis {
|
measureTimeMillis {
|
||||||
syncResponse.rooms?.let {
|
syncResponse.rooms?.let {
|
||||||
checkPushRules(it, isInitialSync)
|
checkPushRules(it, isInitialSync)
|
||||||
|
@ -219,8 +220,8 @@ internal class SyncResponseHandler @Inject constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun markCryptoSyncCompleted(syncResponse: SyncResponse, cryptoStoreAggregator: CryptoStoreAggregator) {
|
private fun List<SpannableMetricPlugin>.markCryptoSyncCompleted(syncResponse: SyncResponse, cryptoStoreAggregator: CryptoStoreAggregator) {
|
||||||
relevantPlugins.measureSpan("task", "crypto_sync_handler_onSyncCompleted") {
|
measureSpan("task", "crypto_sync_handler_onSyncCompleted") {
|
||||||
measureTimeMillis {
|
measureTimeMillis {
|
||||||
cryptoSyncHandler.onSyncCompleted(syncResponse, cryptoStoreAggregator)
|
cryptoSyncHandler.onSyncCompleted(syncResponse, cryptoStoreAggregator)
|
||||||
}.also {
|
}.also {
|
||||||
|
|
Loading…
Reference in New Issue