Fix AzureSdkDiagnosticListener from crashing user app

WEB/Src/DependencyCollector/DependencyCollector.Tests/Implementation/AzureSdkDiagnosticListenerTest.cs

@@ -49,6 +49,32 @@ public void CleanUp()
             }
         }
 
+        [TestMethod]
+        public void AzureSdkListenerDoesNotThrowAfterInitialization()
+        {
+            using (var listener = new DiagnosticListener("Azure.SomeClient"))
+            using (var module = new DependencyTrackingTelemetryModule())
+            {
+                module.Initialize(this.configuration);
+
+                // Dispose config after initialize
+                // If AzureSdkListener attempted to create
+                // new TelemetryClient after initialize, it'd throw.
+                this.configuration.Dispose();
+
+                Activity sendActivity = new Activity("Azure.SomeClient.Send");
+                sendActivity.AddTag("kind", "client");
+
+                listener.StartActivity(sendActivity, null);
+                listener.StopActivity(sendActivity, null);
+
+                var listenerAnother = new DiagnosticListener("Azure.AnotherClient");
+                var listenerYetAnother = new DiagnosticListener("Azure.YetAnotherClient");
+
+                Assert.AreEqual(0, this.sentItems.Count);
+            }
+        }
+
         [TestMethod]
         public void AzureClientSpansNotCollectedWhenDisabled()
         {
@@ -93,7 +119,7 @@ public void AzureClientSpansAreCollected()
                 Assert.AreEqual(sendActivity.SpanId.ToHexString(), telemetry.Id);
 
                 Assert.AreEqual("v1", telemetry.Properties["k1"]);
-                
+
                 Assert.IsTrue(telemetry.Properties.TryGetValue("tracestate", out var tracestate));
                 Assert.AreEqual("state=some", tracestate);
             }
@@ -847,7 +873,7 @@ public void AzureClientSpansAreCollectedForHttp()
                     .AddTag("serviceRequestId", "service-request-id");
 
                 listener.StopActivity(httpActivity, payload);
-                
+
                 var telemetry = this.sentItems.Last() as DependencyTelemetry;
 
                 Assert.IsNotNull(telemetry);

WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticListenerSubscriber.cs

@@ -24,7 +24,7 @@ internal override bool IsActivityEnabled(string evnt, object context)
 
         protected override IDiagnosticEventHandler GetEventHandler(string diagnosticListenerName)
         {
-            return new AzureSdkDiagnosticsEventHandler(this.Configuration);
+            return new AzureSdkDiagnosticsEventHandler(this.Client);
         }
     }
 }

WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkDiagnosticsEventHandler.cs

@@ -25,7 +25,7 @@ internal class AzureSdkDiagnosticsEventHandler : DiagnosticsEventHandlerBase
         // fetcher is created per AzureSdkDiagnosticsEventHandler and AzureSdkDiagnosticsEventHandler is created per DiagnosticSource
         private readonly PropertyFetcher linksPropertyFetcher = new PropertyFetcher("Links");
 
-        public AzureSdkDiagnosticsEventHandler(TelemetryConfiguration configuration) : base(configuration)
+        public AzureSdkDiagnosticsEventHandler(TelemetryClient client) : base(client)
         {
         }
 
@@ -159,7 +159,7 @@ private static bool TryGetAverageTimeInQueueForBatch(IEnumerable<Activity> links
                     // instrumentation does not consistently report enqueued time, ignoring whole span
                     return false;
                 }
-                
+
                 long startEpochTime = 0;
 #if NET452
                 startEpochTime = (long)(requestStartTime - EpochStart).TotalMilliseconds;
@@ -318,7 +318,7 @@ private static void SetEventHubsProperties(Activity activity, OperationTelemetry
                 return;
             }
 
-            // Target uniquely identifies the resource, we use both: queueName and endpoint 
+            // Target uniquely identifies the resource, we use both: queueName and endpoint
             // with schema used for SQL-dependencies
             string separator = "/";
             if (endpoint.EndsWith(separator, StringComparison.Ordinal))

WEB/Src/DependencyCollector/DependencyCollector/Implementation/EventHandlers/DiagnosticsEventHandlerBase.cs

@@ -31,6 +31,11 @@ protected DiagnosticsEventHandlerBase(TelemetryConfiguration configuration)
             this.TelemetryClient = new TelemetryClient(configuration);
         }
 
+        protected DiagnosticsEventHandlerBase(TelemetryClient client)
+        {
+            this.TelemetryClient = client;
+        }
+
         public virtual bool IsEventEnabled(string evnt, object arg1, object arg2)
         {
             return !evnt.EndsWith(TelemetryDiagnosticSourceListener.ActivityStartNameSuffix, StringComparison.Ordinal);