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

package/dist/index.d.ts

@@ -71,6 +71,7 @@ export declare type ConfigurationOption = WorkerOtelConfig | ResolveConfigFn;
 export declare class ConsoleTransport implements LogTransport {
     readonly name = "console";
     private options;
+    private minSeverity;
     constructor(options?: ConsoleTransportConfig);
     export(logs: ReadableLogRecord[], callback: ExportResultCallback): void;
     private printLog;
@@ -84,6 +85,7 @@ export declare interface ConsoleTransportConfig {
     pretty?: boolean;
     colors?: boolean;
     includeTimestamp?: boolean;
+    level?: LogLevel;
     transformLog?: (logRecord: ReadableLogRecord) => ReadableLogRecord;
 }
 
@@ -247,7 +249,8 @@ export declare interface Logger {
     error(message: string, attributes?: LogAttributes): void;
     fatal(message: string, attributes?: LogAttributes): void;
     forceFlush(): Promise<void>;
-    child(attributes: LogAttributes): Logger;
+    child(name: string, attributes?: LogAttributes): Logger;
+    setProperties(attributes: LogAttributes): this;
 }
 
 export declare interface LoggerOptions {
@@ -260,6 +263,8 @@ export declare interface LoggerProvider {
     shutdown(): Promise<void>;
 }
 
+export declare type LogLevel = 'TRACE' | 'DEBUG' | 'INFO' | 'WARN' | 'ERROR' | 'FATAL';
+
 export declare interface LogRecord {
     readonly timeUnixNano: HrTime;
     readonly observedTimeUnixNano: HrTime;
@@ -282,7 +287,6 @@ export declare interface LogsConfig {
     transports?: LogTransport[];
     batching?: BatchConfig;
     instrumentation?: LogsInstrumentationOptions;
-    level?: 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal';
 }
 
 export declare interface LogsInstrumentationOptions {
@@ -350,6 +354,7 @@ export declare class OTLPTransport implements LogTransport {
     readonly name = "otlp";
     private headers;
     private url;
+    private minSeverity;
     constructor(config: OTLPTransportConfig);
     export(logs: ReadableLogRecord[], callback: ExportResultCallback): void;
     private _export;
@@ -366,6 +371,7 @@ export declare class OTLPTransport implements LogTransport {
 export declare interface OTLPTransportConfig {
     url: string;
     headers?: Record<string, string>;
+    level?: LogLevel;
 }
 
 export declare interface ParentRatioSamplingConfig {
@@ -393,7 +399,6 @@ export declare type ResolveConfigFn<Env = any> = (env: Env, trigger: Trigger) =>
 export declare interface ResolvedLogsConfig {
     processors: LogRecordProcessor[];
     instrumentation: LogsInstrumentationOptions;
-    level: 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal';
 }
 
 export declare interface ResolvedTraceConfig extends TraceConfigBase {
@@ -558,11 +563,8 @@ export declare class WorkerLogger implements Logger {
     private readonly resource;
     private readonly name;
     private readonly version?;
-    private readonly inheritedAttributes;
-    private readonly minSeverity;
-    constructor(name: string, processors: LogRecordProcessor[], resource: Resource, version?: string, inheritedAttributes?: LogAttributes, minLevel?: 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal');
-    private levelToSeverity;
-    private shouldEmit;
+    private properties;
+    constructor(name: string, processors: LogRecordProcessor[], resource: Resource, version?: string, properties?: LogAttributes);
     emit(logRecord: Partial<LogRecord>): void;
     trace(message: string, attributes?: LogAttributes): void;
     debug(message: string, attributes?: LogAttributes): void;
@@ -572,18 +574,22 @@ export declare class WorkerLogger implements Logger {
     fatal(message: string, attributes?: LogAttributes): void;
     forceFlush(): Promise<void>;
     /**
-     * Create a child logger that inherits attributes from this logger
-     * Child attributes are merged with parent attributes (child takes precedence)
+     * Create a child logger with a concatenated name (parent:child) that inherits properties from this logger
+     * Child properties are merged with parent properties (child takes precedence)
+     */
+    child(name: string, attributes?: LogAttributes): Logger;
+    /**
+     * Add properties to this logger that will be included in all future log records
+     * New properties are merged with existing properties (new takes precedence)
      */
-    child(attributes: LogAttributes): Logger;
+    setProperties(attributes: LogAttributes): this;
 }
 
 export declare class WorkerLoggerProvider implements LoggerProvider {
     private loggers;
     private processors;
     private resource;
-    private minLevel;
-    constructor(processors: LogRecordProcessor[], resource: Resource, minLevel?: 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal');
+    constructor(processors: LogRecordProcessor[], resource: Resource);
     getLogger(name: string, version?: string, options?: LoggerOptions): Logger;
     register(): void;
     shutdown(): Promise<void>;

package/dist/index.js

@@ -96,7 +96,7 @@ function passthroughGet(target, prop, thisArg) {
   }
 }
 
-const PACKAGE_VERSION = "2.2.1";
+const PACKAGE_VERSION = "2.4.0";
 const PACKAGE_NAME = "@inference-net/otel-cf-workers";
 const ATTR_CLOUDFLARE_COLO = "cloudflare.colo";
 const ATTR_CLOUDFLARE_RAY_ID = "cloudflare.ray_id";
@@ -292,12 +292,13 @@ class OTLPExporter {
       headers: this.headers,
       body
     };
-    unwrap(fetch)(this.url, params).then((response) => {
+    unwrap(fetch)(this.url, params).then(async (response) => {
       if (response.ok) {
         onSuccess();
       } else {
         onError(new OTLPExporterError(`Exporter received a statusCode: ${response.status}`));
       }
+      await response.body?.cancel();
     }).catch((error) => {
       onError(new OTLPExporterError(`Exception during export: ${error.toString()}`, error.code, error.stack));
     });
@@ -600,8 +601,7 @@ function parseLogsConfig(supplied) {
     processors,
     instrumentation: {
       instrumentConsole: supplied.instrumentation?.instrumentConsole ?? false
-    },
-    level: supplied.level ?? "info"
+    }
   };
 }
 
@@ -1127,38 +1127,17 @@ class WorkerLogger {
   resource;
   name;
   version;
-  inheritedAttributes;
-  minSeverity;
-  constructor(name, processors, resource, version, inheritedAttributes, minLevel = "info") {
+  properties;
+  constructor(name, processors, resource, version, properties) {
     this.name = name;
     this.processors = processors;
     this.resource = resource;
     this.version = version;
-    this.inheritedAttributes = inheritedAttributes || {};
-    this.minSeverity = this.levelToSeverity(minLevel);
-  }
-  levelToSeverity(level) {
-    switch (level) {
-      case "trace":
-        return SEVERITY_NUMBERS.TRACE;
-      case "debug":
-        return SEVERITY_NUMBERS.DEBUG;
-      case "info":
-        return SEVERITY_NUMBERS.INFO;
-      case "warn":
-        return SEVERITY_NUMBERS.WARN;
-      case "error":
-        return SEVERITY_NUMBERS.ERROR;
-      case "fatal":
-        return SEVERITY_NUMBERS.FATAL;
-    }
-  }
-  shouldEmit(severityNumber) {
-    return severityNumber >= this.minSeverity;
+    this.properties = properties || {};
   }
   emit(logRecord) {
     const mergedAttributes = {
-      ...this.inheritedAttributes,
+      ...this.properties,
       ...logRecord.attributes || {}
     };
     const record = new LogRecordImpl({
@@ -1176,7 +1155,6 @@ class WorkerLogger {
     });
   }
   trace(message, attributes) {
-    if (!this.shouldEmit(SEVERITY_NUMBERS.TRACE)) return;
     this.emit({
       severityNumber: SEVERITY_NUMBERS.TRACE,
       severityText: "TRACE",
@@ -1185,7 +1163,6 @@ class WorkerLogger {
     });
   }
   debug(message, attributes) {
-    if (!this.shouldEmit(SEVERITY_NUMBERS.DEBUG)) return;
     this.emit({
       severityNumber: SEVERITY_NUMBERS.DEBUG,
       severityText: "DEBUG",
@@ -1194,7 +1171,6 @@ class WorkerLogger {
     });
   }
   info(message, attributes) {
-    if (!this.shouldEmit(SEVERITY_NUMBERS.INFO)) return;
     this.emit({
       severityNumber: SEVERITY_NUMBERS.INFO,
       severityText: "INFO",
@@ -1203,7 +1179,6 @@ class WorkerLogger {
     });
   }
   warn(message, attributes) {
-    if (!this.shouldEmit(SEVERITY_NUMBERS.WARN)) return;
     this.emit({
       severityNumber: SEVERITY_NUMBERS.WARN,
       severityText: "WARN",
@@ -1212,7 +1187,6 @@ class WorkerLogger {
     });
   }
   error(message, attributes) {
-    if (!this.shouldEmit(SEVERITY_NUMBERS.ERROR)) return;
     const exception = attributes?.["error"] instanceof Error ? attributes["error"] : void 0;
     const activeSpan = trace.getActiveSpan();
     if (activeSpan) {
@@ -1229,7 +1203,6 @@ class WorkerLogger {
     });
   }
   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) {
@@ -1250,22 +1223,27 @@ class WorkerLogger {
     await Promise.allSettled(promises);
   }
   /**
-   * Create a child logger that inherits attributes from this logger
-   * Child attributes are merged with parent attributes (child takes precedence)
+   * Create a child logger with a concatenated name (parent:child) that inherits properties from this logger
+   * Child properties are merged with parent properties (child takes precedence)
    */
-  child(attributes) {
-    const mergedAttributes = {
-      ...this.inheritedAttributes,
+  child(name, attributes) {
+    const childName = `${this.name}:${name}`;
+    const mergedProperties = {
+      ...this.properties,
+      ...attributes || {}
+    };
+    return new WorkerLogger(childName, this.processors, this.resource, this.version, mergedProperties);
+  }
+  /**
+   * Add properties to this logger that will be included in all future log records
+   * New properties are merged with existing properties (new takes precedence)
+   */
+  setProperties(attributes) {
+    this.properties = {
+      ...this.properties,
       ...attributes
     };
-    let minLevel = "info";
-    if (this.minSeverity <= SEVERITY_NUMBERS.TRACE) minLevel = "trace";
-    else if (this.minSeverity <= SEVERITY_NUMBERS.DEBUG) minLevel = "debug";
-    else if (this.minSeverity <= SEVERITY_NUMBERS.INFO) minLevel = "info";
-    else if (this.minSeverity <= SEVERITY_NUMBERS.WARN) minLevel = "warn";
-    else if (this.minSeverity <= SEVERITY_NUMBERS.ERROR) minLevel = "error";
-    else minLevel = "fatal";
-    return new WorkerLogger(this.name, this.processors, this.resource, this.version, mergedAttributes, minLevel);
+    return this;
   }
 }
 
@@ -1280,16 +1258,14 @@ class WorkerLoggerProvider {
   loggers = /* @__PURE__ */ new Map();
   processors;
   resource;
-  minLevel;
-  constructor(processors, resource, minLevel = "info") {
+  constructor(processors, resource) {
     this.processors = processors;
     this.resource = resource;
-    this.minLevel = minLevel;
   }
   getLogger(name, version, options) {
     const key = `${name}@${version || ""}:${options?.schemaUrl || ""}`;
     if (!this.loggers.has(key)) {
-      this.loggers.set(key, new WorkerLogger(name, this.processors, this.resource, version, void 0, this.minLevel));
+      this.loggers.set(key, new WorkerLogger(name, this.processors, this.resource, version));
     }
     return this.loggers.get(key);
   }
@@ -1320,6 +1296,9 @@ class NoopLogger {
   child() {
     return this;
   }
+  setProperties() {
+    return this;
+  }
 }
 class NoopLoggerProvider {
   logger = new NoopLogger();
@@ -3582,7 +3561,7 @@ function init(config, serviceConfig, propagator) {
       traceProvider.register();
     }
     if (config.logs && config.logs.processors.length > 0) {
-      const logsProvider = new WorkerLoggerProvider(config.logs.processors, resource, config.logs.level);
+      const logsProvider = new WorkerLoggerProvider(config.logs.processors, resource);
       logsProvider.register();
       if (config.logs.instrumentation.instrumentConsole) {
         import('./console-Cy5QdByD.js').then(({ instrumentConsole }) => {
@@ -3748,16 +3727,39 @@ class MultiSpanExporterAsync {
   }
 }
 
+function levelToSeverity(level) {
+  switch (level) {
+    case "TRACE":
+      return SEVERITY_NUMBERS.TRACE;
+    case "DEBUG":
+      return SEVERITY_NUMBERS.DEBUG;
+    case "INFO":
+      return SEVERITY_NUMBERS.INFO;
+    case "WARN":
+      return SEVERITY_NUMBERS.WARN;
+    case "ERROR":
+      return SEVERITY_NUMBERS.ERROR;
+    case "FATAL":
+      return SEVERITY_NUMBERS.FATAL;
+  }
+}
 class OTLPTransport {
   name = "otlp";
   headers;
   url;
+  minSeverity;
   constructor(config) {
     this.url = config.url;
     this.headers = Object.assign({}, DEFAULT_OTLP_HEADERS, config.headers);
+    this.minSeverity = levelToSeverity(config.level ?? "TRACE");
   }
   export(logs, callback) {
-    this._export(logs).then(() => {
+    const filteredLogs = logs.filter((log) => (log.severityNumber ?? 0) >= this.minSeverity);
+    if (filteredLogs.length === 0) {
+      callback({ code: ExportResultCode.SUCCESS });
+      return;
+    }
+    this._export(filteredLogs).then(() => {
       callback({ code: ExportResultCode.SUCCESS });
     }).catch((error) => {
       callback({ code: ExportResultCode.FAILED, error });
@@ -3782,6 +3784,7 @@ class OTLPTransport {
     if (!response.ok) {
       throw new OTLPExporterError(`Exporter received a statusCode: ${response.status}`);
     }
+    await response.body?.cancel();
   }
   transformToOTLP(logs) {
     const resourceLogsMap = /* @__PURE__ */ new Map();
@@ -3885,6 +3888,7 @@ class OTLPTransport {
 class ConsoleTransport {
   name = "console";
   options;
+  minSeverity;
   constructor(options = {}) {
     this.options = {
       pretty: options.pretty ?? true,
@@ -3892,10 +3896,12 @@ class ConsoleTransport {
       includeTimestamp: options.includeTimestamp ?? true,
       transformLog: options.transformLog ?? ((l) => l)
     };
+    this.minSeverity = levelToSeverity(options.level ?? "TRACE");
   }
   export(logs, callback) {
     try {
       for (const log of logs) {
+        if ((log.severityNumber ?? 0) < this.minSeverity) continue;
         this.printLog(this.options.transformLog ? this.options.transformLog(log) : log);
       }
       callback({ code: ExportResultCode.SUCCESS });