@replit/river 0.23.6 → 0.23.7

package/dist/transport/index.cjs

@@ -128,7 +128,57 @@ function isAck(controlFlag) {
 }
 
 // logging/log.ts
-var log = void 0;
+var LoggingLevels = {
+  debug: -1,
+  info: 0,
+  warn: 1,
+  error: 2
+};
+var cleanedLogFn = (log) => {
+  return (msg, metadata) => {
+    if (!metadata?.transportMessage) {
+      log(msg, metadata);
+      return;
+    }
+    const { payload, ...rest } = metadata.transportMessage;
+    metadata.transportMessage = rest;
+    log(msg, metadata);
+  };
+};
+var BaseLogger = class {
+  minLevel;
+  output;
+  constructor(output, minLevel = "info") {
+    this.minLevel = minLevel;
+    this.output = output;
+  }
+  debug(msg, metadata) {
+    if (LoggingLevels[this.minLevel] <= LoggingLevels.debug) {
+      this.output(msg, metadata ?? {}, "debug");
+    }
+  }
+  info(msg, metadata) {
+    if (LoggingLevels[this.minLevel] <= LoggingLevels.info) {
+      this.output(msg, metadata ?? {}, "info");
+    }
+  }
+  warn(msg, metadata) {
+    if (LoggingLevels[this.minLevel] <= LoggingLevels.warn) {
+      this.output(msg, metadata ?? {}, "warn");
+    }
+  }
+  error(msg, metadata) {
+    if (LoggingLevels[this.minLevel] <= LoggingLevels.error) {
+      this.output(msg, metadata ?? {}, "error");
+    }
+  }
+};
+var createLogProxy = (log) => ({
+  debug: cleanedLogFn(log.debug.bind(log)),
+  info: cleanedLogFn(log.info.bind(log)),
+  warn: cleanedLogFn(log.warn.bind(log)),
+  error: cleanedLogFn(log.error.bind(log))
+});
 
 // transport/events.ts
 var ProtocolError = {
@@ -171,7 +221,7 @@ var import_nanoid2 = require("nanoid");
 var import_api = require("@opentelemetry/api");
 
 // package.json
-var version = "0.23.6";
+var version = "0.23.7";
 
 // tracing/index.ts
 function getPropagationContext(ctx) {
@@ -183,7 +233,7 @@ function getPropagationContext(ctx) {
   return tracing;
 }
 function createSessionTelemetryInfo(session, propagationCtx) {
-  const ctx = propagationCtx ? import_api.propagation.extract(import_api.context.active(), propagationCtx) : import_api.context.active();
+  const parentCtx = propagationCtx ? import_api.propagation.extract(import_api.context.active(), propagationCtx) : import_api.context.active();
   const span = tracer.startSpan(
     `session ${session.id}`,
     {
@@ -194,12 +244,12 @@ function createSessionTelemetryInfo(session, propagationCtx) {
         "river.session.from": session.from
       }
     },
-    ctx
+    parentCtx
   );
+  const ctx = import_api.trace.setSpan(parentCtx, span);
   return { span, ctx };
 }
-function createConnectionTelemetryInfo(connection, sessionSpan) {
-  const ctx = import_api.trace.setSpan(import_api.context.active(), sessionSpan);
+function createConnectionTelemetryInfo(connection, info) {
   const span = tracer.startSpan(
     `connection ${connection.id}`,
     {
@@ -207,10 +257,11 @@ function createConnectionTelemetryInfo(connection, sessionSpan) {
         component: "river",
         "river.connection.id": connection.id
       },
-      links: [{ context: sessionSpan.spanContext() }]
+      links: [{ context: info.span.spanContext() }]
     },
-    ctx
+    info.ctx
   );
+  const ctx = import_api.trace.setSpan(info.ctx, span);
   return { span, ctx };
 }
 var tracer = import_api.trace.getTracer("river", version);
@@ -226,6 +277,17 @@ var Connection = class {
   constructor() {
     this.id = `conn-${nanoid2(12)}`;
   }
+  get loggingMetadata() {
+    const metadata = { connId: this.id };
+    const spanContext = this.telemetry?.span.spanContext();
+    if (spanContext) {
+      metadata.telemetry = {
+        traceId: spanContext.traceId,
+        spanId: spanContext.spanId
+      };
+    }
+    return metadata;
+  }
 };
 var Session = class {
   codec;
@@ -271,6 +333,7 @@ var Session = class {
    * The interval for sending heartbeats.
    */
   heartbeat;
+  log;
   constructor(conn, from, to, options, propagationCtx) {
     this.id = `session-${nanoid2(12)}`;
     this.options = options;
@@ -285,12 +348,20 @@ var Session = class {
     );
     this.telemetry = createSessionTelemetryInfo(this, propagationCtx);
   }
+  bindLogger(log) {
+    this.log = log;
+  }
   get loggingMetadata() {
+    const spanContext = this.telemetry.span.spanContext();
     return {
       clientId: this.from,
       connectedTo: this.to,
       sessionId: this.id,
-      connId: this.connection?.id
+      connId: this.connection?.id,
+      telemetry: {
+        traceId: spanContext.traceId,
+        spanId: spanContext.spanId
+      }
     };
   }
   /**
@@ -303,7 +374,7 @@ var Session = class {
    */
   send(msg) {
     const fullMsg = this.constructMsg(msg);
-    log?.debug(`sending msg`, {
+    this.log?.debug(`sending msg`, {
       ...this.loggingMetadata,
       transportMessage: fullMsg
     });
@@ -311,7 +382,7 @@ var Session = class {
       const ok = this.connection.send(this.codec.toBuffer(fullMsg));
       if (ok)
         return fullMsg.id;
-      log?.info(
+      this.log?.info(
         `failed to send msg to ${fullMsg.to}, connection is probably dead`,
         {
           ...this.loggingMetadata,
@@ -319,8 +390,8 @@ var Session = class {
         }
       );
     } else {
-      log?.info(
-        `failed to send msg to ${fullMsg.to}, connection not ready yet`,
+      this.log?.debug(
+        `buffering msg to ${fullMsg.to}, connection not ready yet`,
         { ...this.loggingMetadata, transportMessage: fullMsg }
       );
     }
@@ -331,7 +402,7 @@ var Session = class {
     const missDuration = misses * this.options.heartbeatIntervalMs;
     if (misses > this.options.heartbeatsUntilDead) {
       if (this.connection) {
-        log?.info(
+        this.log?.info(
           `closing connection to ${this.to} due to inactivity (missed ${misses} heartbeats which is ${missDuration}ms)`,
           this.loggingMetadata
         );
@@ -355,12 +426,12 @@ var Session = class {
     this.ack = 0;
   }
   sendBufferedMessages(conn) {
-    log?.info(`resending ${this.sendBuffer.length} buffered messages`, {
+    this.log?.info(`resending ${this.sendBuffer.length} buffered messages`, {
       ...this.loggingMetadata,
       connId: conn.id
     });
     for (const msg of this.sendBuffer) {
-      log?.debug(`resending msg`, {
+      this.log?.debug(`resending msg`, {
         ...this.loggingMetadata,
         transportMessage: msg,
         connId: conn.id
@@ -372,7 +443,7 @@ var Session = class {
           code: import_api2.SpanStatusCode.ERROR,
           message: errMsg
         });
-        log?.error(errMsg, {
+        this.log?.error(errMsg, {
           ...this.loggingMetadata,
           transportMessage: msg,
           connId: conn.id,
@@ -385,7 +456,7 @@ var Session = class {
   }
   updateBookkeeping(ack, seq) {
     if (seq + 1 < this.ack) {
-      log?.error(`received stale seq ${seq} + 1 < ${this.ack}`, {
+      this.log?.error(`received stale seq ${seq} + 1 < ${this.ack}`, {
         ...this.loggingMetadata,
         tags: ["invariant-violation"]
       });
@@ -397,7 +468,7 @@ var Session = class {
   closeStaleConnection(conn) {
     if (this.connection === void 0 || this.connection === conn)
       return;
-    log?.info(
+    this.log?.info(
       `closing old inner connection from session to ${this.to}`,
       this.loggingMetadata
     );
@@ -411,7 +482,7 @@ var Session = class {
     this.connection = newConn;
   }
   beginGrace(cb) {
-    log?.info(
+    this.log?.info(
       `starting ${this.options.sessionDisconnectGraceMs}ms grace period until session to ${this.to} is closed`,
       this.loggingMetadata
     );
@@ -645,6 +716,7 @@ var Transport = class {
    * The options for this transport.
    */
   options;
+  log;
   /**
    * Creates a new Transport instance.
    * This should also set up {@link onConnect}, and {@link onDisconnect} listeners.
@@ -659,6 +731,13 @@ var Transport = class {
     this.clientId = clientId;
     this.state = "open";
   }
+  bindLogger(fn, level) {
+    if (typeof fn === "function") {
+      this.log = createLogProxy(new BaseLogger(fn, level));
+      return;
+    }
+    this.log = createLogProxy(fn);
+  }
   /**
    * Called when a new connection is established
    * and we know the identity of the connected client.
@@ -669,13 +748,15 @@ var Transport = class {
       status: "connect",
       conn
     });
-    conn.telemetry = createConnectionTelemetryInfo(
-      conn,
-      session.telemetry.span
-    );
+    conn.telemetry = createConnectionTelemetryInfo(conn, session.telemetry);
     if (isReconnect) {
       session.replaceWithNewConnection(conn);
-      log?.info(`reconnected to ${connectedTo}`, session.loggingMetadata);
+      this.log?.info(`reconnected to ${connectedTo}`, {
+        ...conn.loggingMetadata,
+        ...session.loggingMetadata,
+        clientId: this.clientId,
+        connectedTo
+      });
     }
   }
   createSession(to, conn, propagationCtx) {
@@ -686,6 +767,9 @@ var Transport = class {
       this.options,
       propagationCtx
     );
+    if (this.log) {
+      session.bindLogger(this.log);
+    }
     this.sessions.set(session.to, session);
     this.eventDispatcher.dispatchEvent("sessionStatus", {
       status: "connect",
@@ -697,7 +781,7 @@ var Transport = class {
     let session = this.sessions.get(to);
     let isReconnect = session !== void 0;
     if (session?.advertisedSessionId !== void 0 && sessionId !== void 0 && session.advertisedSessionId !== sessionId) {
-      log?.info(
+      this.log?.info(
         `session for ${to} already exists but has a different session id (expected: ${session.advertisedSessionId}, got: ${sessionId}), creating a new one`,
         session.loggingMetadata
       );
@@ -707,7 +791,7 @@ var Transport = class {
     }
     if (!session) {
       session = this.createSession(to, conn, propagationCtx);
-      log?.info(
+      this.log?.info(
         `no session for ${to}, created a new one`,
         session.loggingMetadata
       );
@@ -721,7 +805,7 @@ var Transport = class {
     session.close();
     session.telemetry.span.end();
     this.sessions.delete(session.to);
-    log?.info(
+    this.log?.info(
       `session ${session.id} disconnect from ${session.to}`,
       session.loggingMetadata
     );
@@ -752,18 +836,23 @@ var Transport = class {
    * @param msg The message to parse.
    * @returns The parsed message, or null if the message is malformed or invalid.
    */
-  parseMsg(msg) {
+  parseMsg(msg, conn) {
     const parsedMsg = this.codec.fromBuffer(msg);
     if (parsedMsg === null) {
       const decodedBuffer = new TextDecoder().decode(Buffer.from(msg));
-      log?.error(`received malformed msg, killing conn: ${decodedBuffer}`, {
-        clientId: this.clientId
-      });
+      this.log?.error(
+        `received malformed msg, killing conn: ${decodedBuffer}`,
+        {
+          clientId: this.clientId,
+          ...conn.loggingMetadata
+        }
+      );
       return null;
     }
     if (!import_value.Value.Check(OpaqueTransportMessageSchema, parsedMsg)) {
-      log?.error(`received invalid msg: ${JSON.stringify(parsedMsg)}`, {
+      this.log?.error(`received invalid msg: ${JSON.stringify(parsedMsg)}`, {
         clientId: this.clientId,
+        ...conn.loggingMetadata,
         validationErrors: [
           ...import_value.Value.Errors(OpaqueTransportMessageSchema, parsedMsg)
         ]
@@ -777,34 +866,41 @@ var Transport = class {
    * You generally shouldn't need to override this in downstream transport implementations.
    * @param msg The received message.
    */
-  handleMsg(msg) {
+  handleMsg(msg, conn) {
     if (this.state !== "open")
       return;
     const session = this.sessions.get(msg.from);
     if (!session) {
-      log?.error(`no existing session for ${msg.from}`, {
+      this.log?.error(`received message for unknown session from ${msg.from}`, {
         clientId: this.clientId,
         transportMessage: msg,
+        ...conn.loggingMetadata,
         tags: ["invariant-violation"]
       });
       return;
     }
     session.cancelGrace();
-    log?.debug(`received msg`, {
+    this.log?.debug(`received msg`, {
       clientId: this.clientId,
-      transportMessage: msg
+      transportMessage: msg,
+      ...conn.loggingMetadata
     });
     if (msg.seq !== session.nextExpectedSeq) {
       if (msg.seq < session.nextExpectedSeq) {
-        log?.debug(
+        this.log?.debug(
           `received duplicate msg (got seq: ${msg.seq}, wanted seq: ${session.nextExpectedSeq}), discarding`,
-          { clientId: this.clientId, transportMessage: msg }
+          {
+            clientId: this.clientId,
+            transportMessage: msg,
+            ...conn.loggingMetadata
+          }
         );
       } else {
         const errMsg = `received out-of-order msg (got seq: ${msg.seq}, wanted seq: ${session.nextExpectedSeq})`;
-        log?.error(`${errMsg}, marking connection as dead`, {
+        this.log?.error(`${errMsg}, marking connection as dead`, {
           clientId: this.clientId,
           transportMessage: msg,
+          ...conn.loggingMetadata,
           tags: ["invariant-violation"]
         });
         this.protocolError(ProtocolError.MessageOrderingViolated, errMsg);
@@ -820,9 +916,10 @@ var Transport = class {
     if (!isAck(msg.controlFlags)) {
       this.eventDispatcher.dispatchEvent("message", msg);
     } else {
-      log?.debug(`discarding msg (ack bit set)`, {
+      this.log?.debug(`discarding msg (ack bit set)`, {
         clientId: this.clientId,
-        transportMessage: msg
+        transportMessage: msg,
+        ...conn.loggingMetadata
       });
     }
   }
@@ -851,7 +948,7 @@ var Transport = class {
   send(to, msg) {
     if (this.state === "destroyed") {
       const err = "transport is destroyed, cant send";
-      log?.error(err, {
+      this.log?.error(err, {
         clientId: this.clientId,
         transportMessage: msg,
         tags: ["invariant-violation"]
@@ -859,7 +956,7 @@ var Transport = class {
       this.protocolError(ProtocolError.UseAfterDestroy, err);
       return void 0;
     } else if (this.state === "closed") {
-      log?.info(`transport closed when sending, discarding`, {
+      this.log?.info(`transport closed when sending, discarding`, {
         clientId: this.clientId,
         transportMessage: msg
       });
@@ -890,7 +987,7 @@ var Transport = class {
     for (const session of this.sessions.values()) {
       this.deleteSession(session);
     }
-    log?.info(`manually closed transport`, { clientId: this.clientId });
+    this.log?.info(`manually closed transport`, { clientId: this.clientId });
   }
   /**
    * Default destroy implementation for transports. You should override this in the downstream
@@ -902,7 +999,7 @@ var Transport = class {
     for (const session of this.sessions.values()) {
       this.deleteSession(session);
     }
-    log?.info(`manually destroyed transport`, { clientId: this.clientId });
+    this.log?.info(`manually destroyed transport`, { clientId: this.clientId });
   }
 };
 var ClientTransport = class extends Transport {
@@ -944,9 +1041,9 @@ var ClientTransport = class extends Transport {
     let session = void 0;
     const handshakeTimeout = setTimeout(() => {
       if (!session) {
-        log?.warn(
+        this.log?.warn(
           `connection to ${to} timed out waiting for handshake, closing`,
-          { clientId: this.clientId, connectedTo: to, connId: conn.id }
+          { ...conn.loggingMetadata, clientId: this.clientId, connectedTo: to }
         );
         conn.close();
       }
@@ -962,7 +1059,7 @@ var ClientTransport = class extends Transport {
       }
       conn.removeDataListener(handshakeHandler);
       conn.addDataListener((data2) => {
-        const parsed = this.parseMsg(data2);
+        const parsed = this.parseMsg(data2, conn);
         if (!parsed) {
           conn.telemetry?.span.setStatus({
             code: import_api3.SpanStatusCode.ERROR,
@@ -971,7 +1068,7 @@ var ClientTransport = class extends Transport {
           conn.close();
           return;
         }
-        this.handleMsg(parsed);
+        this.handleMsg(parsed, conn);
       });
     };
     conn.addDataListener(handshakeHandler);
@@ -979,7 +1076,8 @@ var ClientTransport = class extends Transport {
       if (session) {
         this.onDisconnect(conn, session);
       }
-      log?.info(`connection to ${to} disconnected`, {
+      this.log?.info(`connection to ${to} disconnected`, {
+        ...conn.loggingMetadata,
         ...session?.loggingMetadata,
         clientId: this.clientId,
         connectedTo: to
@@ -994,15 +1092,19 @@ var ClientTransport = class extends Transport {
         code: import_api3.SpanStatusCode.ERROR,
         message: "connection error"
       });
-      log?.warn(`error in connection to ${to}: ${coerceErrorString(err)}`, {
-        ...session?.loggingMetadata,
-        clientId: this.clientId,
-        connectedTo: to
-      });
+      this.log?.warn(
+        `error in connection to ${to}: ${coerceErrorString(err)}`,
+        {
+          ...conn.loggingMetadata,
+          ...session?.loggingMetadata,
+          clientId: this.clientId,
+          connectedTo: to
+        }
+      );
     });
   }
   receiveHandshakeResponseMessage(data, conn) {
-    const parsed = this.parseMsg(data);
+    const parsed = this.parseMsg(data, conn);
     if (!parsed) {
       conn.telemetry?.span.setStatus({
         code: import_api3.SpanStatusCode.ERROR,
@@ -1019,7 +1121,8 @@ var ClientTransport = class extends Transport {
         code: import_api3.SpanStatusCode.ERROR,
         message: "invalid handshake response"
       });
-      log?.warn(`received invalid handshake resp`, {
+      this.log?.warn(`received invalid handshake resp`, {
+        ...conn.loggingMetadata,
         clientId: this.clientId,
         connectedTo: parsed.from,
         transportMessage: parsed,
@@ -1041,7 +1144,8 @@ var ClientTransport = class extends Transport {
         code: import_api3.SpanStatusCode.ERROR,
         message: "handshake rejected"
       });
-      log?.warn(`received handshake rejection`, {
+      this.log?.warn(`received handshake rejection`, {
+        ...conn.loggingMetadata,
         clientId: this.clientId,
         connectedTo: parsed.from,
         transportMessage: parsed
@@ -1052,7 +1156,8 @@ var ClientTransport = class extends Transport {
       );
       return false;
     }
-    log?.debug(`handshake from ${parsed.from} ok`, {
+    this.log?.debug(`handshake from ${parsed.from} ok`, {
+      ...conn.loggingMetadata,
       clientId: this.clientId,
       connectedTo: parsed.from,
       transportMessage: parsed
@@ -1073,7 +1178,7 @@ var ClientTransport = class extends Transport {
   async connect(to) {
     const canProceedWithConnection = () => this.state === "open";
     if (!canProceedWithConnection()) {
-      log?.info(
+      this.log?.info(
         `transport state is no longer open, cancelling attempt to connect to ${to}`,
         { clientId: this.clientId, connectedTo: to }
       );
@@ -1084,7 +1189,7 @@ var ClientTransport = class extends Transport {
       const budgetConsumed = this.retryBudget.getBudgetConsumed(to);
       if (!this.retryBudget.hasBudget(to)) {
         const errMsg = `tried to connect to ${to} but retry budget exceeded (more than ${budgetConsumed} attempts in the last ${this.retryBudget.totalBudgetRestoreTime}ms)`;
-        log?.warn(errMsg, { clientId: this.clientId, connectedTo: to });
+        this.log?.error(errMsg, { clientId: this.clientId, connectedTo: to });
         this.protocolError(ProtocolError.RetriesExceeded, errMsg);
         return;
       }
@@ -1093,10 +1198,13 @@ var ClientTransport = class extends Transport {
       if (backoffMs > 0) {
         sleep = new Promise((resolve) => setTimeout(resolve, backoffMs));
       }
-      log?.info(`attempting connection to ${to} (${backoffMs}ms backoff)`, {
-        clientId: this.clientId,
-        connectedTo: to
-      });
+      this.log?.info(
+        `attempting connection to ${to} (${backoffMs}ms backoff)`,
+        {
+          clientId: this.clientId,
+          connectedTo: to
+        }
+      );
       this.retryBudget.consumeBudget(to);
       reconnectPromise = tracing_default.startActiveSpan("connect", async (span) => {
         try {
@@ -1108,12 +1216,12 @@ var ClientTransport = class extends Transport {
           span.addEvent("connecting");
           const conn = await this.createNewOutgoingConnection(to);
           if (!canProceedWithConnection()) {
-            log?.info(
+            this.log?.info(
               `transport state is no longer open, closing pre-handshake connection to ${to}`,
               {
+                ...conn.loggingMetadata,
                 clientId: this.clientId,
-                connectedTo: to,
-                connId: conn.id
+                connectedTo: to
               }
             );
             conn.close();
@@ -1137,10 +1245,13 @@ var ClientTransport = class extends Transport {
       });
       this.inflightConnectionPromises.set(to, reconnectPromise);
     } else {
-      log?.info(`attempting connection to ${to} (reusing previous attempt)`, {
-        clientId: this.clientId,
-        connectedTo: to
-      });
+      this.log?.info(
+        `attempting connection to ${to} (reusing previous attempt)`,
+        {
+          clientId: this.clientId,
+          connectedTo: to
+        }
+      );
     }
     try {
       await reconnectPromise;
@@ -1148,12 +1259,12 @@ var ClientTransport = class extends Transport {
       this.inflightConnectionPromises.delete(to);
       const errStr = coerceErrorString(error);
       if (!this.reconnectOnConnectionDrop || !canProceedWithConnection()) {
-        log?.warn(`connection to ${to} failed (${errStr})`, {
+        this.log?.warn(`connection to ${to} failed (${errStr})`, {
           clientId: this.clientId,
           connectedTo: to
         });
       } else {
-        log?.warn(`connection to ${to} failed (${errStr}), retrying`, {
+        this.log?.warn(`connection to ${to} failed (${errStr}), retrying`, {
           clientId: this.clientId,
           connectedTo: to
         });
@@ -1170,7 +1281,8 @@ var ClientTransport = class extends Transport {
     if (this.handshakeExtensions) {
       metadata = await this.handshakeExtensions.construct();
       if (!import_value.Value.Check(this.handshakeExtensions.schema, metadata)) {
-        log?.error(`constructed handshake metadata did not match schema`, {
+        this.log?.error(`constructed handshake metadata did not match schema`, {
+          ...conn.loggingMetadata,
           clientId: this.clientId,
           connectedTo: to,
           validationErrors: [
@@ -1197,9 +1309,11 @@ var ClientTransport = class extends Transport {
       metadata,
       getPropagationContext(session.telemetry.ctx)
     );
-    log?.debug(`sending handshake request to ${to}`, {
+    this.log?.debug(`sending handshake request to ${to}`, {
+      ...conn.loggingMetadata,
       clientId: this.clientId,
-      connectedTo: to
+      connectedTo: to,
+      transportMessage: requestMsg
     });
     conn.send(this.codec.toBuffer(requestMsg));
     return true;
@@ -1229,7 +1343,7 @@ var ServerTransport = class extends Transport {
       ...providedOptions
     };
     this.sessionHandshakeMetadata = /* @__PURE__ */ new WeakMap();
-    log?.info(`initiated server transport`, {
+    this.log?.info(`initiated server transport`, {
       clientId: this.clientId,
       protocolVersion: PROTOCOL_VERSION
     });
@@ -1240,20 +1354,20 @@ var ServerTransport = class extends Transport {
   handleConnection(conn) {
     if (this.state !== "open")
       return;
-    log?.info(`new incoming connection`, {
-      clientId: this.clientId,
-      connId: conn.id
+    this.log?.info(`new incoming connection`, {
+      ...conn.loggingMetadata,
+      clientId: this.clientId
     });
     let session = void 0;
     const client = () => session?.to ?? "unknown";
     const handshakeTimeout = setTimeout(() => {
       if (!session) {
-        log?.warn(
+        this.log?.warn(
           `connection to ${client()} timed out waiting for handshake, closing`,
           {
+            ...conn.loggingMetadata,
             clientId: this.clientId,
-            connectedTo: client(),
-            connId: conn.id
+            connectedTo: client()
           }
         );
         conn.telemetry?.span.setStatus({
@@ -1280,12 +1394,12 @@ var ServerTransport = class extends Transport {
           }
           session = maybeSession;
           const dataHandler = (data2) => {
-            const parsed = this.parseMsg(data2);
+            const parsed = this.parseMsg(data2, conn);
             if (!parsed) {
               conn.close();
               return;
             }
-            this.handleMsg(parsed);
+            this.handleMsg(parsed, conn);
           };
           for (const data2 of buffer) {
             dataHandler(data2);
@@ -1300,9 +1414,9 @@ var ServerTransport = class extends Transport {
     conn.addCloseListener(() => {
       if (!session)
         return;
-      log?.info(`connection to ${client()} disconnected`, {
-        clientId: this.clientId,
-        connId: conn.id
+      this.log?.info(`connection to ${client()} disconnected`, {
+        ...conn.loggingMetadata,
+        clientId: this.clientId
       });
       this.onDisconnect(conn, session);
     });
@@ -1313,9 +1427,9 @@ var ServerTransport = class extends Transport {
       });
       if (!session)
         return;
-      log?.warn(
+      this.log?.warn(
         `connection to ${client()} got an error: ${coerceErrorString(err)}`,
-        { clientId: this.clientId, connId: conn.id }
+        { ...conn.loggingMetadata, clientId: this.clientId }
       );
     });
   }
@@ -1333,9 +1447,9 @@ var ServerTransport = class extends Transport {
           reason
         });
         conn.send(this.codec.toBuffer(responseMsg));
-        log?.warn(`received malformed handshake metadata from ${from}`, {
+        this.log?.warn(`received malformed handshake metadata from ${from}`, {
+          ...conn.loggingMetadata,
           clientId: this.clientId,
-          connId: conn.id,
           validationErrors: [
             ...import_value.Value.Errors(this.handshakeExtensions.schema, rawMetadata)
           ]
@@ -1359,9 +1473,9 @@ var ServerTransport = class extends Transport {
           reason
         });
         conn.send(this.codec.toBuffer(responseMsg));
-        log?.warn(`rejected handshake from ${from}`, {
-          clientId: this.clientId,
-          connId: conn.id
+        this.log?.warn(`rejected handshake from ${from}`, {
+          ...conn.loggingMetadata,
+          clientId: this.clientId
         });
         this.protocolError(ProtocolError.HandshakeFailed, reason);
         return false;
@@ -1370,7 +1484,7 @@ var ServerTransport = class extends Transport {
     return parsedMetadata;
   }
   async receiveHandshakeRequestMessage(data, conn) {
-    const parsed = this.parseMsg(data);
+    const parsed = this.parseMsg(data, conn);
     if (!parsed) {
       conn.telemetry?.span.setStatus({
         code: import_api3.SpanStatusCode.ERROR,
@@ -1393,10 +1507,10 @@ var ServerTransport = class extends Transport {
         reason
       });
       conn.send(this.codec.toBuffer(responseMsg2));
-      log?.warn(reason, {
+      this.log?.warn(reason, {
+        ...conn.loggingMetadata,
         clientId: this.clientId,
-        connId: conn.id,
-        // safe to log metadata here as we remove the payload
+        // safe to this.log metadata here as we remove the payload
         // before passing it to user-land
         transportMessage: parsed,
         validationErrors: [
@@ -1421,9 +1535,9 @@ var ServerTransport = class extends Transport {
         reason
       });
       conn.send(this.codec.toBuffer(responseMsg2));
-      log?.warn(
+      this.log?.warn(
         `received handshake msg with incompatible protocol version (got: ${gotVersion}, expected: ${PROTOCOL_VERSION})`,
-        { clientId: this.clientId, connId: conn.id }
+        { ...conn.loggingMetadata, clientId: this.clientId }
       );
       this.protocolError(ProtocolError.HandshakeFailed, reason);
       return false;
@@ -1445,9 +1559,9 @@ var ServerTransport = class extends Transport {
       parsed.tracing
     );
     this.sessionHandshakeMetadata.set(session, parsedMetadata);
-    log?.debug(
+    this.log?.debug(
       `handshake from ${parsed.from} ok, responding with handshake success`,
-      { clientId: this.clientId, connId: conn.id }
+      conn.loggingMetadata
     );
     const responseMsg = handshakeResponseMessage(this.clientId, parsed.from, {
       ok: true,