mermaid diagrams added

Author: HasanJaved-Developer

CentralizedLoggingApi/Program.cs

@@ -10,6 +10,7 @@
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
 using Serilog;
+using SharedLibrary;
 using SharedLibrary.Middlewares;
 using System.Reflection;
 using System.Text;
@@ -22,6 +23,7 @@
     .ReadFrom.Configuration(builder.Configuration)
     .Enrich.WithProperty("Application", "CentralizedLogging.Api")
     .Enrich.FromLogContext()
+    .Enrich.With(new ActivityTraceEnricher())  // <-- custom enricher
     .CreateLogger();
 
 builder.Host.UseSerilog();
@@ -126,15 +128,6 @@
 
 app.MapGet("/health", () => Results.Ok("OK"));
 
-app.Use(async (ctx, next) =>
-{
-    using (Serilog.Context.LogContext.PushProperty("Environment", app.Environment.EnvironmentName))
-    using (Serilog.Context.LogContext.PushProperty("Service", "CoreAPI"))
-    using (Serilog.Context.LogContext.PushProperty("CorrelationId", ctx.TraceIdentifier))
-    {
-        await next();
-    }
-});
 
 // Middleware should be early in the pipeline
 app.UseMiddleware<RequestAudibilityMiddleware>();

README.md

@@ -1,6 +1,6 @@
 # 🛰️ Centralized Observability Platform
 
