@avtechno/sfr 2.1.1 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avtechno/sfr",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "An opinionated way of writing services using ExpressJS.",
   "type": "module",
   "files": [

package/src/index.mts

@@ -189,6 +189,8 @@ export {
   type LoggerConfig
 } from "./observability/logger.mjs";
 
+export { sfr_rest_telemetry } from "./observability/middleware/rest.mjs";
+
 export { 
   REST, 
   WS, 

package/src/observability/logger.mts

@@ -9,23 +9,23 @@ import { trace } from "@opentelemetry/api";
 
 // Define log levels matching standard syslog levels
 const levels = {
-  error: 0,
-  warn: 1,
-  info: 2,
-  http: 3,
-  verbose: 4,
-  debug: 5,
-  silly: 6
+  error   : 0,
+  warn    : 1,
+  info    : 2,
+  http    : 3,
+  verbose : 4,
+  debug   : 5,
+  silly   : 6
 };
 
 const colors = {
-  error: "red",
-  warn: "yellow",
-  info: "green",
-  http: "magenta",
-  verbose: "cyan",
-  debug: "blue",
-  silly: "gray"
+  error   : "red",
+  warn    : "yellow",
+  info    : "green",
+  http    : "magenta",
+  verbose : "cyan",
+  debug   : "blue",
+  silly   : "gray"
 };
 
 winston.addColors(colors);
@@ -74,14 +74,10 @@ const pretty_format = winston.format.combine(
   winston.format.timestamp({ format: "YYYY-MM-DD HH:mm:ss.SSS" }),
   winston.format.colorize({ all: true }),
   winston.format.printf((info) => {
-    const trace_suffix = info.trace_id
-      ? ` [${String(info.trace_id).slice(0, 8)}]`
-      : "";
+    const trace_suffix = info.trace_id ? ` [${String(info.trace_id).slice(0, 8)}]` : "";
 
     let meta_str = "";
-    const meta_keys = Object.keys(info).filter(
-      (k) => !["level", "message", "timestamp", "trace_id", "span_id", "trace_flags", "service"].includes(k)
-    );
+    const meta_keys = Object.keys(info).filter((k) => !["level", "message", "timestamp", "trace_id", "span_id", "trace_flags", "service"].includes(k));
 
     if (meta_keys.length > 0) {
       const meta_obj: Record<string, any> = {};
@@ -89,7 +85,7 @@ const pretty_format = winston.format.combine(
       meta_str = ` ${JSON.stringify(meta_obj)}`;
     }
 
-    return `${info.timestamp} ${info.level}${trace_suffix}: ${info.message}${meta_str}`;
+    return `[${info.timestamp}][${info.level}]${trace_suffix}: ${info.message} > ${meta_str}`;
   })
 );
 
@@ -150,13 +146,13 @@ export function create_child_logger(meta: Record<string, any>): winston.Logger {
  * Automatically includes trace context when available.
  */
 export const sfr_logger = {
-  error: (message: string, meta?: Record<string, any>) => get_logger().error(message, meta),
-  warn: (message: string, meta?: Record<string, any>) => get_logger().warn(message, meta),
-  info: (message: string, meta?: Record<string, any>) => get_logger().info(message, meta),
-  http: (message: string, meta?: Record<string, any>) => get_logger().http(message, meta),
-  verbose: (message: string, meta?: Record<string, any>) => get_logger().verbose(message, meta),
-  debug: (message: string, meta?: Record<string, any>) => get_logger().debug(message, meta),
-  silly: (message: string, meta?: Record<string, any>) => get_logger().silly(message, meta),
+  error   : (message: string, meta?: Record<string, any>) => get_logger().error(message, meta),
+  warn    : (message: string, meta?: Record<string, any>) => get_logger().warn(message, meta),
+  info    : (message: string, meta?: Record<string, any>) => get_logger().info(message, meta),
+  http    : (message: string, meta?: Record<string, any>) => get_logger().http(message, meta),
+  verbose : (message: string, meta?: Record<string, any>) => get_logger().verbose(message, meta),
+  debug   : (message: string, meta?: Record<string, any>) => get_logger().debug(message, meta),
+  silly   : (message: string, meta?: Record<string, any>) => get_logger().silly(message, meta),
 
   /**
    * Creates a child logger with additional context.

package/src/observability/metrics.mts

@@ -20,26 +20,26 @@ const METER_VERSION = "1.0.0";
  */
 export interface SFRMetrics {
   // REST Metrics
-  rest_requests_total: Counter;
-  rest_request_duration: Histogram;
-  rest_errors_total: Counter;
-  rest_request_size: Histogram;
-  rest_response_size: Histogram;
+  rest_requests_total   : Counter;
+  rest_request_duration : Histogram;
+  rest_errors_total     : Counter;
+  rest_request_size     : Histogram;
+  rest_response_size    : Histogram;
 
   // WebSocket Metrics
-  ws_connections_active: UpDownCounter;
-  ws_connections_total: Counter;
-  ws_events_total: Counter;
-  ws_event_duration: Histogram;
-  ws_errors_total: Counter;
+  ws_connections_active : UpDownCounter;
+  ws_connections_total  : Counter;
+  ws_events_total       : Counter;
+  ws_event_duration     : Histogram;
+  ws_errors_total       : Counter;
 
   // MQ Metrics
-  mq_messages_received: Counter;
-  mq_messages_published: Counter;
-  mq_processing_duration: Histogram;
-  mq_errors_total: Counter;
-  mq_messages_rejected: Counter;
-  mq_messages_acked: Counter;
+  mq_messages_received   : Counter;
+  mq_messages_published  : Counter;
+  mq_processing_duration : Histogram;
+  mq_errors_total        : Counter;
+  mq_messages_rejected   : Counter;
+  mq_messages_acked      : Counter;
 }
 
 let sfr_metrics: SFRMetrics | null = null;

package/src/observability/middleware/mq.mts

@@ -53,9 +53,7 @@ export function wrap_mq_handler(
     const ctx = trace.setSpan(parent_context, span);
 
     // Record received metric
-    if (metrics) {
-      metrics.mq_messages_received.add(1, { queue, pattern });
-    }
+    if (metrics) metrics.mq_messages_received.add(1, { queue, pattern });
 
     try {
       await context.with(ctx, async () => {

package/src/observability/middleware/rest.mts

@@ -48,7 +48,7 @@ export function sfr_rest_telemetry() {
           "http.user_agent": req.get("user-agent") ?? "unknown",
           "http.request_content_length": req.get("content-length") ?? 0,
           "sfr.protocol": "REST",
-          "sfr.route": route
+          "sfr.route": route,
         }
       },
       parent_context

package/src/sfr-pipeline.mts

@@ -88,6 +88,7 @@ export class SFRPipeline {
 
   async init(base_url?: string): Promise<ServiceDocuments> {
     this.base_url = base_url;
+    const observability_enabled = is_observability_enabled();
 
     // Initialize observability with service config from oas_cfg
     if (SFRPipeline.observability_options.enabled !== false) {
@@ -95,12 +96,12 @@ export class SFRPipeline {
     }
 
     // Add REST telemetry middleware if enabled
-    if (this.comms["REST"] && is_observability_enabled()) {
+    if (this.comms["REST"] && observability_enabled) {
       this.comms["REST"].use(sfr_rest_telemetry());
     }
 
     // Instrument Socket.IO if enabled
-    if (this.comms["WS"] && is_observability_enabled()) {
+    if (this.comms["WS"] && observability_enabled) {
       instrument_socket_io(this.comms["WS"]);
     }