Update AppInsightsProducerEventsHandler.cs (#2)

* Update AppInsightsProducerEventsHandler.cs * Update AppInsightsProducerEventsHandler.cs * Update ExtensionMethods.cs * Update AppInsightsConsumerEventsHandler.cs * Update AppInsightsProducerEventsHandler.cs * Update AppInsightsProducerEventsHandler.cs
agoda-com · Dec 21, 2023 · 95a514a · 95a514a
1 parent 55e9761
commit 95a514a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/KafkaFlow.ApplicationInsights/AppInsightsConsumerEventsHandler.cs b/src/KafkaFlow.ApplicationInsights/AppInsightsConsumerEventsHandler.cs
@@ -14,9 +14,10 @@ public static Task OnConsumeStarted(IMessageContext eventContextMessageContext,
         return Task.CompletedTask;
     }
 
-    public static Task OnConsumeError(IMessageContext eventContextMessageContext, Exception eventContextException,
-        TelemetryClient telemetryClient)
+    public static Task OnConsumeError(IMessageContext eventContextMessageContext, Exception eventContextException)
     {
+        eventContextMessageContext.Items.TryGetValue("telemetryClient", out var telemetryClientOut);
+        var telemetryClient = (TelemetryClient)telemetryClientOut;
         telemetryClient.TrackException(eventContextException, new Dictionary<string, string>()
         {
             {"topic" , eventContextMessageContext.ConsumerContext.Topic},
@@ -50,4 +51,4 @@ public static Task OnConsumeCompleted(IMessageContext eventContextMessageContext
             theTimer.Elapsed, "200", true);
         return Task.CompletedTask;
     }
-}
+}
diff --git a/src/KafkaFlow.ApplicationInsights/AppInsightsProducerEventsHandler.cs b/src/KafkaFlow.ApplicationInsights/AppInsightsProducerEventsHandler.cs
@@ -10,12 +10,14 @@ public class AppInsightsProducerEventsHandler
     public static Task OnProducerStarted(IMessageContext eventContextMessageContext, TelemetryClient telemetryClient)
     {
         eventContextMessageContext.Items.Add("timer", Stopwatch.StartNew());
+        eventContextMessageContext.Items.Add("telemetryClient", telemetryClient); 
         return Task.CompletedTask;
     }
 
-    public static Task OnProducerError(IMessageContext eventContextMessageContext, Exception eventContextException,
-        TelemetryClient telemetryClient)
+    public static Task OnProducerError(IMessageContext eventContextMessageContext, Exception eventContextException)
     {
+        eventContextMessageContext.Items.TryGetValue("telemetryClient", out var telemetryClientOut);
+        var telemetryClient = (TelemetryClient)telemetryClientOut;
         telemetryClient.TrackException(eventContextException, new Dictionary<string, string>()
         {
             {"topic" , eventContextMessageContext.ProducerContext.Topic},
@@ -35,8 +37,10 @@ public static Task OnProducerError(IMessageContext eventContextMessageContext, E
         return Task.CompletedTask;
     }
 
-    public static Task OnProducerCompleted(IMessageContext eventContextMessageContext, TelemetryClient telemetryClient)
+    public static Task OnProducerCompleted(IMessageContext eventContextMessageContext)
     {
+        eventContextMessageContext.Items.TryGetValue("telemetryClient", out var telemetryClientOut);
+        var telemetryClient = (TelemetryClient)telemetryClientOut;
         eventContextMessageContext.Items.TryGetValue("timer", out var timer);
         var theTimer = (Stopwatch)timer;
         theTimer.Stop();
@@ -49,4 +53,4 @@ public static Task OnProducerCompleted(IMessageContext eventContextMessageContex
             theTimer.Elapsed, "200", true);
         return Task.CompletedTask;
     }
-}
+}
diff --git a/src/KafkaFlow.ApplicationInsights/ExtensionMethods.cs b/src/KafkaFlow.ApplicationInsights/ExtensionMethods.cs
@@ -18,17 +18,17 @@ public static IKafkaConfigurationBuilder AddAppInsightsInstrumentation(this IKaf
         {
             hub.MessageConsumeStarted.Subscribe(eventContext => AppInsightsConsumerEventsHandler.OnConsumeStarted(eventContext.MessageContext, eventContext.MessageContext.DependencyResolver.Resolve<TelemetryClient>()));
 
-            hub.MessageConsumeError.Subscribe(eventContext => AppInsightsConsumerEventsHandler.OnConsumeError(eventContext.MessageContext, eventContext.Exception, eventContext.MessageContext.DependencyResolver.Resolve<TelemetryClient>()));
+            hub.MessageConsumeError.Subscribe(eventContext => AppInsightsConsumerEventsHandler.OnConsumeError(eventContext.MessageContext, eventContext.Exception));
 
             hub.MessageConsumeCompleted.Subscribe(eventContext => AppInsightsConsumerEventsHandler.OnConsumeCompleted(eventContext.MessageContext));
 
             hub.MessageProduceStarted.Subscribe(eventContext => AppInsightsProducerEventsHandler.OnProducerStarted(eventContext.MessageContext, eventContext.MessageContext.DependencyResolver.Resolve<TelemetryClient>()));
 
-            hub.MessageProduceError.Subscribe(eventContext => AppInsightsProducerEventsHandler.OnProducerError(eventContext.MessageContext, eventContext.Exception, eventContext.MessageContext.DependencyResolver.Resolve<TelemetryClient>()));
+            hub.MessageProduceError.Subscribe(eventContext => AppInsightsProducerEventsHandler.OnProducerError(eventContext.MessageContext, eventContext.Exception));
 
-            hub.MessageProduceCompleted.Subscribe(eventContext => AppInsightsProducerEventsHandler.OnProducerCompleted(eventContext.MessageContext, eventContext.MessageContext.DependencyResolver.Resolve<TelemetryClient>()));
+            hub.MessageProduceCompleted.Subscribe(eventContext => AppInsightsProducerEventsHandler.OnProducerCompleted(eventContext.MessageContext));
         });
 
         return builder;
     }
-}
+}