Merge branch 'master' into ci/enable-managed-pool

Author: marcschier

Applications/ConsoleReferenceServer/ConsoleReferenceServer.csproj

@@ -16,6 +16,14 @@
   <ItemGroup Condition=" '$(NoHttps)' != 'true' ">
     <ProjectReference Include="..\..\Stack\Opc.Ua.Bindings.Https\Opc.Ua.Bindings.Https.csproj" />
   </ItemGroup>
+  <!-- Server-side pcap capture (Opc.Ua.Core.Diagnostics). The diagnostics
+       package resolves to net10.0 in every solution build configuration
+       (including the netstandard test builds where it collapses to net10.0
+       only), so gate the reference on net10.0 to keep the multi-TFM solution
+       build consistent. -->
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net10.0'))">
+    <ProjectReference Include="..\..\Stack\Opc.Ua.Core.Diagnostics\Opc.Ua.Core.Diagnostics.csproj" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Stack\Opc.Ua.Core\Opc.Ua.Core.csproj" />
     <ProjectReference Include="..\..\Libraries\Opc.Ua.Configuration\Opc.Ua.Configuration.csproj" />

Applications/ConsoleReferenceServer/Ctt.ReferenceServer.Config.xml

@@ -197,6 +197,8 @@
       <ua:String>http://opcfoundation.org/UA-Profile/Server/Methods</ua:String>
       <ua:String>http://opcfoundation.org/UA-Profile/Server/ReverseConnect</ua:String>
       <ua:String>http://opcfoundation.org/UA-Profile/Server/ClientRedundancy</ua:String>
+      <ua:String>http://opcfoundation.org/UA-Profile/Server/HistoricalRawData2022</ua:String>
+      <ua:String>http://opcfoundation.org/UA-Profile/Server/AggregateHistorical2022</ua:String>
     </ServerProfileArray>
     <ShutdownDelay>5</ShutdownDelay>
     <ServerCapabilities>

Applications/ConsoleReferenceServer/Dockerfile

@@ -13,8 +13,10 @@ COPY ["Tools/Opc.Ua.SourceGeneration/Opc.Ua.SourceGeneration.csproj", "Tools/Opc
 COPY ["Stack/Opc.Ua.Core.Types/Opc.Ua.Core.Types.csproj", "Stack/Opc.Ua.Core.Types/"]
 COPY ["Stack/Opc.Ua.Core/Opc.Ua.Core.csproj", "Stack/Opc.Ua.Core/"]
 COPY ["Stack/Opc.Ua.Core.Schema/Opc.Ua.Core.Schema.csproj", "Stack/Opc.Ua.Core.Schema/"]
+COPY ["Stack/Opc.Ua.Core.Diagnostics/Opc.Ua.Core.Diagnostics.csproj", "Stack/Opc.Ua.Core.Diagnostics/"]
 COPY ["Stack/Opc.Ua.Types/Opc.Ua.Types.csproj", "Stack/Opc.Ua.Types/"]
 COPY ["Stack/Opc.Ua.Security.Certificates/Opc.Ua.Security.Certificates.csproj", "Stack/Opc.Ua.Security.Certificates/"]
+COPY ["Libraries/Opc.Ua.Client/Opc.Ua.Client.csproj", "Libraries/Opc.Ua.Client/"]
 COPY ["Libraries/Opc.Ua.Configuration/Opc.Ua.Configuration.csproj", "Libraries/Opc.Ua.Configuration/"]
 COPY ["Libraries/Opc.Ua.Server/Opc.Ua.Server.csproj", "Libraries/Opc.Ua.Server/"]
 COPY ["Applications/Quickstarts.Servers/Quickstarts.Servers.csproj", "Applications/Quickstarts.Servers/"]

Applications/ConsoleReferenceServer/Quickstarts.ReferenceServer.Config.xml

@@ -320,6 +320,8 @@
       <ua:String>http://opcfoundation.org/UA-Profile/Server/Methods</ua:String>
       <ua:String>http://opcfoundation.org/UA-Profile/Server/ReverseConnect</ua:String>
       <ua:String>http://opcfoundation.org/UA-Profile/Server/ClientRedundancy</ua:String>
+      <ua:String>http://opcfoundation.org/UA-Profile/Server/HistoricalRawData2022</ua:String>
+      <ua:String>http://opcfoundation.org/UA-Profile/Server/AggregateHistorical2022</ua:String>
     </ServerProfileArray>
     <ShutdownDelay>5</ShutdownDelay>
     <ServerCapabilities>

Applications/ConsoleReferenceServer/UAServer.cs

@@ -37,6 +37,9 @@
 using Microsoft.Extensions.Logging;
 using Opc.Ua;
 using Opc.Ua.Configuration;
+#if NET10_0_OR_GREATER
+using Opc.Ua.Pcap.Capture;
+#endif
 using Opc.Ua.Security.Certificates;
 using Opc.Ua.Server;
 
@@ -162,6 +165,19 @@ public async Task StartAsync(CancellationToken ct = default)
                 // create the server.
                 Server ??= m_factory(m_telemetry);
 
+#if NET10_0_OR_GREATER
+                // Opt-in diagnostics: when OPCUA_PCAP_FILE / OPCUA_KEYLOGFILE are
+                // set, install server-side pcap capture into the transport
+                // bindings before the listeners open. Mirrors the client env-var
+                // path and honours the same variables; a complete no-op (nothing
+                // installed, no files written) when the variables are unset.
+                // The pcap capture package targets net8.0+ only.
+                m_pcapCapture = await PcapServerCapture.TryStartFromEnvironmentAsync(
+                    Server!.TransportBindings,
+                    m_telemetry.LoggerFactory,
+                    ct).ConfigureAwait(false);
+#endif
+
                 // start the server
                 await Application.StartAsync(Server, ct).ConfigureAwait(false);
 
@@ -211,7 +227,16 @@ public async Task StopAsync(CancellationToken ct = default)
                     await server.StopAsync(ct).ConfigureAwait(false);
                 }
 
-                ExitCode = ExitCode.Ok;
+#if NET10_0_OR_GREATER
+                    // Stop any env-var-driven pcap capture installed at start.
+                    if (m_pcapCapture != null)
+                    {
+                        await m_pcapCapture.DisposeAsync().ConfigureAwait(false);
+                        m_pcapCapture = null;
+                    }
+#endif
+
+                    ExitCode = ExitCode.Ok;
             }
             catch (Exception ex)
             {
@@ -360,5 +385,8 @@ public override async Task<bool> ShowAsync()
         private readonly ILogger m_logger;
         private Task m_status = Task.CompletedTask;
         private DateTime m_lastEventTime;
+#if NET10_0_OR_GREATER
+        private IAsyncDisposable? m_pcapCapture;
+#endif
     }
 }