@inference-net/otel-cf-workers 2.0.5 → 2.1.1

package/dist/console-Cy5QdByD.js.map

@@ -1 +1 @@
-{"version":3,"file":"console-Cy5QdByD.js","sources":["../src/logs/console.ts"],"sourcesContent":["import { getLogger } from './provider.js'\nimport { SEVERITY_NUMBERS } from '../constants.js'\n\nconst severityMap = {\n\tdebug: SEVERITY_NUMBERS.DEBUG,\n\tlog: SEVERITY_NUMBERS.INFO,\n\tinfo: SEVERITY_NUMBERS.INFO,\n\twarn: SEVERITY_NUMBERS.WARN,\n\terror: SEVERITY_NUMBERS.ERROR,\n} as const\n\ntype ConsoleMethod = keyof typeof severityMap\n\n/**\n * Instrument console methods to emit OpenTelemetry log records\n * This is OPT-IN and must be explicitly enabled in configuration\n */\nexport function instrumentConsole() {\n\tconst logger = getLogger('console')\n\n\tfor (const [method, severityNumber] of Object.entries(severityMap)) {\n\t\tconst consoleMethod = method as ConsoleMethod\n\t\tconst original = console[consoleMethod]\n\n\t\tif (typeof original !== 'function') {\n\t\t\tcontinue\n\t\t}\n\n\t\t// Replace console method with instrumented version\n\t\t;(console as any)[consoleMethod] = function (...args: any[]) {\n\t\t\ttry {\n\t\t\t\t// Emit log record\n\t\t\t\tlogger.emit({\n\t\t\t\t\tseverityNumber,\n\t\t\t\t\tseverityText: method.toUpperCase(),\n\t\t\t\t\tbody: args.length === 1 ? String(args[0]) : args.map(String).join(' '),\n\t\t\t\t\tattributes: {\n\t\t\t\t\t\t'log.source': 'console',\n\t\t\t\t\t\t'log.method': method,\n\t\t\t\t\t\t'log.args_count': args.length,\n\t\t\t\t\t},\n\t\t\t\t})\n\t\t\t} catch (error) {\n\t\t\t\t// Don't break console if logging fails - but can't use console.error here!\n\t\t\t}\n\n\t\t\t// Always call original console method\n\t\t\treturn original.apply(console, args)\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;AAGA,MAAM,WAAA,GAAc;AAAA,EACnB,OAAO,gBAAA,CAAiB,KAAA;AAAA,EACxB,KAAK,gBAAA,CAAiB,IAAA;AAAA,EACtB,MAAM,gBAAA,CAAiB,IAAA;AAAA,EACvB,MAAM,gBAAA,CAAiB,IAAA;AAAA,EACvB,OAAO,gBAAA,CAAiB;AACzB,CAAA;AAQO,SAAS,iBAAA,GAAoB;AACnC,EAAA,MAAM,MAAA,GAAS,UAAU,SAAS,CAAA;AAElC,EAAA,KAAA,MAAW,CAAC,MAAA,EAAQ,cAAc,KAAK,MAAA,CAAO,OAAA,CAAQ,WAAW,CAAA,EAAG;AACnE,IAAA,MAAM,aAAA,GAAgB,MAAA;AACtB,IAAA,MAAM,QAAA,GAAW,QAAQ,aAAa,CAAA;AAEtC,IAAA,IAAI,OAAO,aAAa,UAAA,EAAY;AACnC,MAAA;AAAA,IACD;AAGC,IAAC,OAAA,CAAgB,aAAa,CAAA,GAAI,SAAA,GAAa,IAAA,EAAa;AAC5D,MAAA,IAAI;AAEH,QAAA,MAAA,CAAO,IAAA,CAAK;AAAA,UACX,cAAA;AAAA,UACA,YAAA,EAAc,OAAO,WAAA,EAAY;AAAA,UACjC,IAAA,EAAM,IAAA,CAAK,MAAA,KAAW,CAAA,GAAI,OAAO,IAAA,CAAK,CAAC,CAAC,CAAA,GAAI,IAAA,CAAK,GAAA,CAAI,MAAM,CAAA,CAAE,KAAK,GAAG,CAAA;AAAA,UACrE,UAAA,EAAY;AAAA,YACX,YAAA,EAAc,SAAA;AAAA,YACd,YAAA,EAAc,MAAA;AAAA,YACd,kBAAkB,IAAA,CAAK;AAAA;AACxB,SACA,CAAA;AAAA,MACF,SAAS,KAAA,EAAO;AAAA,MAEhB;AAGA,MAAA,OAAO,QAAA,CAAS,KAAA,CAAM,OAAA,EAAS,IAAI,CAAA;AAAA,IACpC,CAAA;AAAA,EACD;AACD;;;;"}
+{"version":3,"file":"console-Cy5QdByD.js","sources":["../src/logs/console.ts"],"sourcesContent":["import { getLogger } from './provider'\nimport { SEVERITY_NUMBERS } from '../constants'\n\nconst severityMap = {\n\tdebug: SEVERITY_NUMBERS.DEBUG,\n\tlog: SEVERITY_NUMBERS.INFO,\n\tinfo: SEVERITY_NUMBERS.INFO,\n\twarn: SEVERITY_NUMBERS.WARN,\n\terror: SEVERITY_NUMBERS.ERROR,\n} as const\n\ntype ConsoleMethod = keyof typeof severityMap\n\n/**\n * Instrument console methods to emit OpenTelemetry log records\n * This is OPT-IN and must be explicitly enabled in configuration\n */\nexport function instrumentConsole() {\n\tconst logger = getLogger('console')\n\n\tfor (const [method, severityNumber] of Object.entries(severityMap)) {\n\t\tconst consoleMethod = method as ConsoleMethod\n\t\tconst original = console[consoleMethod]\n\n\t\tif (typeof original !== 'function') {\n\t\t\tcontinue\n\t\t}\n\n\t\t// Replace console method with instrumented version\n\t\t;(console as any)[consoleMethod] = function (...args: any[]) {\n\t\t\ttry {\n\t\t\t\t// Emit log record\n\t\t\t\tlogger.emit({\n\t\t\t\t\tseverityNumber,\n\t\t\t\t\tseverityText: method.toUpperCase(),\n\t\t\t\t\tbody: args.length === 1 ? String(args[0]) : args.map(String).join(' '),\n\t\t\t\t\tattributes: {\n\t\t\t\t\t\t'log.source': 'console',\n\t\t\t\t\t\t'log.method': method,\n\t\t\t\t\t\t'log.args_count': args.length,\n\t\t\t\t\t},\n\t\t\t\t})\n\t\t\t} catch (error) {\n\t\t\t\t// Don't break console if logging fails - but can't use console.error here!\n\t\t\t}\n\n\t\t\t// Always call original console method\n\t\t\treturn original.apply(console, args)\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;AAGA,MAAM,WAAA,GAAc;AAAA,EACnB,OAAO,gBAAA,CAAiB,KAAA;AAAA,EACxB,KAAK,gBAAA,CAAiB,IAAA;AAAA,EACtB,MAAM,gBAAA,CAAiB,IAAA;AAAA,EACvB,MAAM,gBAAA,CAAiB,IAAA;AAAA,EACvB,OAAO,gBAAA,CAAiB;AACzB,CAAA;AAQO,SAAS,iBAAA,GAAoB;AACnC,EAAA,MAAM,MAAA,GAAS,UAAU,SAAS,CAAA;AAElC,EAAA,KAAA,MAAW,CAAC,MAAA,EAAQ,cAAc,KAAK,MAAA,CAAO,OAAA,CAAQ,WAAW,CAAA,EAAG;AACnE,IAAA,MAAM,aAAA,GAAgB,MAAA;AACtB,IAAA,MAAM,QAAA,GAAW,QAAQ,aAAa,CAAA;AAEtC,IAAA,IAAI,OAAO,aAAa,UAAA,EAAY;AACnC,MAAA;AAAA,IACD;AAGC,IAAC,OAAA,CAAgB,aAAa,CAAA,GAAI,SAAA,GAAa,IAAA,EAAa;AAC5D,MAAA,IAAI;AAEH,QAAA,MAAA,CAAO,IAAA,CAAK;AAAA,UACX,cAAA;AAAA,UACA,YAAA,EAAc,OAAO,WAAA,EAAY;AAAA,UACjC,IAAA,EAAM,IAAA,CAAK,MAAA,KAAW,CAAA,GAAI,OAAO,IAAA,CAAK,CAAC,CAAC,CAAA,GAAI,IAAA,CAAK,GAAA,CAAI,MAAM,CAAA,CAAE,KAAK,GAAG,CAAA;AAAA,UACrE,UAAA,EAAY;AAAA,YACX,YAAA,EAAc,SAAA;AAAA,YACd,YAAA,EAAc,MAAA;AAAA,YACd,kBAAkB,IAAA,CAAK;AAAA;AACxB,SACA,CAAA;AAAA,MACF,SAAS,KAAA,EAAO;AAAA,MAEhB;AAGA,MAAA,OAAO,QAAA,CAAS,KAAA,CAAM,OAAA,EAAS,IAAI,CAAA;AAAA,IACpC,CAAA;AAAA,EACD;AACD;;;;"}

package/dist/index.d.ts

@@ -105,7 +105,7 @@ export declare interface DOConstructorTrigger {
     name?: string;
 }
 
-declare type Env_2 = Record<string, any>;
+declare type Env = Record<string, any>;
 
 export declare type ExporterConfig = OTLPExporterConfig | SpanExporter;
 
@@ -168,7 +168,7 @@ export declare interface InitialSpanInfo {
     context?: Context;
 }
 
-export declare function instrument<E extends Env_2, Q, C>(handler: ExportedHandler<E, Q, C>, config: ConfigurationOption): ExportedHandler<E, Q, C>;
+export declare function instrument<E extends Env, Q, C>(handler: ExportedHandler<E, Q, C>, config: ConfigurationOption): ExportedHandler<E, Q, C>;
 
 export declare interface InstrumentationOptions {
     instrumentGlobalFetch?: boolean;

package/dist/index.js

@@ -96,7 +96,7 @@ function passthroughGet(target, prop, thisArg) {
   }
 }
 
-const PACKAGE_VERSION = "2.0.5";
+const PACKAGE_VERSION = "2.1.1";
 const PACKAGE_NAME = "@inference-net/otel-cf-workers";
 const ATTR_CLOUDFLARE_COLO = "cloudflare.colo";
 const ATTR_CLOUDFLARE_RAY_ID = "cloudflare.ray_id";
@@ -1284,14 +1284,6 @@ function getLogger(name, version, options) {
   return getGlobalLoggerProvider().getLogger(name, version, options);
 }
 
-const provider = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
-	__proto__: null,
-	WorkerLoggerProvider,
-	getGlobalLoggerProvider,
-	getLogger,
-	setGlobalLoggerProvider
-}, Symbol.toStringTag, { value: 'Module' }));
-
 function isValidAttributeValue(value) {
   return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
 }
