Skip to content

Commit 0bb37f1

Browse files
committed
fix(nav3): Remove unverifiable Nav3 timing metrics
1 parent 76818d9 commit 0bb37f1

2 files changed

Lines changed: 10 additions & 52 deletions

File tree

‎sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/navigation/nav3/Nav3Activity.kt‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -296,30 +296,22 @@ private fun Nav3SampleApp(
296296
controller = customTransactionController,
297297
)
298298

299-
val extractorNanosBefore =
300-
performanceState.nameExtractorNanos + performanceState.argumentsExtractorNanos
301-
val startedAtNanos = System.nanoTime()
302-
303299
SentryNavEffect(
304300
backStack = sentryBackStack,
305301
backStackEntryMapper = backStackEntryMapper,
306302
options = sentryNavOptions,
307303
)
308304

309305
if (isPerformanceScenario) {
310-
SideEffect {
311-
performanceState.recordSentryNavEffect(
312-
durationNanos = System.nanoTime() - startedAtNanos,
313-
extractorNanosBefore = extractorNanosBefore,
314-
processedCall = true,
315-
resolvedEntryCount =
316-
if (integrationMode.captureBackStack) {
317-
minOf(sentryBackStack.size, maxCapturedBackStackEntries)
318-
} else {
319-
0
320-
},
321-
)
322-
}
306+
performanceState.recordSentryNavEffect(
307+
processedCall = true,
308+
resolvedEntryCount =
309+
if (integrationMode.captureBackStack) {
310+
minOf(sentryBackStack.size, maxCapturedBackStackEntries)
311+
} else {
312+
0
313+
},
314+
)
323315
}
324316
}
325317

‎sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/navigation/nav3/Nav3PerformanceControls.kt‎

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ internal class Nav3PerformanceState(
9797
var capturedEntriesResolved = 0
9898
private set
9999

100-
private val sentryNavEffectDurations = Nav3PerformanceDurations()
101-
private val extractorDurations = Nav3PerformanceDurations()
102100
private val mutationToCompositionDurations = Nav3PerformanceDurations()
103101
private val mutationToFirstDrawDurations = Nav3PerformanceDurations()
104102
private var pendingOperation: PendingNav3PerformanceOperation? = null
@@ -123,8 +121,6 @@ internal class Nav3PerformanceState(
123121
sentryNavEffectAttempts = 0
124122
sentryNavEffectProcessedCalls = 0
125123
capturedEntriesResolved = 0
126-
sentryNavEffectDurations.clear()
127-
extractorDurations.clear()
128124
mutationToCompositionDurations.clear()
129125
mutationToFirstDrawDurations.clear()
130126
comparisonResult = null
@@ -239,8 +235,6 @@ internal class Nav3PerformanceState(
239235
}
240236

241237
fun recordSentryNavEffect(
242-
durationNanos: Long,
243-
extractorNanosBefore: Long,
244238
processedCall: Boolean,
245239
resolvedEntryCount: Int,
246240
) {
@@ -259,8 +253,6 @@ internal class Nav3PerformanceState(
259253
capturedEntriesResolved += resolvedEntryCount
260254
}
261255
pendingProcessedNavigationWork = false
262-
sentryNavEffectDurations.add(durationNanos)
263-
extractorDurations.add(nameExtractorNanos + argumentsExtractorNanos - extractorNanosBefore)
264256
}
265257

266258
fun startPerformanceRun(status: String) {
@@ -319,8 +311,7 @@ internal class Nav3PerformanceState(
319311
}
320312

321313
fun performanceSummary(label: String): String =
322-
"$label: effect ${sentryNavEffectDurations.compactSummary()}, " +
323-
"first draw ${mutationToFirstDrawDurations.compactSummary()}"
314+
"$label: first draw ${mutationToFirstDrawDurations.compactSummary()}"
324315

325316
fun diagnosticsSummary(currentRoute: String, backStack: String): String = buildString {
326317
appendLine("status=$performanceStatus")
@@ -336,9 +327,6 @@ internal class Nav3PerformanceState(
336327
appendLine("arguments_extractor_calls=$argumentsExtractorCalls")
337328
appendLine("name_extractor_avg=${nameExtractorAverageMicros()}")
338329
appendLine("arguments_extractor_avg=${argumentsExtractorAverageMicros()}")
339-
appendLine("sentry_nav_effect_duration=${sentryNavEffectDurationSummary()}")
340-
appendLine("extractor_duration=${extractorDurationSummary()}")
341-
appendLine("non_extractor_estimate=${nonExtractorDurationSummary()}")
342330
appendLine("mutation_to_composition=${mutationToCompositionSummary()}")
343331
appendLine("mutation_to_first_draw=${mutationToFirstDrawSummary()}")
344332
appendLine("first_draws_over_8_3_ms=${firstDrawsOver8Millis()}")
@@ -391,13 +379,6 @@ internal class Nav3PerformanceState(
391379
pendingMeasuredPhase = null
392380
}
393381

394-
fun sentryNavEffectDurationSummary(): String = sentryNavEffectDurations.summary()
395-
396-
fun extractorDurationSummary(): String = extractorDurations.summary()
397-
398-
fun nonExtractorDurationSummary(): String =
399-
sentryNavEffectDurations.minus(extractorDurations).summary()
400-
401382
fun mutationToCompositionSummary(): String = mutationToCompositionDurations.summary()
402383

403384
fun mutationToFirstDrawSummary(): String = mutationToFirstDrawDurations.summary()
@@ -954,21 +935,6 @@ internal fun Nav3PerformancePanel(
954935
state.argumentsExtractorAverageMicros(),
955936
tag = navPerformanceTag("arguments_extractor_avg"),
956937
)
957-
PerfInfoRow(
958-
"SentryNavEffect duration",
959-
state.sentryNavEffectDurationSummary(),
960-
tag = navPerformanceTag("sentry_nav_effect_duration"),
961-
)
962-
PerfInfoRow(
963-
"Extractor duration",
964-
state.extractorDurationSummary(),
965-
tag = navPerformanceTag("extractor_duration"),
966-
)
967-
PerfInfoRow(
968-
"Non-extractor estimate",
969-
state.nonExtractorDurationSummary(),
970-
tag = navPerformanceTag("non_extractor_estimate"),
971-
)
972938
PerfInfoRow(
973939
"Mutation to composition",
974940
state.mutationToCompositionSummary(),

0 commit comments

Comments
 (0)