Removed verbose printing on DevTools events, test webdev with local dwds (#1535)

Anna Gringauze · web-flow · commit 3778a9a14094 · 2022-03-10T13:00:30.000-08:00
* Removed verbose printing on DevTools events, test webdev with local dwds

* Fix analyzer warnings
diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
@@ -10,6 +10,9 @@
 - Add an `ide` query parameter to the Dart DevTools URL for analytics.
 - Fix a race where injected client crashed on events send just before hot
   restart.
+- Remove verbose printing on receiving DevTools events.
+- Update `vm_service` version to `^8.2.0`.
+
 
 **Breaking changes:**
 - `Dwds.start` and `ExpressionCompilerService` now take
diff --git a/dwds/lib/src/dwds_vm_client.dart b/dwds/lib/src/dwds_vm_client.dart
@@ -150,25 +150,31 @@ void _processSendEvent(Map<String, dynamic> event,
   switch (type) {
     case 'DevtoolsEvent':
       {
+        _logger.finest('Received DevTools event: $event');
         var action = payload == null ? null : payload['action'];
         if (action == 'pageReady') {
           if (dwdsStats.isFirstDebuggerReady) {
             if (dwdsStats.devToolsStart != null) {
-              emitEvent(DwdsEvent.devToolsLoad(DateTime.now()
+              var time = DateTime.now()
                   .difference(dwdsStats.devToolsStart)
-                  .inMilliseconds));
+                  .inMilliseconds;
+              emitEvent(DwdsEvent.devToolsLoad(time));
+              _logger.fine('DevTools load time: $time ms');
             }
             if (dwdsStats.debuggerStart != null) {
-              emitEvent(DwdsEvent.debuggerReady(DateTime.now()
+              var time = DateTime.now()
                   .difference(dwdsStats.debuggerStart)
-                  .inMilliseconds));
+                  .inMilliseconds;
+              emitEvent(DwdsEvent.debuggerReady(time));
+              _logger.fine('Debugger ready time: $time ms');
             }
           } else {
-            print('Ignoring already received event: $event');
-            _logger.warning('Ignoring already received event: $event');
+            _logger
+                .finest('Debugger and DevTools startup times alredy recorded.'
+                    ' Ignoring $event.');
           }
         } else {
-          _logger.warning('Ignoring unknown event: $event');
+          _logger.finest('Ignoring unknown event: $event');
         }
       }
   }
diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js
diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml
@@ -34,7 +34,7 @@ dependencies:
   stack_trace: ^1.10.0
   sse: ^4.1.0
   uuid: '>=2.0.0 <4.0.0'
-  vm_service: ^8.1.0
+  vm_service: ^8.2.0
   web_socket_channel: ^2.0.0
   webkit_inspection_protocol: ^1.0.0
 
diff --git a/webdev/lib/src/serve/webdev_server.dart b/webdev/lib/src/serve/webdev_server.dart
@@ -132,7 +132,7 @@ class WebDevServer {
           options.configuration.hostname,
           options.port,
           assetHandler,
-          options.configuration.verbose,
+          verbose: options.configuration.verbose,
         );
       }
       var shouldServeDevTools =
diff --git a/webdev/lib/src/version.dart b/webdev/lib/src/version.dart
diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml
@@ -1,6 +1,6 @@
 name: webdev
 # Every time this changes you need to run `dart run build_runner build`.
-version: 2.7.8
+version: 2.7.9-dev
 # We should not depend on a dev SDK before publishing.
 # publish_to: none
 homepage: https://github.com/dart-lang/webdev
@@ -47,10 +47,10 @@ dev_dependencies:
   test_process: ^2.0.2
   webdriver: ^3.0.0
 
-# Uncomment for development versions
-# dependency_overrides:
-#   dwds:
-#     path: ../dwds
+# Comment out before releasing webdev.
+dependency_overrides:
+  dwds:
+    path: ../dwds
 
 executables:
   webdev:

Original file line number	Diff line number	Diff line change
`@@ -150,25 +150,31 @@ void _processSendEvent(Map<String, dynamic> event,`
`150`	`150`	`switch (type) {`
`151`	`151`	`case 'DevtoolsEvent':`
`152`	`152`	`{`
	`153`	`+ _logger.finest('Received DevTools event: $event');`
`153`	`154`	`var action = payload == null ? null : payload['action'];`
`154`	`155`	`if (action == 'pageReady') {`
`155`	`156`	`if (dwdsStats.isFirstDebuggerReady) {`
`156`	`157`	`if (dwdsStats.devToolsStart != null) {`
`157`		`- emitEvent(DwdsEvent.devToolsLoad(DateTime.now()`
	`158`	`+ var time = DateTime.now()`
`158`	`159`	`.difference(dwdsStats.devToolsStart)`
`159`		`- .inMilliseconds));`
	`160`	`+ .inMilliseconds;`
	`161`	`+ emitEvent(DwdsEvent.devToolsLoad(time));`
	`162`	`+ _logger.fine('DevTools load time: $time ms');`
`160`	`163`	`}`
`161`	`164`	`if (dwdsStats.debuggerStart != null) {`
`162`		`- emitEvent(DwdsEvent.debuggerReady(DateTime.now()`
	`165`	`+ var time = DateTime.now()`
`163`	`166`	`.difference(dwdsStats.debuggerStart)`
`164`		`- .inMilliseconds));`
	`167`	`+ .inMilliseconds;`
	`168`	`+ emitEvent(DwdsEvent.debuggerReady(time));`
	`169`	`+ _logger.fine('Debugger ready time: $time ms');`
`165`	`170`	`}`
`166`	`171`	`} else {`
`167`		`- print('Ignoring already received event: $event');`
`168`		`- _logger.warning('Ignoring already received event: $event');`
	`172`	`+ _logger`
	`173`	`+ .finest('Debugger and DevTools startup times alredy recorded.'`
	`174`	`+ ' Ignoring $event.');`
`169`	`175`	`}`
`170`	`176`	`} else {`
`171`		`- _logger.warning('Ignoring unknown event: $event');`
	`177`	`+ _logger.finest('Ignoring unknown event: $event');`
`172`	`178`	`}`
`173`	`179`	`}`
`174`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ class WebDevServer {`
`132`	`132`	`options.configuration.hostname,`
`133`	`133`	`options.port,`
`134`	`134`	`assetHandler,`
`135`		`- options.configuration.verbose,`
	`135`	`+ verbose: options.configuration.verbose,`
`136`	`136`	`);`
`137`	`137`	`}`
`138`	`138`	`var shouldServeDevTools =`