@@ -1449,11 +1441,22 @@ function getParentContextFromRequest(request) {
   const acceptTraceContext = typeof workerConfig.handlers.fetch.acceptTraceContext === "function" ? workerConfig.handlers.fetch.acceptTraceContext(request) : workerConfig.handlers.fetch.acceptTraceContext ?? true;
   return acceptTraceContext ? getParentContextFromHeaders(request.headers) : context.active();
 }
-function updateSpanNameOnRoute(span, request) {
+function updateSpanNameOnRoute(span, request, result) {
   const readable = span;
-  if (readable.attributes["http.route"]) {
+  const route = readable.attributes?.["http.route"];
+  if (route) {
     const method = request.method.toUpperCase();
-    span.updateName(`${method} ${readable.attributes["http.route"]}`);
+    span.updateName(`${method} ${route}`);
+  }
+  if (result) {
+    if (result.status >= 400) {
+      span.setStatus({
+        code: SpanStatusCode.ERROR,
+        message: `HTTP ${result.status}: ${result.statusText}`
+      });
+    } else {
+      span.setStatus({ code: SpanStatusCode.OK });
+    }
   }
 }
 const fetchInstrumentation = {
@@ -1468,8 +1471,10 @@ const fetchInstrumentation = {
     Object.assign(attributes, gatherRootSpanAttributes(request, "fetch"));
     Object.assign(attributes, gatherUserAgentAttributes(request));
     const method = request.method.toUpperCase();
+    const url = new URL(request.url);
+    const route = url.pathname;
     return {
-      name: `fetchHandler ${method}`,
+      name: `${method} ${route}`,
       options: {
         attributes,
         kind: SpanKind.SERVER
@@ -1478,7 +1483,10 @@ const fetchInstrumentation = {
     };
   },
   getAttributesFromResult: (response) => {
-    return gatherResponseAttributes(response);
+    const attrs = gatherResponseAttributes(response);
+    attrs["http.status_code"] = response.status;
+    attrs["http.status_text"] = response.statusText;
+    return attrs;
   },
   executionSucces: updateSpanNameOnRoute,
   executionFailed: updateSpanNameOnRoute
@@ -1512,6 +1520,18 @@ function instrumentClientFetch(fetchFn, configFn, attrs) {
           if (request.cf) span.setAttributes(gatherOutgoingCfAttributes(request.cf));
           const response = await Reflect.apply(target, thisArg, [request]);
           span.setAttributes(gatherResponseAttributes(response));
+          span.setAttributes({
+            "http.status_code": response.status,
+            "http.status_text": response.statusText
+          });
+          if (response.status >= 400) {
+            span.setStatus({
+              code: SpanStatusCode.ERROR,
+              message: `HTTP ${response.status}: ${response.statusText}`
+            });
+          } else {
+            span.setStatus({ code: SpanStatusCode.OK });
+          }
           return response;
         } catch (error) {
           span.recordException(error);
@@ -2870,7 +2890,7 @@ function instrumentSQLStorageExec(fn, operation) {
   const fnHandler = {
     apply: (target, thisArg, argArray) => {
       const query = argArray[0];
-      const bindings = argArray[1];
+      const bindings = argArray.slice(1);
       const attributes = {
         [ATTR_DB_SYSTEM_NAME]: dbSystem,
         [ATTR_DB_OPERATION_NAME]: operation,
@@ -2883,58 +2903,74 @@ function instrumentSQLStorageExec(fn, operation) {
         kind: SpanKind.CLIENT,
         attributes
       };
-      return tracer.startActiveSpan(`Durable Object SQL ${operation}`, options, async (span) => {
-        const result = await Reflect.apply(target, thisArg, argArray);
-        if (result && typeof result === "object") {
-          if ("rowsRead" in result) {
-            span.setAttribute(ATTR_CLOUDFLARE_DO_SQL_RESPONSE_ROWS_READ, result.rowsRead);
+      return tracer.startActiveSpan(`Durable Object SQL ${operation}`, options, (span) => {
+        const cursor = Reflect.apply(target, thisArg, argArray);
+        let spanEnded = false;
+        const endSpanWithMetrics = () => {
+          if (spanEnded) return;
+          spanEnded = true;
+          if (typeof cursor.rowsRead === "number") {
+            span.setAttribute(ATTR_CLOUDFLARE_DO_SQL_RESPONSE_ROWS_READ, cursor.rowsRead);
           }
-          if ("rowsWritten" in result) {
-            span.setAttribute(ATTR_CLOUDFLARE_DO_SQL_RESPONSE_ROWS_WRITTEN, result.rowsWritten);
+          if (typeof cursor.rowsWritten === "number") {
+            span.setAttribute(ATTR_CLOUDFLARE_DO_SQL_RESPONSE_ROWS_WRITTEN, cursor.rowsWritten);
           }
-        }
-        span.end();
-        return result;
-      });
-    }
-  };
-  return wrap(fn, fnHandler);
-}
-function instrumentSQLStorageExecBatch(fn, operation) {
-  const tracer = trace.getTracer("do_sql_storage");
-  const fnHandler = {
-    apply: (target, thisArg, argArray) => {
-      const statements = argArray[0];
-      const attributes = {
-        [ATTR_DB_SYSTEM_NAME]: dbSystem,
-        [ATTR_DB_OPERATION_NAME]: operation,
-        [ATTR_DB_OPERATION_BATCH_SIZE]: statements.length
-      };
-      if (statements.length > 0 && statements[0]) {
-        attributes[ATTR_DB_QUERY_TEXT] = statements[0].query;
-      }
-      const options = {
-        kind: SpanKind.CLIENT,
-        attributes
-      };
-      return tracer.startActiveSpan(`Durable Object SQL ${operation}`, options, async (span) => {
-        const results = await Reflect.apply(target, thisArg, argArray);
-        let totalRowsRead = 0;
-        let totalRowsWritten = 0;
-        for (const result of results) {
-          if (result && typeof result === "object") {
-            if ("rowsRead" in result) {
-              totalRowsRead += result.rowsRead;
+          span.end();
+        };
+        Promise.resolve().then(() => {
+          if (!spanEnded) {
+            endSpanWithMetrics();
+          }
+        });
+        const wrappedCursor = new Proxy(cursor, {
+          get(target2, prop, receiver) {
+            const value = Reflect.get(target2, prop, receiver);
+            if (prop === "toArray") {
+              return function(...args) {
+                const result = typeof value === "function" ? value.apply(target2, args) : value;
+                endSpanWithMetrics();
+                return result;
+              };
             }
-            if ("rowsWritten" in result) {
-              totalRowsWritten += result.rowsWritten;
+            if (prop === "one") {
+              return function(...args) {
+                const result = typeof value === "function" ? value.apply(target2, args) : value;
+                endSpanWithMetrics();
+                return result;
+              };
             }
+            if (prop === Symbol.iterator) {
+              return function() {
+                const iterator = typeof value === "function" ? value.apply(target2) : value;
+                let iterationComplete = false;
+                return {
+                  next() {
+                    const result = iterator.next();
+                    if (result.done && !iterationComplete) {
+                      iterationComplete = true;
+                      endSpanWithMetrics();
+                    }
+                    return result;
+                  },
+                  [Symbol.iterator]() {
+                    return this;
+                  }
+                };
+              };
+            }
+            if (prop === "next") {
+              return function(...args) {
+                const result = typeof value === "function" ? value.apply(target2, args) : value;
+                if (result && result.done) {
+                  endSpanWithMetrics();
+                }
+                return result;
+              };
+            }
+            return typeof value === "function" ? value.bind(target2) : value;
           }
-        }
-        span.setAttribute(ATTR_CLOUDFLARE_DO_SQL_RESPONSE_ROWS_READ, totalRowsRead);
-        span.setAttribute(ATTR_CLOUDFLARE_DO_SQL_RESPONSE_ROWS_WRITTEN, totalRowsWritten);
-        span.end();
-        return results;
+        });
+        return wrappedCursor;
       });
     }
   };
@@ -2950,8 +2986,6 @@ function instrumentSQLStorage(sql) {
       switch (prop) {
         case "exec":
           return instrumentSQLStorageExec(fn, "exec");
-        case "execBatch":
-          return instrumentSQLStorageExecBatch(fn, "execBatch");
         default:
           return fn;
       }
@@ -3016,7 +3050,8 @@ function instrumentRpcMethod(method, methodName, nsName, stubId) {
         kind: SpanKind.CLIENT,
         attributes
       };
-      const spanName = `RPC ${nsName}.${methodName}`;
+      const serviceName = stubId.name || nsName;
+      const spanName = `RPC ${serviceName}.${methodName}`;
       return tracer.startActiveSpan(spanName, options, async (span) => {
         try {
           const contextCarrier = injectRpcContext(context.active(), stubId.name);
@@ -3203,17 +3238,6 @@ function instrumentRpcHandlerMethod(fn, methodName, initialiser, env, id) {
       const [extractedContext, cleanedArgs] = extractAndRemoveRpcContext(argArray);
       const carrierDoName = argArray.length > 0 && extractedContext ? argArray[0].doName : void 0;
       const doName = carrierDoName || id.name || void 0;
-      const carrier = argArray.length > 0 ? argArray[0] : void 0;
-      console.log("[DO RPC Server]", {
-        methodName,
-        hasExtractedContext: !!extractedContext,
-        carrierDoName,
-        idName: id.name,
-        finalDoName: doName,
-        argArrayLength: argArray.length,
-        cleanedArgsLength: cleanedArgs.length,
-        carrierHeaders: carrier ? carrier.headers : void 0
-      });
       let context$1 = extractedContext || context.active();
       context$1 = setConfig(config, context$1);
       const tracer = trace.getTracer("do_rpc_handler");
@@ -3488,7 +3512,6 @@ function createInitialiser(config) {
 }
 async function exportTelemetry(traceId, tracker) {
   const tracer = trace.getTracer("export");
-  const { getLogger } = await Promise.resolve().then(() => provider);
   const logger = getLogger("export");
   if (tracer instanceof WorkerTracer) {
     await scheduler.wait(1);
@@ -3518,12 +3541,19 @@ function createHandlerFlowFn(instrumentation) {
     const result = tracer.startActiveSpan(name, options, parentContext, async (span) => {
       try {
         const result2 = await handlerFn(instrumentedTrigger, proxiedEnv, proxiedCtx);
-        if (instrumentation.getAttributesFromResult) {
-          const attributes = instrumentation.getAttributesFromResult(result2);
-          span.setAttributes(attributes);
-        }
-        if (instrumentation.executionSucces) {
-          instrumentation.executionSucces(span, trigger, result2);
+        const isWebSocketUpgrade = isRequest(trigger) && trigger.headers.get("upgrade")?.toLowerCase() === "websocket" && trigger.headers.has("sec-websocket-key");
+        if (isWebSocketUpgrade) {
+          const logger = getLogger("handler");
+          logger.trace("WebSocket upgrade detected, closing span without reading response");
+          span.setStatus({ code: SpanStatusCode.OK });
+        } else {
+          if (instrumentation.getAttributesFromResult) {
+            const attributes = instrumentation.getAttributesFromResult(result2);
+            span.setAttributes(attributes);
+          }
+          if (instrumentation.executionSucces) {
+            instrumentation.executionSucces(span, trigger, result2);
+          }
         }
         return result2;
       } catch (error) {