Merge pull request #8261 from ulyssessouza/metrics-nosuchcommand

Ignore command names on NoSuchCommand exceptions
docker · Apr 13, 2021 · adae403 · adae403
2 parents 0bea52b + e5cab3c
commit adae403
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/compose/cli/main.py b/compose/cli/main.py
@@ -82,7 +82,7 @@ def main():  # noqa: C901
         if not IS_LINUX_PLATFORM and command == 'help':
             print("\nDocker Compose is now in the Docker CLI, try `docker compose` help")
     except (KeyboardInterrupt, signals.ShutdownException):
-        exit_with_metrics(command, "Aborting.", status=Status.FAILURE)
+        exit_with_metrics(command, "Aborting.", status=Status.CANCELED)
     except (UserError, NoSuchService, ConfigurationError,
             ProjectError, OperationFailedError) as e:
         exit_with_metrics(command, e.msg, status=Status.FAILURE)
@@ -103,7 +103,8 @@ def main():  # noqa: C901
         commands = "\n".join(parse_doc_section("commands:", getdoc(e.supercommand)))
         if not IS_LINUX_PLATFORM:
             commands += "\n\nDocker Compose is now in the Docker CLI, try `docker compose`"
-        exit_with_metrics(e.command, "No such command: {}\n\n{}".format(e.command, commands))
+        exit_with_metrics("", log_msg="No such command: {}\n\n{}".format(
+            e.command, commands), status=Status.FAILURE)
     except (errors.ConnectionError, StreamParseError):
         exit_with_metrics(command, status=Status.FAILURE)
     except SystemExit as e:

diff --git a/compose/metrics/client.py b/compose/metrics/client.py
@@ -36,7 +36,7 @@ def __init__(self, command,
                  context_type=None, status=Status.SUCCESS,
                  source=MetricsSource.CLI, uri=None):
         super().__init__()
-        self.command = "compose " + command if command else "compose --help"
+        self.command = ("compose " + command).strip() if command else "compose --help"
         self.context = context_type or ContextAPI.get_current_context().context_type or 'moby'
         self.source = source
         self.status = status.value