1.0.35

framework/docs/telemetry/README.md

@@ -92,7 +92,9 @@ Config section key: `Telemetry` or `Aether:Telemetry`.
       "ParseStateValues": true,
       "Enrichers": {
         "CustomAttributes": { "env": "Production", "team": "platform" },
-        "Headers": ["x-correlation-id", "x-request-id"]
+        "Headers": ["x-correlation-id", "x-request-id"],
+        "RequestHeaderKeyPrefix": "RequestHeader.",
+        "ResponseHeaderKeyPrefix": "ResponseHeader."
       },
       "Body": {
         "EnableRequestBody": false,
@@ -278,7 +280,8 @@ public class OrderMetrics
 `Telemetry:Logging:Enrichers` (CustomAttributes and Headers) are added as attributes to **every** log record in the application via `EnricherLogProcessor`. This allows querying all logs with the same enrich fields (e.g. `env`, `app`, `RequestHeader.x_correlation_id`) in a single observability query.
 
 - **CustomAttributes**: Key-value pairs added to every log.
-- **Headers**: Listed request/response headers are added as `RequestHeader.<name>` and `ResponseHeader.<name>`; values for headers in the sensitive list are redacted. When there is no HTTP context (e.g. background job), only CustomAttributes are added.
+- **Headers**: Listed request/response headers are added as `RequestHeader.<name>` and `ResponseHeader.<name>`; values for headers in the sensitive list are redacted. When there is no HTTP context (e.g. background job), only CustomAttributes are added. The header name is normalized (lowercased, `-` replaced by `_`), so `X-Request-Id` becomes `RequestHeader.x_request_id`.
+- **RequestHeaderKeyPrefix / ResponseHeaderKeyPrefix**: The prefixes above are configurable (defaults `RequestHeader.` / `ResponseHeader.`). Log backends that cannot store dots in flat field names — OpenObserve, Elasticsearch — lowercase the key and replace `.` with `_` on ingest, so `RequestHeader.act_sub` is queried as `requestheader_act_sub`. Set the prefix to `""` to emit the bare header name (`act_sub`) instead. Request and response keys are distinguished only by these prefixes: giving both the same value (for example both empty) makes a header present on both request and response collapse onto a single key.
 
 ### Automatic Enrichment
 

framework/src/BBT.Aether.AspNetCore/BBT/Aether/AspNetCore/Telemetry/EnricherLogProcessor.cs

@@ -38,15 +38,16 @@ public override void OnEnd(LogRecord record)
         }
 
         var httpContext = httpContextAccessor?.HttpContext;
-        if (httpContext != null && options.Logging?.Enrichers?.Headers is { Count: > 0 } headerNames)
+        if (httpContext != null && options.Logging?.Enrichers is { } enrichers
+            && enrichers.Headers is { Count: > 0 } headerNames)
         {
             foreach (var headerName in headerNames)
             {
                 if (string.IsNullOrWhiteSpace(headerName))
                     continue;
                 var key = headerName.Trim();
-                var requestKey = $"RequestHeader.{NormalizeHeaderKey(key)}";
-                var responseKey = $"ResponseHeader.{NormalizeHeaderKey(key)}";
+                var requestKey = HeaderEnrichmentKeys.Request(enrichers, key);
+                var responseKey = HeaderEnrichmentKeys.Response(enrichers, key);
                 var isSensitive = _sensitiveHeaderNames.Contains(key);
 
                 if (httpContext.Request.Headers.TryGetValue(key, out var reqVal))
@@ -89,7 +90,4 @@ private static bool HasBodyOrHeaderEnrichment(LogRecord record)
         }
         return false;
     }
-
-    private static string NormalizeHeaderKey(string key)
-        => key.Replace("-", "_", StringComparison.Ordinal).ToLowerInvariant();
 }

framework/src/BBT.Aether.AspNetCore/BBT/Aether/AspNetCore/Telemetry/HeaderEnrichmentKeys.cs

