Skip to content

[tool] Wire dependency injection into runner and executable with required non-nullable contexts - #190922

Merged
auto-submit[bot] merged 14 commits into
flutter:masterfrom
bkonyi:di/02-runner-bootstrap
Aug 19, 2026
Merged

[tool] Wire dependency injection into runner and executable with required non-nullable contexts#190922
auto-submit[bot] merged 14 commits into
flutter:masterfrom
bkonyi:di/02-runner-bootstrap

Conversation

@bkonyi

@bkonyi bkonyi commented Aug 11, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Summary

Part 2 of the modular dependency injection migration (stacked on #190724).

Wires explicit dependency injection into the Flutter tool entrypoints:

  • Wires ToolDependencies.bootstrap into runner.dart to initialize dependencies at startup.
  • Updates FlutterCommandRunner to accept non-nullable toolContext, androidContext, appleContext, and toolDependencies.
  • Updates executable.dart to forward ToolDependencies into generateCommands.
  • Updates test_flutter_command_runner.dart and hermetic test doubles.

Part of #47161

@bkonyi
bkonyi requested review from a team as code owners August 11, 2026 14:53
@bkonyi
bkonyi requested review from mboetger and removed request for a team August 11, 2026 14:53
@flutter-dashboard flutter-dashboard Bot added the CICD Run CI/CD label Aug 11, 2026
@github-actions github-actions Bot added tool Affects the "flutter" command-line tool. See also t: labels. team-android Owned by Android platform team team-ios Owned by iOS platform team team-macos Owned by the macOS platform team labels Aug 11, 2026
gemini-code-assist[bot]
gemini-code-assist Bot reviewed Aug 11, 2026
View reviewed changes

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request refactors dependency injection in flutter_tools by introducing AndroidContext, AppleContext, ToolContext, and ToolDependencies to manage and bootstrap tool dependencies instead of relying on global variables. Feedback on these changes highlights opportunities to improve testability and efficiency, such as using the shared finalShutdownHooks for the file system, utilizing finalSystemClock.now() for the terminal, preferring injected analytics over global analytics, avoiding a potential null pointer crash with DevtoolsLauncher.instance, and optimizing path traversal in _gatherProjectPaths by using fs.path.basename.

Comment thread packages/flutter_tools/lib/src/context/tool_dependencies.dart
Comment thread packages/flutter_tools/lib/src/context/tool_dependencies.dart
Comment thread packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
Comment thread packages/flutter_tools/lib/src/runner/flutter_command_runner.dart Outdated
Comment thread packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
Comment thread packages/flutter_tools/lib/src/runner/flutter_command_runner.dart Outdated
@bkonyi bkonyi mentioned this pull request Aug 11, 2026
Merged
@bkonyi
bkonyi force-pushed the di/02-runner-bootstrap branch from cf41bc2 to cb1f566 Compare August 11, 2026 15:31
@bkonyi
bkonyi force-pushed the di/02-runner-bootstrap branch from cb1f566 to 5533bb8 Compare August 11, 2026 17:58
victorsanni pushed a commit to victorsanni/flutter that referenced this pull request Aug 12, 2026
@bkonyi
[tool] Define modular dependency injection containers and bootstrapper (
cad3054 
flutter#190724)

## Summary

Part 1 of the modular dependency injection migration.

Defines the foundational modular dependency injection containers and
bootstrapper for `flutter_tools`:
1. **`ToolContext`**: Layer 1 OS wrappers (`HostEnvironment`) and Layer
2 SDK state (`ToolConfiguration`).
2. **Nullable Sub-contexts**: `AndroidContext` and `AppleContext` for
clean platform isolation.
3. **`ToolDependencies`**: Topologically instantiates and manages the
dependency graph at startup with explicit overrides and lazy closures.
4. **Hermetic Test Doubles**: Includes `dependency_injection_test.dart`
and fake context doubles.

Followed by Part 2 (flutter#190922) for runner wiring.

Part of flutter#47161
@bkonyi
Merge remote-tracking branch 'origin/master' into di/02-runner-bootstrap
0125d94 
# Conflicts:
#	packages/flutter_tools/lib/src/context/tool_dependencies.dart
#	packages/flutter_tools/test/general.shard/context/dependency_injection_test.dart
@github-actions github-actions Bot removed the team-android Owned by Android platform team label Aug 12, 2026
@github-actions github-actions Bot added the platform-ios iOS applications specifically label Aug 13, 2026
@cbracken
cbracken requested a review from vashworth August 13, 2026 21:58
@bkonyi
bkonyi requested a review from chingjun August 18, 2026 20:10
chingjun
chingjun previously approved these changes Aug 18, 2026
View reviewed changes
@bkonyi bkonyi added the autosubmit Merge PR when tree becomes green via auto submit App label Aug 18, 2026
@auto-submit
auto-submit Bot added this pull request to the merge queue Aug 18, 2026
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch Aug 19, 2026
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Aug 19, 2026
@bkonyi
Merge remote-tracking branch 'origin/master' into di/02-runner-bootstrap
edbfd12 
# Conflicts:
#	packages/flutter_tools/lib/executable.dart
@bkonyi
bkonyi requested a review from chingjun August 19, 2026 01:14
@bkonyi bkonyi added the autosubmit Merge PR when tree becomes green via auto submit App label Aug 19, 2026
@auto-submit
auto-submit Bot added this pull request to the merge queue Aug 19, 2026
Merged via the queue into flutter:master with commit 4186f65 Aug 19, 2026
22 checks passed
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Aug 19, 2026
This was referenced Aug 20, 2026
Closed
Closed
Closed
Closed
Closed
Closed
@gaaclarke

gaaclarke commented Aug 24, 2026

Copy link
Copy Markdown
Member

hey @bkonyi, this seemed to have regressed this benchmark about 1s. I just wanted to let you know so you can determine if thats a fair tradeoff.

https://flutter-flutter-perf.luci.app/e/?begin=1787146576&enable_chart_tooltip=true&enable_favorites=true&end=1787607292&keys=X56502995d88ff41a36e30fc91a9186d8&plotSummary=true&selected=commit%3D2809380%26name%3D%252Carch%253Dintel%252Cbranch%253Dmaster%252Cconfig%253Ddefault%252Cdevice_type%253Dnone%252Cdevice_version%253Dnone%252Chost_type%253Dmac%252Csub_result%253Ddebug_second_compile_millis%252Ctest%253Dbasic_material_app_macos__compile%252C%26tableCol%3D6%26tableRow%3D1468&use_titles=true&xbaroffset=2809380

@jason-simmons

jason-simmons commented Aug 27, 2026

Copy link
Copy Markdown
Member

hey @bkonyi, this seemed to have regressed this benchmark about 1s.

This PR is constructing ToolDependencies using various objects from globals. These globals objects have lazy initializers, so before the introduction of ToolDependencies many commands avoided the initialization cost because they did not use a particular object.

In particular, AndroidStudio is part of ToolDependencies and is expensive to construct. Its constructor spawns various external tools to gather configuration data.

Tasks like macOS app compilation are seeing increased latency because they now create an AndroidStudio object even though it is never used.

@bkonyi

bkonyi commented Aug 28, 2026

Copy link
Copy Markdown
Contributor Author

hey @bkonyi, this seemed to have regressed this benchmark about 1s.

This PR is constructing ToolDependencies using various objects from globals. These globals objects have lazy initializers, so before the introduction of ToolDependencies many commands avoided the initialization cost because they did not use a particular object.

In particular, AndroidStudio is part of ToolDependencies and is expensive to construct. Its constructor spawns various external tools to gather configuration data.

Tasks like macOS app compilation are seeing increased latency because they now create an AndroidStudio object even though it is never used.

Yikes, I'm surprised we're doing blocking IO in a constructor like that.

I'll send a couple of PRs out to lazily run the initialization when we actually go to access the state instead of when we create the object.

@bkonyi
bkonyi deleted the di/02-runner-bootstrap branch August 28, 2026 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chingjun chingjun chingjun approved these changes
@mboetger mboetger Awaiting requested review from mboetger mboetger was automatically assigned from flutter/android-reviewers
@vashworth vashworth Awaiting requested review from vashworth
+1 more reviewer
@gemini-code-assist gemini-code-assist[bot] gemini-code-assist[bot] left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

CICD Run CI/CD platform-ios iOS applications specifically team-ios Owned by iOS platform team team-macos Owned by the macOS platform team tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@bkonyi @gaaclarke @jason-simmons @chingjun