From b8668b44a0a33af6da7a6865fc105a66d6ebcc16 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 24 May 2020 12:12:06 +0200
Subject: [PATCH] Enable feature telemetry

---
 app/Console/Commands/Correction/CorrectDatabase.php         | 2 +-
 .../Commands/Correction/CorrectOpeningBalanceCurrencies.php | 2 +-
 app/Console/Commands/Correction/CreateAccessTokens.php      | 2 +-
 app/Console/Commands/Correction/CreateLinkTypes.php         | 2 +-
 app/Console/Commands/Correction/DeleteEmptyGroups.php       | 2 +-
 app/Console/Commands/Correction/DeleteEmptyJournals.php     | 2 +-
 .../Commands/Correction/DeleteOrphanedTransactions.php      | 2 +-
 app/Console/Commands/Correction/DeleteZeroAmount.php        | 2 +-
 app/Console/Commands/Correction/EnableCurrencies.php        | 2 +-
 app/Console/Commands/Correction/FixAccountTypes.php         | 2 +-
 app/Console/Commands/Correction/FixLongDescriptions.php     | 2 +-
 app/Console/Commands/Correction/FixPiggies.php              | 2 +-
 .../Commands/Correction/FixRecurringTransactions.php        | 2 +-
 app/Console/Commands/Correction/FixUnevenAmount.php         | 2 +-
 app/Console/Commands/Correction/RemoveBills.php             | 2 +-
 app/Console/Commands/Correction/RenameMetaFields.php        | 2 +-
 app/Console/Commands/Correction/TransferBudgets.php         | 2 +-
 app/Console/Commands/DecryptDatabase.php                    | 2 +-
 app/Console/Commands/Export/ExportData.php                  | 4 ++--
 app/Console/Commands/Import/CreateCSVImport.php             | 6 +++---
 app/Console/Commands/Integrity/ReportEmptyObjects.php       | 2 +-
 app/Console/Commands/Integrity/ReportIntegrity.php          | 2 +-
 app/Console/Commands/Integrity/ReportSum.php                | 2 +-
 app/Console/Commands/Integrity/RestoreOAuthKeys.php         | 2 +-
 app/Console/Commands/ScanAttachments.php                    | 2 +-
 app/Console/Commands/SetLatestVersion.php                   | 2 +-
 app/Console/Commands/Tools/ApplyRules.php                   | 6 +++---
 app/Console/Commands/Tools/Cron.php                         | 2 +-
 app/Console/Commands/Upgrade/AccountCurrencies.php          | 2 +-
 app/Console/Commands/Upgrade/BackToJournals.php             | 2 +-
 app/Console/Commands/Upgrade/BudgetLimitCurrency.php        | 2 +-
 app/Console/Commands/Upgrade/CCLiabilities.php              | 2 +-
 app/Console/Commands/Upgrade/MigrateAttachments.php         | 2 +-
 app/Console/Commands/Upgrade/MigrateJournalNotes.php        | 2 +-
 app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php      | 2 +-
 app/Console/Commands/Upgrade/MigrateTagLocations.php        | 2 +-
 app/Console/Commands/Upgrade/MigrateToGroups.php            | 2 +-
 app/Console/Commands/Upgrade/MigrateToRules.php             | 2 +-
 app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php | 2 +-
 app/Console/Commands/Upgrade/RenameAccountMeta.php          | 2 +-
 app/Console/Commands/Upgrade/TransactionIdentifier.php      | 2 +-
 .../Commands/Upgrade/TransferCurrenciesCorrections.php      | 2 +-
 app/Console/Commands/Upgrade/UpgradeDatabase.php            | 2 +-
 app/Http/Controllers/NewUserController.php                  | 6 +++---
 app/Http/Controllers/PreferencesController.php              | 6 +++---
 45 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/app/Console/Commands/Correction/CorrectDatabase.php b/app/Console/Commands/Correction/CorrectDatabase.php
