@dexto/core 1.8.4 → 1.8.5

package/dist/llm/services/vercel.js

@@ -14,6 +14,7 @@ import { TurnExecutor } from "../executor/turn-executor.js";
 import { DextoRuntimeError } from "../../errors/DextoRuntimeError.js";
 import { ErrorScope, ErrorType } from "../../errors/types.js";
 import { LLMErrorCode } from "../error-codes.js";
+import { recordOperationSpan } from "../../telemetry/operation-span.js";
 function ensureRunContextMatchesServiceSession(serviceSessionId, runContext) {
   if (runContext !== void 0 && runContext.sessionId !== serviceSessionId) {
     throw new DextoRuntimeError(
@@ -93,11 +94,37 @@ class VercelLLMService {
   async createTurnDriver(options = {}) {
     const sessionId = ensureRunContextMatchesServiceSession(this.sessionId, options.runContext);
     const executor = this.createTurnExecutor(options.signal, options.runContext);
-    const contributorContext = await this.toolManager.buildContributorContext({ sessionId });
-    return executor.createDriver(contributorContext, {
-      streaming: options.streaming ?? true,
-      ...options.state !== void 0 ? { state: options.state } : {}
-    });
+    const contributorContext = await recordOperationSpan(
+      {
+        name: "llm.vercel.build_contributor_context",
+        attributes: {
+          "session.id": sessionId
+        },
+        resultAttributes: (context2) => ({
+          "tool.has_workspace_context": context2.workspace !== null,
+          "tool.has_environment_context": context2.environment !== void 0,
+          "tool.session_prompt_contributors": context2.session?.systemPromptContributors?.length ?? 0
+        })
+      },
+      () => this.toolManager.buildContributorContext({ sessionId }),
+      this.logger
+    );
+    const streaming = options.streaming ?? true;
+    return recordOperationSpan(
+      {
+        name: "llm.vercel.create_turn_executor_driver",
+        attributes: {
+          "session.id": sessionId,
+          "turn.streaming": streaming,
+          "turn.resume": options.state !== void 0
+        }
+      },
+      () => executor.createDriver(contributorContext, {
+        streaming,
+        ...options.state !== void 0 ? { state: options.state } : {}
+      }),
+      this.logger
+    );
   }
   /**
    * Create a TurnExecutor instance for executing the agent loop.

package/dist/session/chat-session.cjs

@@ -31,6 +31,7 @@ var import_message_queue = require("./message-queue.js");
 var import_usage_metadata = require("../llm/usage-metadata.js");
 var import_codex_base_url = require("../llm/providers/codex-base-url.js");
 var import_errors2 = require("./errors.js");
+var import_operation_span = require("../telemetry/operation-span.js");
 class ChatSession {
   /**
    * Creates a new ChatSession instance.
@@ -426,19 +427,48 @@ class ChatSession {
     const detachForwarders = this.attachRunEventForwarders(input.runContext);
     try {
       if (input.kind === "start") {
-        const modifiedParts = await this.prepareTurnInput(
-          input.content,
-          signal,
-          input.runContext
+        const modifiedParts = await (0, import_operation_span.recordOperationSpan)(
+          {
+            name: "chat_session.prepare_turn_input",
+            attributes: {
+              "session.id": this.id,
+              "turn.kind": input.kind
+            }
+          },
+          () => this.prepareTurnInput(input.content, signal, input.runContext),
+          this.logger
+        );
+        await (0, import_operation_span.recordOperationSpan)(
+          {
+            name: "chat_session.add_user_message",
+            attributes: {
+              "session.id": this.id,
+              "turn.kind": input.kind,
+              "message.parts": modifiedParts.length
+            }
+          },
+          () => this.llmService.getContextManager().addUserMessage(modifiedParts),
+          this.logger
         );
-        await this.llmService.getContextManager().addUserMessage(modifiedParts);
       }
-      const driver = await this.llmService.createTurnDriver({
-        signal,
-        streaming: input.streaming ?? true,
-        ...input.runContext !== void 0 && { runContext: input.runContext },
-        ...input.kind === "resume" ? { state: input.state } : {}
-      });
+      const streaming = input.streaming ?? true;
+      const driver = await (0, import_operation_span.recordOperationSpan)(
+        {
+          name: "chat_session.create_llm_turn_driver",
+          attributes: {
+            "session.id": this.id,
+            "turn.kind": input.kind,
+            "turn.streaming": streaming
+          }
+        },
+        () => this.llmService.createTurnDriver({
+          signal,
+          streaming,
+          ...input.runContext !== void 0 && { runContext: input.runContext },
+          ...input.kind === "resume" ? { state: input.state } : {}
+        }),
+        this.logger
+      );
       return this.wrapTurnDriver(driver, signal, input.runContext, detachForwarders);
     } catch (error) {
       if (input.kind === "start" && error instanceof import_errors.DextoRuntimeError && error.code === import_error_codes.HookErrorCode.HOOK_BLOCKED_EXECUTION && error.scope === import_errors.ErrorScope.HOOK && error.type === import_errors.ErrorType.FORBIDDEN) {

package/dist/session/chat-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-session.d.ts","sourceRoot":"","sources":["../../src/session/chat-session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chat-session.d.ts","sourceRoot":"","sources":["../../src/session/chat-session.ts"],"names":[],"mappings":"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"}

package/dist/session/chat-session.js

@@ -16,6 +16,7 @@ import {
 } from "../llm/usage-metadata.js";
 import { parseCodexBaseURL } from "../llm/providers/codex-base-url.js";
 import { SessionError } from "./errors.js";
+import { recordOperationSpan } from "../telemetry/operation-span.js";
 class ChatSession {
   /**
    * Creates a new ChatSession instance.
@@ -411,19 +412,48 @@ class ChatSession {
     const detachForwarders = this.attachRunEventForwarders(input.runContext);
     try {
       if (input.kind === "start") {
-        const modifiedParts = await this.prepareTurnInput(
-          input.content,
-          signal,
-          input.runContext
+        const modifiedParts = await recordOperationSpan(
+          {
+            name: "chat_session.prepare_turn_input",
+            attributes: {
+              "session.id": this.id,
+              "turn.kind": input.kind
+            }
+          },
+          () => this.prepareTurnInput(input.content, signal, input.runContext),
+          this.logger
+        );
+        await recordOperationSpan(
+          {
+            name: "chat_session.add_user_message",
+            attributes: {
+              "session.id": this.id,
+              "turn.kind": input.kind,
+              "message.parts": modifiedParts.length
+            }
+          },
+          () => this.llmService.getContextManager().addUserMessage(modifiedParts),
+          this.logger
         );
-        await this.llmService.getContextManager().addUserMessage(modifiedParts);
       }
-      const driver = await this.llmService.createTurnDriver({
-        signal,
-        streaming: input.streaming ?? true,
-        ...input.runContext !== void 0 && { runContext: input.runContext },
-        ...input.kind === "resume" ? { state: input.state } : {}
-      });
+      const streaming = input.streaming ?? true;
+      const driver = await recordOperationSpan(
+        {
+          name: "chat_session.create_llm_turn_driver",
+          attributes: {
+            "session.id": this.id,
+            "turn.kind": input.kind,
+            "turn.streaming": streaming
+          }
+        },
+        () => this.llmService.createTurnDriver({
+          signal,
+          streaming,
+          ...input.runContext !== void 0 && { runContext: input.runContext },
+          ...input.kind === "resume" ? { state: input.state } : {}
+        }),
+        this.logger
+      );
       return this.wrapTurnDriver(driver, signal, input.runContext, detachForwarders);
     } catch (error) {
       if (input.kind === "start" && error instanceof DextoRuntimeError && error.code === HookErrorCode.HOOK_BLOCKED_EXECUTION && error.scope === ErrorScope.HOOK && error.type === ErrorType.FORBIDDEN) {

package/dist/telemetry/decorators.cjs

@@ -49,11 +49,7 @@ function withSpan(options) {
       if (spanKind !== void 0) {
         spanOptions.kind = spanKind;
       }
-      const span = tracer.startSpan(spanName, spanOptions);
-      let ctx = import_api.trace.setSpan(import_api.context.active(), span);
-      args.forEach((arg, index) => {
-        span.setAttribute(`${spanName}.argument.${index}`, (0, import_safe_stringify.safeStringify)(arg, 8192));
-      });
+      let ctx = import_api.context.active();
       const {
         requestId,
         componentName,
@@ -63,47 +59,52 @@ function withSpan(options) {
         sessionId,
         hostRuntime
       } = (0, import_utils.getBaggageValues)(ctx);
-      if (sessionId) {
-        span.setAttribute("sessionId", sessionId);
-        span.setAttribute("baggage.sessionId", sessionId);
-      }
-      if (requestId) {
-        span.setAttribute("http.request_id", requestId);
-        span.setAttribute("baggage.http.request_id", requestId);
-      }
-      if (threadId) {
-        span.setAttribute("threadId", threadId);
-        span.setAttribute("baggage.threadId", threadId);
-      }
-      if (resourceId) {
-        span.setAttribute("resourceId", resourceId);
-        span.setAttribute("baggage.resourceId", resourceId);
-      }
-      if (runId !== void 0) {
-        span.setAttribute("runId", String(runId));
-        span.setAttribute("baggage.runId", String(runId));
-      }
-      for (const [key, value] of Object.entries((0, import_runtime.getHostRuntimeAttributes)(hostRuntime))) {
-        span.setAttribute(key, value);
-      }
       const inferredComponentName = options?.componentName;
       const effectiveHostRuntime = hostRuntime;
       const effectiveRunId = effectiveHostRuntime?.ids?.runId ?? runId;
-      if (componentName) {
-        span.setAttribute("componentName", componentName);
-        span.setAttribute("baggage.componentName", componentName);
-      } else if (inferredComponentName) {
-        span.setAttribute("componentName", inferredComponentName);
-      }
-      if (effectiveRunId !== void 0) {
-        span.setAttribute("runId", String(effectiveRunId));
-        span.setAttribute("baggage.runId", String(effectiveRunId));
-      }
-      for (const [key, value] of Object.entries(
-        (0, import_runtime.getHostRuntimeAttributes)(effectiveHostRuntime)
-      )) {
-        span.setAttribute(key, value);
-      }
+      const applySpanAttributes = (span) => {
+        args.forEach((arg, index) => {
+          span.setAttribute(`${spanName}.argument.${index}`, (0, import_safe_stringify.safeStringify)(arg, 8192));
+        });
+        if (sessionId) {
+          span.setAttribute("sessionId", sessionId);
+          span.setAttribute("baggage.sessionId", sessionId);
+        }
+        if (requestId) {
+          span.setAttribute("http.request_id", requestId);
+          span.setAttribute("baggage.http.request_id", requestId);
+        }
+        if (threadId) {
+          span.setAttribute("threadId", threadId);
+          span.setAttribute("baggage.threadId", threadId);
+        }
+        if (resourceId) {
+          span.setAttribute("resourceId", resourceId);
+          span.setAttribute("baggage.resourceId", resourceId);
+        }
+        if (runId !== void 0) {
+          span.setAttribute("runId", String(runId));
+          span.setAttribute("baggage.runId", String(runId));
+        }
+        for (const [key, value] of Object.entries((0, import_runtime.getHostRuntimeAttributes)(hostRuntime))) {
+          span.setAttribute(key, value);
+        }
+        if (componentName) {
+          span.setAttribute("componentName", componentName);
+          span.setAttribute("baggage.componentName", componentName);
+        } else if (inferredComponentName) {
+          span.setAttribute("componentName", inferredComponentName);
+        }
+        if (effectiveRunId !== void 0) {
+          span.setAttribute("runId", String(effectiveRunId));
+          span.setAttribute("baggage.runId", String(effectiveRunId));
+        }
+        for (const [key, value] of Object.entries(
+          (0, import_runtime.getHostRuntimeAttributes)(effectiveHostRuntime)
+        )) {
+          span.setAttribute(key, value);
+        }
+      };
       const existingBaggage = import_api.propagation.getBaggage(ctx);
       const baggageEntries = {};
       if (existingBaggage) {
@@ -151,48 +152,51 @@ function withSpan(options) {
       if (Object.keys(baggageEntries).length > 0) {
         ctx = import_api.propagation.setBaggage(ctx, import_api.propagation.createBaggage(baggageEntries));
       }
-      let result;
-      try {
-        result = import_api.context.with(ctx, () => originalMethod.apply(this, args));
-        if (result instanceof Promise) {
-          return result.then((resolvedValue) => {
-            span.setAttribute(
-              `${spanName}.result`,
-              (0, import_safe_stringify.safeStringify)(resolvedValue, 8192)
-            );
-            return resolvedValue;
-          }).catch((error) => {
-            span.recordException(error);
-            span.setStatus({
-              code: import_api.SpanStatusCode.ERROR,
-              message: error?.toString()
+      return tracer.startActiveSpan(spanName, spanOptions, ctx, (span) => {
+        applySpanAttributes(span);
+        let result;
+        try {
+          result = originalMethod.apply(this, args);
+          if (result instanceof Promise) {
+            return result.then((resolvedValue) => {
+              span.setAttribute(
+                `${spanName}.result`,
+                (0, import_safe_stringify.safeStringify)(resolvedValue, 8192)
+              );
+              return resolvedValue;
+            }).catch((error) => {
+              span.recordException(error);
+              span.setStatus({
+                code: import_api.SpanStatusCode.ERROR,
+                message: error?.toString()
+              });
+              throw error;
+            }).finally(() => {
+              span.end();
             });
-            throw error;
-          }).finally(() => {
-            span.end();
+          }
+          span.setAttribute(`${spanName}.result`, (0, import_safe_stringify.safeStringify)(result, 8192));
+          return result;
+        } catch (error) {
+          const logger2 = this?.logger;
+          logger2?.error(
+            `withSpan: Error in method '${methodName}': ${error instanceof Error ? error.message : String(error)}`,
+            { error }
+          );
+          span.setStatus({
+            code: import_api.SpanStatusCode.ERROR,
+            message: error instanceof Error ? error.message : "Unknown error"
           });
+          if (error instanceof Error) {
+            span.recordException(error);
+          }
+          throw error;
+        } finally {
+          if (!(result instanceof Promise)) {
+            span.end();
+          }
         }
-        span.setAttribute(`${spanName}.result`, (0, import_safe_stringify.safeStringify)(result, 8192));
-        return result;
-      } catch (error) {
-        const logger2 = this?.logger;
-        logger2?.error(
-          `withSpan: Error in method '${methodName}': ${error instanceof Error ? error.message : String(error)}`,
-          { error }
-        );
-        span.setStatus({
-          code: import_api.SpanStatusCode.ERROR,
-          message: error instanceof Error ? error.message : "Unknown error"
-        });
-        if (error instanceof Error) {
-          span.recordException(error);
-        }
-        throw error;
-      } finally {
-        if (!(result instanceof Promise)) {
-          span.end();
-        }
-      }
+      });
     };
     return descriptor;
   };

package/dist/telemetry/decorators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/telemetry/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,QAAQ,EAIX,MAAM,oBAAoB,CAAC;AAO5B,wBAAgB,QAAQ,CAAC,OAAO,EAAE;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,GAAG,CAgON;AAGD,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,IACoB,CAAC,SAAS;IAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;CAAE,EAAE,QAAQ,CAAC,OA6BrE"}
+{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/telemetry/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,QAAQ,EAKX,MAAM,oBAAoB,CAAC;AAO5B,wBAAgB,QAAQ,CAAC,OAAO,EAAE;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,GAAG,CAmON;AAGD,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,IACoB,CAAC,SAAS;IAAE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;CAAE,EAAE,QAAQ,CAAC,OA6BrE"}

package/dist/telemetry/decorators.js

@@ -32,11 +32,7 @@ function withSpan(options) {
       if (spanKind !== void 0) {
         spanOptions.kind = spanKind;
       }
-      const span = tracer.startSpan(spanName, spanOptions);
-      let ctx = trace.setSpan(context.active(), span);
-      args.forEach((arg, index) => {
-        span.setAttribute(`${spanName}.argument.${index}`, safeStringify(arg, 8192));
-      });
+      let ctx = context.active();
       const {
         requestId,
         componentName,
@@ -46,47 +42,52 @@ function withSpan(options) {
         sessionId,
         hostRuntime
       } = getBaggageValues(ctx);
-      if (sessionId) {
-        span.setAttribute("sessionId", sessionId);
-        span.setAttribute("baggage.sessionId", sessionId);
-      }
-      if (requestId) {
-        span.setAttribute("http.request_id", requestId);
-        span.setAttribute("baggage.http.request_id", requestId);
-      }
-      if (threadId) {
-        span.setAttribute("threadId", threadId);
-        span.setAttribute("baggage.threadId", threadId);
-      }
-      if (resourceId) {
-        span.setAttribute("resourceId", resourceId);
-        span.setAttribute("baggage.resourceId", resourceId);
-      }
-      if (runId !== void 0) {
-        span.setAttribute("runId", String(runId));
-        span.setAttribute("baggage.runId", String(runId));
-      }
-      for (const [key, value] of Object.entries(getHostRuntimeAttributes(hostRuntime))) {
-        span.setAttribute(key, value);
-      }
       const inferredComponentName = options?.componentName;
       const effectiveHostRuntime = hostRuntime;
       const effectiveRunId = effectiveHostRuntime?.ids?.runId ?? runId;
-      if (componentName) {
-        span.setAttribute("componentName", componentName);
-        span.setAttribute("baggage.componentName", componentName);
-      } else if (inferredComponentName) {
-        span.setAttribute("componentName", inferredComponentName);
-      }
-      if (effectiveRunId !== void 0) {
-        span.setAttribute("runId", String(effectiveRunId));
-        span.setAttribute("baggage.runId", String(effectiveRunId));
-      }
-      for (const [key, value] of Object.entries(
-        getHostRuntimeAttributes(effectiveHostRuntime)
-      )) {
-        span.setAttribute(key, value);
-      }
+      const applySpanAttributes = (span) => {
+        args.forEach((arg, index) => {
+          span.setAttribute(`${spanName}.argument.${index}`, safeStringify(arg, 8192));
+        });
+        if (sessionId) {
+          span.setAttribute("sessionId", sessionId);
+          span.setAttribute("baggage.sessionId", sessionId);
+        }
+        if (requestId) {
+          span.setAttribute("http.request_id", requestId);
+          span.setAttribute("baggage.http.request_id", requestId);
+        }
+        if (threadId) {
+          span.setAttribute("threadId", threadId);
+          span.setAttribute("baggage.threadId", threadId);
+        }
+        if (resourceId) {
+          span.setAttribute("resourceId", resourceId);
+          span.setAttribute("baggage.resourceId", resourceId);
+        }
+        if (runId !== void 0) {
+          span.setAttribute("runId", String(runId));
+          span.setAttribute("baggage.runId", String(runId));
+        }
+        for (const [key, value] of Object.entries(getHostRuntimeAttributes(hostRuntime))) {
+          span.setAttribute(key, value);
+        }
+        if (componentName) {
+          span.setAttribute("componentName", componentName);
+          span.setAttribute("baggage.componentName", componentName);
+        } else if (inferredComponentName) {
+          span.setAttribute("componentName", inferredComponentName);
+        }
+        if (effectiveRunId !== void 0) {
+          span.setAttribute("runId", String(effectiveRunId));
+          span.setAttribute("baggage.runId", String(effectiveRunId));
+        }
+        for (const [key, value] of Object.entries(
+          getHostRuntimeAttributes(effectiveHostRuntime)
+        )) {
+          span.setAttribute(key, value);
+        }
+      };
       const existingBaggage = propagation.getBaggage(ctx);
       const baggageEntries = {};
       if (existingBaggage) {
@@ -134,48 +135,51 @@ function withSpan(options) {
       if (Object.keys(baggageEntries).length > 0) {
         ctx = propagation.setBaggage(ctx, propagation.createBaggage(baggageEntries));
       }
-      let result;
-      try {
-        result = context.with(ctx, () => originalMethod.apply(this, args));
-        if (result instanceof Promise) {
-          return result.then((resolvedValue) => {
-            span.setAttribute(
-              `${spanName}.result`,
-              safeStringify(resolvedValue, 8192)
-            );
-            return resolvedValue;
-          }).catch((error) => {
-            span.recordException(error);
-            span.setStatus({
-              code: SpanStatusCode.ERROR,
-              message: error?.toString()
+      return tracer.startActiveSpan(spanName, spanOptions, ctx, (span) => {
+        applySpanAttributes(span);
+        let result;
+        try {
+          result = originalMethod.apply(this, args);
+          if (result instanceof Promise) {
+            return result.then((resolvedValue) => {
+              span.setAttribute(
+                `${spanName}.result`,
+                safeStringify(resolvedValue, 8192)
+              );
+              return resolvedValue;
+            }).catch((error) => {
+              span.recordException(error);
+              span.setStatus({
+                code: SpanStatusCode.ERROR,
+                message: error?.toString()
+              });
+              throw error;
+            }).finally(() => {
+              span.end();
             });
-            throw error;
-          }).finally(() => {
-            span.end();
+          }
+          span.setAttribute(`${spanName}.result`, safeStringify(result, 8192));
+          return result;
+        } catch (error) {
+          const logger2 = this?.logger;
+          logger2?.error(
+            `withSpan: Error in method '${methodName}': ${error instanceof Error ? error.message : String(error)}`,
+            { error }
+          );
+          span.setStatus({
+            code: SpanStatusCode.ERROR,
+            message: error instanceof Error ? error.message : "Unknown error"
           });
+          if (error instanceof Error) {
+            span.recordException(error);
+          }
+          throw error;
+        } finally {
+          if (!(result instanceof Promise)) {
+            span.end();
+          }
         }
-        span.setAttribute(`${spanName}.result`, safeStringify(result, 8192));
-        return result;
-      } catch (error) {
-        const logger2 = this?.logger;
-        logger2?.error(
-          `withSpan: Error in method '${methodName}': ${error instanceof Error ? error.message : String(error)}`,
-          { error }
-        );
-        span.setStatus({
-          code: SpanStatusCode.ERROR,
-          message: error instanceof Error ? error.message : "Unknown error"
-        });
-        if (error instanceof Error) {
-          span.recordException(error);
-        }
-        throw error;
-      } finally {
-        if (!(result instanceof Promise)) {
-          span.end();
-        }
-      }
+      });
     };
     return descriptor;
   };