## What & why S-16b, second of the S-16 split, on top of the #125 backplane. The five .NET services now emit OpenTelemetry traces so a request is **one connected trace** across them. - Each host wires `AddOpenTelemetry().WithTracing(...)` with `AddAspNetCoreInstrumentation` (incoming) + `AddHttpClientInstrumentation` (outgoing) + `AddOtlpExporter` to **Tempo**. - Because every cross-service call already goes through a typed `HttpClient` (§8 boundaries), the W3C `traceparent` propagates with no manual code — bff → domain → acl → openzaak and bff → projection-api stitch into a single trace. - Service name + OTLP endpoint come from `OTEL_*` env set per app service in compose. `/health` is filtered out so liveness polls don't flood the traces. No new ADR — ADR-0023 already records the stack + the two documented gaps (browser-side tracing is out of scope, so the trace begins at the BFF; the async Flowable-poll boundary is a separate trace). Closes #123 ## Definition of Done - [x] Failing test committed first (`verify-tracing` fails with no instrumentation). - [x] Implementation makes it pass — **validated locally end to end**: a real connected trace spanning `bff` + `projection-api` was found in Tempo (BFF→projection→db + Tempo subset, no OpenZaak/egress). - [x] Conventional Commits referencing the issue (`refs #123`). - [ ] CI green — awaiting Gitea Actions (verify-tracing added to verify-stack after verify-bff). - [x] `docker compose up` health unaffected — services boot healthy even when Tempo is unreachable (exporter no-ops; verified). - [x] Docs — demo-script + BACKLOG. - [x] ADR — none needed (covered by ADR-0023). ## Notes for reviewers - **Per-service wiring, no shared lib:** the block is duplicated across the five hosts by design — services don't share code across boundaries here (§8), same as the duplicated typed clients. - **Packages:** OpenTelemetry.Extensions.Hosting / Instrumentation.AspNetCore / Instrumentation.Http / Exporter.OpenTelemetryProtocol, all 1.17.0, pinned per-csproj (no central props file). - **The check** generates anonymous BFF→projection traffic (no auth, no OpenZaak), then queries Tempo (TraceQL search → fetch trace → assert both service.names present) from a python:3-slim container in-network — same idiom as run-projection-check.sh. - **Next:** #124 (S-16c) adds `/metrics` + Prometheus scrape targets + golden-signal Grafana dashboards. Reviewed-on: #126
86 lines
3.9 KiB
C#
86 lines
3.9 KiB
C#
using System.Text.Json;
|
|
using EventSubscriber.Application;
|
|
using OpenTelemetry.Resources;
|
|
using OpenTelemetry.Trace;
|
|
using Projection.ReadModel;
|
|
|
|
var builder = WebApplication.CreateBuilder(args);
|
|
|
|
// OpenTelemetry tracing (S-16b, ADR-0023): auto-instrument the incoming NRC notification callback and
|
|
// the outgoing ACL enrichment call, exported over OTLP to Tempo. Service name + OTLP endpoint come
|
|
// from OTEL_* env (compose); the exporter no-ops when Tempo is unreachable.
|
|
builder.Services.AddOpenTelemetry()
|
|
.ConfigureResource(r => r.AddService(
|
|
builder.Configuration["OTEL_SERVICE_NAME"] ?? builder.Environment.ApplicationName))
|
|
.WithTracing(tracing => tracing
|
|
.AddAspNetCoreInstrumentation(o => o.Filter = ctx => ctx.Request.Path != "/health")
|
|
.AddHttpClientInstrumentation()
|
|
.AddOtlpExporter());
|
|
|
|
var connectionString = builder.Configuration.GetConnectionString("Projection")
|
|
?? throw new InvalidOperationException("Missing connection string 'ConnectionStrings:Projection'");
|
|
// The exact Authorization header value Open Notificaties sends on each abonnement callback.
|
|
// NRC probes the callback during registration and refuses it unless it returns 401 without
|
|
// this value (ADR-0007), so the webhook enforces it.
|
|
var webhookToken = builder.Configuration["EventSubscriber:Webhook:AuthToken"]
|
|
?? throw new InvalidOperationException("Missing configuration 'EventSubscriber:Webhook:AuthToken'");
|
|
// The ACL is the only code that may read ZGW (§8.1); the subscriber enriches the projection with the
|
|
// zaak reference through it (adr-proposal #78).
|
|
var aclBaseUrl = builder.Configuration["Acl:BaseUrl"]
|
|
?? throw new InvalidOperationException("Missing configuration 'Acl:BaseUrl'");
|
|
|
|
builder.Services.AddProjectionReadModel(connectionString);
|
|
builder.Services.AddProjectionWriteSide();
|
|
builder.Services.AddHttpClient<EventSubscriber.Application.IAclClient, EventSubscriber.Api.AclHttpClient>(
|
|
c => c.BaseAddress = new Uri(aclBaseUrl));
|
|
|
|
var app = builder.Build();
|
|
|
|
// Apply migrations on start so a fresh stack reaches a usable schema unattended.
|
|
await app.Services.MigrateProjectionAsync();
|
|
|
|
app.MapGet("/health", () => "Healthy");
|
|
|
|
// The NRC abonnement callback. Open Notificaties POSTs a notification here; we project it.
|
|
// Auth-on-callback is mandatory: the auth check runs *before* the body is read, so NRC's
|
|
// registration probe (a POST without the configured Authorization, and without a valid
|
|
// notification body) gets the 401 it requires rather than a 400 (ADR-0007).
|
|
app.MapPost("/notifications", async (
|
|
HttpRequest request,
|
|
NotificationProjector projector,
|
|
CancellationToken ct) =>
|
|
{
|
|
if (request.Headers.Authorization != webhookToken)
|
|
return Results.Unauthorized();
|
|
|
|
var dto = await JsonSerializer.DeserializeAsync<NotificationDto>(
|
|
request.Body, SerializerOptions, ct);
|
|
if (dto is null)
|
|
return Results.BadRequest();
|
|
|
|
await projector.HandleAsync(dto.ToNotification(), ct);
|
|
return Results.NoContent();
|
|
});
|
|
|
|
// Admin: rebuild the projection from the durable notification log (PRD §8.4 — rebuildable).
|
|
app.MapPost("/admin/rebuild", async (NotificationProjector projector, CancellationToken ct) =>
|
|
{
|
|
await projector.RebuildAsync(ct);
|
|
return Results.NoContent();
|
|
});
|
|
|
|
await app.RunAsync();
|
|
|
|
/// <summary>The NRC notification body, as Open Notificaties POSTs it. Only the fields the
|
|
/// projection needs are bound; <c>aanmaakdatum</c>/<c>kenmerken</c> are ignored for the minimal slice.</summary>
|
|
public sealed record NotificationDto(string Kanaal, string Resource, string Actie, Uri ResourceUrl, Uri? HoofdObject = null)
|
|
{
|
|
public Notification ToNotification() => new(Kanaal, Resource, Actie, ResourceUrl, HoofdObject);
|
|
}
|
|
|
|
public partial class Program
|
|
{
|
|
// NRC sends camelCase JSON; match it case-insensitively.
|
|
private static readonly JsonSerializerOptions SerializerOptions = new(JsonSerializerDefaults.Web);
|
|
}
|