discord
diff --git a/‎pre_commit/commands/run.py‎
Lines changed: 14 additions & 18 deletions b/‎pre_commit/commands/run.py‎
Lines changed: 14 additions & 18 deletions
@@ -147,6 +147,7 @@ def _run_single_hook(
         diff_before: bytes,
         verbose: bool,
         use_color: bool,
+        stage: str,
 ) -> tuple[bool, bytes]:
     filenames = tuple(classifier.filenames_for_hook(hook))
 
@@ -172,7 +173,7 @@ def _run_single_hook(
             filenames = ()
         time_before = time.monotonic()
         language = languages[hook.language]
-        with monitor.trace(f'precommit.hook.{hook.name}') as trace:
+        with monitor.trace(f'precommit.{stage}.hook.{hook.name}') as trace:
             with language.in_env(hook.prefix, hook.language_version):
                 retcode, out = language.run_hook(
                     hook.prefix,
@@ -292,6 +293,7 @@ def _run_hooks(
         current_retval, prior_diff = _run_single_hook(
             classifier, hook, skips, cols, prior_diff,
             verbose=args.verbose, use_color=args.color,
+            stage=args.hook_stage,
         )
         retval |= current_retval
         if current_retval and (config['fail_fast'] or hook.fail_fast):
@@ -330,11 +332,11 @@ def _has_unstaged_config(config_file: str) -> bool:
     return retcode == 1
 
 
-def _run_inner(
+def run(
         config_file: str,
         store: Store,
         args: argparse.Namespace,
-        environ: MutableMapping[str, str],
+        environ: MutableMapping[str, str] = os.environ,
 ) -> int:
     stash = not args.all_files and not args.files
 
@@ -412,6 +414,11 @@ def _run_inner(
     environ['PRE_COMMIT'] = '1'
 
     with contextlib.ExitStack() as exit_stack:
+        # Metrics should get reported as the last thing that happens.
+        exit_stack.callback(monitor.report_metrics)
+
+        # Start the timing trace.
+        trace = exit_stack.enter_context(monitor.trace(f'precommit.{args.hook_stage}'))
         if stash:
             exit_stack.enter_context(staged_files_only(store.directory))
 
@@ -428,6 +435,7 @@ def _run_inner(
             output.write_line(
                 f'No hook with id `{args.hook}` in stage `{args.hook_stage}`',
             )
+            trace.set_success(False)
             return 1
 
         skips = _get_skips(environ)
@@ -438,22 +446,10 @@ def _run_inner(
         ]
         install_hook_envs(to_install, store)
 
-        return _run_hooks(config, hooks, skips, args)
+        retval = _run_hooks(config, hooks, skips, args)
+        trace.set_success(retval == 0)
+        return retval
 
     # https://github.com/python/mypy/issues/7726
     raise AssertionError('unreachable')
 
-def run(
-        config_file: str,
-        store: Store,
-        args: argparse.Namespace,
-        environ: MutableMapping[str, str] = os.environ,
-) -> int:
-    try:
-        with monitor.trace('precommit') as trace:
-            retval = _run_inner(config_file, store, args, environ)
-            trace.set_success(retval == 0)
-        return retval
-    finally:
-        monitor.report_metrics()
-