index e4aa86bb32..7fbc9ca843 100644
--- a/app/Console/Commands/Correction/CorrectDatabase.php
+++ b/app/Console/Commands/Correction/CorrectDatabase.php
@@ -83,7 +83,7 @@ class CorrectDatabase extends Command
             echo $result;
         }
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php b/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php
index bf404548c8..549ce7c551 100644
--- a/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php
+++ b/app/Console/Commands/Correction/CorrectOpeningBalanceCurrencies.php
@@ -77,7 +77,7 @@ class CorrectOpeningBalanceCurrencies extends Command
             $this->info('There was nothing to fix in the opening balance transactions.');
         }
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Correction/CreateAccessTokens.php b/app/Console/Commands/Correction/CreateAccessTokens.php
index 25f7f56293..6bed48674a 100644
--- a/app/Console/Commands/Correction/CreateAccessTokens.php
+++ b/app/Console/Commands/Correction/CreateAccessTokens.php
@@ -78,7 +78,7 @@ class CreateAccessTokens extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verify access tokens in %s seconds.', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Correction/CreateLinkTypes.php b/app/Console/Commands/Correction/CreateLinkTypes.php
index f1e9bd6c46..20a70d033d 100644
--- a/app/Console/Commands/Correction/CreateLinkTypes.php
+++ b/app/Console/Commands/Correction/CreateLinkTypes.php
@@ -79,7 +79,7 @@ class CreateLinkTypes extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified link types in %s seconds', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Correction/DeleteEmptyGroups.php b/app/Console/Commands/Correction/DeleteEmptyGroups.php
index 9f3f2b8caf..3204156c11 100644
--- a/app/Console/Commands/Correction/DeleteEmptyGroups.php
+++ b/app/Console/Commands/Correction/DeleteEmptyGroups.php
@@ -76,7 +76,7 @@ class DeleteEmptyGroups extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified empty groups in %s seconds', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Correction/DeleteEmptyJournals.php b/app/Console/Commands/Correction/DeleteEmptyJournals.php
index e62c30c1bd..a2f1e7bc23 100644
--- a/app/Console/Commands/Correction/DeleteEmptyJournals.php
+++ b/app/Console/Commands/Correction/DeleteEmptyJournals.php
@@ -58,7 +58,7 @@ class DeleteEmptyJournals extends Command
         $this->deleteUnevenJournals();
         $this->deleteEmptyJournals();
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Correction/DeleteOrphanedTransactions.php b/app/Console/Commands/Correction/DeleteOrphanedTransactions.php
index c280f1a8c4..fa47758318 100644
--- a/app/Console/Commands/Correction/DeleteOrphanedTransactions.php
+++ b/app/Console/Commands/Correction/DeleteOrphanedTransactions.php
@@ -62,7 +62,7 @@ class DeleteOrphanedTransactions extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified orphans in %s seconds', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Correction/DeleteZeroAmount.php b/app/Console/Commands/Correction/DeleteZeroAmount.php
index cc546d3b3a..71eb8907d6 100644
--- a/app/Console/Commands/Correction/DeleteZeroAmount.php
+++ b/app/Console/Commands/Correction/DeleteZeroAmount.php
@@ -78,7 +78,7 @@ class DeleteZeroAmount extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified zero-amount integrity in %s seconds', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Correction/EnableCurrencies.php b/app/Console/Commands/Correction/EnableCurrencies.php
index eefddcea9a..09d0729aed 100644
--- a/app/Console/Commands/Correction/EnableCurrencies.php
+++ b/app/Console/Commands/Correction/EnableCurrencies.php
@@ -101,7 +101,7 @@ class EnableCurrencies extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified currencies in %s seconds.', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Correction/FixAccountTypes.php b/app/Console/Commands/Correction/FixAccountTypes.php
index 2ed826ecb0..92d01fde71 100644
--- a/app/Console/Commands/Correction/FixAccountTypes.php
+++ b/app/Console/Commands/Correction/FixAccountTypes.php
@@ -106,7 +106,7 @@ class FixAccountTypes extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verifying account types took %s seconds', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Correction/FixLongDescriptions.php b/app/Console/Commands/Correction/FixLongDescriptions.php
index 58a40fb87f..5bc1177a8c 100644
--- a/app/Console/Commands/Correction/FixLongDescriptions.php
+++ b/app/Console/Commands/Correction/FixLongDescriptions.php
@@ -75,7 +75,7 @@ class FixLongDescriptions extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified all transaction group and journal title lengths in %s seconds.', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 }
diff --git a/app/Console/Commands/Correction/FixPiggies.php b/app/Console/Commands/Correction/FixPiggies.php
index c8f31a441d..01c2ef15c4 100644
--- a/app/Console/Commands/Correction/FixPiggies.php
+++ b/app/Console/Commands/Correction/FixPiggies.php
@@ -98,7 +98,7 @@ class FixPiggies extends Command
         $end = round(microtime(true) - $start, 2);
         $this->line(sprintf('Verified the content of %d piggy bank events in %s seconds.', $set->count(), $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 }
diff --git a/app/Console/Commands/Correction/FixRecurringTransactions.php b/app/Console/Commands/Correction/FixRecurringTransactions.php
index 1fad2d232f..45c45bbe1c 100644
--- a/app/Console/Commands/Correction/FixRecurringTransactions.php
+++ b/app/Console/Commands/Correction/FixRecurringTransactions.php
@@ -67,7 +67,7 @@ class FixRecurringTransactions extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Corrected recurring transactions %s seconds.', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Correction/FixUnevenAmount.php b/app/Console/Commands/Correction/FixUnevenAmount.php
index 3361ff1789..78c1978ff5 100644
--- a/app/Console/Commands/Correction/FixUnevenAmount.php
+++ b/app/Console/Commands/Correction/FixUnevenAmount.php
@@ -75,7 +75,7 @@ class FixUnevenAmount extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified amount integrity in %s seconds', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Correction/RemoveBills.php b/app/Console/Commands/Correction/RemoveBills.php
index ad288248d6..5cc116a79b 100644
--- a/app/Console/Commands/Correction/RemoveBills.php
+++ b/app/Console/Commands/Correction/RemoveBills.php
@@ -71,7 +71,7 @@ class RemoveBills extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified bills / journals in %s seconds', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 }
diff --git a/app/Console/Commands/Correction/RenameMetaFields.php b/app/Console/Commands/Correction/RenameMetaFields.php
index 1c4a941fb1..a7252c52fb 100644
--- a/app/Console/Commands/Correction/RenameMetaFields.php
+++ b/app/Console/Commands/Correction/RenameMetaFields.php
@@ -83,7 +83,7 @@ class RenameMetaFields extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Renamed meta fields in %s seconds', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Correction/TransferBudgets.php b/app/Console/Commands/Correction/TransferBudgets.php
index 1199a15d9f..33f46b501c 100644
--- a/app/Console/Commands/Correction/TransferBudgets.php
+++ b/app/Console/Commands/Correction/TransferBudgets.php
@@ -74,7 +74,7 @@ class TransferBudgets extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified budget/journals in %s seconds.', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 }
diff --git a/app/Console/Commands/DecryptDatabase.php b/app/Console/Commands/DecryptDatabase.php
index 85639c8ae4..8c1ebe7bed 100644
--- a/app/Console/Commands/DecryptDatabase.php
+++ b/app/Console/Commands/DecryptDatabase.php
@@ -123,7 +123,7 @@ class DecryptDatabase extends Command
         }
         $this->info('Done!');
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Export/ExportData.php b/app/Console/Commands/Export/ExportData.php
index 41ba516741..e187b8ef9c 100644
--- a/app/Console/Commands/Export/ExportData.php
+++ b/app/Console/Commands/Export/ExportData.php
@@ -137,11 +137,11 @@ class ExportData extends Command
         } catch (FireflyException $e) {
             $this->error(sprintf('Could not store data: %s', $e->getMessage()));
 
-            // app('telemetry')->feature('executed-command-with-error', $this->signature);
+            app('telemetry')->feature('system.command.errored', $this->signature);
             return 1;
         }
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Import/CreateCSVImport.php b/app/Console/Commands/Import/CreateCSVImport.php
index b4e5a4cd20..ab717fe393 100644
--- a/app/Console/Commands/Import/CreateCSVImport.php
+++ b/app/Console/Commands/Import/CreateCSVImport.php
@@ -128,7 +128,7 @@ class CreateCSVImport extends Command
         } catch (FireflyException $e) {
             $this->errorLine($e->getMessage());
 
-            // app('telemetry')->feature('executed-command-with-error', $this->signature);
+            app('telemetry')->feature('system.command.errored', $this->signature);
             return 1;
         }
 
