shorebirdtech
diff --git a/‎DEPS‎
Lines changed: 1 addition & 1 deletion b/‎DEPS‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/flutter_tools/bin/xcode_backend.dart‎
Lines changed: 8 additions & 0 deletions b/‎packages/flutter_tools/bin/xcode_backend.dart‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎packages/flutter_tools/gradle/shorebird_trace_init.gradle‎
Lines changed: 159 additions & 0 deletions b/‎packages/flutter_tools/gradle/shorebird_trace_init.gradle‎
Lines changed: 159 additions & 0 deletions
diff --git a/‎packages/flutter_tools/gradle/src/main/kotlin/FlutterPlugin.kt‎
Lines changed: 3 additions & 0 deletions b/‎packages/flutter_tools/gradle/src/main/kotlin/FlutterPlugin.kt‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎packages/flutter_tools/gradle/src/main/kotlin/tasks/BaseFlutterTask.kt‎
Lines changed: 6 additions & 0 deletions b/‎packages/flutter_tools/gradle/src/main/kotlin/tasks/BaseFlutterTask.kt‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎packages/flutter_tools/gradle/src/main/kotlin/tasks/BaseFlutterTaskHelper.kt‎
Lines changed: 3 additions & 0 deletions b/‎packages/flutter_tools/gradle/src/main/kotlin/tasks/BaseFlutterTaskHelper.kt‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎packages/flutter_tools/lib/src/android/gradle.dart‎
Lines changed: 20 additions & 1 deletion b/‎packages/flutter_tools/lib/src/android/gradle.dart‎
Lines changed: 20 additions & 1 deletion
diff --git a/‎packages/flutter_tools/lib/src/base/build.dart‎
Lines changed: 1 addition & 2 deletions b/‎packages/flutter_tools/lib/src/base/build.dart‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎packages/flutter_tools/lib/src/base/net.dart‎
Lines changed: 19 additions & 5 deletions b/‎packages/flutter_tools/lib/src/base/net.dart‎
Lines changed: 19 additions & 5 deletions
@@ -63,7 +63,7 @@ vars = {
   # updated revision list of existing dependencies. You will need to
   # gclient sync before and after update deps to ensure all deps are updated.
   # updated revision list of existing dependencies.
-  'dart_revision': '02abc57898bebc334a997e609ce5827c8ef207d7',
+  'dart_revision': '9854a736bcdbb66afcb332a5576f4f50798c0ab9',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
 
@@ -722,6 +722,14 @@ class Context {
       );
     }
 
