feat(telemetry): pack ZB.MOM.WW.Telemetry 0.1.0 + README/CLAUDE + register observability component in indexes
- NuGet metadata: expanded Description and PackageTags on both library csproj files (opentelemetry;observability;metrics;tracing;prometheus;otlp;... / serilog;logging;...) - Full dotnet test: 7 (Telemetry) + 12 (Serilog) = 19 tests, all green - dotnet pack: ZB.MOM.WW.Telemetry.0.1.0.nupkg + ZB.MOM.WW.Telemetry.Serilog.0.1.0.nupkg (artifacts/ gitignored, not committed) - ZB.MOM.WW.Telemetry/README.md: overview, 2 packages, unifying hinge prose, exporter options, OTel signals + trace-log correlation, test/pack commands, status - ZB.MOM.WW.Telemetry/CLAUDE.md: package responsibilities, consumer matrix, build/test/pack commands, status + pointers to components/observability/ - components/README.md: Observability row added to component registry table - CLAUDE.md: Telemetry row added to component-normalization table; intro count updated to four shared libs; observability prose paragraph added (MxGateway logging adoption noted) - upcoming.md: Observability item ticked done, pointing at components/observability/ and ZB.MOM.WW.Telemetry; MxGateway MEL->Serilog adoption noted - components/observability/README.md: status updated to Built @ 0.1.0, library build/pack commands added, MxGateway adoption row updated
This commit is contained in:
@@ -6,10 +6,11 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
|
|||||||
|
|
||||||
`scadaproj` is primarily an umbrella/index workspace that aggregates a family of
|
`scadaproj` is primarily an umbrella/index workspace that aggregates a family of
|
||||||
related SCADA / OT / Wonderware / OPC UA "sister projects" that live as **sibling
|
related SCADA / OT / Wonderware / OPC UA "sister projects" that live as **sibling
|
||||||
directories under `~/Desktop/`**. It now also **hosts three pieces of source itself** —
|
directories under `~/Desktop/`**. It now also **hosts four pieces of source itself** —
|
||||||
the shared [`ZB.MOM.WW.Auth/`](ZB.MOM.WW.Auth/) library, the shared
|
the shared [`ZB.MOM.WW.Auth/`](ZB.MOM.WW.Auth/) library, the shared
|
||||||
[`ZB.MOM.WW.Theme/`](ZB.MOM.WW.Theme/) UI kit, and the shared
|
[`ZB.MOM.WW.Theme/`](ZB.MOM.WW.Theme/) UI kit, the shared
|
||||||
[`ZB.MOM.WW.Health/`](ZB.MOM.WW.Health/) health-check library — all the realized output of their
|
[`ZB.MOM.WW.Health/`](ZB.MOM.WW.Health/) health-check library, and the shared
|
||||||
|
[`ZB.MOM.WW.Telemetry/`](ZB.MOM.WW.Telemetry/) observability library — all the realized output of their
|
||||||
respective component normalizations (see [Component normalization](#component-normalization)).
|
respective component normalizations (see [Component normalization](#component-normalization)).
|
||||||
The point of this file is to give a high-level scan of each sister project — its purpose,
|
The point of this file is to give a high-level scan of each sister project — its purpose,
|
||||||
location, stack, and primary commands — so a fresh Claude Code session can orient across
|
location, stack, and primary commands — so a fresh Claude Code session can orient across
|
||||||
@@ -121,6 +122,7 @@ each project's **code-verified current state**, and the **gaps** between. See
|
|||||||
| Auth (login / identity / authz) | Built (lib `0.1.0`) | Shared `ZB.MOM.WW.Auth` lib | [`components/auth/`](components/auth/) | [`ZB.MOM.WW.Auth/`](ZB.MOM.WW.Auth/) |
|
| Auth (login / identity / authz) | Built (lib `0.1.0`) | Shared `ZB.MOM.WW.Auth` lib | [`components/auth/`](components/auth/) | [`ZB.MOM.WW.Auth/`](ZB.MOM.WW.Auth/) |
|
||||||
| UI Theme (layout / tokens / components) | Built (lib `0.1.0`) | Shared `ZB.MOM.WW.Theme` RCL | [`components/ui-theme/`](components/ui-theme/) | [`ZB.MOM.WW.Theme/`](ZB.MOM.WW.Theme/) |
|
| UI Theme (layout / tokens / components) | Built (lib `0.1.0`) | Shared `ZB.MOM.WW.Theme` RCL | [`components/ui-theme/`](components/ui-theme/) | [`ZB.MOM.WW.Theme/`](ZB.MOM.WW.Theme/) |
|
||||||
| Health (readiness / liveness / active-node) | Built (lib `0.1.0`) | Shared `ZB.MOM.WW.Health` lib | [`components/health/`](components/health/) | [`ZB.MOM.WW.Health/`](ZB.MOM.WW.Health/) |
|
| Health (readiness / liveness / active-node) | Built (lib `0.1.0`) | Shared `ZB.MOM.WW.Health` lib | [`components/health/`](components/health/) | [`ZB.MOM.WW.Health/`](ZB.MOM.WW.Health/) |
|
||||||
|
| Observability (metrics / traces / logs) | Built (lib `0.1.0`) | Shared `ZB.MOM.WW.Telemetry` lib + `.Serilog` | [`components/observability/`](components/observability/) | [`ZB.MOM.WW.Telemetry/`](ZB.MOM.WW.Telemetry/) |
|
||||||
|
|
||||||
The auth component is fully populated: a normalized [`spec`](components/auth/spec/SPEC.md), a
|
The auth component is fully populated: a normalized [`spec`](components/auth/spec/SPEC.md), a
|
||||||
proposed [`shared-contract`](components/auth/shared-contract/ZB.MOM.WW.Auth.md), three
|
proposed [`shared-contract`](components/auth/shared-contract/ZB.MOM.WW.Auth.md), three
|
||||||
@@ -166,6 +168,24 @@ The shared library is **built and lives in this repo** at [`ZB.MOM.WW.Health/`](
|
|||||||
Build/test from `ZB.MOM.WW.Health/`: `dotnet test`. Consumer matrix: MxAccessGateway → core only;
|
Build/test from `ZB.MOM.WW.Health/`: `dotnet test`. Consumer matrix: MxAccessGateway → core only;
|
||||||
OtOpcUa & ScadaBridge → all three packages.
|
OtOpcUa & ScadaBridge → all three packages.
|
||||||
|
|
||||||
|
The observability component is fully populated: a normalized [`spec`](components/observability/spec/SPEC.md),
|
||||||
|
a [`metric-conventions`](components/observability/spec/METRIC-CONVENTIONS.md) reference, a
|
||||||
|
[`shared-contract`](components/observability/shared-contract/ZB.MOM.WW.Telemetry.md), three
|
||||||
|
[`current-state`](components/observability/current-state/) docs, and an adoption [`GAPS`](components/observability/GAPS.md)
|
||||||
|
backlog. Shared = OTel Resource (service.name/site.id/node.role identity triple) + standard instrumentation
|
||||||
|
(ASP.NET Core, HttpClient, gRPC client, runtime, process) + Prometheus always-on exporter + OTLP opt-in
|
||||||
|
+ Serilog two-stage bootstrap + SiteId/NodeRole/NodeHostname enrichers + TraceContextEnricher (trace_id/span_id)
|
||||||
|
+ ILogRedactor seam; left per-project = application Meters/ActivitySources, sink config, per-operation
|
||||||
|
enrichers, and redaction policies.
|
||||||
|
|
||||||
|
The shared library is **built and lives in this repo** at [`ZB.MOM.WW.Telemetry/`](ZB.MOM.WW.Telemetry/)
|
||||||
|
(.NET 10; 2 packages — `ZB.MOM.WW.Telemetry`, `ZB.MOM.WW.Telemetry.Serilog`; 19 tests;
|
||||||
|
`dotnet pack` → 2 nupkgs @ 0.1.0). **MxAccessGateway logging adopted** (MEL → Serilog migration done on
|
||||||
|
its own branch) — the one in-pass adoption. Broader OtOpcUa and ScadaBridge telemetry adoption is
|
||||||
|
follow-on, tracked in [`components/observability/GAPS.md`](components/observability/GAPS.md).
|
||||||
|
Build/test from `ZB.MOM.WW.Telemetry/`: `dotnet test`. Consumer matrix: all three apps consume both
|
||||||
|
packages after adoption (OtOpcUa, MxGateway Server, ScadaBridge Host + any instrumented project).
|
||||||
|
|
||||||
## Per-project primary commands
|
## Per-project primary commands
|
||||||
|
|
||||||
Run these from inside each project directory (not from `scadaproj`).
|
Run these from inside each project directory (not from `scadaproj`).
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
# ZB.MOM.WW.Telemetry
|
||||||
|
|
||||||
|
Observability libraries for the **ZB.MOM.WW SCADA family** (OtOpcUa, MxAccessGateway, ScadaBridge). These are **libraries, not a service** — each package is linked directly into the consuming application at build time. There is no central telemetry process; instrumentation runs in-process alongside the application.
|
||||||
|
|
||||||
|
The library normalizes the three-project observability surface: a shared OpenTelemetry Resource driven by a single identity triple (`service.name` / `site.id` / `node.role`), standard instrumentation wiring, Prometheus and OTLP export, and a Serilog bootstrap with enrichers and `TraceContextEnricher` for trace↔log correlation.
|
||||||
|
|
||||||
|
**Built at 0.1.0. MxAccessGateway logging adopted (MEL → Serilog migration done on its own branch). OtOpcUa and ScadaBridge telemetry adoption is follow-on.** Adoption tracked in `~/Desktop/scadaproj/components/observability/GAPS.md`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Packages
|
||||||
|
|
||||||
|
| Package | Responsibilities | Key Dependencies |
|
||||||
|
|---|---|---|
|
||||||
|
| `ZB.MOM.WW.Telemetry` | `AddZbTelemetry` — wires OTel SDK (metrics + tracing), populates shared Resource (`service.name`, `service.namespace`, `service.version`, `site.id`, `node.role`, `host.name`), registers caller-supplied Meters/ActivitySources, adds standard instrumentation (ASP.NET Core, HttpClient, gRPC client, runtime, process), Prometheus always-on exporter, OTLP additive overlay. `app.MapZbMetrics()` — mounts `/metrics`. `ZbTelemetryOptions` — the single options object shared by both packages. | `Microsoft.AspNetCore.App` (framework ref), `OpenTelemetry.*` stack |
|
||||||
|
| `ZB.MOM.WW.Telemetry.Serilog` | `AddZbSerilog` — shared two-stage Serilog bootstrap: `ReadFrom.Configuration`-driven sinks, `MinimumLevel.Is(Information)` default (config-overridable), `SiteId`/`NodeRole`/`NodeHostname` enrichers from `ZbTelemetryOptions`, `TraceContextEnricher` (writes `trace_id`/`span_id` from `Activity.Current`), `ILogRedactor` seam (per-project sensitive-field redaction via `RedactionEnricher`). Does NOT freeze `Log.Logger` — safe for multi-host/test scenarios. | `ZB.MOM.WW.Telemetry`, `Serilog.*` stack |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Consumer matrix
|
||||||
|
|
||||||
|
| Consumer | `ZB.MOM.WW.Telemetry` (core) | `ZB.MOM.WW.Telemetry.Serilog` |
|
||||||
|
|---|:---:|:---:|
|
||||||
|
| **OtOpcUa** | yes (after adoption) | yes (after adoption) |
|
||||||
|
| **MxAccessGateway** | yes (after adoption) | yes (MEL → Serilog adopted now) |
|
||||||
|
| **ScadaBridge** | yes (after adoption) | yes (after adoption) |
|
||||||
|
|
||||||
|
MxAccessGateway's logging adoption is the one in-pass migration. Full metrics/tracing wiring
|
||||||
|
for all three apps is follow-on.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Build, test, and pack commands
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# From ZB.MOM.WW.Telemetry/
|
||||||
|
|
||||||
|
# Build
|
||||||
|
dotnet build ZB.MOM.WW.Telemetry.slnx
|
||||||
|
dotnet build ZB.MOM.WW.Telemetry.slnx -c Release
|
||||||
|
|
||||||
|
# Test (no external dependencies — no running OTel collector, no Serilog backend required)
|
||||||
|
dotnet test ZB.MOM.WW.Telemetry.slnx
|
||||||
|
|
||||||
|
# Pack (two .nupkg files land in artifacts/)
|
||||||
|
dotnet pack ZB.MOM.WW.Telemetry.slnx -c Release -o ./artifacts
|
||||||
|
```
|
||||||
|
|
||||||
|
All test assemblies run offline:
|
||||||
|
|
||||||
|
| Assembly | Tests |
|
||||||
|
|---|---|
|
||||||
|
| `ZB.MOM.WW.Telemetry.Tests` | 7 |
|
||||||
|
| `ZB.MOM.WW.Telemetry.Serilog.Tests` | 12 |
|
||||||
|
| **Total** | **19** |
|
||||||
|
|
||||||
|
`GeneratePackageOnBuild` is off — pack explicitly with the command above.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Status
|
||||||
|
|
||||||
|
Built at **0.1.0** and published to the Gitea NuGet feed. MxAccessGateway logging (MEL → Serilog)
|
||||||
|
adopted on its own branch. **OtOpcUa and ScadaBridge telemetry adoption not yet started** —
|
||||||
|
tracked in the component backlog:
|
||||||
|
|
||||||
|
- `~/Desktop/scadaproj/components/observability/GAPS.md` — adoption order, effort, and risk
|
||||||
|
|
||||||
|
Design documentation:
|
||||||
|
|
||||||
|
- `~/Desktop/scadaproj/components/observability/spec/SPEC.md` — normalized observability target
|
||||||
|
- `~/Desktop/scadaproj/components/observability/spec/METRIC-CONVENTIONS.md` — metric naming reference
|
||||||
|
- `~/Desktop/scadaproj/components/observability/shared-contract/ZB.MOM.WW.Telemetry.md` — proposed shared-library API
|
||||||
|
- `~/Desktop/scadaproj/components/observability/current-state/` — per-project current state (code-verified)
|
||||||
@@ -0,0 +1,153 @@
|
|||||||
|
# ZB.MOM.WW.Telemetry
|
||||||
|
|
||||||
|
Observability libraries for the **ZB.MOM.WW SCADA family** (OtOpcUa, MxAccessGateway, ScadaBridge). These are **libraries, not a service** — each package is linked directly into the consuming application at build time. There is no central telemetry process; all instrumentation runs in-process alongside the application.
|
||||||
|
|
||||||
|
The library normalizes the three-project observability surface: a shared OpenTelemetry Resource identity, standard instrumentation wiring, Prometheus and OTLP export, and a Serilog bootstrap with enrichers and trace↔log correlation — so metrics, traces, and log lines from the same node carry identical dimensions and can join up in any backend.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Packages
|
||||||
|
|
||||||
|
| Package | Description | Key Dependencies |
|
||||||
|
|---|---|---|
|
||||||
|
| `ZB.MOM.WW.Telemetry` | `AddZbTelemetry` extension, `ZbTelemetryOptions`, shared OTel Resource builder (`ZbResource`), standard instrumentation (ASP.NET Core, HttpClient, gRPC client, runtime, process), Prometheus always-on exporter + OTLP opt-in overlay, `app.MapZbMetrics()` endpoint extension. | `Microsoft.AspNetCore.App` (framework ref), `OpenTelemetry.*` stack |
|
||||||
|
| `ZB.MOM.WW.Telemetry.Serilog` | `AddZbSerilog` extension, shared enrichers (`SiteId`/`NodeRole`/`NodeHostname`), `TraceContextEnricher` (writes `trace_id`/`span_id` from `Activity.Current` into every log event), `ILogRedactor` seam (per-project sensitive-field redaction), `RedactionEnricher`. | `ZB.MOM.WW.Telemetry`, `Serilog.*` stack |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## The unifying hinge
|
||||||
|
|
||||||
|
The single `ZbTelemetryOptions` object drives both packages. Its identity triple —
|
||||||
|
`ServiceName` → OTel Resource `service.name`, `SiteId` → `site.id`, `NodeRole` → `node.role` —
|
||||||
|
is applied once and flows automatically to **both** the OpenTelemetry Resource (so every metric
|
||||||
|
and span carries it) **and** the Serilog enrichers (so every log event carries it). A metric,
|
||||||
|
a span, and a log line emitted by the same node share identical `service.name`, `site.id`, and
|
||||||
|
`node.role` dimensions, enabling cross-signal correlation in any backend (Grafana, Jaeger, Seq,
|
||||||
|
Loki, etc.) without per-project bookkeeping.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Consumer matrix
|
||||||
|
|
||||||
|
| Consumer | `ZB.MOM.WW.Telemetry` (core) | `ZB.MOM.WW.Telemetry.Serilog` |
|
||||||
|
|---|:---:|:---:|
|
||||||
|
| **OtOpcUa** | yes | yes |
|
||||||
|
| **MxAccessGateway** | yes | yes (logging adopted — MEL → Serilog migration done) |
|
||||||
|
| **ScadaBridge** | yes | yes |
|
||||||
|
|
||||||
|
All three apps consume both packages after adoption. MxAccessGateway's MEL→Serilog migration
|
||||||
|
is the one in-pass adoption completed on its own branch; OtOpcUa and ScadaBridge adoption is
|
||||||
|
follow-on (tracked in `components/observability/GAPS.md`).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## OTel signals
|
||||||
|
|
||||||
|
`AddZbTelemetry` wires all three OpenTelemetry signals in a single call:
|
||||||
|
|
||||||
|
| Signal | What is wired |
|
||||||
|
|---|---|
|
||||||
|
| **Metrics** | App Meters (via `options.Meters[]`) + standard: ASP.NET Core, HttpClient, .NET runtime, process. Exported via Prometheus (always on) with OTLP as an additive overlay. |
|
||||||
|
| **Traces** | App ActivitySources (via `options.ActivitySources[]`) + standard: ASP.NET Core, HttpClient, gRPC client. Exported via OTLP when `Exporter = ZbExporter.Otlp`. |
|
||||||
|
| **Logs** | Wired by `AddZbSerilog` (companion call). Serilog is used as the log sink; logs are bridged to OpenTelemetry via `Serilog.Sinks.OpenTelemetry` when configured. |
|
||||||
|
|
||||||
|
Trace↔log correlation is automatic: `TraceContextEnricher` reads `Activity.Current` for each
|
||||||
|
log event and attaches `trace_id` and `span_id`, so log events produced inside a traced request
|
||||||
|
carry the same span identity as the trace backend.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Exporter options
|
||||||
|
|
||||||
|
Prometheus is **always wired** for metrics regardless of the `Exporter` setting. OTLP is an
|
||||||
|
additive overlay — set `Exporter = ZbExporter.Otlp` and `OtlpEndpoint` to push to a collector
|
||||||
|
in addition to the scrape endpoint.
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
// Prometheus only (default — scrape /metrics)
|
||||||
|
builder.AddZbTelemetry(o =>
|
||||||
|
{
|
||||||
|
o.ServiceName = "mxgateway";
|
||||||
|
o.SiteId = config["Site:Id"];
|
||||||
|
o.NodeRole = "standalone";
|
||||||
|
o.Meters = ["ZB.MOM.WW.MxGateway"];
|
||||||
|
});
|
||||||
|
|
||||||
|
// OTLP overlay (metrics + traces pushed to collector; /metrics still active)
|
||||||
|
builder.AddZbTelemetry(o =>
|
||||||
|
{
|
||||||
|
o.ServiceName = "mxgateway";
|
||||||
|
o.SiteId = config["Site:Id"];
|
||||||
|
o.NodeRole = "standalone";
|
||||||
|
o.Meters = ["ZB.MOM.WW.MxGateway"];
|
||||||
|
o.Exporter = ZbExporter.Otlp;
|
||||||
|
o.OtlpEndpoint = "http://collector:4317";
|
||||||
|
});
|
||||||
|
|
||||||
|
// Mount the Prometheus scrape endpoint (call after app.UseRouting())
|
||||||
|
app.MapZbMetrics(); // → /metrics
|
||||||
|
```
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
// Serilog bootstrap (same options object drives enrichers)
|
||||||
|
builder.AddZbSerilog(o =>
|
||||||
|
{
|
||||||
|
o.ServiceName = "mxgateway";
|
||||||
|
o.SiteId = config["Site:Id"];
|
||||||
|
o.NodeRole = "standalone";
|
||||||
|
});
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Building and testing
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# from ZB.MOM.WW.Telemetry/
|
||||||
|
dotnet build ZB.MOM.WW.Telemetry.slnx
|
||||||
|
dotnet test ZB.MOM.WW.Telemetry.slnx
|
||||||
|
```
|
||||||
|
|
||||||
|
All test assemblies run with no external dependencies (no running OTel collector, no Serilog
|
||||||
|
backend):
|
||||||
|
|
||||||
|
| Assembly | Tests |
|
||||||
|
|---|---|
|
||||||
|
| `ZB.MOM.WW.Telemetry.Tests` | 7 |
|
||||||
|
| `ZB.MOM.WW.Telemetry.Serilog.Tests` | 12 |
|
||||||
|
| **Total** | **19** |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Packing
|
||||||
|
|
||||||
|
```bash
|
||||||
|
dotnet pack ZB.MOM.WW.Telemetry.slnx -c Release -o ./artifacts
|
||||||
|
```
|
||||||
|
|
||||||
|
Produces two `.nupkg` files in `artifacts/`:
|
||||||
|
|
||||||
|
```
|
||||||
|
ZB.MOM.WW.Telemetry.0.1.0.nupkg
|
||||||
|
ZB.MOM.WW.Telemetry.Serilog.0.1.0.nupkg
|
||||||
|
```
|
||||||
|
|
||||||
|
`GeneratePackageOnBuild` is off — pack explicitly as above. Both packages are versioned
|
||||||
|
lockstep from `Directory.Build.props`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Status
|
||||||
|
|
||||||
|
**Built at 0.1.0. MxAccessGateway logging adopted (MEL → Serilog migration, on its own branch).
|
||||||
|
Broader OtOpcUa and ScadaBridge telemetry adoption deferred.** Adoption is tracked in the
|
||||||
|
component backlog:
|
||||||
|
|
||||||
|
- `~/Desktop/scadaproj/components/observability/GAPS.md`
|
||||||
|
|
||||||
|
Design documentation lives alongside that backlog:
|
||||||
|
|
||||||
|
- `~/Desktop/scadaproj/components/observability/spec/SPEC.md` — normalized observability target
|
||||||
|
- `~/Desktop/scadaproj/components/observability/spec/METRIC-CONVENTIONS.md` — metric naming reference
|
||||||
|
- `~/Desktop/scadaproj/components/observability/shared-contract/ZB.MOM.WW.Telemetry.md` — proposed API
|
||||||
|
- `~/Desktop/scadaproj/components/observability/current-state/` — per-project current state (code-verified)
|
||||||
+2
-2
@@ -4,8 +4,8 @@
|
|||||||
<IsPackable>true</IsPackable>
|
<IsPackable>true</IsPackable>
|
||||||
<PackageId>ZB.MOM.WW.Telemetry.Serilog</PackageId>
|
<PackageId>ZB.MOM.WW.Telemetry.Serilog</PackageId>
|
||||||
<Authors>ZB.MOM.WW</Authors>
|
<Authors>ZB.MOM.WW</Authors>
|
||||||
<Description>Serilog structured logging extensions for the ZB.MOM.WW SCADA family, bridging to OpenTelemetry.</Description>
|
<Description>Serilog structured logging extensions for the ZB.MOM.WW SCADA family. Provides a shared two-stage Serilog bootstrap (AddZbSerilog), enrichers for SiteId/NodeRole/NodeHostname, a TraceContextEnricher for trace_id/span_id correlation with OpenTelemetry spans, and an ILogRedactor seam for per-project sensitive-field redaction.</Description>
|
||||||
<PackageTags>serilog;logging;opentelemetry;aspnetcore;scada;wonderware;zb-mom-ww</PackageTags>
|
<PackageTags>opentelemetry;observability;serilog;logging;tracing;enrichers;scada;wonderware;zb-mom-ww</PackageTags>
|
||||||
<PackageProjectUrl>https://gitea.dohertylan.com/dohertj2/zb-mom-ww-telemetry</PackageProjectUrl>
|
<PackageProjectUrl>https://gitea.dohertylan.com/dohertj2/zb-mom-ww-telemetry</PackageProjectUrl>
|
||||||
<RepositoryUrl>https://gitea.dohertylan.com/dohertj2/zb-mom-ww-telemetry</RepositoryUrl>
|
<RepositoryUrl>https://gitea.dohertylan.com/dohertj2/zb-mom-ww-telemetry</RepositoryUrl>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
<IsPackable>true</IsPackable>
|
<IsPackable>true</IsPackable>
|
||||||
<PackageId>ZB.MOM.WW.Telemetry</PackageId>
|
<PackageId>ZB.MOM.WW.Telemetry</PackageId>
|
||||||
<Authors>ZB.MOM.WW</Authors>
|
<Authors>ZB.MOM.WW</Authors>
|
||||||
<Description>Core OpenTelemetry metrics and traces extensions for the ZB.MOM.WW SCADA family.</Description>
|
<Description>Core OpenTelemetry extensions for the ZB.MOM.WW SCADA family. Wires the OTel SDK (metrics + tracing + logs), populates a shared Resource (service.name/site.id/node.role), registers standard instrumentation (ASP.NET Core, HttpClient, runtime, process), and maps a Prometheus /metrics endpoint. OTLP exporter opt-in overlay included.</Description>
|
||||||
<PackageTags>opentelemetry;metrics;traces;aspnetcore;scada;wonderware;zb-mom-ww</PackageTags>
|
<PackageTags>opentelemetry;observability;metrics;tracing;prometheus;otlp;aspnetcore;scada;wonderware;zb-mom-ww</PackageTags>
|
||||||
<PackageProjectUrl>https://gitea.dohertylan.com/dohertj2/zb-mom-ww-telemetry</PackageProjectUrl>
|
<PackageProjectUrl>https://gitea.dohertylan.com/dohertj2/zb-mom-ww-telemetry</PackageProjectUrl>
|
||||||
<RepositoryUrl>https://gitea.dohertylan.com/dohertj2/zb-mom-ww-telemetry</RepositoryUrl>
|
<RepositoryUrl>https://gitea.dohertylan.com/dohertj2/zb-mom-ww-telemetry</RepositoryUrl>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ specs and analyses that *drive* changes made in the individual repos.
|
|||||||
| Auth (login / identity / authz) | Draft | OtOpcUa, MxAccessGateway, ScadaBridge | Path to shared code (`ZB.MOM.WW.Auth`) | [`auth/`](auth/) |
|
| Auth (login / identity / authz) | Draft | OtOpcUa, MxAccessGateway, ScadaBridge | Path to shared code (`ZB.MOM.WW.Auth`) | [`auth/`](auth/) |
|
||||||
| UI Theme (layout / tokens / components) | Draft | OtOpcUa, MxAccessGateway, ScadaBridge | Path to shared code (`ZB.MOM.WW.Theme`) | [`ui-theme/`](ui-theme/) |
|
| UI Theme (layout / tokens / components) | Draft | OtOpcUa, MxAccessGateway, ScadaBridge | Path to shared code (`ZB.MOM.WW.Theme`) | [`ui-theme/`](ui-theme/) |
|
||||||
| Health (readiness / liveness / active-node) | Draft | OtOpcUa, MxAccessGateway, ScadaBridge | Shared `ZB.MOM.WW.Health` lib (3 packages) | [`health/`](health/) |
|
| Health (readiness / liveness / active-node) | Draft | OtOpcUa, MxAccessGateway, ScadaBridge | Shared `ZB.MOM.WW.Health` lib (3 packages) | [`health/`](health/) |
|
||||||
|
| Observability (metrics / traces / logs) | Draft | OtOpcUa, MxAccessGateway, ScadaBridge | Shared `ZB.MOM.WW.Telemetry` lib (2 packages) | [`observability/`](observability/) |
|
||||||
|
|
||||||
> Add a row when you start normalizing a new component. Status: `Draft` → `Reviewed` → `Adopting` → `Converged`.
|
> Add a row when you start normalizing a new component. Status: `Draft` → `Reviewed` → `Adopting` → `Converged`.
|
||||||
|
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ other app wiring is follow-on, consistent with how Auth and UI-Theme are structu
|
|||||||
| Project | OTel SDK today | Metrics today | Tracing today | Logging today | Enrichers today | Adoption status |
|
| Project | OTel SDK today | Metrics today | Tracing today | Logging today | Enrichers today | Adoption status |
|
||||||
|---|---|---|---|---|---|---|
|
|---|---|---|---|---|---|---|
|
||||||
| **OtOpcUa** | ✅ full SDK (`WithMetrics`+`WithTracing`) | ✅ 7 instruments (`otopcua.*`); Prometheus `/metrics` | 🟡 2 spans defined; no exporter | Serilog (Console+File) | `DriverInstanceId`/`DriverType`/`CapabilityName`/`CorrelationId` (driver-scope) | Not started (follow-on) |
|
| **OtOpcUa** | ✅ full SDK (`WithMetrics`+`WithTracing`) | ✅ 7 instruments (`otopcua.*`); Prometheus `/metrics` | 🟡 2 spans defined; no exporter | Serilog (Console+File) | `DriverInstanceId`/`DriverType`/`CapabilityName`/`CorrelationId` (driver-scope) | Not started (follow-on) |
|
||||||
| **MxAccessGateway** | ⛔ none (hand-rolled `Meter`) | 🟡 20 instruments (`mxgateway.*`); **never exported** | ⛔ none | MEL → **migrating to Serilog in this task** | `SessionId`/`WorkerProcessId`/`CorrelationId`/`CommandMethod` (MEL scope) | **In progress (Task #9)** |
|
| **MxAccessGateway** | ⛔ none (hand-rolled `Meter`) | 🟡 20 instruments (`mxgateway.*`); **never exported** | ⛔ none | **Serilog (migrated from MEL — adopted)** | `SiteId`/`NodeRole`/`NodeHostname` (via `AddZbSerilog`); session/worker enrichers via `LogContext.PushProperty` | **Logging adopted; OTel metrics/traces follow-on** |
|
||||||
| **ScadaBridge** | ⛔ (`OpenTelemetry.Api` CVE-patch only) | ⛔ zero instruments | ⛔ none | Serilog (Console+File) | `SiteId`/`NodeRole`/`NodeHostname` (process-level; strongest set) | Not started (follow-on) |
|
| **ScadaBridge** | ⛔ (`OpenTelemetry.Api` CVE-patch only) | ⛔ zero instruments | ⛔ none | Serilog (Console+File) | `SiteId`/`NodeRole`/`NodeHostname` (process-level; strongest set) | Not started (follow-on) |
|
||||||
|
|
||||||
See each project's [`current-state/<project>/CURRENT-STATE.md`](current-state/) for the
|
See each project's [`current-state/<project>/CURRENT-STATE.md`](current-state/) for the
|
||||||
@@ -100,7 +100,15 @@ hinge that makes a metric, a span, and a log line from the same node carry ident
|
|||||||
|
|
||||||
## Component status
|
## Component status
|
||||||
|
|
||||||
**Status: Draft.** Spec and shared-contract written; current-state docs verified; GAPS backlog
|
**Status: Built @ 0.1.0. MxAccessGateway MEL → Serilog logging adopted (on its own branch).
|
||||||
populated. Library implementation in progress (`ZB.MOM.WW.Telemetry` — Task #8). MxAccessGateway
|
OtOpcUa and ScadaBridge telemetry adoption is follow-on, tracked in [`GAPS.md`](GAPS.md).**
|
||||||
MEL → Serilog migration in progress (Task #9, blocked by library build). Adoption by OtOpcUa and
|
|
||||||
ScadaBridge is follow-on, tracked in [`GAPS.md`](GAPS.md).
|
The shared library lives at
|
||||||
|
[`~/Desktop/scadaproj/ZB.MOM.WW.Telemetry/`](../../ZB.MOM.WW.Telemetry/) (.NET 10; 2 packages —
|
||||||
|
`ZB.MOM.WW.Telemetry` and `ZB.MOM.WW.Telemetry.Serilog`; 19 tests; `dotnet pack` → 2 nupkgs @ 0.1.0).
|
||||||
|
Build/test/pack from `ZB.MOM.WW.Telemetry/`:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
dotnet test ZB.MOM.WW.Telemetry.slnx
|
||||||
|
dotnet pack ZB.MOM.WW.Telemetry.slnx -c Release -o ./artifacts
|
||||||
|
```
|
||||||
|
|||||||
+7
-2
@@ -86,5 +86,10 @@ cross-repo interop checks, distinct from the others.
|
|||||||
0.1.0 (3 packages, 58 tests). Design: [`components/health/`](components/health/);
|
0.1.0 (3 packages, 58 tests). Design: [`components/health/`](components/health/);
|
||||||
implementation: [`../ZB.MOM.WW.Health/`](../ZB.MOM.WW.Health/). Adoption tracked in
|
implementation: [`../ZB.MOM.WW.Health/`](../ZB.MOM.WW.Health/). Adoption tracked in
|
||||||
[`components/health/GAPS.md`](components/health/GAPS.md).
|
[`components/health/GAPS.md`](components/health/GAPS.md).
|
||||||
2. **Observability/telemetry** (completes the operability cluster with Health). 3. **Audit model**
|
2. ~~**Observability/telemetry** (completes the operability cluster with Health).~~ **Done** —
|
||||||
(ties back to Auth). Then revisit the gRPC contract surface and the `Hosting` aggregator.
|
`ZB.MOM.WW.Telemetry` built @ 0.1.0 (2 packages, 19 tests). Design:
|
||||||
|
[`components/observability/`](components/observability/); implementation:
|
||||||
|
[`../ZB.MOM.WW.Telemetry/`](../ZB.MOM.WW.Telemetry/). MxAccessGateway MEL → Serilog
|
||||||
|
logging adoption done on its own branch. Broader OtOpcUa/ScadaBridge telemetry adoption
|
||||||
|
tracked in [`components/observability/GAPS.md`](components/observability/GAPS.md).
|
||||||
|
3. **Audit model** (ties back to Auth). Then revisit the gRPC contract surface and the `Hosting` aggregator.
|
||||||
|
|||||||
Reference in New Issue
Block a user