Updating custom event

frasermolyneux-archive · Nov 7, 2023 · 6ec683b · 6ec683b
1 parent 4c554da
commit 6ec683b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/src/abstractions/Models/ApimCustomEvent.cs b/src/abstractions/Models/ApimCustomEvent.cs
@@ -7,7 +7,10 @@ namespace Company.Abstractions.Models
 {
     public class ApimCustomEvent
     {
-        public string InterfaceId { get; set; }
+        public string OperationId { get; set; }
+        public string ServiceId { get; set; }
+        public string ServiceName { get; set; }
         public string EventName { get; set; }
+        public Dictionary<string, string> CustomDimensions { get; set; }
     }
 }
diff --git a/src/func-app-sub/AppInsightsCustomEvents.cs b/src/func-app-sub/AppInsightsCustomEvents.cs
@@ -38,10 +38,10 @@ public async Task RunAppInsightsCustomEventsTrigger([EventHubTrigger("appinsight
                     continue;
                 }
 
-                TelemetryClient.TrackEvent(messageData.EventName, new Dictionary<string, string>()
-                {
-                    {"InterfaceId", messageData.InterfaceId}
-                });
+                TelemetryClient.Context.Operation.Id = messageData.OperationId;
+                TelemetryClient.Context.Operation.Name = messageData.EventName;
+
+                TelemetryClient.TrackEvent(messageData.EventName, messageData.CustomDimensions);
             }
         }
     }

diff --git a/terraform/api-management-api-func.tf b/terraform/api-management-api-func.tf
@@ -99,12 +99,23 @@ resource "azurerm_api_management_api_policy" "funcapp_backend" {
       <set-backend-service backend-id="${azurerm_api_management_backend.funcapp_backend[each.key].name}" />
       <log-to-eventhub logger-id="${azurerm_api_management_logger.apim_eh_logger[each.value.location].name}">
         @{
-            return new JObject(
-                new JProperty("InterfaceId", "ID_VehicleTollBooth"),
-                new JProperty("EventName", context.Operation.Name),
-                new JProperty("EventTime", DateTime.UtcNow.ToString()), 
-                new JProperty("ServiceName", context.Deployment.ServiceName)
-            ).ToString();
+            dynamic requestData = JsonConvert.DeserializeObject(context.Request.Body.As<string>());
+
+            var customDimensions = new Dictionary<string, string>() {
+                {"InterfaceId", "ID_VehicleTollBooth"},
+                {"TollId", requestData?.TollId},
+                {"LicensePlate", requestData?.LicensePlate}
+            };
+
+            var customEvent = new {
+                OperationId = context.Operation.Id,
+                ServiceId = context.Deployment.ServiceId,
+                ServiceName = context.Deployment.ServiceName,
+                EventName = context.Operation.Name,
+                CustomDimensions = customDimensions
+            };
+
+            return JsonConvert.SerializeObject(customEvent);
         }
       </log-to-eventhub>
   </inbound>