@replit/river 0.203.1 → 0.204.0

package/dist/router/index.cjs

@@ -609,11 +609,6 @@ function unwrapOrThrow(result) {
 
 // tracing/index.ts
 var import_api = require("@opentelemetry/api");
-
-// package.json
-var version = "0.203.1";
-
-// tracing/index.ts
 function getPropagationContext(ctx) {
   const tracing = {
     traceparent: "",
@@ -622,10 +617,10 @@ function getPropagationContext(ctx) {
   import_api.propagation.inject(ctx, tracing);
   return tracing;
 }
-function createProcTelemetryInfo(session, kind, serviceName, procedureName, streamId) {
+function createProcTelemetryInfo(tracer, session, kind, serviceName, procedureName, streamId) {
   const baseCtx = import_api.context.active();
   const span = tracer.startSpan(
-    `procedure call ${serviceName}.${procedureName}`,
+    `river.client.${serviceName}.${procedureName}`,
     {
       attributes: {
         component: "river",
@@ -657,10 +652,10 @@ function createProcTelemetryInfo(session, kind, serviceName, procedureName, stre
   session.log?.info(`invoked ${serviceName}.${procedureName}`, metadata);
   return { span, ctx };
 }
-function createHandlerSpan(session, kind, serviceName, procedureName, streamId, tracing, fn) {
+function createHandlerSpan(tracer, 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}`,
+    `river.server.${serviceName}.${procedureName}`,
     {
       attributes: {
         component: "river",
@@ -677,7 +672,16 @@ function createHandlerSpan(session, kind, serviceName, procedureName, streamId,
     fn
   );
 }
-var tracer = import_api.trace.getTracer("river", version);
+function recordRiverError(span, error) {
+  span.setStatus({
+    code: import_api.SpanStatusCode.ERROR,
+    message: error.message
+  });
+  span.setAttributes({
+    "river.error_code": error.code,
+    "river.error_message": error.message
+  });
+}
 
 // router/streams.ts
 var ReadableBrokenError = {
@@ -952,6 +956,7 @@ function handleProc(procType, transport, serverId, init, serviceName, procedureN
   const procClosesWithInit = procType === "rpc" || procType === "subscription";
   const streamId = generateId();
   const { span, ctx } = createProcTelemetryInfo(
+    transport.tracer,
     session,
     procType,
     serviceName,
@@ -1170,7 +1175,6 @@ function coerceErrorString(err) {
 }
 
 // router/server.ts
-var import_api2 = require("@opentelemetry/api");
 var CancelResultSchema = ErrResultSchema(
   import_typebox6.Type.Object({
     code: import_typebox6.Type.Literal(CANCEL_CODE),
@@ -1238,6 +1242,7 @@ var RiverServer = class {
         return;
       }
       createHandlerSpan(
+        transport.tracer,
         newStreamProps.initialSession,
         newStreamProps.procedure.type,
         newStreamProps.serviceName,
@@ -1416,6 +1421,7 @@ var RiverServer = class {
       this.cancelStream(from, sessionScopedSend, streamId2, payload);
     };
     const onServerCancel = (e) => {
+      recordRiverError(span, e);
       if (reqReadable.isClosed() && resWritable.isClosed()) {
         return;
       }
@@ -1450,6 +1456,9 @@ var RiverServer = class {
     }
     const resWritable = new WritableImpl({
       writeCb: (response) => {
+        if (!response.ok) {
+          recordRiverError(span, response.payload);
+        }
         sessionScopedSend({
           streamId,
           controlFlags: procClosesWithResponse ? getStreamCloseBackwardsCompat(protocolVersion) : 0,
@@ -1479,7 +1488,6 @@ var RiverServer = class {
     const onHandlerError = (err, span2) => {
       const errorMsg = coerceErrorString(err);
       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`,
         {
@@ -1848,6 +1856,9 @@ function createClientHandshakeOptions(schema, construct) {
 function createServerHandshakeOptions(schema, validate) {
   return { schema, validate };
 }
+
+// package.json
+var version = "0.204.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CANCEL_CODE,