fix mappings

agoda-com · Dec 22, 2023 · dd1a9f8 · dd1a9f8
1 parent 6a3fc69
commit dd1a9f8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/src/KafkaFlow.ApplicationInsights/AppInsightsConsumerEventsHandler.cs b/src/KafkaFlow.ApplicationInsights/AppInsightsConsumerEventsHandler.cs
@@ -22,7 +22,6 @@ public static Task OnConsumeError(IMessageContext eventContextMessageContext, Ex
         {
             {"topic" , eventContextMessageContext.ConsumerContext.Topic},
             {"partition" , eventContextMessageContext.ConsumerContext.Partition.ToString()},
-            {"offset" , eventContextMessageContext.ConsumerContext.Offset.ToString()},
         });
         eventContextMessageContext.Items.TryGetValue("timer", out var timer);
         var theTimer = (Stopwatch)timer;

diff --git a/src/KafkaFlow.ApplicationInsights/AppInsightsProducerEventsHandler.cs b/src/KafkaFlow.ApplicationInsights/AppInsightsProducerEventsHandler.cs
@@ -22,7 +22,6 @@ public static Task OnProducerError(IMessageContext eventContextMessageContext, E
         {
             {"topic" , eventContextMessageContext.ProducerContext.Topic},
             {"partition" , eventContextMessageContext.ProducerContext.Partition.ToString()},
-            {"offset" , eventContextMessageContext.ProducerContext.Offset.ToString()},
         });
         eventContextMessageContext.Items.TryGetValue("timer", out var timer);
         var theTimer = (Stopwatch)timer;

diff --git a/src/KafkaFlow.ApplicationInsights/ExtensionMethods.cs b/src/KafkaFlow.ApplicationInsights/ExtensionMethods.cs
@@ -34,25 +34,23 @@ public static IKafkaConfigurationBuilder AddAppInsightsInstrumentation(this IKaf
     }
 
     internal static string GetDependencyName(this IMessageContext eventContextMessageContext)
+    {
+        return eventContextMessageContext.ConsumerContext?.Topic ??
+               eventContextMessageContext.ProducerContext?.Topic;
+    }
+
+    internal static string GetData(this IMessageContext eventContextMessageContext)
     {
         var type = Constants.ConsumerType;
         if (eventContextMessageContext.ConsumerContext == null)
         {
             type = Constants.ProducerType;
         }
 
-        var topic = eventContextMessageContext.ConsumerContext?.Topic ?? 
-                    eventContextMessageContext.ProducerContext?.Topic;
-
         var partition = eventContextMessageContext.ConsumerContext?.Partition.ToString() ??
                         eventContextMessageContext.ProducerContext?.Partition.ToString();
 
-        return $"{type}/{topic}/{partition}";
-    }
-
-    internal static string GetOffset(this IMessageContext eventContextMessageContext)
-    {
-        return eventContextMessageContext.ConsumerContext?.Offset.ToString() ?? eventContextMessageContext.ProducerContext?.Offset.ToString();
+        return $"{type}/{partition}";
     }
 
     internal static string GetTarget(this IMessageContext eventContextMessageContext)
@@ -66,7 +64,7 @@ internal static void TrackKafkaDependency(this TelemetryClient telemetryClient,
         telemetryClient.TrackDependency(Constants.DependencyType,
                                     eventContextMessageContext.GetTarget(),
                                     eventContextMessageContext.GetDependencyName(),
-                                      eventContextMessageContext.GetOffset(),
+                                      eventContextMessageContext.GetData(),
                                       DateTimeOffset.UtcNow,
                                       elapsedTime,
                                       resultCode,