@@ -138,7 +138,7 @@ class CreateCSVImport extends Command
         } catch (FireflyException $e) {
             $this->errorLine($e->getMessage());
 
-            // app('telemetry')->feature('executed-command-with-error', $this->signature);
+            app('telemetry')->feature('system.command.errored', $this->signature);
             return 1;
         }
 
@@ -148,7 +148,7 @@ class CreateCSVImport extends Command
         // clear cache for user:
         app('preferences')->setForUser($user, 'lastActivity', microtime());
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Integrity/ReportEmptyObjects.php b/app/Console/Commands/Integrity/ReportEmptyObjects.php
index 4be37459dd..e1c5387a42 100644
--- a/app/Console/Commands/Integrity/ReportEmptyObjects.php
+++ b/app/Console/Commands/Integrity/ReportEmptyObjects.php
@@ -64,7 +64,7 @@ class ReportEmptyObjects extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Report on empty objects finished in %s seconds', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Integrity/ReportIntegrity.php b/app/Console/Commands/Integrity/ReportIntegrity.php
index 9060d95f4b..8982fa77c6 100644
--- a/app/Console/Commands/Integrity/ReportIntegrity.php
+++ b/app/Console/Commands/Integrity/ReportIntegrity.php
@@ -69,7 +69,7 @@ class ReportIntegrity extends Command
             echo $result;
         }
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 }
diff --git a/app/Console/Commands/Integrity/ReportSum.php b/app/Console/Commands/Integrity/ReportSum.php
index f9182a0c23..3273db6d7c 100644
--- a/app/Console/Commands/Integrity/ReportSum.php
+++ b/app/Console/Commands/Integrity/ReportSum.php
@@ -54,7 +54,7 @@ class ReportSum extends Command
     {
         $this->reportSum();
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Integrity/RestoreOAuthKeys.php b/app/Console/Commands/Integrity/RestoreOAuthKeys.php
index 30e3e259ff..81b2858648 100644
--- a/app/Console/Commands/Integrity/RestoreOAuthKeys.php
+++ b/app/Console/Commands/Integrity/RestoreOAuthKeys.php
@@ -53,7 +53,7 @@ class RestoreOAuthKeys extends Command
     {
         $this->restoreOAuthKeys();
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/ScanAttachments.php b/app/Console/Commands/ScanAttachments.php
index 973671434e..21af60f99d 100644
--- a/app/Console/Commands/ScanAttachments.php
+++ b/app/Console/Commands/ScanAttachments.php
@@ -86,7 +86,7 @@ class ScanAttachments extends Command
             $this->line(sprintf('Fixed attachment #%d', $attachment->id));
         }
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 }
diff --git a/app/Console/Commands/SetLatestVersion.php b/app/Console/Commands/SetLatestVersion.php
index 7f9fbb84f4..0c3c1c9e36 100644
--- a/app/Console/Commands/SetLatestVersion.php
+++ b/app/Console/Commands/SetLatestVersion.php
@@ -59,7 +59,7 @@ class SetLatestVersion extends Command
         app('fireflyconfig')->set('ff3_version', config('firefly.version'));
         $this->line('Updated version.');
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Tools/ApplyRules.php b/app/Console/Commands/Tools/ApplyRules.php
index dccb7e1ee3..8a9fd90b5b 100644
--- a/app/Console/Commands/Tools/ApplyRules.php
+++ b/app/Console/Commands/Tools/ApplyRules.php
@@ -112,7 +112,7 @@ class ApplyRules extends Command
 
         $result = $this->verifyInput();
         if (false === $result) {
-            // app('telemetry')->feature('executed-command-with-error', $this->signature);
+            app('telemetry')->feature('system.command.errored', $this->signature);
             return 1;
         }
 