+    // Shorebird-specific build-trace plumbing: mac.dart sets
+    // SHOREBIRD_TRACE_FILE in the Xcode build environment; here (running
+    // as an Xcode build phase script) we forward it to flutter assemble.
+    final String? shorebirdTraceFile = environment['SHOREBIRD_TRACE_FILE'];
+    if (shorebirdTraceFile != null && shorebirdTraceFile.isNotEmpty) {
+      flutterArgs.add('--shorebird-trace-file=$shorebirdTraceFile');
+    }
+
     if (environment['CODE_SIZE_DIRECTORY'] != null &&
         environment['CODE_SIZE_DIRECTORY']!.isNotEmpty) {
       flutterArgs.add('-dCodeSizeDirectory=${environment['CODE_SIZE_DIRECTORY']}');
 
@@ -0,0 +1,159 @@
+// Emits Chrome Trace Event Format events for every Gradle task so the
+// Shorebird build trace (`flutter build ... --shorebird-trace`) can show
+// per-task timings alongside flutter tool + flutter assemble spans.
+//
+// This file is Shorebird-specific — it exists in the Shorebird fork of
+// Flutter and has no equivalent upstream. Activated by passing
+// `-I=<this>` together with `-Pshorebird.gradle-trace-file=<path>`.
+// Output file is consumed by Flutter's gradle.dart and merged into the
+// main trace.
+//
+// Events land on tid=4 (flutter tool = 1, native build outer = 2, flutter
+// assemble = 3) so Perfetto shows a clean per-tier layout.
+
+import groovy.json.JsonOutput
+import org.gradle.api.Task
+import org.gradle.api.execution.TaskExecutionListener
+import org.gradle.api.tasks.TaskState
+
+def traceFilePath = gradle.startParameter.projectProperties['shorebird.gradle-trace-file']
+if (!traceFilePath) {
+    traceFilePath = System.getProperty('shorebird.gradle-trace-file')
+}
+if (!traceFilePath) {
+    return
+}
+
+// Flow id shared with flutter_tool so Perfetto draws an arrow from the
+// parent "gradle <task>" span into our first per-task event. Missing
+// when flutter_tool is older than the flow-id plumbing; that's fine,
+// the init script just skips the flow-end event in that case.
+def gradleFlowIdRaw = gradle.startParameter.projectProperties['shorebird.gradle-trace-flow-id']
+def gradleFlowId = gradleFlowIdRaw ? gradleFlowIdRaw.toLong() : null
+
+// Real pid of this Gradle JVM — Gradle tasks belong to this process, so
+// emitting spans on it matches the process topology. Named via a
+// `process_name` metadata event below so Perfetto labels the row
+// "gradle" rather than showing a bare number.
+def gradlePid = ProcessHandle.current().pid()
+def gradleTid = 1
+
+def events = Collections.synchronizedList([
+    [
+        name: 'process_name',
+        ph: 'M',
+        pid: gradlePid,
+        args: [name: 'gradle'],
+    ],
+    [
+        name: 'thread_name',
+        ph: 'M',
+        pid: gradlePid,
+        tid: gradleTid,
+        args: [name: 'gradle tasks'],
+    ],
+])
+def firstTaskFlowEmitted = new java.util.concurrent.atomic.AtomicBoolean(false)
+def startTimesMicros = Collections.synchronizedMap([:])
+
+gradle.addListener(new TaskExecutionListener() {
+    @Override
+    void beforeExecute(Task task) {
+        startTimesMicros[task.path] = System.currentTimeMillis() * 1000L
+    }
+
+    @Override
+    void afterExecute(Task task, TaskState state) {
+        def start = startTimesMicros.remove(task.path)
+        if (start == null) return
+        def end = System.currentTimeMillis() * 1000L
+        def dur = Math.max(0L, end - start)
+        // Classify the task path into a small set of "kinds" so downstream
+        // summarizers can bucket without retaining names. Match against the
+        // task's simple name (last colon segment) so plugin names like
+        // `:package_info_plus:...` don't accidentally trigger the `packaging`
+        // bucket.
+        //
+        // The kind strings below are a wire-format contract with
+        // shorebird_cli (which buckets its summary by these values).
+        // KEEP IN SYNC with the `GradleTaskKind` enum in the
+        // `shorebird_build_trace` package; adding a new kind means
+        // landing the matching enum value there AND teaching
+        // shorebird_cli to bucket it, otherwise it silently falls into
+        // `other`.
+        def path = task.path
+        def lastColon = path.lastIndexOf(':')
+        def simpleName = (lastColon >= 0 ? path.substring(lastColon + 1) : path).toLowerCase()
+
+        // Order matters: the first regex that matches wins. `kotlin_compile`
+        // must precede `java_compile` (both match `compile*`). `java_compile`
+        // must precede the `scaffold` bucket's `prepare*` because AGP's
+        // javaPreCompileRelease is scaffolding-shaped but semantically javac.
+        // `flutter_gradle_plugin` must precede `packaging` so tasks like
+        // `packageFlutterBuild` don't fall through to the `package*` bucket.
+        def kindRules = [
+            [~/^compile.*kotlin.*/,                                   'kotlin_compile'],
+            [~/(^compile.*(java|jni).*|.*precompile.*)/,              'java_compile'],
+            [~/.*aidl.*/,                                             'aidl'],
+            [~/(^minify.*|.*r8.*)/,                                   'r8_minify'],
+            [~/.*dex.*/,                                              'dex'],
+            [~/^lint.*/,                                              'lint'],
+            [~/(.*jnilibs.*|.*nativelibs.*|.*link.*native.*)/,        'native_link'],
+            [~/.*(processresources|mergeresources|mergemanifest|rfile|parserelease|mergerelease|generaterelease).*/, 'resources'],
+            [~/(^compileflutter.*|.*flutterbuild.*|^flutter.*)/,      'flutter_gradle_plugin'],
+            [~/^package.*/,                                           'packaging'],
+            [~/.*bundle.*/,                                           'bundle'],
+            [~/.*transform.*/,                                        'transform'],
+            // Catch-all for Gradle's per-plugin / per-variant scaffolding
+            // (metadata files, proguard rule export, pre-/post-compile
+            // bookkeeping). Individually small but the long tail adds up on
+            // plugin-heavy apps.
+            [~/(.*aarmetadata.*|.*proguard.*|.*validate.*|^check.*|^prepare.*|^generate.*|^copy.*)/, 'gradle_scaffold'],
+        ]
+        def kind = kindRules.find { simpleName ==~ it[0] }?.getAt(1) ?: 'other'
+
+        // The task "owner" is the first colon-separated segment. For
+        // subproject tasks this is typically the plugin name (e.g.
+        // `:camera_android`). Kept for local debug — the privacy-safe
+        // summary that Shorebird writes aggregates this out.
+        def owner = path.startsWith(':') ? path.substring(1).split(':')[0] : ''
+
+        // Emit the flow-end event on the first task, connecting back to
+        // flutter_tool's "gradle <task>" span. Atomic so we emit at most
+        // one across concurrent task callbacks.
+        if (gradleFlowId != null && firstTaskFlowEmitted.compareAndSet(false, true)) {
+            events.add([
+                ph: 'f',
+                name: 'spawn',
+                cat: 'flow',
+                id: gradleFlowId,
+                ts: start,
+                pid: gradlePid,
+                tid: gradleTid,
+                bp: 'e',
+            ])
+        }
+        events.add([
+            name: path,
+            cat: 'gradle_task',
+            ph: 'X',
+            ts: start,
+            dur: dur,
+            pid: gradlePid,
+            tid: gradleTid,
+            args: [
+                kind: kind,
+                owner: owner,
+                skipped: state.skipped,
+                upToDate: state.upToDate,
+                fromCache: state.skipMessage == 'FROM-CACHE',
+            ],
+        ])
+    }
+})
+
+gradle.buildFinished {
+    def f = new File(traceFilePath)
+    f.parentFile?.mkdirs()
+    f.text = JsonOutput.toJson(events)
+}
@@ -597,6 +597,8 @@ class FlutterPlugin : Plugin<Project> {
             val dartDefinesValue: String? = project.findProperty("dart-defines")?.toString()
             val performanceMeasurementFileValue: String? =
                 project.findProperty("performance-measurement-file")?.toString()
+            val shorebirdTraceFileValue: String? =
+                project.findProperty("shorebird-trace-file")?.toString()
             val codeSizeDirectoryValue: String? =
                 project.findProperty("code-size-directory")?.toString()
             val deferredComponentsValue: Boolean =
@@ -694,6 +696,7 @@ class FlutterPlugin : Plugin<Project> {
                     dartObfuscation = dartObfuscationValue
                     dartDefines = dartDefinesValue
                     performanceMeasurementFile = performanceMeasurementFileValue
+                    shorebirdTraceFile = shorebirdTraceFileValue
                     codeSizeDirectory = codeSizeDirectoryValue
                     deferredComponents = deferredComponentsValue
                     validateDeferredComponents = validateDeferredComponentsValue
 
@@ -111,6 +111,12 @@ open class BaseFlutterTask : DefaultTask() {
     @Input
     var performanceMeasurementFile: String? = null
 
+    // Shorebird-specific: path for the Shorebird build trace. Prefixed so
+    // it stands out as fork-only surface in this otherwise upstream file.
+    @Optional
+    @Input
+    var shorebirdTraceFile: String? = null
+
     @Optional
     @Input
     var deferredComponents: Boolean? = null
 
@@ -110,6 +110,9 @@ object BaseFlutterTaskHelper {
             baseFlutterTask.performanceMeasurementFile?.let {
                 args("--performance-measurement-file=$it")
             }
+            baseFlutterTask.shorebirdTraceFile?.let {
+                args("--shorebird-trace-file=$it")
+            }
             args("-dTargetFile=${baseFlutterTask.targetPath}")
             args("-dTargetPlatform=android")
             args("-dBuildMode=${baseFlutterTask.buildMode}")
 
@@ -29,6 +29,7 @@ import '../convert.dart';
 import '../flutter_manifest.dart';
 import '../globals.dart' as globals;
 import '../project.dart';
+import '../shorebird/android_build_trace_session.dart';
 import 'android_builder.dart';
 import 'android_studio.dart';
 import 'gradle_errors.dart';
@@ -276,6 +277,7 @@ class AndroidGradleBuilder implements AndroidBuilder {
     VoidCallback? postRunTask,
     int? maxRetries,
     _OutputParser? outputParser,
+    void Function(Process process)? onStart,
   }) async {
     final bool usesAndroidX = isAppUsingAndroidX(project.android.hostAppGradleRoot);
     final String? agpVersion = gradle.getAgpVersion(
@@ -352,6 +354,7 @@ class AndroidGradleBuilder implements AndroidBuilder {
         allowReentrantFlutter: true,
         environment: _java?.environment,
         mapFunction: consumeLog,
+        onStart: onStart,
       );
     } on ProcessException catch (exception) {
       consumeLog(exception.toString());
@@ -479,7 +482,12 @@ class AndroidGradleBuilder implements AndroidBuilder {
       return;
     }
 
-    // Assembly work starts here.
+    final AndroidBuildTraceSession? traceSession = AndroidBuildTraceSession.maybeStart(
+      androidBuildInfo,
+      _fileSystem,
+      project.android.buildDirectory,
+    );
+
     final BuildInfo buildInfo = androidBuildInfo.buildInfo;
     final String assembleTask = isBuildingBundle
         ? getBundleTaskFor(buildInfo)
@@ -556,6 +564,7 @@ class AndroidGradleBuilder implements AndroidBuilder {
       }
     }
     options.addAll(androidBuildInfo.buildInfo.toGradleConfig());
+    options.addAll(traceSession?.extraGradleOptions(assembleTask) ?? const <String>[]);
     if (buildInfo.fileSystemRoots.isNotEmpty) {
       options.add('-Pfilesystem-roots=${buildInfo.fileSystemRoots.join('|')}');
     }
@@ -569,8 +578,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
     final int exitCode = await _runGradleTask(
       assembleTask,
       preRunTask: () {
+        traceSession?.onGradleAboutToStart();
         sw = Stopwatch()..start();
       },
+      onStart: (process) => traceSession?.onGradleSpawn(process),
       postRunTask: () {
         final Duration elapsedDuration = sw.elapsed;
         _analytics.send(
@@ -588,13 +599,21 @@ class AndroidGradleBuilder implements AndroidBuilder {
       gradleExecutablePath: gradleExecutablePath,
     );
 
+    traceSession?.onGradleFinished(assembleTask);
+
     if (exitCode != 0) {
+      traceSession?.abortOnGradleFailure();
       throwToolExit(
         'Gradle task $assembleTask failed with exit code $exitCode',
         exitCode: exitCode,
       );
     }
 
+    traceSession?.finish(
+      buildTarget: isBuildingBundle ? 'appbundle' : 'apk',
+      printStatus: _logger.printStatus,
+    );
+
     if (isBuildingBundle) {
       final File bundleFile = findBundleFile(project, buildInfo, _logger, _analytics);
 
 
@@ -148,8 +148,7 @@ class AOTSnapshotter {
       // Shorebird uses --deterministic to improve snapshot stability and increase linking.
       '--deterministic',
       // Only save LinkInfo if we're using the linker.
-      if (usesLinker)
-        ...dumpLinkInfoArgs,
+      if (usesLinker) ...dumpLinkInfoArgs,
     ];
 
     final bool targetingApplePlatform =
 
@@ -7,6 +7,7 @@ import 'dart:async';
 import 'package:meta/meta.dart';
 
 import '../convert.dart';
+import '../shorebird/network_trace_span.dart';
 import 'common.dart';
 import 'file_system.dart';
 import 'io.dart';
@@ -87,6 +88,8 @@ class Net {
   Future<bool> _attempt(Uri url, {IOSink? destSink, bool onlyHeaders = false}) async {
     assert(onlyHeaders || destSink != null);
     _logger.printTrace('Downloading: $url');
+    final traceSpan = NetworkTraceSpan.start(url: url, onlyHeaders: onlyHeaders);
+
     final HttpClient httpClient = _httpClientFactory();
     HttpClientRequest request;
     HttpClientResponse? response;
@@ -98,6 +101,7 @@ class Net {
       }
       response = await request.close();
     } on ArgumentError catch (error) {
+      traceSpan.record(errorKind: 'ArgumentError');
       final String? overrideUrl = _platform.environment[kFlutterStorageBaseUrl];
       if (overrideUrl != null && url.toString().contains(overrideUrl)) {
         _logger.printError(error.toString());
@@ -112,6 +116,7 @@ class Net {
       _logger.printError(error.toString());
       rethrow;
     } on HandshakeException catch (error) {
+      traceSpan.record(errorKind: 'HandshakeException');
       _logger.printTrace(error.toString());
       throwToolExit(
         'Could not authenticate download server. You may be experiencing a man-in-the-middle attack,\n'
@@ -120,29 +125,35 @@ class Net {
         exitCode: kNetworkProblemExitCode,
       );
     } on SocketException catch (error) {
+      traceSpan.record(errorKind: 'SocketException');
       _logger.printTrace('Download error: $error');
       return false;
     } on HttpException catch (error) {
+      traceSpan.record(errorKind: 'HttpException');
       _logger.printTrace('Download error: $error');
       return false;
     }
 
+    final int statusCode = response.statusCode;
+
     // If we're making a HEAD request, we're only checking to see if the URL is
     // valid.
     if (onlyHeaders) {
-      return response.statusCode == HttpStatus.ok;
+      traceSpan.record(statusCode: statusCode);
+      return statusCode == HttpStatus.ok;
     }
-    if (response.statusCode != HttpStatus.ok) {
-      if (response.statusCode > 0 && response.statusCode < 500) {
+    if (statusCode != HttpStatus.ok) {
+      traceSpan.record(statusCode: statusCode);
+      if (statusCode > 0 && statusCode < 500) {
         throwToolExit(
           'Download failed.\n'
           'URL: $url\n'
-          'Error: ${response.statusCode} ${response.reasonPhrase}',
+          'Error: $statusCode ${response.reasonPhrase}',
           exitCode: kNetworkProblemExitCode,
         );
       }
       // 5xx errors are server errors and we can try again
-      _logger.printTrace('Download error: ${response.statusCode} ${response.reasonPhrase}');
+      _logger.printTrace('Download error: $statusCode ${response.reasonPhrase}');
       return false;
     }
     _logger.printTrace('Received response from server, collecting bytes...');
@@ -156,6 +167,9 @@ class Net {
     } finally {
       await destSink?.flush();
       await destSink?.close();
+      // Record after the body has been fully drained so `dur` reflects
+      // end-to-end download time, not just time-to-first-byte.
+      traceSpan.record(statusCode: statusCode);
     }
   }
 }