Update readme and test nuget (#382)

* Add otlpublishmetrics * Update test nuget * Cosmetic * Refactor
Azure-Samples · Aug 1, 2024 · ef2454e · ef2454e
1 parent c340a5d
commit ef2454e
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -344,6 +344,12 @@ Options:
                              the protocol for exporting OTLP information.
                                (allowed values: grpc, protobuf).
                                Default: grpc
+      --otlpub, --otlpublishmetrics=VALUE
+                             how to handle metrics for publish requests.
+                               (allowed values: disable=Always disabled, enable=
+                               Always enabled, auto=Auto-disable when sessions >
+                                40 or monitored items > 500).
+                               Default: auto
       --lr, --ldsreginterval=VALUE
                              the LDS(-ME) registration interval in ms. If 0,
                                then the registration is disabled.

diff --git a/src/Configuration/OpcUaAppConfigFactory.cs b/src/Configuration/OpcUaAppConfigFactory.cs
@@ -69,7 +69,7 @@ public async Task<ApplicationConfiguration> ConfigureAsync()
             }
         }
 
-        _logger.LogInformation("Alternate base addresses (for server binding and certificate DNSNames and IPAddresses extensions): {alternateBaseAddresses}", alternateBaseAddresses);
+        _logger.LogInformation("Alternate base addresses (for server binding and certificate DNSNames and IPAddresses extensions): {AlternateBaseAddresses}", alternateBaseAddresses);
 
         string applicationUri = $"urn:{_config.ProgramName}:{_config.OpcUa.HostnameLabel}{(string.IsNullOrEmpty(_config.OpcUa.ServerPath)
              ? string.Empty

diff --git a/src/PlcServer.cs b/src/PlcServer.cs
@@ -265,27 +265,7 @@ public override ResponseHeader Publish(
 
             if (PublishMetricsEnabled)
             {
-                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
-                    {
-                        LogUnknownNotification(x.Body.GetType().Name);
-                    }
-                });
-
-                MetricsHelper.AddPublishedCount(context.SessionId.ToString(), subscriptionId.ToString(), dataChanges, events);
+                AddPublishMetrics(notificationMessage, context.SessionId.ToString(), subscriptionId.ToString());
             }
 
             LogSuccessWithSessionIdAndSubscriptionId(
@@ -594,6 +574,31 @@ protected override void OnServerStopping()
         base.OnServerStopping();
     }
 
+    private void AddPublishMetrics(NotificationMessage notificationMessage, string sessionId, string subscriptionId)
+    {
+        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
+            {
+                LogUnknownNotification(x.Body.GetType().Name);
+            }
+        });
+
+        MetricsHelper.AddPublishedCount(sessionId, subscriptionId, dataChanges, events);
+    }
+
     [LoggerMessage(
         Level = LogLevel.Information,
         Message = "\n\t# Open sessions: {Sessions}\n" +

diff --git a/tests/opc-plc-tests.csproj b/tests/opc-plc-tests.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="NUnit" Version="4.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
   </ItemGroup>