@@ -131,7 +131,7 @@ class ApplyRules extends Command
             $this->warn('    --rule_groups=1,2,...');
             $this->warn('    --all_rules');
 
-            // app('telemetry')->feature('executed-command-with-error', $this->signature);
+            app('telemetry')->feature('system.command.errored', $this->signature);
             return 1;
         }
 
@@ -167,7 +167,7 @@ class ApplyRules extends Command
         $this->line('');
         $this->line('Done!');
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Tools/Cron.php b/app/Console/Commands/Tools/Cron.php
index f103714c08..e37676718a 100644
--- a/app/Console/Commands/Tools/Cron.php
+++ b/app/Console/Commands/Tools/Cron.php
@@ -106,7 +106,7 @@ class Cron extends Command
 
         $this->info('More feedback on the cron jobs can be found in the log files.');
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Upgrade/AccountCurrencies.php b/app/Console/Commands/Upgrade/AccountCurrencies.php
index f12d9e57e2..fad3ae3606 100644
--- a/app/Console/Commands/Upgrade/AccountCurrencies.php
+++ b/app/Console/Commands/Upgrade/AccountCurrencies.php
@@ -87,7 +87,7 @@ class AccountCurrencies extends Command
         $this->info(sprintf('Verified and fixed account currencies in %s seconds.', $end));
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Upgrade/BackToJournals.php b/app/Console/Commands/Upgrade/BackToJournals.php
index 5e859faaa2..d251a1c5c7 100644
--- a/app/Console/Commands/Upgrade/BackToJournals.php
+++ b/app/Console/Commands/Upgrade/BackToJournals.php
@@ -78,7 +78,7 @@ class BackToJournals extends Command
         $this->info(sprintf('Updated category and budget info for all transaction journals in %s seconds.', $end));
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Upgrade/BudgetLimitCurrency.php b/app/Console/Commands/Upgrade/BudgetLimitCurrency.php
index a33ebb31ea..cc2d16b875 100644
--- a/app/Console/Commands/Upgrade/BudgetLimitCurrency.php
+++ b/app/Console/Commands/Upgrade/BudgetLimitCurrency.php
@@ -92,7 +92,7 @@ class BudgetLimitCurrency extends Command
 
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Upgrade/CCLiabilities.php b/app/Console/Commands/Upgrade/CCLiabilities.php
index 897653851e..b65358f51c 100644
--- a/app/Console/Commands/Upgrade/CCLiabilities.php
+++ b/app/Console/Commands/Upgrade/CCLiabilities.php
@@ -91,7 +91,7 @@ class CCLiabilities extends Command
         $this->info(sprintf('Verified credit card liabilities in %s seconds', $end));
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Upgrade/MigrateAttachments.php b/app/Console/Commands/Upgrade/MigrateAttachments.php
index bff79093e6..1f85089312 100644
--- a/app/Console/Commands/Upgrade/MigrateAttachments.php
+++ b/app/Console/Commands/Upgrade/MigrateAttachments.php
@@ -101,7 +101,7 @@ class MigrateAttachments extends Command
         $this->info(sprintf('Migrated attachment notes in %s seconds.', $end));
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Upgrade/MigrateJournalNotes.php b/app/Console/Commands/Upgrade/MigrateJournalNotes.php
index 19346dc305..65531ca217 100644
--- a/app/Console/Commands/Upgrade/MigrateJournalNotes.php
+++ b/app/Console/Commands/Upgrade/MigrateJournalNotes.php
@@ -100,7 +100,7 @@ class MigrateJournalNotes extends Command
         $this->info(sprintf('Migrated notes in %s seconds.', $end));
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php b/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php
index 677cb26774..f0d0b1f581 100644
--- a/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php
+++ b/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php
@@ -72,7 +72,7 @@ class MigrateRecurrenceMeta extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Migrated recurrence meta data in %s seconds.', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Upgrade/MigrateTagLocations.php b/app/Console/Commands/Upgrade/MigrateTagLocations.php
index 217d519f3a..b490e10106 100644
--- a/app/Console/Commands/Upgrade/MigrateTagLocations.php
+++ b/app/Console/Commands/Upgrade/MigrateTagLocations.php
@@ -65,7 +65,7 @@ class MigrateTagLocations extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Migrated tag locations in %s seconds.', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Upgrade/MigrateToGroups.php b/app/Console/Commands/Upgrade/MigrateToGroups.php
index b6a0e1522d..21034ae085 100644
--- a/app/Console/Commands/Upgrade/MigrateToGroups.php
+++ b/app/Console/Commands/Upgrade/MigrateToGroups.php
@@ -112,7 +112,7 @@ class MigrateToGroups extends Command
 
         $this->markAsMigrated();
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
 
         return 0;
     }