-[![Build](https://github.com/hasanjaved-developer/CentralizedObservability/actions/workflows/dotnet-tests.yml/badge.svg?branch=master)](https://github.com/hasanjaved-developer/CentralizedObservability/actions/workflows/dotnet-tests.yml)
+[![Build](https://github.com/hasanjaved-developer/CentralizedObservability/actions/workflows/dotnet-tests.yml/badge.svg?branch=v1.0.2)](https://github.com/hasanjaved-developer/CentralizedLoggingMonitoring/actions/workflows/dotnet-tests.yml)
 [![codecov](https://codecov.io/gh/hasanjaved-developer/CentralizedObservability/branch/master/graph/badge.svg)](https://codecov.io/gh/hasanjaved-developer/CentralizedObservability)
 [![Docker Compose CI](https://github.com/hasanjaved-developer/CentralizedObservability/actions/workflows/docker-compose-ci.yml/badge.svg)](https://github.com/hasanjaved-developer/CentralizedObservability/actions/workflows/docker-compose-ci.yml)
 [![License](https://img.shields.io/github/license/hasanjaved-developer/CentralizedObservability)](LICENSE.txt)
@@ -13,27 +13,30 @@
 
 | Service | Pulls | Size | Version |
 |----------|-------|------|----------|
-| **API** | [![Pulls](https://img.shields.io/docker/pulls/hasanjaveddeveloper/centralized-observability-api)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-api) | [![Size](https://img.shields.io/docker/image-size/hasanjaveddeveloper/centralized-observability-api/latest)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-api/tags) | [![Version](https://img.shields.io/docker/v/hasanjaveddeveloper/centralized-observability-api?sort=semver)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-api/tags) |
-| **User API** | [![Pulls](https://img.shields.io/docker/pulls/hasanjaveddeveloper/centralized-observability-userapi)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-userapi) | [![Size](https://img.shields.io/docker/image-size/hasanjaveddeveloper/centralized-observability-userapi/latest)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-userapi/tags) | [![Version](https://img.shields.io/docker/v/hasanjaveddeveloper/centralized-observability-userapi?sort=semver)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-userapi/tags) |
-| **Web (Portal)** | [![Pulls](https://img.shields.io/docker/pulls/hasanjaveddeveloper/centralized-observability-web)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-web) | [![Size](https://img.shields.io/docker/image-size/hasanjaveddeveloper/centralized-observability-web/latest)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-web/tags) | [![Version](https://img.shields.io/docker/v/hasanjaveddeveloper/centralized-observability-web?sort=semver)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-web/tags) |
+| **API** | [![Pulls](https://img.shields.io/docker/pulls/hasanjaveddeveloper/centralized-observability-api)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-api) | [![Size](https://img.shields.io/docker/image-size/hasanjaveddeveloper/centralized-observability-api/v1.0.2)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-api/tags) | [![Version](https://img.shields.io/docker/v/hasanjaveddeveloper/centralized-observability-api?sort=semver)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-api/tags) |
+| **User API** | [![Pulls](https://img.shields.io/docker/pulls/hasanjaveddeveloper/centralized-observability-userapi)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-userapi) | [![Size](https://img.shields.io/docker/image-size/hasanjaveddeveloper/centralized-observability-userapi/v1.0.2)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-userapi/tags) | [![Version](https://img.shields.io/docker/v/hasanjaveddeveloper/centralized-observability-userapi?sort=semver)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-userapi/tags) |
+| **Web (Portal)** | [![Pulls](https://img.shields.io/docker/pulls/hasanjaveddeveloper/centralized-observability-web)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-web) | [![Size](https://img.shields.io/docker/image-size/hasanjaveddeveloper/centralized-observability-web/v1.0.2)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-web/tags) | [![Version](https://img.shields.io/docker/v/hasanjaveddeveloper/centralized-observability-web?sort=semver)](https://hub.docker.com/r/hasanjaveddeveloper/centralized-observability-web/tags) |
 
-The Centralized Observability Platform is a proof-of-concept built with .NET 9, designed to demonstrate unified observability practices — combining structured logging (Serilog), distributed tracing (Jaeger via OpenTelemetry), and future support for metrics.
+The **Centralized Observability Platform** is a .NET 9 proof-of-concept that demonstrates **unified observability practices across services—**with **structured logging** (Serilog file sinks) and **distributed tracing** (OpenTelemetry → **Jaeger**). Metrics are planned for a subsequent phase.
 
-The project extends the earlier Centralized Logging & Monitoring API to include full-fledged trace visualization and request correlation across microservices, enabling end-to-end visibility into system behavior and performance.
+Evolving from the earlier Centralized Logging & Monitoring work, this repo adds **full trace visualization** and **request correlation** across services, enabling end-to-end debugging through Jaeger while keeping logs locally for now.
 
-CI/CD pipelines with GitHub Actions, multi-arch Docker images, and environment-ready compose stacks make this project a production-grade observability showcase for modern .NET solutions.
+**CI/CD:** GitHub Actions builds and publishes **amd64** Docker images using Buildx (QEMU pre-setup for future multi-arch). **Tag-based builds** are pushed to **GHCR** and optionally mirrored to **Docker Hub**. The repo provides **separate Docker Compose stacks** for each registry, enabling quick environment setup and validation.
 
 ---
 
 ## 🧭 Overview
 
-The **Centralized Observability Platform** is a modern observability showcase built with **.NET 9**, combining structured logging, distributed tracing, and visualization into one cohesive stack.
+The **Centralized Observability Platform** is a modern observability showcase built with **.NET 9**, featuring structured logging, distributed tracing, and trace visualization integrated through Jaeger.
 
 It extends the earlier **Centralized Logging & Monitoring API** project with:
+
+- 🧠 **Centralized ActivityTraceEnricher** automatically enriches logs with TraceId and SpanId for distributed correlation
+- ⚙️ **Centralized Exception & Audibility Middleware** ensures consistent error handling and request/response logging across all APIs
 - ✅ **Serilog** for structured logging  
 - 🟣 **Jaeger (via OpenTelemetry)** for distributed tracing  
 - 🧩 **Docker Compose stack** for local observability setup  
-- 🚀 **GitHub Actions CI/CD** for multi-arch image builds and releases  
+- 🚀 **GitHub Actions CI/CD** for image builds and tests  
 - 📊 **Codecov** integration for coverage insights  
 
 ---
@@ -53,7 +56,17 @@ It extends the earlier **Centralized Logging & Monitoring API** project with:
 ---
 
 ## 🧩 Architecture Snapshot
-*(To be added later — include a Mermaid diagram showing Serilog → OpenTelemetry → Jaeger → UI)*
+
+![Integration Portal Architecture](docs/integration_portal_architecture.png)  
+<sub>[View Mermaid source](docs/integration_portal_architecture.mmd)</sub>
+
+---
+
+### 📸 Screenshots
+
+### 🔑 Login Page
+
+![Login Page](docs/screenshots/jaeger.png)
 
 ---
 

UserManagementApi/Program.cs

@@ -5,6 +5,7 @@
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
 using Serilog;
+using SharedLibrary;
 using SharedLibrary.Middlewares;
 using System.Reflection;
 using System.Text;
@@ -19,6 +20,7 @@
     .ReadFrom.Configuration(builder.Configuration)
     .Enrich.WithProperty("Application", "UserManagement.Api")
     .Enrich.FromLogContext()
+    .Enrich.With(new ActivityTraceEnricher())  // <-- custom enricher
     .CreateLogger();
 
 builder.Host.UseSerilog();
@@ -123,16 +125,6 @@
 
 app.MapGet("/health", () => Results.Ok("OK"));
 
-app.Use(async (ctx, next) =>
-{
-    using (Serilog.Context.LogContext.PushProperty("Environment", app.Environment.EnvironmentName))
-    using (Serilog.Context.LogContext.PushProperty("Service", "CoreAPI"))
-    using (Serilog.Context.LogContext.PushProperty("CorrelationId", ctx.TraceIdentifier))
-    {
-        await next();
-    }
-});
-
 // Middleware should be early in the pipeline
 app.UseMiddleware<RequestAudibilityMiddleware>();
 app.UseMiddleware<ExceptionHandlingMiddleware>();

docs/integration_portal_architecture.mmd

@@ -1,7 +1,15 @@
-flowchart TB
-  %% --- Clients ---
+flowchart TB  
+  %% --- Clients ---  
   Portal[💻 Integration Portal<br/>]:::client
-  
+    
+  %% --- OpenTelemetry & Jaeger (Tracing) ---
+  subgraph OBS[Observability Stack]
+    direction TB
+    OTEL[📡 OpenTelemetry SDK<br/>Export → OTLP]:::otel
+    J_COLLECTOR[(📥 Jaeger Collector<br/>OTLP gRPC :4317)]:::infra
+    J_UI[🧭 Jaeger UI<br/>:16686]:::ui
+    OTEL --> J_COLLECTOR --> J_UI
+  end
 
   %% --- SDKs ---
   UM_SDK[📦 UserManagement.SDK]:::sdk
@@ -19,6 +27,12 @@ flowchart TB
   UDB[(🗄️ User DB)]:::db
   LDB[(🗄️ Logging DB)]:::db
 
+  %% --- Shared Observability Library ---
+  SHARED[🧰 Shared.Observability<br/>Middlewares<br/>ActivityTraceEnricher]:::lib
+
+ 
+
+
   %% --- Flows ---
   %% Clients use SDKs
   Portal --> UM_SDK --> UM_API
@@ -36,18 +50,24 @@ flowchart TB
   UM_API --> UDB
   LOG_API --> LDB
 
-  %% --- Legend ---
-  subgraph Legend
-    L1[💻 Client]:::client
-    L2[📦 SDK]:::sdk
-    L3[🔑 API]:::api
-    L4[📄 Contract]:::contract
-    L5[(🗄️ DB)]:::db
-  end
+  %% APIs use Shared Library (middlewares + enricher)
+  UM_API -. uses .-> SHARED
+  LOG_API -. uses .-> SHARED
+  Portal -. uses .-> SHARED
+
+  %% APIs emit traces via OTel to Jaeger
+  UM_API -. uses .-> OTEL
+  LOG_API -. uses .-> OTEL
+  Portal -. uses .-> OTEL
 
   %% --- Styles ---
   classDef client fill:#f0f8ff,stroke:#007acc,stroke-width:2px,color:#000,font-weight:bold;
   classDef sdk fill:#fff5e6,stroke:#ff9900,stroke-width:2px,color:#000;
   classDef api fill:#e6ffe6,stroke:#339933,stroke-width:2px,color:#000;
   classDef contract fill:#f9f9f9,stroke:#555555,stroke-dasharray: 3 3,color:#000;
   classDef db fill:#fff0f5,stroke:#cc0066,stroke-width:2px,color:#000;
+  
+  classDef lib fill:#eef7ff,stroke:#2b6cb0,stroke-width:2px,color:#000;
+  classDef otel fill:#fffbea,stroke:#b7791f,stroke-width:2px,color:#000;
+  classDef infra fill:#f5f5ff,stroke:#6b46c1,stroke-width:2px,color:#000;
+  classDef ui fill:#f0fff4,stroke:#2f855a,stroke-width:2px,color:#000;