@replit/river 0.203.0 → 0.204.0

package/dist/transport/impls/ws/client.d.cts

@@ -1,7 +1,7 @@
-import { C as ClientTransport } from '../../../client-5d2e41a3.js';
+import { C as ClientTransport } from '../../../client-0c0a4a5e.js';
 import { c as TransportClientId } from '../../../message-3def9ded.js';
-import { b as ProvidedClientTransportOptions } from '../../../context-d6dd8a1a.js';
-import { W as WebSocketConnection } from '../../../connection-11a4af0f.js';
+import { b as ProvidedClientTransportOptions } from '../../../context-3cf1ed4e.js';
+import { W as WebSocketConnection } from '../../../connection-7b62dfec.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';

package/dist/transport/impls/ws/client.d.ts

@@ -1,7 +1,7 @@
-import { C as ClientTransport } from '../../../client-5d2e41a3.js';
+import { C as ClientTransport } from '../../../client-0c0a4a5e.js';
 import { c as TransportClientId } from '../../../message-3def9ded.js';
-import { b as ProvidedClientTransportOptions } from '../../../context-d6dd8a1a.js';
-import { W as WebSocketConnection } from '../../../connection-11a4af0f.js';
+import { b as ProvidedClientTransportOptions } from '../../../context-3cf1ed4e.js';
+import { W as WebSocketConnection } from '../../../connection-7b62dfec.js';
 import { W as WsLike } from '../../../wslike-e0b32dd5.js';
 import '@sinclair/typebox/value';
 import '@sinclair/typebox';

package/dist/transport/impls/ws/client.js

@@ -1,12 +1,12 @@
 import {
   ClientTransport
-} from "../../../chunk-DGT3MPD4.js";
+} from "../../../chunk-3V7VMJNA.js";
 import {
   WebSocketConnection
-} from "../../../chunk-XBPEUVWN.js";
-import "../../../chunk-FG22HHCY.js";
-import "../../../chunk-SZHNMLKC.js";
-import "../../../chunk-LHH5LQ7C.js";
+} from "../../../chunk-QSW7AWEP.js";
+import "../../../chunk-6YUDEFCS.js";
+import "../../../chunk-LJCR3ADI.js";
+import "../../../chunk-WBGKPIFS.js";
 import "../../../chunk-AJGIY2UB.js";
 
 // transport/impls/ws/client.ts

package/dist/transport/impls/ws/server.cjs

