Merge branch 'master' into 2.44.1

Author: elliette

.github/workflows/build.yaml

@@ -1,6 +1,6 @@
-# Copyright 2020 The Chromium Authors. All rights reserved.
+# Copyright 2020 The Flutter Authors
 # Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 name: devtools
 

.github/workflows/flutter-prep.yaml

@@ -1,6 +1,6 @@
-# Copyright 2023 The Chromium Authors. All rights reserved.
+# Copyright 2023 The Flutter Authors
 # Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 name: Flutter SDK prep
 

analysis_options.yaml

@@ -67,7 +67,7 @@ linter:
     - cancel_subscriptions
     # - cascade_invocations # not yet tested
     # - close_sinks # https://github.com/flutter/flutter/issues/5789
-    # - comment_references # blocked on https://github.com/dart-lang/dartdoc/issues/1153
+    - comment_references
     # - constant_identifier_names # https://github.com/dart-lang/linter/issues/204
     - control_flow_in_finally
     - directives_ordering

flutter-candidate.txt

@@ -1 +1 @@
-9ffdd3a0ecfa94b94a2fa856fc94e4fcbb2f50c6
+f0992e09655aca7ed2a162042e6ba874f1280dc2

packages/devtools_app/benchmark/devtools_benchmarks_test.dart

@@ -124,12 +124,13 @@ void _verifyScoresAgainstThresholds(
 }) {
   final identifier = '${devToolsBenchmark.id}.${useWasm ? 'wasm' : 'js'}';
   stdout.writeln('Verifying $identifier scores against expected thresholds.');
+  final benchmarkThresholds = _benchmarkThresholds(useWasm);
   expect(
-    _benchmarkThresholds.containsKey(devToolsBenchmark),
+    benchmarkThresholds.containsKey(devToolsBenchmark),
     isTrue,
     reason: 'Missing expected thresholds for ${devToolsBenchmark.id}.',
   );
-  final expectedThresholds = _benchmarkThresholds[devToolsBenchmark]!;
+  final expectedThresholds = benchmarkThresholds[devToolsBenchmark]!;
 
   final scoresAsMap = Map.fromEntries([
     for (final score in scores) MapEntry(score.metric, score),
@@ -171,8 +172,13 @@ void _verifyScoresAgainstThresholds(
 }
 
 const _frameTimeFor60FPSInMicros = 16666.6;
+const _frameTimeFor30FPSInMicros = 33333.3;
 
-final _benchmarkThresholds = {
+/// Creates the expected [DevToolsBenchmark]s for the specified compiler.
+///
+/// Note that some of the wasm benchmarks use a 30fps frame budget instead of
+/// the 60fps frame budget due to https://issues.chromium.org/issues/396208308.
+Map<DevToolsBenchmark, Map<String, num>> _benchmarkThresholds(bool isWasm) => {
   // Note that some of these benchmarks exceed the 60fps frame budget,
   // especially the p90 benchmarks.
   //
@@ -204,29 +210,33 @@ final _benchmarkThresholds = {
   DevToolsBenchmark.offlineCpuProfilerScreen: {
     ..._valuesForMetric(
       BenchmarkMetric.flutterFrameTotalTime,
-      avg: _frameTimeFor60FPSInMicros * 2,
-      p50: _frameTimeFor60FPSInMicros,
+      avg:
+          (isWasm ? _frameTimeFor30FPSInMicros : _frameTimeFor60FPSInMicros) *
+          2,
+      p50: isWasm ? _frameTimeFor30FPSInMicros * 2 : _frameTimeFor60FPSInMicros,
       p90: _frameTimeFor60FPSInMicros * 6,
     ),
     ..._valuesForMetric(
       BenchmarkMetric.flutterFrameBuildTime,
       avg: _frameTimeFor60FPSInMicros * 2,
       p50: _frameTimeFor60FPSInMicros,
-      p90: _frameTimeFor60FPSInMicros,
+      p90: isWasm ? _frameTimeFor30FPSInMicros : _frameTimeFor60FPSInMicros,
     ),
     ..._valuesForMetric(
       BenchmarkMetric.flutterFrameRasterTime,
-      avg: _frameTimeFor60FPSInMicros * 2,
-      p50: _frameTimeFor60FPSInMicros,
-      p90: _frameTimeFor60FPSInMicros,
+      avg:
+          (isWasm ? _frameTimeFor30FPSInMicros : _frameTimeFor60FPSInMicros) *
+          2,
+      p50: isWasm ? _frameTimeFor30FPSInMicros * 2 : _frameTimeFor60FPSInMicros,
+      p90: isWasm ? _frameTimeFor30FPSInMicros * 3 : _frameTimeFor60FPSInMicros,
     ),
   },
   DevToolsBenchmark.offlinePerformanceScreen: {
     ..._valuesForMetric(
       BenchmarkMetric.flutterFrameTotalTime,
       avg: _frameTimeFor60FPSInMicros,
       p50: _frameTimeFor60FPSInMicros,
-      p90: _frameTimeFor60FPSInMicros,
+      p90: _frameTimeFor30FPSInMicros,
     ),
     ..._valuesForMetric(
       BenchmarkMetric.flutterFrameBuildTime,

packages/devtools_app/benchmark/scripts/utils.dart

@@ -1,6 +1,6 @@
-// Copyright 2023 The Chromium Authors. All rights reserved.
+// Copyright 2023 The Flutter Authors
 // Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 
 import 'dart:io';
 

packages/devtools_app/integration_test/README.md

@@ -7,82 +7,101 @@ found in the LICENSE file or at https://developers.google.com/open-source/licens
 
 ## Set up ChromeDriver (one time only)
 
-1. Follow the instructions [here](https://flutter.dev/to/integration-test-on-web) to download ChromeDriver.
+1. Follow the instructions
+   [here](https://flutter.dev/to/integration-test-on-web) to download
+   ChromeDriver.
 
-2. Add `chromedriver` to your PATH by modifying your `.bash_profile` or `.zshrc`:
+2. Add `chromedriver` to your PATH by modifying your `.bash_profile` or
+   `.zshrc`:
 
-```
-export PATH=${PATH}:/Users/me/folder_containing_chromedriver/
-```
+   ```
+   export PATH=${PATH}:/Users/me/folder_containing_chromedriver/
+   ```
 
 3. Verify you can start `chromedriver`:
 
-```
-chromedriver --port=4444
-```
+   ```
+   chromedriver --port=4444
+   ```
 
-If you get the error "'chromedriver' cannot be opened because it is from an unidentified developer.", run the following command with your path to the `chromedriver` executable:
+   If you get the error "'chromedriver' cannot be opened because it is from an
+   unidentified developer." on MacOS, run the following command with your path
+   to the `chromedriver` executable:
 
-```
-xattr -d com.apple.quarantine ~/path/to/chromedriver
-```
+   ```
+   xattr -d com.apple.quarantine ~/path/to/chromedriver
+   ```
 
 ### Updating ChromeDriver
 
-If you update your Chrome version (or it updates automatically), you may need to update your `chromedriver`
-executable as well. To do this, delete your existing `chromedriver` executable (you can find this by
-running `which chromedriver`). Then, download the proper `chromedriver` zip file from
-[here](https://googlechromelabs.github.io/chrome-for-testing/#stable) based on your platform. Copy the
-link for your platform, open in a new tab, and then the zip file will be downloaded. Unzip the
-folder, and move the executable to the same location that you just deleted the previous executable from.
+If you update your Chrome version (or it updates automatically), you may need to
+update your `chromedriver` executable as well. To do this, delete your existing
+`chromedriver` executable (you can find this by running `which chromedriver`).
+Then, download the proper `chromedriver` zip file from
+[here](https://googlechromelabs.github.io/chrome-for-testing/#stable) based on
+your platform. Copy the link for your platform, open in a new tab, and then the
+zip file will be downloaded. Unzip the folder, and move the executable to the
+same location that you just deleted the previous executable from.
+
+If you are on MacOS, you will likely need to run this command again on the new
+executable:
 
-If you are on Mac, you will likely need to run this command again on the new executable:
 ```
 xattr -d com.apple.quarantine ~/path/to/chromedriver
 ```
 
 ## Running a test
 
 * To run all integration tets: `dart run integration_test/run_tests.dart`
-* To run a single integration test: `dart run integration_test/run_tests.dart --target=integration_test/test/my_test.dart`
+* To run a single integration test:
+  `dart run integration_test/run_tests.dart --target=integration_test/test/my_test.dart`
 
 ### Special flags:
 
-* `--test-app-uri`: to speed up local development, you can pass in a vm service uri from a Dart or Flutter
-app running on your local machine. This saves the cost of spinning up a new test app for each test run. To
-do this, pass the vm service uri using the `--test-app-uri=some-uri` run flag.
-* `--headless`: this will run the integration test on the 'web-server' device instead of the 'chrome' device, meaning you will not be able to see the integration test run in Chrome when running locally.
-* `--update-goldens`: behaves like the `--update-goldens` flag for Flutter unit tests,
-updating the golden images to the results produced by the test run.
-
-The following flags are available, but should not be used manually. To run a test with offline data
-or with experiments enabled, place the test in the proper directory, and the `run_tests.dart` script
-will propagate the proper flag values automatically (see [instructions below](#where-to-add-an-integration-test))
+* `--test-app-uri`: to speed up local development, you can pass in a VM service
+  URI from a Dart or Flutter app running on your local machine. This saves the
+  cost of spinning up a new test app for each test run. To do this, pass the VM
+  service URI using the `--test-app-uri=some-uri` run flag.
+* `--headless`: this will run the integration test on the 'web-server' device
+  instead of the 'chrome' device, meaning you will not be able to see the
+  integration test run in Chrome when running locally.
+* `--update-goldens`: behaves like the `--update-goldens` flag for Flutter unit
+  tests, updating the golden images to the results produced by the test run.
+
+The following flags are available, but should not be used manually. To run a
+test with offline data or with experiments enabled, place the test in the proper
+directory, and the `run_tests.dart` script will propagate the proper flag values
+automatically (see [instructions below](#where-to-add-an-integration-test)).
 
 # Where to add an integration test
 
-Where you should place your integration test will depend on the answers to the following questions:
-1. Does your test require DevTools to be connected to a live test application? This is a
-["live connection"](#live-connection-integration-tests) integration test.
+Where you should place your integration test will depend on the answers to the
+following questions:
+
+1. Does your test require DevTools to be connected to a live test application?
+   This is a ["live connection"](#live-connection-integration-tests) integration
+   test.
 2. Does your test need to use offline (and stable) test data? This is an
-["offline"](#offline-integration-tests) integration test.
+   ["offline"](#offline-integration-tests) integration test.
 
 ## "live connection" integration tests
 
-Tests under `integration_test/test/live_connection` will run DevTools and connect it to a live Dart or Flutter
-application.
+Tests under `integration_test/test/live_connection` will run DevTools and
+connect it to a live Dart or Flutter application.
 
 ## "offline" integration tests
 
-Tests under `integration_test/test/offline` will run DevTools without connecting it to a live application.
-Integration tests in this directory will load offline data for testing. This is useful
-for testing features that will not have stable data from a live application. For example,
-the Performance screen timeline data will never be stable with a live applicaiton, so
-loading offline data allows for screenshot testing without flakiness.
+Tests under `integration_test/test/offline` will run DevTools without connecting
+it to a live application. Integration tests in this directory will load offline
+data for testing. This is useful for testing features that will not have stable
+data from a live application. For example, the Performance screen timeline data
+will never be stable with a live applicaiton, so loading offline data allows for
+screenshot testing without flakiness.
 
 # In-file test arguments
 
-Some test arguments are set in the test file directly as specifically formatted comments.
+Some test arguments are set in the test file directly as specifically formatted
+comments.
 
 For example:
 ```dart
@@ -91,5 +110,7 @@ For example:
 // test-argument:experimentsOn=true
 ```
 
-For a list of such arguments, see [_in_file_args.dart](test_infra/run/_in_file_args.dart). For an example of
-usage, see [eval_and_browse_test.dart](test/live_connection/eval_and_browse_test.dart).
+For a list of such arguments, see
+[_in_file_args.dart](test_infra/run/_in_file_args.dart). For an example of
+usage, see
+[eval_and_browse_test.dart](test/live_connection/eval_and_browse_test.dart).

packages/devtools_app/integration_test/test/live_connection/network_screen_test.dart

@@ -0,0 +1,123 @@
+// Copyright 2025 The Flutter Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
+
+// Do not delete these arguments. They are parsed by test runner.
+// test-argument:appPath="test/test_infra/fixtures/networking_app/bin/main.dart"
+
+import 'package:devtools_app/devtools_app.dart';
+import 'package:devtools_app/src/shared/table/table.dart' show DevToolsTable;
+import 'package:devtools_test/helpers.dart';
+import 'package:devtools_test/integration_test.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:http/http.dart' as http;
+import 'package:integration_test/integration_test.dart';
+
+// To run:
+// dart run integration_test/run_tests.dart --target=integration_test/test/live_connection/network_screen_test.dart --test-app-device=cli
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  late TestApp testApp;
+
+  setUpAll(() {
+    testApp = TestApp.fromEnvironment();
+    expect(testApp.vmServiceUri, isNotNull);
+  });
+
+  tearDown(() async {
+    await resetHistory();
+    await http.get(Uri.parse('http://localhost:${testApp.controlPort}/exit/'));
+  });
+
+  testWidgets('nnn', (tester) async {
+    await pumpAndConnectDevTools(tester, testApp);
+    await _prepareNetworkScreen(tester);
+
+    final helper = _NetworkScreenHelper(tester, testApp.controlPort!);
+
+    // Instruct the app to make a GET request via the dart:io HttpClient.
+    await helper.triggerRequest('get/');
+    _expectInRequestTable('GET');
+    await helper.clear();
+
+    // Instruct the app to make a POST request via the dart:io HttpClient.
+    await helper.triggerRequest('post/');
+    _expectInRequestTable('POST');
+    await helper.clear();
+
+    // Instruct the app to make a PUT request via the dart:io HttpClient.
+    await helper.triggerRequest('put/');
+    _expectInRequestTable('PUT');
+    await helper.clear();
+
+    // Instruct the app to make a DELETE request via the dart:io HttpClient.
+    await helper.triggerRequest('delete/');
+    _expectInRequestTable('DELETE');
+    await helper.clear();
+
+    // Instruct the app to make a GET request via the 'http' package.
+    await helper.triggerRequest('packageHttp/get/');
+    _expectInRequestTable('GET');
+    await helper.clear();
+
+    // Instruct the app to make a POST request via the 'http' package.
+    await helper.triggerRequest('packageHttp/post/');
+    _expectInRequestTable('POST');
+    await helper.clear();
+
+    // Instruct the app to make a GET request via Dio.
+    await helper.triggerRequest('dio/get/');
+    _expectInRequestTable('GET');
+    await helper.clear();
+
+    // Instruct the app to make a POST request via Dio.
+    await helper.triggerRequest('dio/post/');
+    _expectInRequestTable('POST');
+  });
+}
+
+final class _NetworkScreenHelper {
+  _NetworkScreenHelper(this._tester, this._controlPort);
+
+  final WidgetTester _tester;
+
+  final int _controlPort;
+
+  Future<void> clear() async {
+    // Press the 'Clear' button between tests.
+    await _tester.tap(find.text('Clear'));
+    await _tester.pump(safePumpDuration);
+    expect(
+      screenControllers.lookup<NetworkController>().requests.value,
+      isEmpty,
+    );
+  }
+
+  Future<void> triggerRequest(String path) async {
+    await http.get(Uri.parse('http://localhost:$_controlPort/$path'));
+    await Future.delayed(const Duration(milliseconds: 200));
+    await _tester.pump(safePumpDuration);
+  }
+}
+
+void _expectInRequestTable(String text) {
+  expect(
+    find.descendant(
+      of: find.byType(DevToolsTable<NetworkRequest>),
+      matching: find.text(text),
+    ),
+    findsOneWidget,
+  );
+}
+
+/// Prepares the UI of the network screen for an integration test.
+Future<void> _prepareNetworkScreen(WidgetTester tester) async {
+  await switchToScreen(
+    tester,
+    tabIcon: ScreenMetaData.network.icon,
+    tabIconAsset: ScreenMetaData.network.iconAsset,
+    screenId: ScreenMetaData.network.id,
+  );
+}