@replit/river 0.203.0 → 0.203.1

package/dist/router/index.cjs

@@ -611,7 +611,7 @@ function unwrapOrThrow(result) {
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.203.0";
+var version = "0.203.1";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -622,7 +622,7 @@ function getPropagationContext(ctx) {
   import_api.propagation.inject(ctx, tracing);
   return tracing;
 }
-function createProcTelemetryInfo(transport, kind, serviceName, procedureName, streamId) {
+function createProcTelemetryInfo(session, kind, serviceName, procedureName, streamId) {
   const baseCtx = import_api.context.active();
   const span = tracer.startSpan(
     `procedure call ${serviceName}.${procedureName}`,
@@ -635,25 +635,29 @@ function createProcTelemetryInfo(transport, kind, serviceName, procedureName, st
         "river.streamId": streamId,
         "span.kind": "client"
       },
+      links: [{ context: session.telemetry.span.spanContext() }],
       kind: import_api.SpanKind.CLIENT
     },
     baseCtx
   );
   const ctx = import_api.trace.setSpan(baseCtx, span);
-  transport.log?.info(`invoked ${serviceName}.${procedureName}`, {
-    clientId: transport.clientId,
+  const metadata = {
+    ...session.loggingMetadata,
     transportMessage: {
       procedureName,
       serviceName
-    },
-    telemetry: {
+    }
+  };
+  if (span.isRecording()) {
+    metadata.telemetry = {
       traceId: span.spanContext().traceId,
       spanId: span.spanContext().spanId
-    }
-  });
+    };
+  }
+  session.log?.info(`invoked ${serviceName}.${procedureName}`, metadata);
   return { span, ctx };
 }
