Use code gen logging (#380)

* Move calc to helper * Improve logs * Update version * Improve status codes * Cosmetic * Debug level * Disable publish metrics during high load * Remove test
Azure-Samples · Jul 30, 2024 · 1d036d1 · 1d036d1
1 parent 88ca0e8
commit 1d036d1
Show file tree

Hide file tree

Showing 4 changed files with 126 additions and 147 deletions.
diff --git a/src/Helpers/MetricsHelper.cs b/src/Helpers/MetricsHelper.cs
@@ -1,5 +1,7 @@
 namespace OpcPlc;
 
+using Microsoft.Extensions.Logging;
+using Opc.Ua;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
@@ -151,18 +153,37 @@ public static void AddMonitoredItemCount(int delta = 1)
     /// <summary>
     /// Add a published count.
     /// </summary>
-    public static void AddPublishedCount(string sessionId, string subscriptionId, int dataPoints, int events)
+    public static void AddPublishedCount(string sessionId, string subscriptionId, NotificationMessage notificationMessage, ILogger logger)
     {
         if (!IsEnabled)
         {
             return;
         }
 
-        if (dataPoints > 0)
+        int events = 0;
+        int dataChanges = 0;
+        int diagnostics = 0;
+        notificationMessage.NotificationData.ForEach(x => {
+            if (x.Body is DataChangeNotification changeNotification)
+            {
+                dataChanges += changeNotification.MonitoredItems.Count;
+                diagnostics += changeNotification.DiagnosticInfos.Count;
+            }
+            else if (x.Body is EventNotificationList eventNotification)
+            {
+                events += eventNotification.Events.Count;
+            }
+            else
+            {
+                logger.LogDebug("Unknown notification type: {NotificationType}", x.Body.GetType().Name);
+            }
+        });
+
+        if (dataChanges > 0)
         {
             var dataPointsDimensions = MergeWithBaseDimensions(
                         new KeyValuePair<string, object>("type", "data_point"));
-            _publishedCountWithType.Add(dataPoints, dataPointsDimensions);
+            _publishedCountWithType.Add(dataChanges, dataPointsDimensions);
         }
 
         if (events > 0)