@cloudbase/agent-server 0.0.16 → 0.0.18

package/dist/index.js

@@ -391,21 +391,28 @@ var ErrorCode = {
 // src/agui/sendMessageAGUI/server.ts
 var startObservation;
 var setupObservability;
-var observabilityLoadAttempted = false;
+var processTraceContextFromHeaders;
+var observabilityLoadingPromise = null;
 async function loadObservability() {
-  if (!observabilityLoadAttempted) {
-    observabilityLoadAttempted = true;
+  if (startObservation) {
+    return true;
+  }
+  if (observabilityLoadingPromise) {
+    return observabilityLoadingPromise;
+  }
+  observabilityLoadingPromise = (async () => {
     try {
       const obs = await import("@cloudbase/agent-observability");
       const obsServer = await import("@cloudbase/agent-observability/server");
       startObservation = obs.startObservation;
+      processTraceContextFromHeaders = obs.processTraceContextFromHeaders;
       setupObservability = obsServer.setupObservability;
       return true;
     } catch (e) {
       return false;
     }
-  }
-  return !!startObservation;
+  })();
+  return observabilityLoadingPromise;
 }
 async function ensureObservabilityReady() {
   if (!setupObservability) return false;
@@ -427,7 +434,7 @@ function createServerAdapter2(createAgent, options) {
   const { logger: parentLogger = import_agent_shared2.noopLogger } = options ?? {};
   const adapterLogger = ((_a = parentLogger.child) == null ? void 0 : _a.call(parentLogger, { component: "sendMessageAGUI" })) ?? parentLogger;
   return (0, import_server3.createServerAdapter)(async (request) => {
-    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     const requestId = getOrGenerateRequestId(request.headers, "agui");
     const logger = ((_a2 = adapterLogger.child) == null ? void 0 : _a2.call(adapterLogger, { requestId })) ?? adapterLogger;
     (_b = logger.info) == null ? void 0 : _b.call(logger, "Request received");
@@ -514,37 +521,62 @@ function createServerAdapter2(createAgent, options) {
       try {
         const isReady = await ensureObservabilityReady();
         if (isReady) {
-          serverSpan = startObservation(
-            "AG-UI.Server",
-            {
-              "http.method": request.method,
-              "http.url": request.url,
-              "http.host": request.headers.get("host") || "unknown",
-              "http.user_agent": request.headers.get("user-agent") || "unknown",
-              "agui.thread_id": inputRes.result.threadId,
-              "agui.run_id": inputRes.result.runId
-            },
-            { asType: "span" }
-          );
-          const spanContext = serverSpan.otelSpan.spanContext();
-          serverContextData = {
-            traceId: spanContext.traceId,
-            spanId: spanContext.spanId,
-            traceFlags: spanContext.traceFlags
+          const spanAttributes = {
+            "http.method": request.method,
+            "http.url": request.url,
+            "http.host": request.headers.get("host") || "unknown",
+            "http.user_agent": request.headers.get("user-agent") || "unknown",
+            "agui.thread_id": inputRes.result.threadId,
+            "agui.run_id": inputRes.result.runId,
+            "agui.request_id": requestId
           };
-          inputRes.result.forwardedProps = {
-            ...inputRes.result.forwardedProps,
-            __agui_server_context: serverContextData
-          };
-          (_i = logger.debug) == null ? void 0 : _i.call(logger, "\u2713 Server span created:", {
-            traceId: serverContextData.traceId,
-            spanId: serverContextData.spanId
-          });
-        } else {
-          (_j = logger.debug) == null ? void 0 : _j.call(logger, "Observability not ready, skipping span creation");
+          if (processTraceContextFromHeaders) {
+            try {
+              const traceContext = processTraceContextFromHeaders(
+                request.headers,
+                logger
+              );
+              if (traceContext.isInherited) {
+                Object.assign(spanAttributes, traceContext.spanAttributes);
+              }
+              serverSpan = startObservation(
+                "AG-UI.Server",
+                spanAttributes,
+                {
+                  asType: "chain",
+                  links: traceContext.links.length > 0 ? traceContext.links : void 0
+                }
+              );
+            } catch (e) {
+              (_i = logger.debug) == null ? void 0 : _i.call(logger, "Failed to process external trace context:", e);
+              serverSpan = startObservation(
+                "AG-UI.Server",
+                spanAttributes,
+                { asType: "chain" }
+              );
+            }
+          } else {
+            serverSpan = startObservation(
+              "AG-UI.Server",
+              spanAttributes,
+              { asType: "chain" }
+            );
+          }
+          const spanContext = (_k = (_j = serverSpan == null ? void 0 : serverSpan.otelSpan) == null ? void 0 : _j.spanContext) == null ? void 0 : _k.call(_j);
+          if ((spanContext == null ? void 0 : spanContext.traceId) && (spanContext == null ? void 0 : spanContext.spanId)) {
+            serverContextData = {
+              traceId: spanContext.traceId,
+              spanId: spanContext.spanId,
+              traceFlags: spanContext.traceFlags
+            };
+            inputRes.result.forwardedProps = {
+              ...inputRes.result.forwardedProps,
+              __agui_server_context: serverContextData
+            };
+          }
         }
       } catch (e) {
-        (_k = logger.debug) == null ? void 0 : _k.call(logger, "Failed to create server span:", e);
+        (_l = logger.debug) == null ? void 0 : _l.call(logger, "Failed to create server span:", e);
       }
     }
     let cleanupCalled = false;
@@ -567,7 +599,21 @@ function createServerAdapter2(createAgent, options) {
     );
     if ("error" in eventsResult) {
       const { error } = eventsResult;
-      (_l = logger.error) == null ? void 0 : _l.call(logger, { err: error }, "Run agent failed");
+      (_m = logger.error) == null ? void 0 : _m.call(logger, { err: error }, "Run agent failed");
+      if (serverSpan) {
+        try {
+          serverSpan.otelSpan.setStatus({
+            code: 2,
+            // SpanStatusCode.ERROR
+            message: error instanceof Error ? error.message : String(error)
+          });
+          serverSpan.otelSpan.setAttribute("error.type", error instanceof Error ? error.name : "UnknownError");
+          serverSpan.otelSpan.setAttribute("error.message", error instanceof Error ? error.message : String(error));
+          serverSpan.end();
+        } catch (e) {
+          (_n = logger.debug) == null ? void 0 : _n.call(logger, "Failed to update server span with error status:", e);
+        }
+      }
       const errorCode = (0, import_agent_shared3.isErrorWithCode)(error) ? error.code : ErrorCode.INTERNAL_ERROR;
       const errorMessage = error instanceof Error ? error.message : String(error);
       return new Response(
@@ -868,12 +914,24 @@ var import_cors = __toESM(require("cors"));
 var import_async_hooks = require("async_hooks");
 var import_server8 = require("@whatwg-node/server");
 var DefaultFetchAPI = __toESM(require("@whatwg-node/fetch"));
+var observabilitySetupPromise = null;
+var observabilitySetupComplete = false;
 async function setupObservabilityIfAvailable(configs) {
-  try {
-    const { setupObservability: setupObservability2 } = await import("@cloudbase/agent-observability/server");
-    await setupObservability2(configs);
-  } catch (error) {
+  if (observabilitySetupComplete) {
+    return;
+  }
+  if (observabilitySetupPromise) {
+    return observabilitySetupPromise;
   }
+  observabilitySetupPromise = (async () => {
+    try {
+      const { setupObservability: setupObservability2 } = await import("@cloudbase/agent-observability/server");
+      await setupObservability2(configs);
+      observabilitySetupComplete = true;
+    } catch (error) {
+    }
+  })();
+  return observabilitySetupPromise;
 }
 var preparedAgentStorage = new import_async_hooks.AsyncLocalStorage();
 function agentCloneFn() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/agent-server",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "main": "dist/index.js",
   "files": [
     "dist/",
@@ -20,13 +20,16 @@
     "express": "^5.1.0",
     "openai": "6.3.0",
     "uuid": "^10.0.0",
-    "@cloudbase/agent-shared": "^0.0.16"
+    "@cloudbase/agent-shared": "^0.0.18"
   },
   "peerDependencies": {
-    "zod": "^3.25.0 || ^4.0.0"
+    "zod": "^3.25.0 || ^4.0.0",
+    "@cloudbase/agent-observability": "0.0.18"
   },
-  "optionalDependencies": {
-    "@cloudbase/agent-observability": "0.0.16"
+  "peerDependenciesMeta": {
+    "@cloudbase/agent-observability": {
+      "optional": true
+    }
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",