update perf timer usage

src/azure/cli/_argparse.py

@@ -226,10 +226,9 @@ def not_global(a):
         old_stdout = sys.stdout
         try:
             sys.stdout = out
-            with PerfTimer():
-                result = handler(parsed, others)
-            telemetry_log_event("Command Finished", {"CommandName": " ".join(nouns)},
-                                {"ExecutionTime": PerfTimer.last_measured_milliseconds()})
+            p = PerfTimer("Command Execution", {"CommandName": " ".join(nouns)})
+            result = handler(parsed, others)
+            p.store_perf_data()
             return result
         except IncorrectUsageError as ex:
             telemetry_log_event("Incorrect Usage", {"CommandName": " ".join(nouns)})

src/azure/cli/_performance.py

@@ -1,21 +1,16 @@
 import time
+from ._telemetry import telemetry_log_performance
 
 class PerfTimer(object): # pylint:disable=too-few-public-methods
-    _last_result = 0
-
-    def __init__(self, *args, **kwargs):
+    def __init__(self, event_name, properties):
+        self.event_name = event_name
+        self.properties = properties
         self.start = 0
-        self.end = 0
-        super(PerfTimer, self).__init__(*args, **kwargs)
-
-    def __enter__(self):
-        self.start = time.time()
-        return self
+        super(PerfTimer, self).__init__()
 
-    def __exit__(self, *args):
-        self.end = time.time()
-        PerfTimer._last_result = (self.end - self.start) * 1000
+    def total_milliseconds(self):
+        return (time.time() - self.start) * 1000
 
-    @staticmethod
-    def last_measured_milliseconds():
-        return PerfTimer._last_result
+    def store_perf_data(self):
+        self.properties["Milliseconds"] = self.total_milliseconds()
+        telemetry_log_performance(self.event_name, self.properties)

src/azure/cli/_telemetry.py

@@ -35,3 +35,5 @@ def telemetry_log_event(name, properties=None, measurements=None):
         #pass
         raise e
 
+def telemetry_log_performance(name, properties=None):
+    telemetry_log_event("Perf: "+name, properties)