@@ -0,0 +1,33 @@
+using System;
+
+namespace BBT.Aether.AspNetCore.Telemetry;
+
+/// <summary>
+/// Builds the attribute keys used to enrich log records with individual HTTP header values.
+/// Shared by <see cref="EnricherLogProcessor"/> (all log records) and
+/// <see cref="HttpBodyLoggingMiddleware"/> (the HTTP body log scope) so the two paths cannot
+/// drift apart and both honour the configured prefixes.
+/// </summary>
+internal static class HeaderEnrichmentKeys
+{
+    /// <summary>
+    /// Normalizes a header name for use in an attribute key: lowercase, with '-' replaced by '_'
+    /// (e.g. <c>X-Request-Id</c> becomes <c>x_request_id</c>).
+    /// </summary>
+    internal static string Normalize(string headerName)
+        => headerName.Replace("-", "_", StringComparison.Ordinal).ToLowerInvariant();
+
+    /// <summary>
+    /// Builds the enrich key for a header read from the request, honouring
+    /// <see cref="LoggingEnricherOptions.RequestHeaderKeyPrefix"/>.
+    /// </summary>
+    internal static string Request(LoggingEnricherOptions options, string headerName)
+        => $"{options.RequestHeaderKeyPrefix ?? string.Empty}{Normalize(headerName)}";
+
+    /// <summary>
+    /// Builds the enrich key for a header read from the response, honouring
+    /// <see cref="LoggingEnricherOptions.ResponseHeaderKeyPrefix"/>.
+    /// </summary>
+    internal static string Response(LoggingEnricherOptions options, string headerName)
+        => $"{options.ResponseHeaderKeyPrefix ?? string.Empty}{Normalize(headerName)}";
+}

framework/src/BBT.Aether.AspNetCore/BBT/Aether/AspNetCore/Telemetry/HttpBodyLoggingMiddleware.cs

@@ -346,8 +346,8 @@ private void AddEnricherProperties(
             if (string.IsNullOrWhiteSpace(headerName))
                 continue;
             var key = headerName.Trim();
-            var requestKey = $"RequestHeader.{key.Replace("-", "_", StringComparison.Ordinal).ToLowerInvariant()}";
-            var responseKey = $"ResponseHeader.{key.Replace("-", "_", StringComparison.Ordinal).ToLowerInvariant()}";
+            var requestKey = HeaderEnrichmentKeys.Request(_enricherOptions, key);
+            var responseKey = HeaderEnrichmentKeys.Response(_enricherOptions, key);
             var isSensitive = _sensitiveHeaderNames.Contains(key);
 
             if (context.Request.Headers.TryGetValue(key, out var reqVal))

framework/src/BBT.Aether.AspNetCore/BBT/Aether/AspNetCore/Telemetry/TelemetryOptions.cs

@@ -110,6 +110,29 @@ public sealed class LoggingEnricherOptions
     /// Header names to add as individual enrich properties (e.g. RequestHeader.x_correlation_id). Values for headers in the sensitive list are shown as ***REDACTED***. Full request/response headers remain in RequestHeaders/ResponseHeaders JSON.
     /// </summary>
     public List<string> Headers { get; set; } = new();
+
+    /// <summary>
+    /// Prefix applied to request-header enrich keys. Defaults to <c>"RequestHeader."</c>, so the
+    /// header <c>x-correlation-id</c> is emitted as <c>RequestHeader.x_correlation_id</c>.
+    /// <para>
+    /// Set to an empty string to emit the bare (normalized) header name instead — useful for log
+    /// backends such as OpenObserve or Elasticsearch, which cannot store dots in flat field names
+    /// and therefore lowercase the key and replace <c>.</c> with <c>_</c> on ingest, turning
+    /// <c>RequestHeader.act_sub</c> into <c>requestheader_act_sub</c>.
+    /// </para>
+    /// <para>
+    /// Note: request and response keys are distinguished only by these prefixes. Setting this and
+    /// <see cref="ResponseHeaderKeyPrefix"/> to the same value (for example both empty) makes a
+    /// header present on both the request and the response collapse onto a single key.
+    /// </para>
+    /// </summary>
+    public string RequestHeaderKeyPrefix { get; set; } = "RequestHeader.";
+
+    /// <summary>
+    /// Prefix applied to response-header enrich keys. Defaults to <c>"ResponseHeader."</c>.
+    /// See <see cref="RequestHeaderKeyPrefix"/> for the prefix semantics and the collision note.
+    /// </summary>
+    public string ResponseHeaderKeyPrefix { get; set; } = "ResponseHeader.";
 }
 
 public sealed class AetherTracingOptions