From dd1a9f80e8bd68f4d52506f5900687220b6ccbf7 Mon Sep 17 00:00:00 2001
From: Joel Dickson <Joel.Dickson@agoda.com>
Date: Fri, 22 Dec 2023 12:38:57 +0700
Subject: [PATCH] fix mappings

---
 .../AppInsightsConsumerEventsHandler.cs        |  1 -
 .../AppInsightsProducerEventsHandler.cs        |  1 -
 .../ExtensionMethods.cs                        | 18 ++++++++----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/KafkaFlow.ApplicationInsights/AppInsightsConsumerEventsHandler.cs b/src/KafkaFlow.ApplicationInsights/AppInsightsConsumerEventsHandler.cs
index ded5dc7..aa6683d 100644
--- 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
index 2aad74f..b9677a1 100644
--- 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
index cf5384c..a2a3a9f 100644
--- a/src/KafkaFlow.ApplicationInsights/ExtensionMethods.cs
+++ b/src/KafkaFlow.ApplicationInsights/ExtensionMethods.cs
@@ -34,6 +34,12 @@ 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)
@@ -41,18 +47,10 @@ internal static string GetDependencyName(this IMessageContext eventContextMessag
             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,