@payloops/observability 0.0.6 → 0.0.8

package/README.md

@@ -5,7 +5,7 @@ Shared observability package for PayLoops services. Provides OpenTelemetry traci
 ## Installation
 
 ```bash
-pnpm add @payloops/observability
+npm install @payloops/observability
 ```
 
 ## Features

package/dist/index.d.ts

@@ -18,6 +18,8 @@ declare function shutdownTelemetry(): Promise<void>;
 
 /**
  * Base logger with trace context mixin
+ * In development: pretty print to console + OTLP
+ * In production: JSON to stdout + OTLP
  */
 declare const logger: pino.Logger<never, boolean>;
 /**

package/dist/index.js

@@ -2,6 +2,7 @@
 import { NodeSDK } from "@opentelemetry/sdk-node";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
 import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
+import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
 import { getNodeAutoInstrumentations } from "@opentelemetry/auto-instrumentations-node";
 
 // node_modules/@opentelemetry/resources/build/esm/Resource.js
@@ -229,18 +230,31 @@ var Resource = (
 // src/lib/otel.ts
 import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from "@opentelemetry/semantic-conventions";
 import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
+import {
+  LoggerProvider,
+  BatchLogRecordProcessor
+} from "@opentelemetry/sdk-logs";
+import { logs } from "@opentelemetry/api-logs";
 var sdk = null;
+var loggerProvider = null;
 function initTelemetry(config, serviceVersion = "0.0.1") {
   if (sdk) return sdk;
   const cfg = typeof config === "string" ? { serviceName: config, serviceVersion } : config;
   const otlpEndpoint = cfg.otlpEndpoint || process.env.OTEL_EXPORTER_OTLP_ENDPOINT || "http://localhost:4318";
   const environment = cfg.environment || process.env.NODE_ENV || "development";
+  const resource = new Resource({
+    [ATTR_SERVICE_NAME]: cfg.serviceName,
+    [ATTR_SERVICE_VERSION]: cfg.serviceVersion || "0.0.1",
+    "deployment.environment": environment
+  });
+  const logExporter = new OTLPLogExporter({
+    url: `${otlpEndpoint}/v1/logs`
+  });
+  loggerProvider = new LoggerProvider({ resource });
+  loggerProvider.addLogRecordProcessor(new BatchLogRecordProcessor(logExporter));
+  logs.setGlobalLoggerProvider(loggerProvider);
   sdk = new NodeSDK({
-    resource: new Resource({
-      [ATTR_SERVICE_NAME]: cfg.serviceName,
-      [ATTR_SERVICE_VERSION]: cfg.serviceVersion || "0.0.1",
-      "deployment.environment": environment
-    }),
+    resource,
     traceExporter: new OTLPTraceExporter({
       url: `${otlpEndpoint}/v1/traces`
     }),
@@ -260,7 +274,7 @@ function initTelemetry(config, serviceVersion = "0.0.1") {
   });
   sdk.start();
   process.on("SIGTERM", () => {
-    sdk?.shutdown().then(() => console.log("Telemetry shut down")).catch((err) => console.error("Telemetry shutdown error", err));
+    Promise.all([sdk?.shutdown(), loggerProvider?.shutdown()]).then(() => console.log("Telemetry shut down")).catch((err) => console.error("Telemetry shutdown error", err));
   });
   return sdk;
 }
@@ -272,6 +286,7 @@ function shutdownTelemetry() {
 // src/lib/logger.ts
 import pino from "pino";
 import { trace } from "@opentelemetry/api";
+import { logs as logs2, SeverityNumber as SeverityNumber2 } from "@opentelemetry/api-logs";
 
 // src/lib/context.ts
 import { AsyncLocalStorage } from "async_hooks";
@@ -318,6 +333,20 @@ function createContextFromMemo(memo) {
 // src/lib/logger.ts
 var NODE_ENV = process.env.NODE_ENV || "development";
 var SERVICE_NAME = process.env.OTEL_SERVICE_NAME || "loop";
+var pinoLevelToOtelSeverity = {
+  10: SeverityNumber2.TRACE,
+  // trace
+  20: SeverityNumber2.DEBUG,
+  // debug
+  30: SeverityNumber2.INFO,
+  // info
+  40: SeverityNumber2.WARN,
+  // warn
+  50: SeverityNumber2.ERROR,
+  // error
+  60: SeverityNumber2.FATAL
+  // fatal
+};
 var traceMixin = () => {
   const mixinData = {};
   const span = trace.getActiveSpan();
@@ -335,16 +364,74 @@ var traceMixin = () => {
   }
   return mixinData;
 };
-var logger = pino({
-  level: NODE_ENV === "production" ? "info" : "debug",
-  mixin: traceMixin,
-  base: {
-    service: SERVICE_NAME,
-    env: NODE_ENV
+function emitToOtel(logRecord) {
+  try {
+    const otelLogger = logs2.getLogger(SERVICE_NAME);
+    const span = trace.getActiveSpan();
+    const spanContext = span?.spanContext();
+    otelLogger.emit({
+      severityNumber: pinoLevelToOtelSeverity[logRecord.level] || SeverityNumber2.INFO,
+      severityText: pino.levels.labels[logRecord.level] || "INFO",
+      body: logRecord.msg,
+      attributes: {
+        ...logRecord,
+        // Remove fields that are part of the log record structure
+        msg: void 0,
+        level: void 0,
+        time: void 0
+      },
+      timestamp: logRecord.time ? new Date(logRecord.time).getTime() * 1e6 : Date.now() * 1e6,
+      // nanoseconds
+      ...spanContext && {
+        spanId: spanContext.spanId,
+        traceId: spanContext.traceId,
+        traceFlags: spanContext.traceFlags
+      }
+    });
+  } catch {
+  }
+}
+var otelHooks = {
+  logMethod(inputArgs, method, level) {
+    method.apply(this, inputArgs);
+    const [objOrMsg, msgOrUndefined] = inputArgs;
+    const logRecord = {
+      level,
+      time: (/* @__PURE__ */ new Date()).toISOString(),
+      service: SERVICE_NAME,
+      env: NODE_ENV
+    };
+    if (typeof objOrMsg === "object" && objOrMsg !== null) {
+      Object.assign(logRecord, objOrMsg);
+      logRecord.msg = msgOrUndefined || "";
+    } else {
+      logRecord.msg = objOrMsg;
+    }
+    Object.assign(logRecord, traceMixin());
+    emitToOtel(logRecord);
+  }
+};
+var logger = pino(
+  {
+    level: NODE_ENV === "production" ? "info" : "debug",
+    mixin: traceMixin,
+    base: {
+      service: SERVICE_NAME,
+      env: NODE_ENV
+    },
+    timestamp: pino.stdTimeFunctions.isoTime,
+    hooks: otelHooks,
+    // In development, use pino-pretty for console output
+    ...NODE_ENV !== "production" && {
+      transport: {
+        target: "pino-pretty",
+        options: { colorize: true }
+      }
+    }
   },
-  timestamp: pino.stdTimeFunctions.isoTime,
-  transport: NODE_ENV !== "production" ? { target: "pino-pretty", options: { colorize: true } } : void 0
-});
+  // In production, also write JSON to stdout (in addition to OTLP via hooks)
+  NODE_ENV === "production" ? pino.destination(1) : void 0
+);
 function createActivityLogger(activityName, correlationId) {
   return logger.child({
     activity: activityName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloops/observability",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "type": "module",
   "repository": {
     "type": "git",
@@ -27,9 +27,12 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/api-logs": "^0.57.0",
     "@opentelemetry/auto-instrumentations-node": "^0.53.0",
+    "@opentelemetry/exporter-logs-otlp-http": "^0.57.0",
     "@opentelemetry/exporter-metrics-otlp-http": "^0.57.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.57.0",
+    "@opentelemetry/sdk-logs": "^0.57.0",
     "@opentelemetry/sdk-metrics": "^1.30.1",
     "@opentelemetry/sdk-node": "^0.57.0",
     "@opentelemetry/semantic-conventions": "^1.28.0",