@malloy-publisher/server 0.0.152 → 0.0.153

package/dist/instrumentation.js

@@ -116694,9 +116694,22 @@ var import_sdk_logs = __toESM(require_src7());
 var import_winston = __toESM(require_winston());
 var isTelemetryEnabled = Boolean(process.env.OTEL_EXPORTER_OTLP_ENDPOINT);
 var logger = import_winston.default.createLogger({
-  format: isTelemetryEnabled ? import_winston.default.format.combine(import_winston.default.format.uncolorize(), import_winston.default.format.timestamp(), import_winston.default.format.json()) : import_winston.default.format.combine(import_winston.default.format.colorize(), import_winston.default.format.simple()),
+  format: isTelemetryEnabled ? import_winston.default.format.combine(import_winston.default.format.uncolorize(), import_winston.default.format.timestamp(), import_winston.default.format.metadata({
+    fillExcept: ["message", "level", "timestamp"]
+  }), import_winston.default.format.json()) : import_winston.default.format.combine(import_winston.default.format.colorize(), import_winston.default.format.simple()),
   transports: [new import_winston.default.transports.Console]
 });
+function extractTraceIdFromTraceparent(traceparent) {
+  if (!traceparent) {
+    return;
+  }
+  const parts = traceparent.split("-");
+  const traceId = parts.length >= 2 ? parts[1] : parts.length == 1 ? parts[0] : undefined;
+  if (traceId && traceId.length === 32 && /^[0-9a-fA-F]{32}$/.test(traceId)) {
+    return traceId;
+  }
+  return;
+}
 var loggerMiddleware = (req, res, next) => {
   const startTime = performance.now();
   const resJson = res.json;
@@ -116706,14 +116719,20 @@ var loggerMiddleware = (req, res, next) => {
   };
   res.on("finish", () => {
     const endTime = performance.now();
-    logger.info(`${req.method} ${req.url}`, {
+    const traceparent = req.headers["traceparent"];
+    const traceId = extractTraceIdFromTraceparent(traceparent);
+    const logMetadata = {
       statusCode: res.statusCode,
       duration: endTime - startTime,
       payload: req.body,
       response: res.locals.body,
       params: req.params,
       query: req.query
-    });
+    };
+    if (traceId) {
+      logMetadata.traceId = traceId;
+    }
+    logger.info(`${req.method} ${req.url}`, logMetadata);
   });
   next();
 };

package/dist/server.js

@@ -125121,9 +125121,22 @@ class FrozenConfigError extends Error {
 var import_winston = __toESM(require_winston());
 var isTelemetryEnabled = Boolean(process.env.OTEL_EXPORTER_OTLP_ENDPOINT);
 var logger = import_winston.default.createLogger({
-  format: isTelemetryEnabled ? import_winston.default.format.combine(import_winston.default.format.uncolorize(), import_winston.default.format.timestamp(), import_winston.default.format.json()) : import_winston.default.format.combine(import_winston.default.format.colorize(), import_winston.default.format.simple()),
+  format: isTelemetryEnabled ? import_winston.default.format.combine(import_winston.default.format.uncolorize(), import_winston.default.format.timestamp(), import_winston.default.format.metadata({
+    fillExcept: ["message", "level", "timestamp"]
+  }), import_winston.default.format.json()) : import_winston.default.format.combine(import_winston.default.format.colorize(), import_winston.default.format.simple()),
   transports: [new import_winston.default.transports.Console]
 });
+function extractTraceIdFromTraceparent(traceparent) {
+  if (!traceparent) {
+    return;
+  }
+  const parts = traceparent.split("-");
+  const traceId = parts.length >= 2 ? parts[1] : parts.length == 1 ? parts[0] : undefined;
+  if (traceId && traceId.length === 32 && /^[0-9a-fA-F]{32}$/.test(traceId)) {
+    return traceId;
+  }
+  return;
+}
 var loggerMiddleware = (req, res, next) => {
   const startTime = performance.now();
   const resJson = res.json;
@@ -125133,14 +125146,20 @@ var loggerMiddleware = (req, res, next) => {
   };
   res.on("finish", () => {
     const endTime = performance.now();
-    logger.info(`${req.method} ${req.url}`, {
+    const traceparent = req.headers["traceparent"];
+    const traceId = extractTraceIdFromTraceparent(traceparent);
+    const logMetadata = {
       statusCode: res.statusCode,
       duration: endTime - startTime,
       payload: req.body,
       response: res.locals.body,
       params: req.params,
       query: req.query
-    });
+    };
+    if (traceId) {
+      logMetadata.traceId = traceId;
+    }
+    logger.info(`${req.method} ${req.url}`, logMetadata);
   });
   next();
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@malloy-publisher/server",
   "description": "Malloy Publisher Server",
-  "version": "0.0.152",
+  "version": "0.0.153",
   "main": "dist/server.js",
   "bin": {
     "malloy-publisher": "dist/server.js"

package/src/logger.ts

@@ -9,6 +9,9 @@ export const logger = winston.createLogger({
       ? winston.format.combine(
            winston.format.uncolorize(),
            winston.format.timestamp(),
+           winston.format.metadata({
+              fillExcept: ["message", "level", "timestamp"],
+           }),
            winston.format.json(),
         )
       : winston.format.combine(
@@ -18,6 +21,33 @@ export const logger = winston.createLogger({
    transports: [new winston.transports.Console()],
 });
 
+/**
+ * Extracts the trace ID from a W3C traceparent header.
+ * Format: version-trace-id-parent-id-trace-flags
+ * Example: 00-81f2264f363f1b5596c84ab29e6be171-83ef39df12ab6bab-01
+ *
+ * @param traceparent The traceparent header value
+ * @returns The trace ID (32 hex characters) or undefined if invalid
+ */
+function extractTraceIdFromTraceparent(
+   traceparent: string | undefined,
+): string | undefined {
+   if (!traceparent) {
+      return undefined;
+   }
+
+   // format of traceparent can either be: version-traceId-parentId-traceFlags or traceId
+   const parts = traceparent.split("-");
+   const traceId =
+      parts.length >= 2 ? parts[1] : parts.length == 1 ? parts[0] : undefined;
+   // Validate that the traceId is 32 hex characters
+   if (traceId && traceId.length === 32 && /^[0-9a-fA-F]{32}$/.test(traceId)) {
+      return traceId;
+   }
+
+   return undefined;
+}
+
 export const loggerMiddleware: RequestHandler = (req, res, next) => {
    const startTime = performance.now();
    const resJson = res.json;
@@ -27,14 +57,26 @@ export const loggerMiddleware: RequestHandler = (req, res, next) => {
    };
    res.on("finish", () => {
       const endTime = performance.now();
-      logger.info(`${req.method} ${req.url}`, {
+
+      // Extract trace ID from traceparent header if present
+      const traceparent = req.headers["traceparent"] as string | undefined;
+      const traceId = extractTraceIdFromTraceparent(traceparent);
+
+      const logMetadata: Record<string, unknown> = {
          statusCode: res.statusCode,
          duration: endTime - startTime,
          payload: req.body,
          response: res.locals.body,
          params: req.params,
          query: req.query,
-      });
+      };
+
+      // Add traceId to log metadata if present
+      if (traceId) {
+         logMetadata.traceId = traceId;
+      }
+
+      logger.info(`${req.method} ${req.url}`, logMetadata);
    });
    next();
 };