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

package/dist/index.js

@@ -96,7 +96,7 @@ function passthroughGet(target, prop, thisArg) {
   }
 }
 
-const PACKAGE_VERSION = "2.1.0";
+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";
@@ -1443,9 +1443,10 @@ function getParentContextFromRequest(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) {
@@ -3540,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) {