@inference-net/otel-cf-workers 2.2.0 → 2.2.1

package/dist/index.d.ts

@@ -225,9 +225,16 @@ export declare interface LocalTrace {
     readonly spans: ReadableSpan[];
 }
 
-export declare interface LogAttributes {
-    [key: string]: any;
-}
+/**
+ * Log attributes must be a plain object with string keys.
+ * This type explicitly excludes strings to prevent accidental argument swapping.
+ */
+export declare type LogAttributes = {
+    [key: string]: unknown;
+} & {
+    length?: never;
+    substring?: never;
+};
 
 export declare type LogBody = string | Record<string, any>;
 
@@ -237,7 +244,7 @@ export declare interface Logger {
     debug(message: string, attributes?: LogAttributes): void;
     info(message: string, attributes?: LogAttributes): void;
     warn(message: string, attributes?: LogAttributes): void;
-    error(message: string | Error, attributes?: LogAttributes): void;
+    error(message: string, attributes?: LogAttributes): void;
     fatal(message: string, attributes?: LogAttributes): void;
     forceFlush(): Promise<void>;
     child(attributes: LogAttributes): Logger;
@@ -561,7 +568,7 @@ export declare class WorkerLogger implements Logger {
     debug(message: string, attributes?: LogAttributes): void;
     info(message: string, attributes?: LogAttributes): void;
     warn(message: string, attributes?: LogAttributes): void;
-    error(message: string | Error, attributes?: LogAttributes): void;
+    error(message: string, attributes?: LogAttributes): void;
     fatal(message: string, attributes?: LogAttributes): void;
     forceFlush(): Promise<void>;
     /**

package/dist/index.js

@@ -96,7 +96,7 @@ function passthroughGet(target, prop, thisArg) {
   }
 }
 
-const PACKAGE_VERSION = "2.2.0";
+const PACKAGE_VERSION = "2.2.1";
 const PACKAGE_NAME = "@inference-net/otel-cf-workers";
 const ATTR_CLOUDFLARE_COLO = "cloudflare.colo";
 const ATTR_CLOUDFLARE_RAY_ID = "cloudflare.ray_id";
@@ -1022,6 +1022,53 @@ class WorkerTracerProvider {
 function millisToHr(millis) {
   return [Math.trunc(millis / 1e3), millis % 1e3 * 1e6];
 }
+function flattenError(error, prefix) {
+  const result = {};
+  result[`${prefix}.type`] = error.name;
+  result[`${prefix}.message`] = error.message;
+  if (error.stack) {
+    result[`${prefix}.stacktrace`] = error.stack;
+  }
+  if ("cause" in error && error.cause) {
+    if (error.cause instanceof Error) {
+      Object.assign(result, flattenError(error.cause, `${prefix}.cause`));
+    } else {
+      result[`${prefix}.cause`] = String(error.cause);
+    }
+  }
+  return result;
+}
+function flattenAttributes(attrs, prefix = "") {
+  const result = {};
+  for (const [key, value] of Object.entries(attrs)) {
+    const fullKey = prefix ? `${prefix}.${key}` : key;
+    if (value === null || value === void 0) {
+      continue;
+    } else if (value instanceof Error) {
+      Object.assign(result, flattenError(value, fullKey));
+    } else if (Array.isArray(value)) {
+      const hasObjects = value.some((item) => item !== null && typeof item === "object" && !Array.isArray(item));
+      if (hasObjects) {
+        value.forEach((item, index) => {
+          if (item instanceof Error) {
+            Object.assign(result, flattenError(item, `${fullKey}.${index}`));
+          } else if (item !== null && typeof item === "object" && !Array.isArray(item)) {
+            Object.assign(result, flattenAttributes(item, `${fullKey}.${index}`));
+          } else if (item !== null && item !== void 0) {
+            result[`${fullKey}.${index}`] = item;
+          }
+        });
+      } else {
+        result[fullKey] = value;
+      }
+    } else if (typeof value === "object") {
+      Object.assign(result, flattenAttributes(value, fullKey));
+    } else {
+      result[fullKey] = value;
+    }
+  }
+  return result;
+}
 function getHrTime(input) {
   const now = Date.now();
   if (!input) {
@@ -1055,7 +1102,8 @@ class LogRecordImpl {
     this.severityNumber = init.severityNumber;
     this.severityText = init.severityText;
     this.body = init.body;
-    this.attributes = sanitizeAttributes(init.attributes || {});
+    const flattenedAttributes = flattenAttributes(init.attributes || {});
+    this.attributes = sanitizeAttributes(flattenedAttributes);
     this.resource = init.resource;
     this.instrumentationScope = init.instrumentationScope || {
       name: "@inference-net/otel-cf-workers"
@@ -1165,28 +1213,31 @@ class WorkerLogger {
   }
   error(message, attributes) {
     if (!this.shouldEmit(SEVERITY_NUMBERS.ERROR)) return;
-    let body;
-    let attrs = { ...attributes };
-    if (message instanceof Error) {
-      body = message.message;
-      attrs = {
-        ...attrs,
-        "exception.type": message.name,
-        "exception.message": message.message,
-        "exception.stacktrace": message.stack
-      };
-    } else {
-      body = message;
+    const exception = attributes?.["error"] instanceof Error ? attributes["error"] : void 0;
+    const activeSpan = trace.getActiveSpan();
+    if (activeSpan) {
+      activeSpan.setStatus({ code: SpanStatusCode.ERROR, message });
+      if (exception) {
+        activeSpan.recordException(exception);
+      }
     }
     this.emit({
       severityNumber: SEVERITY_NUMBERS.ERROR,
       severityText: "ERROR",
-      body,
-      attributes: attrs
+      body: message,
+      attributes
     });
   }
   fatal(message, attributes) {
     if (!this.shouldEmit(SEVERITY_NUMBERS.FATAL)) return;
+    const exception = attributes?.["error"] instanceof Error ? attributes["error"] : void 0;
+    const activeSpan = trace.getActiveSpan();
+    if (activeSpan) {
+      activeSpan.setStatus({ code: SpanStatusCode.ERROR, message });
+      if (exception) {
+        activeSpan.recordException(exception);
+      }
+    }
     this.emit({
       severityNumber: SEVERITY_NUMBERS.FATAL,
       severityText: "FATAL",