Merge remote-tracking branch 'upstream/master' into fix-widget-rebuilds-profile-mode

# Conflicts:
#	packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md

Author: crackedhandle

.github/workflows/build.yaml

@@ -79,7 +79,7 @@ jobs:
           sudo chmod +x /usr/bin/dcm
           echo "$(dcm --version)"
       - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
+        uses: dart-lang/setup-dart@7654d458321ee25acccccfdb86cd48bd95768ff1
       - name: Run dcm analyze on root
         run: |
           dcm analyze packages/devtools_app packages/devtools_app_shared packages/devtools_extensions packages/devtools_shared packages/devtools_test

.github/workflows/flutter-candidate-update.yaml

@@ -25,7 +25,7 @@ jobs:
         with:
           ref: master
 
-      - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c
+      - uses: dart-lang/setup-dart@7654d458321ee25acccccfdb86cd48bd95768ff1
 
       - name: setup git config
         run: |

TRIAGE.md

@@ -14,7 +14,7 @@ The triager is assigned by an automatic rotation of DevTools team members.
 - [Untriaged issues](https://github.com/flutter/devtools/issues?q=is%3Aopen+is%3Aissue+-label%3AP0%2CP1%2CP2%2CP3)
 - [Reproduce to verify issues](https://github.com/flutter/devtools/labels/reproduce%20to%20verify)
 (issues that need to be manually reproduced in order to verify validity)
-- [flutter/flutter issues related to DevTools](https://github.com/flutter/flutter/labels/d%3A%20devtools)
+- [flutter/flutter issues related to DevTools](https://github.com/flutter/flutter/labels/a%3A%20devtools)
 
 ## Triager responsibilities
 

packages/devtools_app/benchmark/scripts/compare_benchmarks.dart

@@ -5,7 +5,6 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:devtools_app/src/shared/primitives/utils.dart';
 import 'package:web_benchmarks/analysis.dart';
 
 import 'utils.dart';

packages/devtools_app/benchmark/scripts/dart2wasm_performance_diff.dart

@@ -96,7 +96,7 @@ class CsvBuilder {
 
   void writeHeaders({required int averageOf}) {
     writeLines([
-      'Flutter DevTools performance benchmarks diff: dart2wasm diffed against dart2js.',
+      'Flutter DevTools performance benchmarks diff: dart2js (baseline) vs dart2wasm (test).',
       'Benchmark results were averaged over $averageOf benchmark run(s).',
       '',
       'These results were auto-generated by a script:',
@@ -105,9 +105,8 @@ class CsvBuilder {
     ]);
 
     // Write the Flutter and DevTools commit hash for the benchmark run.
-    // TODO(kenz): automatically detect these and write them to the CSV.
-    const flutter = '<enter manually by running \'flutter --version\'>';
-    const devtools = '<enter manually by running \'git log\'>';
+    final flutter = _detectFlutterVersion();
+    final devtools = _detectDevToolsCommit();
     writeLines([
       'Version info:',
       'Flutter: $flutter',
@@ -120,7 +119,8 @@ class CsvBuilder {
     writeLine([
       'Benchmark Name',
       'Metric',
-      'Value (micros)',
+      'Baseline (micros)',
+      'Test (micros)',
       'Delta (micros)',
       'Delta (%)',
     ]);
@@ -178,6 +178,49 @@ class CsvBuilder {
         '(Google Sheets, Excel, etc.) for viewing.',
       );
   }
+
+  String _detectFlutterVersion() {
+    try {
+      final result = Process.runSync('flutter', [
+        '--version',
+        '--machine',
+      ], runInShell: true);
+      if (result.exitCode == 0) {
+        final json =
+            jsonDecode(result.stdout.toString()) as Map<String, Object?>;
+        final flutterVersion = json['flutterVersion'];
+        final frameworkRevision = json['frameworkRevision'];
+        if (flutterVersion != null && frameworkRevision != null) {
+          return '$flutterVersion (revision $frameworkRevision)';
+        }
+        return result.stdout.toString().trim();
+      }
+    } catch (_) {}
+
+    try {
+      final result = Process.runSync('flutter', [
+        '--version',
+      ], runInShell: true);
+      if (result.exitCode == 0) {
+        return result.stdout.toString().trim().split('\n').first;
+      }
+    } catch (_) {}
+
+    return '<unknown>';
+  }
+
+  String _detectDevToolsCommit() {
+    try {
+      final result = Process.runSync('git', [
+        'rev-parse',
+        'HEAD',
+      ], runInShell: true);
+      if (result.exitCode == 0) {
+        return result.stdout.toString().trim();
+      }
+    } catch (_) {}
+    return '<unknown>';
+  }
 }
 
 Future<BenchmarkResults> runBenchmarkOrUseExisting(

packages/devtools_app/benchmark/scripts/utils.dart

@@ -2,10 +2,15 @@
 // 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.
 
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:web_benchmarks/analysis.dart';
 
+/// Returns a pretty-printed representation of a JSON payload.
+String prettyPrintJson(Object? json) =>
+    const JsonEncoder.withIndent('  ').convert(json);
+
 File? checkFileExists(String path) {
   final testFile = File.fromUri(Uri.parse(path));
   if (!testFile.existsSync()) {
@@ -40,14 +45,22 @@ extension BenchmarkResultsExtension on BenchmarkResults {
 
 extension BenchmarkScoreExtension on BenchmarkScore {
   List<String> toCsvLine() {
+    final deltaValue = delta;
+    final baselineValue = deltaValue != null ? value - deltaValue : null;
+    final String deltaPercent;
+    if (baselineValue == null) {
+      deltaPercent = '';
+    } else if (baselineValue == 0) {
+      deltaPercent = 'N/A';
+    } else {
+      deltaPercent = (deltaValue! / baselineValue).toString();
+    }
     return [
       metric, // Metric name
-      value.toString(), // Value
-      delta?.toString() ?? '', // Delta value
-      // value - delta represents the baseline score.
-      delta != null
-          ? (delta! / (value - delta!)).toString()
-          : '', // Delta % value
+      baselineValue?.toString() ?? '', // Baseline value
+      value.toString(), // Test value
+      deltaValue?.toString() ?? '', // Delta value
+      deltaPercent, // Delta % value
     ];
   }
 }

packages/devtools_app/benchmark/test_infra/common.dart

@@ -10,11 +10,9 @@
 /// found" in DevTools.
 const _benchmarkInitialPage = '';
 
-const _wasmQueryParameters = {'compiler': 'wasm'};
-
 String benchmarkPath({required bool useWasm}) => Uri(
   path: _benchmarkInitialPage,
-  queryParameters: useWasm ? _wasmQueryParameters : null,
+  queryParameters: {'compiler': useWasm ? 'wasm' : 'js'},
 ).toString();
 
 String generateBenchmarkEntryPoint({required bool useWasm}) {

packages/devtools_app/lib/devtools_app.dart

@@ -27,6 +27,7 @@ export 'src/screens/deep_link_validation/deep_links_screen.dart';
 export 'src/screens/dtd/dtd_tools_controller.dart';
 export 'src/screens/dtd/dtd_tools_screen.dart';
 export 'src/screens/inspector/inspector_controller.dart';
+export 'src/screens/inspector/inspector_errors.dart';
 export 'src/screens/inspector/inspector_screen.dart';
 export 'src/screens/inspector/inspector_screen_body.dart';
 export 'src/screens/inspector/inspector_screen_controller.dart';

packages/devtools_app/lib/src/framework/scaffold/status_line.dart

@@ -90,7 +90,9 @@ class StatusLine extends StatelessWidget {
     final pageStatus = currentScreen.buildStatus(context);
     final widerThanXxs = screenWidth > MediaSize.xxs;
     final screenMetaData = ScreenMetaData.lookup(currentScreen.screenId);
-    final showVideoTutorial = screenMetaData?.tutorialVideoTimestamp != null;
+    final showVideoTutorial =
+        screenMetaData?.tutorialVideoTimestamp != null ||
+        screenMetaData?.tutorialVideoUrl != null;
     return [
       Row(
         mainAxisSize: MainAxisSize.min,
@@ -237,12 +239,15 @@ class DocumentationLink extends StatelessWidget {
 /// A widget that links to the "Dive in to DevTools" YouTube video at the
 /// chapter for the given [screenMetaData].
 class VideoTutorialLink extends StatelessWidget {
-  const VideoTutorialLink({
+  VideoTutorialLink({
     super.key,
     required this.screenMetaData,
     required this.screenWidth,
     required this.highlightForConnection,
-  });
+  }) : assert(
+         screenMetaData.tutorialVideoTimestamp != null ||
+             screenMetaData.tutorialVideoUrl != null,
+       );
 
   final ScreenMetaData screenMetaData;
 
@@ -262,6 +267,7 @@ class VideoTutorialLink extends StatelessWidget {
       link: GaLink(
         display: screenWidth <= MediaSize.xs ? 'Tutorial' : 'Watch tutorial',
         url:
+            screenMetaData.tutorialVideoUrl ??
             '$_devToolsYouTubeVideoUrl${screenMetaData.tutorialVideoTimestamp}',
         gaScreenName: screenMetaData.id,
         gaSelectedItemDescription:

packages/devtools_app/lib/src/screens/debugger/controls.dart

@@ -64,19 +64,37 @@ class _DebuggingControlsState extends State<DebuggingControls>
       height: defaultButtonHeight,
       child: Row(
         children: [
-          _pauseAndResumeButtons(
-            isPaused: serviceConnection.serviceManager.isMainIsolatePaused,
-            resuming: resuming,
+          // The debugging controls have no way to shrink further once their
+          // labels have already been dropped (see
+          // [DebuggingControls.minWidth]), so below roughly 630px the icon-only
+          // content still does not fit and the [Row] overflows. Making the
+          // controls scroll horizontally keeps every control reachable at any
+          // width instead of clipping them behind an overflow error. The
+          // libraries button stays pinned on the right, outside the scroll
+          // view, so it does not scroll out of reach.
+          Expanded(
+            child: SingleChildScrollView(
+              scrollDirection: Axis.horizontal,
+              child: Row(
+                children: [
+                  _pauseAndResumeButtons(
+                    isPaused:
+                        serviceConnection.serviceManager.isMainIsolatePaused,
+                    resuming: resuming,
+                  ),
+                  const SizedBox(width: denseSpacing),
+                  _stepButtons(canStep: canStep),
+                  const SizedBox(width: denseSpacing),
+                  BreakOnExceptionsControl(controller: controller),
+                  if (isVmApp) ...[
+                    const SizedBox(width: denseSpacing),
+                    CodeStatisticsControls(controller: controller),
+                  ],
+                ],
+              ),
+            ),
           ),
           const SizedBox(width: denseSpacing),
-          _stepButtons(canStep: canStep),
-          const SizedBox(width: denseSpacing),
-          BreakOnExceptionsControl(controller: controller),
-          if (isVmApp) ...[
-            const SizedBox(width: denseSpacing),
-            CodeStatisticsControls(controller: controller),
-          ],
-          const Expanded(child: SizedBox(width: denseSpacing)),
           _librariesButton(),
         ],
       ),