Merge pull request #6451 from Shopify/analytics-logging-issue

Fix theme analytics logging even when a command fails

Author: EvilGenius13

packages/theme/src/cli/utilities/theme-command.ts

@@ -88,8 +88,11 @@ export default abstract class ThemeCommand extends Command {
         throw new AbortError(`Path does not exist: ${flags.path}`)
       }
 
-      await this.command(flags, session, false, args)
-      await this.logAnalyticsData(session)
+      try {
+        await this.command(flags, session, false, args)
+      } finally {
+        await this.logAnalyticsData(session)
+      }
       return
     }
 
@@ -267,8 +270,11 @@ export default abstract class ThemeCommand extends Command {
                 const commandName = this.constructor.name.toLowerCase()
                 recordEvent(`theme-command:${commandName}:multi-env:authenticated`)
 
-                await this.command(flags, session, true, {}, {stdout, stderr})
-                await this.logAnalyticsData(session)
+                try {
+                  await this.command(flags, session, true, {}, {stdout, stderr})
+                } finally {
+                  await this.logAnalyticsData(session)
+                }
               })
 
               // eslint-disable-next-line no-catch-all/no-catch-all
@@ -371,7 +377,6 @@ export default abstract class ThemeCommand extends Command {
     if (!session) return
 
     const data = compileData()
-
     await addPublicMetadata(() => ({
       store_fqdn_hash: hashString(session.storeFqdn),