Use Chain.capture instead of runZoned

- [x] Swap all calls of runZoned to Chain.capture. Chain.capture is a wrapper around runZoned that tracks stack traces across asynchronous gaps. [email protected] Review URL: https://codereview.chromium.org/2349753002 .
dart-lang · Sep 16, 2016 · 0d831bd · 0d831bd
1 parent 3360b3c
commit 0d831bd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/runtime/observatory/lib/app.dart b/runtime/observatory/lib/app.dart
@@ -17,6 +17,7 @@ import 'package:observatory/models.dart' as M;
 import 'package:observatory/repositories.dart';
 import 'package:observatory/tracer.dart';
 import 'package:observatory/utils.dart';
+import 'package:stack_trace/stack_trace.dart';
 import 'package:usage/usage_html.dart';
 
 export 'package:observatory/utils.dart';

diff --git a/runtime/observatory/lib/src/app/location_manager.dart b/runtime/observatory/lib/src/app/location_manager.dart
@@ -90,7 +90,7 @@ class LocationManager {
 
   /// Notify the current page that something has changed.
   _visit() {
-    runZoned(() => _app._visit(_uri, internalArguments), onError: (e, st) {
+    Chain.capture(() => _app._visit(_uri, internalArguments), onError: (e, st) {
       if (e is IsolateNotFound) {
         var newPath = ((_app.vm == null || _app.vm.isDisconnected)
             ? '/vm-connect'

diff --git a/runtime/observatory/lib/src/elements/instance_ref.dart b/runtime/observatory/lib/src/elements/instance_ref.dart
@@ -11,7 +11,6 @@ import 'package:observatory/src/elements/helpers/any_ref.dart';
 import 'package:observatory/src/elements/helpers/rendering_scheduler.dart';
 import 'package:observatory/src/elements/helpers/tag.dart';
 import 'package:observatory/src/elements/helpers/uris.dart';
-import 'package:observatory/src/elements/sentinel_value.dart';
 import 'package:observatory/utils.dart';
 
 class InstanceRefElement extends HtmlElement implements Renderable {

diff --git a/runtime/observatory/tests/service/test_helper.dart b/runtime/observatory/tests/service/test_helper.dart
@@ -8,6 +8,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:observatory/service_io.dart';
+import 'package:stack_trace/stack_trace.dart';
 import 'service_test_common.dart';
 
 /// Will be set to the http address of the VM's service protocol before
@@ -271,7 +272,7 @@ class _FlutterDeviceServiceTesterRunner {
     serviceWebsocketAddress = 'ws://localhost:$port/ws';
     serviceHttpAddress = 'http://localhost:$port';
     var name = Platform.script.pathSegments.last;
-    runZoned(() async {
+    Chain.capture(() async {
       var vm =
           new WebSocketVM(new WebSocketVMTarget(serviceWebsocketAddress));
       print('Loading VM...');
@@ -338,7 +339,7 @@ class _ServiceTesterRunner {
       serviceWebsocketAddress = 'ws://localhost:$port/ws';
       serviceHttpAddress = 'http://localhost:$port';
       var name = Platform.script.pathSegments.last;
-      runZoned(() async {
+      Chain.capture(() async {
         var vm =
             new WebSocketVM(new WebSocketVMTarget(serviceWebsocketAddress));
         print('Loading VM...');