Missing slow and frozen frames for Auto transactions (#1172)

getsentry · Dec 9, 2022 · deaeece · deaeece
1 parent 1131914
commit deaeece
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixes
+
+- Missing slow and frozen frames for Auto transactions ([#1172](https://github.com/getsentry/sentry-dart/pull/1172))
+
 ### Dependencies
 
 - Bump Android SDK from v6.9.1 to v6.9.2 ([#1167](https://github.com/getsentry/sentry-dart/pull/1167))

diff --git a/dart/lib/src/hub_adapter.dart b/dart/lib/src/hub_adapter.dart
@@ -129,6 +129,7 @@ class HubAdapter implements Hub {
         waitForChildren: waitForChildren,
         autoFinishAfter: autoFinishAfter,
         trimEnd: trimEnd,
+        onFinish: onFinish,
       );
 
   @override

diff --git a/dart/lib/src/protocol/sentry_span.dart b/dart/lib/src/protocol/sentry_span.dart
@@ -7,6 +7,8 @@ import '../sentry_tracer.dart';
 import '../tracing.dart';
 import '../utils.dart';
 
+typedef OnFinishedCallback = Future<void> Function({DateTime? endTimestamp});
+
 class SentrySpan extends ISentrySpan {
   final SentrySpanContext _context;
   DateTime? _endTimestamp;
@@ -19,7 +21,7 @@ class SentrySpan extends ISentrySpan {
 
   SpanStatus? _status;
   final Map<String, String> _tags = {};
-  Function({DateTime? endTimestamp})? _finishedCallback;
+  OnFinishedCallback? _finishedCallback;
 
   @override
   final SentryTracesSamplingDecision? samplingDecision;
@@ -30,7 +32,7 @@ class SentrySpan extends ISentrySpan {
     this._hub, {
     DateTime? startTimestamp,
     this.samplingDecision,
-    Function({DateTime? endTimestamp})? finishedCallback,
+    OnFinishedCallback? finishedCallback,
   }) {
     _startTimestamp = startTimestamp?.toUtc() ?? _hub.options.clock();
     _finishedCallback = finishedCallback;

diff --git a/dart/lib/src/scope.dart b/dart/lib/src/scope.dart
@@ -9,6 +9,8 @@ import 'sentry_options.dart';
 import 'sentry_span_interface.dart';
 import 'sentry_tracer.dart';
 
+typedef _OnScopeObserver = Future<void> Function(ScopeObserver observer);
+
 /// Scope data to be sent with the event
 class Scope {
   /// How important this event is.
@@ -445,8 +447,7 @@ class Scope {
     return clone;
   }
 
-  Future<void> _callScopeObservers(
-      Future<void> Function(ScopeObserver) action) async {
+  Future<void> _callScopeObservers(_OnScopeObserver action) async {
     if (_options.enableScopeSync) {
       for (final scopeObserver in _options.scopeObservers) {
         await action(scopeObserver);

diff --git a/dart/lib/src/sentry.dart b/dart/lib/src/sentry.dart
@@ -41,7 +41,7 @@ class Sentry {
     @internal SentryOptions? options,
   }) async {
     final sentryOptions = options ?? SentryOptions();
-    await _initDefaultValues(sentryOptions, appRunner);
+    await _initDefaultValues(sentryOptions);
 
     try {
       await optionsConfiguration(sentryOptions);
@@ -61,10 +61,7 @@ class Sentry {
     await _init(sentryOptions, appRunner, callAppRunnerInRunZonedGuarded);
   }
 
-  static Future<void> _initDefaultValues(
-    SentryOptions options,
-    AppRunner? appRunner,
-  ) async {
+  static Future<void> _initDefaultValues(SentryOptions options) async {
     _setEnvironmentVariables(options);
 
     // Throws when running on the browser

diff --git a/dart/lib/src/sentry_tracer.dart b/dart/lib/src/sentry_tracer.dart
@@ -23,7 +23,7 @@ class SentryTracer extends ISentrySpan {
   @visibleForTesting
   Timer? get autoFinishAfterTimer => _autoFinishAfterTimer;
 
-  Function(SentryTracer)? _onFinish;
+  OnTransactionFinish? _onFinish;
   var _finishStatus = SentryTracerFinishStatus.notFinishing();
   late final bool _trimEnd;
 
@@ -51,7 +51,7 @@ class SentryTracer extends ISentrySpan {
     bool waitForChildren = false,
     Duration? autoFinishAfter,
     bool trimEnd = false,
-    Function(SentryTracer)? onFinish,
+    OnTransactionFinish? onFinish,
   }) {
     _rootSpan = SentrySpan(
       this,

diff --git a/dart/test/sentry_span_test.dart b/dart/test/sentry_span_test.dart
@@ -226,7 +226,8 @@ void main() {
 
   test('callback called on finish', () async {
     var numberOfCallbackCalls = 0;
-    final sut = fixture.getSut(finishedCallback: ({DateTime? endTimestamp}) {
+    final sut =
+        fixture.getSut(finishedCallback: ({DateTime? endTimestamp}) async {
       numberOfCallbackCalls += 1;
     });
 
@@ -269,7 +270,7 @@ class Fixture {
   SentrySpan getSut({
     DateTime? startTimestamp,
     bool? sampled = true,
-    Function({DateTime? endTimestamp})? finishedCallback,
+    OnFinishedCallback? finishedCallback,
     Duration? autoFinishAfter,
   }) {
     tracer = SentryTracer(context, hub, autoFinishAfter: autoFinishAfter);

diff --git a/flutter/lib/src/integrations/widgets_flutter_binding_integration.dart b/flutter/lib/src/integrations/widgets_flutter_binding_integration.dart
@@ -4,16 +4,17 @@ import 'package:flutter/widgets.dart';
 import 'package:sentry/sentry.dart';
 import '../sentry_flutter_options.dart';
 
+typedef OnWidgetsBinding = WidgetsBinding Function();
+
 /// It is necessary to initialize Flutter method channels so that our plugin can
 /// call into the native code.
 class WidgetsFlutterBindingIntegration
     extends Integration<SentryFlutterOptions> {
-  WidgetsFlutterBindingIntegration(
-      [WidgetsBinding Function()? ensureInitialized])
+  WidgetsFlutterBindingIntegration([OnWidgetsBinding? ensureInitialized])
       : _ensureInitialized =
             ensureInitialized ?? WidgetsFlutterBinding.ensureInitialized;
 
-  final WidgetsBinding Function() _ensureInitialized;
+  final OnWidgetsBinding _ensureInitialized;
 
   @override
   FutureOr<void> call(Hub hub, SentryFlutterOptions options) {