Telemetry cleanup (#558)

* Cleanup

* Better message

* Add telemetry initialized message

* debug instead of trace

Author: Charles-Gagnon

src/Telemetry/Telemetry.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
@@ -78,13 +77,14 @@ private void InitializeTelemetry(string productVersion, IConfiguration config)
 
                 this._commonProperties = new TelemetryCommonProperties(productVersion, this._client, config).GetTelemetryCommonProperties();
                 this._commonMeasurements = new Dictionary<string, double>();
+                this._logger.LogDebug($"Telemetry Initialized. Session={CurrentSessionId}");
             }
             catch (Exception e)
             {
-                this._client.TrackException(e);
+                this._client?.TrackException(e);
                 this._client = null;
                 // we don't want to fail the tool if telemetry fails.
-                Debug.Fail(e.ToString());
+                this._logger.LogError($"Error initializing telemetry. Telemetry will be disabled. Message={e.Message}");
             }
         }
 
@@ -109,7 +109,7 @@ public void TrackEvent(TelemetryEventName eventName, IDictionary<TelemetryProper
             catch (Exception ex)
             {
                 // We don't want errors sending telemetry to break the app, so just log and move on
-                Debug.Fail($"Error sending event {eventName} : {ex.Message}");
+                this._logger.LogError($"Error sending event {eventName}. Message={ex.Message}");
             }
         }
 
@@ -134,7 +134,7 @@ public void TrackException(TelemetryErrorName errorName, Exception exception, ID
             catch (Exception ex)
             {
                 // We don't want errors sending telemetry to break the app, so just log and move on
-                Debug.Fail($"Error sending exception event : {ex.Message}");
+                this._logger.LogError($"Error sending exception event. Message={ex.Message}");
             }
         }
 
@@ -157,7 +157,7 @@ public void TrackDuration(TelemetryEventName eventName, long durationMs, IDictio
             catch (Exception ex)
             {
                 // We don't want errors sending telemetry to break the app, so just log and move on
-                Debug.Fail($"Error sending event {eventName} : {ex.Message}");
+                this._logger.LogError($"Error sending event {eventName}. Message={ex.Message}");
             }
         }
 
@@ -179,7 +179,7 @@ public void TrackCreate(CreateType type, IDictionary<TelemetryPropertyName, stri
             catch (Exception ex)
             {
                 // We don't want errors sending telemetry to break the app, so just log and move on
-                Debug.Fail($"Error sending event Create : {ex.Message}");
+                this._logger.LogError($"Error sending event Create. Message={ex.Message}");
             }
         }
 
@@ -201,7 +201,7 @@ public void TrackConvert(ConvertType type, IDictionary<TelemetryPropertyName, st
             catch (Exception ex)
             {
                 // We don't want errors sending telemetry to break the app, so just log and move on
-                Debug.Fail($"Error sending event Create : {ex.Message}");
+                this._logger.LogError($"Error sending event Convert. Message={ex.Message}");
             }
         }
 
@@ -225,7 +225,7 @@ private void TrackEventTask(
             }
             catch (Exception e)
             {
-                Debug.Fail(e.ToString());
+                this._logger.LogError($"Error sending event {eventName}. Message={e.Message}");
             }
         }
 
@@ -249,7 +249,7 @@ private void TrackExceptionTask(
             }
             catch (Exception e)
             {
-                Debug.Fail(e.ToString());
+                this._logger.LogError($"Error sending exception event. Message={e.Message}");
             }
         }