diff --git a/app/Console/Commands/Upgrade/MigrateToRules.php b/app/Console/Commands/Upgrade/MigrateToRules.php
index ca39719aec..142c66bc0d 100644
--- a/app/Console/Commands/Upgrade/MigrateToRules.php
+++ b/app/Console/Commands/Upgrade/MigrateToRules.php
@@ -99,7 +99,7 @@ class MigrateToRules extends Command
         $this->info(sprintf('Verified and fixed bills in %s seconds.', $end));
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php b/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
index 7d0c144221..f3ef6b17ae 100644
--- a/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
+++ b/app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
@@ -90,7 +90,7 @@ class OtherCurrenciesCorrections extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified and fixed transaction currencies in %s seconds.', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Upgrade/RenameAccountMeta.php b/app/Console/Commands/Upgrade/RenameAccountMeta.php
index 129bf9372c..d4e30e143d 100644
--- a/app/Console/Commands/Upgrade/RenameAccountMeta.php
+++ b/app/Console/Commands/Upgrade/RenameAccountMeta.php
@@ -91,7 +91,7 @@ class RenameAccountMeta extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Fixed account meta data in %s seconds.', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Upgrade/TransactionIdentifier.php b/app/Console/Commands/Upgrade/TransactionIdentifier.php
index bfb0de2ef2..8cf874f217 100644
--- a/app/Console/Commands/Upgrade/TransactionIdentifier.php
+++ b/app/Console/Commands/Upgrade/TransactionIdentifier.php
@@ -101,7 +101,7 @@ class TransactionIdentifier extends Command
         $this->info(sprintf('Verified and fixed transaction identifiers in %s seconds.', $end));
         $this->markAsExecuted();
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php b/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php
index bf316c7545..01125ef1f7 100644
--- a/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php
+++ b/app/Console/Commands/Upgrade/TransferCurrenciesCorrections.php
@@ -111,7 +111,7 @@ class TransferCurrenciesCorrections extends Command
         $end = round(microtime(true) - $start, 2);
         $this->info(sprintf('Verified and fixed currency information for transfers in %s seconds.', $end));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Console/Commands/Upgrade/UpgradeDatabase.php b/app/Console/Commands/Upgrade/UpgradeDatabase.php