-function createHandlerSpan(kind, serviceName, procedureName, streamId, tracing, fn) {
+function createHandlerSpan(session, kind, serviceName, procedureName, streamId, tracing, fn) {
   const ctx = tracing ? import_api.propagation.extract(import_api.context.active(), tracing) : import_api.context.active();
   return tracer.startActiveSpan(
     `procedure handler ${serviceName}.${procedureName}`,
@@ -666,6 +670,7 @@ function createHandlerSpan(kind, serviceName, procedureName, streamId, tracing,
         "river.streamId": streamId,
         "span.kind": "server"
       },
+      links: [{ context: session.telemetry.span.spanContext() }],
       kind: import_api.SpanKind.SERVER
     },
     ctx,
@@ -947,7 +952,7 @@ function handleProc(procType, transport, serverId, init, serviceName, procedureN
   const procClosesWithInit = procType === "rpc" || procType === "subscription";
   const streamId = generateId();
   const { span, ctx } = createProcTelemetryInfo(
-    transport,
+    session,
     procType,
     serviceName,
     procedureName,
@@ -1232,10 +1237,17 @@ var RiverServer = class {
       if (!newStreamProps) {
         return;
       }
-      this.createNewProcStream({
-        ...newStreamProps,
-        ...message
-      });
+      createHandlerSpan(
+        newStreamProps.initialSession,
+        newStreamProps.procedure.type,
+        newStreamProps.serviceName,
+        newStreamProps.procedureName,
+        newStreamProps.streamId,
+        newStreamProps.tracingCtx,
+        (span) => {
+          this.createNewProcStream(span, newStreamProps);
+        }
+      );
     };
     const handleSessionStatus = (evt) => {
       if (evt.status !== "disconnect")
@@ -1269,7 +1281,7 @@ var RiverServer = class {
     this.transport.addEventListener("sessionStatus", handleSessionStatus);
     this.transport.addEventListener("transportStatus", handleTransportStatus);
   }
-  createNewProcStream(props) {
+  createNewProcStream(span, props) {
     const {
       streamId,
       initialSession,
@@ -1279,7 +1291,6 @@ var RiverServer = class {
       sessionMetadata,
       serviceContext,
       initPayload,
-      tracingCtx,
       procClosesWithInit,
       passInitAsDataForBackwardsCompat
     } = props;
@@ -1289,6 +1300,10 @@ var RiverServer = class {
       protocolVersion,
       id: sessionId
     } = initialSession;
+    loggingMetadata.telemetry = {
+      traceId: span.spanContext().traceId,
+      spanId: span.spanContext().spanId
+    };
     let cleanClose = true;
     const onMessage = (msg) => {
       if (msg.from !== from) {
@@ -1461,10 +1476,10 @@ var RiverServer = class {
         }
       }
     });
-    const onHandlerError = (err, span) => {
+    const onHandlerError = (err, span2) => {
       const errorMsg = coerceErrorString(err);
-      span.recordException(err instanceof Error ? err : new Error(errorMsg));
-      span.setStatus({ code: import_api2.SpanStatusCode.ERROR });
+      span2.recordException(err instanceof Error ? err : new Error(errorMsg));
+      span2.setStatus({ code: import_api2.SpanStatusCode.ERROR });
       this.log?.error(
         `${serviceName}.${procedureName} handler threw an uncaught error`,
         {
@@ -1488,12 +1503,12 @@ var RiverServer = class {
     if (procClosesWithInit) {
       closeReadable();
     }
-    const handlerContextWithSpan = (span) => ({
+    const handlerContextWithSpan = (span2) => ({
       ...serviceContext,
       from,
       sessionId,
       metadata: sessionMetadata,
-      span,
+      span: span2,
       cancel: () => {
         onServerCancel({
           code: CANCEL_CODE,
@@ -1504,100 +1519,72 @@ var RiverServer = class {
     });
     switch (procedure.type) {
       case "rpc":
-        void createHandlerSpan(
-          procedure.type,
-          serviceName,
-          procedureName,
-          streamId,
-          tracingCtx,
-          async (span) => {
-            try {
-              const responsePayload = await procedure.handler({
-                ctx: handlerContextWithSpan(span),
-                reqInit: initPayload
-              });
-              if (resWritable.isClosed()) {
-                return;
-              }
-              resWritable.write(responsePayload);
-            } catch (err) {
-              onHandlerError(err, span);
-            } finally {
-              span.end();
+        void (async () => {
+          try {
+            const responsePayload = await procedure.handler({
+              ctx: handlerContextWithSpan(span),
+              reqInit: initPayload
+            });
+            if (resWritable.isClosed()) {
+              return;
             }
+            resWritable.write(responsePayload);
+          } catch (err) {
+            onHandlerError(err, span);
+          } finally {
+            span.end();
           }
-        );
+        })();
         break;
       case "stream":
-        void createHandlerSpan(
-          procedure.type,
-          serviceName,
-          procedureName,
-          streamId,
-          tracingCtx,
-          async (span) => {
-            try {
-              await procedure.handler({
-                ctx: handlerContextWithSpan(span),
-                reqInit: initPayload,
-                reqReadable,
-                resWritable
-              });
-            } catch (err) {
-              onHandlerError(err, span);
-            } finally {
-              span.end();
-            }
+        void (async () => {
+          try {
+            await procedure.handler({
+              ctx: handlerContextWithSpan(span),
+              reqInit: initPayload,
+              reqReadable,
+              resWritable
+            });
+          } catch (err) {
+            onHandlerError(err, span);
+          } finally {
+            span.end();
           }
-        );
+        })();
         break;
       case "subscription":
-        void createHandlerSpan(
-          procedure.type,
-          serviceName,
-          procedureName,
-          streamId,
-          tracingCtx,
-          async (span) => {
-            try {
-              await procedure.handler({
-                ctx: handlerContextWithSpan(span),
-                reqInit: initPayload,
-                resWritable
-              });
-            } catch (err) {
-              onHandlerError(err, span);
-            } finally {
-              span.end();
-            }
+        void (async () => {
+          try {
+            await procedure.handler({
+              ctx: handlerContextWithSpan(span),
+              reqInit: initPayload,
+              resWritable
+            });
+          } catch (err) {
+            onHandlerError(err, span);
+          } finally {
+            span.end();
           }
-        );
+        })();
         break;
       case "upload":
-        void createHandlerSpan(
-          procedure.type,
-          serviceName,
-          procedureName,
-          streamId,
-          tracingCtx,
-          async (span) => {
-            try {
-              const responsePayload = await procedure.handler({
-                ctx: handlerContextWithSpan(span),
-                reqInit: initPayload,
-                reqReadable
-              });
-              if (resWritable.isClosed()) {
-                return;
-              }
-              resWritable.write(responsePayload);
-            } catch (err) {
-              onHandlerError(err, span);
-            } finally {
-              span.end();
+        void (async () => {
+          try {
+            const responsePayload = await procedure.handler({
+              ctx: handlerContextWithSpan(span),
+              reqInit: initPayload,
+              reqReadable
+            });
+            if (resWritable.isClosed()) {
+              return;
             }
+            resWritable.write(responsePayload);
+          } catch (err) {
+            onHandlerError(err, span);
+          } finally {
+            span.end();
           }
-        );
+        })();
         break;
     }
     if (!finishedController.signal.aborted) {