@@ -40,8 +40,8 @@ var Connection = class {
   }
   get loggingMetadata() {
     const metadata = { connId: this.id };
-    const spanContext = this.telemetry?.span.spanContext();
-    if (this.telemetry?.span.isRecording() && spanContext) {
+    if (this.telemetry?.span.isRecording()) {
+      const spanContext = this.telemetry.span.spanContext();
       metadata.telemetry = {
         traceId: spanContext.traceId,
         spanId: spanContext.spanId
@@ -62,6 +62,22 @@ var Connection = class {
   get errorListeners() {
     return [...this._errorListeners];
   }
+  onData(msg) {
+    for (const cb of this.dataListeners) {
+      cb(msg);
+    }
+  }
+  onError(err) {
+    for (const cb of this.errorListeners) {
+      cb(err);
+    }
+  }
+  onClose() {
+    for (const cb of this.closeListeners) {
+      cb();
+    }
+    this.telemetry?.span.end();
+  }
   /**
    * Handle adding a callback for when a message is received.
    * @param msg The message that was received.
@@ -128,18 +144,12 @@ var WebSocketConnection = class extends Connection {
         const err = new Error(
           `websocket closed with code and reason: ${code} - ${reason}`
         );
-        for (const cb of this.errorListeners) {
-          cb(err);
-        }
-      }
-      for (const cb of this.closeListeners) {
-        cb();
+        this.onError(err);
       }
+      this.onClose();
     };
     this.ws.onmessage = (msg) => {
-      for (const cb of this.dataListeners) {
-        cb(msg.data);
-      }
+      this.onData(msg.data);
     };
   }
   send(payload) {
@@ -155,7 +165,7 @@ var WebSocketConnection = class extends Connection {
 };
 
 // transport/server.ts
-var import_api3 = require("@opentelemetry/api");
+var import_api4 = require("@opentelemetry/api");
 
 // transport/message.ts
 var import_typebox = require("@sinclair/typebox");
@@ -350,6 +360,7 @@ var defaultServerTransportOptions = {
 };
 
 // logging/log.ts
+var import_api = require("@opentelemetry/api");
 var LoggingLevels = {
   debug: -1,
   info: 0,
@@ -358,6 +369,15 @@ var LoggingLevels = {
 };
 var cleanedLogFn = (log) => {
   return (msg, metadata) => {
+    if (metadata && !metadata.telemetry) {
+      const span = import_api.trace.getSpan(import_api.context.active());
+      if (span) {
+        metadata.telemetry = {
+          traceId: span.spanContext().traceId,
+          spanId: span.spanContext().spanId
+        };
+      }
+    }
     if (!metadata?.transportMessage) {
       log(msg, metadata);
       return;
@@ -501,12 +521,14 @@ var StateMachineState = class {
 var CommonSession = class extends StateMachineState {
   from;
   options;
+  tracer;
   log;
-  constructor({ from, options, log }) {
+  constructor({ from, options, log, tracer }) {
     super();
     this.from = from;
     this.options = options;
     this.log = log;
+    this.tracer = tracer;
   }
   parseMsg(msg) {
     const parsedMsg = this.options.codec.fromBuffer(msg);
@@ -556,13 +578,13 @@ var IdentifiedSession = class extends CommonSession {
     this.protocolVersion = protocolVersion;
   }
   get loggingMetadata() {
-    const spanContext = this.telemetry.span.spanContext();
     const metadata = {
       clientId: this.from,
       connectedTo: this.to,
       sessionId: this.id
     };
     if (this.telemetry.span.isRecording()) {
+      const spanContext = this.telemetry.span.spanContext();
       metadata.telemetry = {
         traceId: spanContext.traceId,
         spanId: spanContext.spanId
@@ -689,16 +711,24 @@ var SessionNoConnection = class extends IdentifiedSessionWithGracePeriod {
 };
 
 // tracing/index.ts
-var import_api = require("@opentelemetry/api");
+var import_api2 = require("@opentelemetry/api");
+
+// transport/stringifyError.ts
+function coerceErrorString(err) {
+  if (err instanceof Error) {
+    return err.message || "unknown reason";
+  }
+  return `[coerced to error] ${String(err)}`;
+}
 
 // package.json
-var version = "0.203.0";
+var version = "0.204.0";
 
 // tracing/index.ts
-function createSessionTelemetryInfo(sessionId, to, from, propagationCtx) {
-  const parentCtx = propagationCtx ? import_api.propagation.extract(import_api.context.active(), propagationCtx) : import_api.context.active();
+function createSessionTelemetryInfo(tracer, sessionId, to, from, propagationCtx) {
+  const parentCtx = propagationCtx ? import_api2.propagation.extract(import_api2.context.active(), propagationCtx) : import_api2.context.active();
   const span = tracer.startSpan(
-    `session ${sessionId}`,
+    `river.session.${sessionId}`,
     {
       attributes: {
         component: "river",
@@ -709,10 +739,27 @@ function createSessionTelemetryInfo(sessionId, to, from, propagationCtx) {
     },
     parentCtx
   );
-  const ctx = import_api.trace.setSpan(parentCtx, span);
+  const ctx = import_api2.trace.setSpan(parentCtx, span);
   return { span, ctx };
 }
-var tracer = import_api.trace.getTracer("river", version);
+function createConnectionTelemetryInfo(tracer, connection, info) {
+  const span = tracer.startSpan(
+    `connection ${connection.id}`,
+    {
+      attributes: {
+        component: "river",
+        "river.connection.id": connection.id
+      },
+      links: [{ context: info.span.spanContext() }]
+    },
+    info.ctx
+  );
+  const ctx = import_api2.trace.setSpan(info.ctx, span);
+  return { span, ctx };
+}
+function getTracer() {
+  return import_api2.trace.getTracer("river", version);
+}
 
 // transport/sessionStateMachine/SessionWaitingForHandshake.ts
 var SessionWaitingForHandshake = class extends CommonSession {
@@ -818,7 +865,7 @@ var SessionHandshaking = class extends IdentifiedSessionWithGracePeriod {
 };
 
 // transport/sessionStateMachine/SessionConnected.ts
-var import_api2 = require("@opentelemetry/api");
+var import_api3 = require("@opentelemetry/api");
 var SessionConnected = class extends IdentifiedSession {
   state = "Connected" /* Connected */;
   conn;
@@ -922,7 +969,7 @@ var SessionConnected = class extends IdentifiedSession {
           tags: ["invariant-violation"]
         });
         this.telemetry.span.setStatus({
-          code: import_api2.SpanStatusCode.ERROR,
+          code: import_api3.SpanStatusCode.ERROR,
           message: reason
         });
         this.closeConnection();
@@ -998,6 +1045,7 @@ function inheritSharedSession(session) {
     telemetry: session.telemetry,
     options: session.options,
     log: session.log,
+    tracer: session.tracer,
     protocolVersion: session.protocolVersion
   };
 }
@@ -1009,9 +1057,9 @@ function inheritSharedSessionWithGrace(session) {
 }
 var SessionStateGraph = {
   entrypoints: {
-    NoConnection: (to, from, listeners, options, protocolVersion, log) => {
+    NoConnection: (to, from, listeners, options, protocolVersion, tracer, log) => {
       const id = `session-${generateId()}`;
-      const telemetry = createSessionTelemetryInfo(id, to, from);
+      const telemetry = createSessionTelemetryInfo(tracer, id, to, from);
       const sendBuffer = [];
       const session = new SessionNoConnection({
         listeners,
@@ -1025,6 +1073,7 @@ var SessionStateGraph = {
         telemetry,
         options,
         protocolVersion,
+        tracer,
         log
       });
       session.log?.info(`session ${session.id} created in NoConnection state`, {
@@ -1033,12 +1082,13 @@ var SessionStateGraph = {
       });
       return session;
     },
-    WaitingForHandshake: (from, conn, listeners, options, log) => {
+    WaitingForHandshake: (from, conn, listeners, options, tracer, log) => {
       const session = new SessionWaitingForHandshake({
         conn,
         listeners,
         from,
         options,
+        tracer,
         log
       });
       session.log?.info(`session created in WaitingForHandshake state`, {
@@ -1094,6 +1144,11 @@ var SessionStateGraph = {
         listeners,
         ...carriedState
       });
+      conn.telemetry = createConnectionTelemetryInfo(
+        session.tracer,
+        conn,
+        session.telemetry
+      );
       session.log?.info(
         `session ${session.id} transition from Connecting to Handshaking`,
         {
@@ -1137,12 +1192,14 @@ var SessionStateGraph = {
           ack: 0,
           sendBuffer: [],
           telemetry: createSessionTelemetryInfo(
+            pendingSession.tracer,
             sessionId,
             to,
             from,
             propagationCtx
           ),
           options,
+          tracer: pendingSession.tracer,
           log: pendingSession.log,
           protocolVersion
         }
@@ -1154,6 +1211,11 @@ var SessionStateGraph = {
         listeners,
         ...carriedState
       });
+      conn.telemetry = createConnectionTelemetryInfo(
+        session.tracer,
+        conn,
+        session.telemetry
+      );
       session.log?.info(
         `session ${session.id} transition from WaitingForHandshake to Connected`,
         {
@@ -1298,6 +1360,7 @@ var Transport = class {
    */
   options;
   log;
+  tracer;
   sessions;
   /**
    * Creates a new Transport instance.
@@ -1310,6 +1373,7 @@ var Transport = class {
     this.clientId = clientId;
     this.status = "open";
     this.sessions = /* @__PURE__ */ new Map();
+    this.tracer = getTracer();
   }
   bindLogger(fn, level) {
     if (typeof fn === "function") {
@@ -1492,14 +1556,6 @@ var Transport = class {
   }
 };
 
-// transport/stringifyError.ts
-function coerceErrorString(err) {
-  if (err instanceof Error) {
-    return err.message || "unknown reason";
-  }
-  return `[coerced to error] ${String(err)}`;
-}
-
 // transport/server.ts
 var import_value2 = require("@sinclair/typebox/value");
 var ServerTransport = class extends Transport {
@@ -1604,13 +1660,14 @@ var ServerTransport = class extends Transport {
         }
       },
       this.options,
+      this.tracer,
       this.log
     );
     this.pendingSessions.add(pendingSession);
   }
   rejectHandshakeRequest(session, to, reason, code, metadata) {
     session.conn.telemetry?.span.setStatus({
-      code: import_api3.SpanStatusCode.ERROR,
+      code: import_api4.SpanStatusCode.ERROR,
       message: reason
     });
     this.log?.warn(reason, metadata);