Merge feat/adopt-zb-telemetry: adopt ZB.MOM.WW.Telemetry across OtOpcUa

AddZbTelemetry (shared OTel Resource identity + standard instrumentation;
kept meter ZB.MOM.WW.OtOpcUa + /metrics) and AddZbSerilog (shared enrichers +
trace correlation; sinks moved to appsettings). Behaviour-preserving.

Directory.Packages.props

@@ -99,6 +99,8 @@
     <PackageVersion Include="ZB.MOM.WW.Health" Version="0.1.0" />
     <PackageVersion Include="ZB.MOM.WW.Health.Akka" Version="0.1.0" />
     <PackageVersion Include="ZB.MOM.WW.Health.EntityFrameworkCore" Version="0.1.0" />
+    <PackageVersion Include="ZB.MOM.WW.Telemetry" Version="0.1.0" />
+    <PackageVersion Include="ZB.MOM.WW.Telemetry.Serilog" Version="0.1.0" />
     <PackageVersion Include="ZB.MOM.WW.MxGateway.Client" Version="0.1.0" />
     <PackageVersion Include="ZB.MOM.WW.MxGateway.Contracts" Version="0.1.0" />
   </ItemGroup>

NuGet.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
+    <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="local-mxgw" value="./nuget-packages" />
     <add key="dohertj2-gitea" value="https://gitea.dohertylan.com/api/packages/dohertj2/nuget/index.json" />
@@ -15,6 +16,8 @@
     <packageSource key="dohertj2-gitea">
       <package pattern="ZB.MOM.WW.Health" />
       <package pattern="ZB.MOM.WW.Health.*" />
+      <package pattern="ZB.MOM.WW.Telemetry" />
+      <package pattern="ZB.MOM.WW.Telemetry.*" />
     </packageSource>
   </packageSourceMapping>
 </configuration>

src/Server/ZB.MOM.WW.OtOpcUa.Host/Observability/ObservabilityExtensions.cs

@@ -1,6 +1,5 @@
-using OpenTelemetry.Metrics;
-using OpenTelemetry.Trace;
 using ZB.MOM.WW.OtOpcUa.Commons.Observability;
+using ZB.MOM.WW.Telemetry;
 
 namespace ZB.MOM.WW.OtOpcUa.Host.Observability;
 
@@ -17,14 +16,12 @@ public static class ObservabilityExtensions
     /// <param name="services">The service collection to add observability services to.</param>
     public static IServiceCollection AddOtOpcUaObservability(this IServiceCollection services)
     {
-        services.AddOpenTelemetry()
+        return services.AddZbTelemetry(o =>
-            .WithMetrics(b => b
+        {
-                .AddMeter(OtOpcUaTelemetry.MeterName)
+            o.ServiceName = "otopcua";
-                .AddPrometheusExporter())
+            o.Meters = [OtOpcUaTelemetry.MeterName];
-            .WithTracing(b => b
+            o.ActivitySources = [OtOpcUaTelemetry.ActivitySourceName];
-                .AddSource(OtOpcUaTelemetry.ActivitySourceName));
+        });
-
-        return services;
     }
 
     /// <summary>
@@ -35,7 +32,7 @@ public static class ObservabilityExtensions
     /// <param name="app">The endpoint route builder.</param>
     public static IEndpointRouteBuilder MapOtOpcUaMetrics(this IEndpointRouteBuilder app)
     {
-        app.MapPrometheusScrapingEndpoint("/metrics");
+        app.MapZbMetrics();
         return app;
     }
 }

src/Server/ZB.MOM.WW.OtOpcUa.Host/Program.cs

@@ -20,6 +20,7 @@ using ZB.MOM.WW.OtOpcUa.Runtime;
 using ZB.MOM.WW.OtOpcUa.Security;
 using ZB.MOM.WW.OtOpcUa.Security.Endpoints;
 using ZB.MOM.WW.OtOpcUa.Security.Ldap;
+using ZB.MOM.WW.Telemetry.Serilog;
 
 // Roles drive the entire conditional wiring below — see ZB.MOM.WW.OtOpcUa.Cluster.RoleParser.
 var roles = RoleParser.Parse(Environment.GetEnvironmentVariable("OTOPCUA_ROLES"));
@@ -45,11 +46,10 @@ var roleSuffix = roles.Length == 0 ? null : string.Join('-', roles.OrderBy(r =>
 if (roleSuffix is not null)
     builder.Configuration.AddJsonFile($"appsettings.{roleSuffix}.json", optional: true, reloadOnChange: true);
 
-// Serilog — rolling daily file sink per CLAUDE.md. Console for local dev.
+// Serilog — shared ZB.MOM.WW.Telemetry bootstrap. Sinks (Console + rolling daily file)
-builder.Host.UseSerilog((ctx, lc) => lc
+// now live in appsettings.json (ReadFrom.Configuration); AddZbSerilog layers in the
-    .ReadFrom.Configuration(ctx.Configuration)
+// shared NodeHostname / TraceContext / Redaction enrichers and trace correlation.
-    .WriteTo.Console()
+builder.AddZbSerilog(o => o.ServiceName = "otopcua");
-    .WriteTo.File("logs/otopcua-.log", rollingInterval: RollingInterval.Day));
 
 // Windows-service registration is handled at install time by scripts/install/Install-Services.ps1
 // (Task 62) rather than in-process, so the binary stays cross-platform-compilable.

src/Server/ZB.MOM.WW.OtOpcUa.Host/ZB.MOM.WW.OtOpcUa.Host.csproj

@@ -30,6 +30,8 @@
         <PackageReference Include="ZB.MOM.WW.Health" />
         <PackageReference Include="ZB.MOM.WW.Health.Akka" />
         <PackageReference Include="ZB.MOM.WW.Health.EntityFrameworkCore" />
+        <PackageReference Include="ZB.MOM.WW.Telemetry" />
+        <PackageReference Include="ZB.MOM.WW.Telemetry.Serilog" />
     </ItemGroup>
 
     <ItemGroup>

src/Server/ZB.MOM.WW.OtOpcUa.Host/appsettings.json

@@ -1 +1,9 @@
-{}
+{
+  "Serilog": {
+    "Using": [ "Serilog.Sinks.Console", "Serilog.Sinks.File" ],
+    "WriteTo": [
+      { "Name": "Console" },
+      { "Name": "File", "Args": { "path": "logs/otopcua-.log", "rollingInterval": "Day" } }
+    ]
+  }
+}