index 5d961a2b3f..eb52285eaf 100644
--- a/app/Console/Commands/Upgrade/UpgradeDatabase.php
+++ b/app/Console/Commands/Upgrade/UpgradeDatabase.php
@@ -117,7 +117,7 @@ class UpgradeDatabase extends Command
         // index will set FF3 version.
         app('fireflyconfig')->set('ff3_version', (string) config('firefly.version'));
 
-        // app('telemetry')->feature('system.command.executed', $this->signature);
+        app('telemetry')->feature('system.command.executed', $this->signature);
         return 0;
     }
 
diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php
index 4d41d2abb3..2d31ec34e0 100644
--- a/app/Http/Controllers/NewUserController.php
+++ b/app/Http/Controllers/NewUserController.php
@@ -125,9 +125,9 @@ class NewUserController extends Controller
         app('preferences')->set('transaction_journal_optional_fields', $visibleFields);
 
         // telemetry: user language preference + default language.
-        //app('telemetry')->feature('config.firefly.default_language', config('firefly.default_language', 'en_US'));
-        //app('telemetry')->feature('user.preferences.language', app('steam')->getLanguage());
-        //app('telemetry')->feature('user.preferences.locale', app('steam')->getLocale());
+        app('telemetry')->feature('config.firefly.default_language', config('firefly.default_language', 'en_US'));
+        app('telemetry')->feature('user.preferences.language', app('steam')->getLanguage());
+        app('telemetry')->feature('user.preferences.locale', app('steam')->getLocale());
 
         session()->flash('success', (string) trans('firefly.stored_new_accounts_new_user'));
         app('preferences')->mark();
diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php
index 391c06c6e7..39c3d7460d 100644
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -211,9 +211,9 @@ class PreferencesController extends Controller
         app('preferences')->mark();
 
         // telemetry: user language preference + default language.
-        //app('telemetry')->feature('config.firefly.default_language', config('firefly.default_language', 'en_US'));
-        //app('telemetry')->feature('user.preferences.language', app('steam')->getLanguage());
-        //app('telemetry')->feature('user.preferences.locale', app('steam')->getLocale());
+        app('telemetry')->feature('config.firefly.default_language', config('firefly.default_language', 'en_US'));
+        app('telemetry')->feature('user.preferences.language', app('steam')->getLanguage());
+        app('telemetry')->feature('user.preferences.locale', app('steam')->getLocale());
 
         return redirect(route('preferences.index'));
     }