@dexto/core 1.6.26 → 1.6.27

package/dist/session/error-codes.cjs

@@ -27,6 +27,7 @@ var SessionErrorCode = /* @__PURE__ */ ((SessionErrorCode2) => {
   SessionErrorCode2["SESSION_MAX_SESSIONS_EXCEEDED"] = "session_max_sessions_exceeded";
   SessionErrorCode2["SESSION_STORAGE_FAILED"] = "session_storage_failed";
   SessionErrorCode2["SESSION_RESET_FAILED"] = "session_reset_failed";
+  SessionErrorCode2["SESSION_BUSY"] = "session_busy";
   return SessionErrorCode2;
 })(SessionErrorCode || {});
 // Annotate the CommonJS export names for ESM import in node:

package/dist/session/error-codes.d.ts

@@ -7,6 +7,7 @@ export declare enum SessionErrorCode {
     SESSION_INITIALIZATION_FAILED = "session_initialization_failed",
     SESSION_MAX_SESSIONS_EXCEEDED = "session_max_sessions_exceeded",
     SESSION_STORAGE_FAILED = "session_storage_failed",
-    SESSION_RESET_FAILED = "session_reset_failed"
+    SESSION_RESET_FAILED = "session_reset_failed",
+    SESSION_BUSY = "session_busy"
 }
 //# sourceMappingURL=error-codes.d.ts.map

package/dist/session/error-codes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-codes.d.ts","sourceRoot":"","sources":["../../src/session/error-codes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,oBAAY,gBAAgB;IAExB,iBAAiB,sBAAsB;IACvC,6BAA6B,kCAAkC;IAC/D,6BAA6B,kCAAkC;IAG/D,sBAAsB,2BAA2B;IAGjD,oBAAoB,yBAAyB;CAChD"}
+{"version":3,"file":"error-codes.d.ts","sourceRoot":"","sources":["../../src/session/error-codes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,oBAAY,gBAAgB;IAExB,iBAAiB,sBAAsB;IACvC,6BAA6B,kCAAkC;IAC/D,6BAA6B,kCAAkC;IAG/D,sBAAsB,2BAA2B;IAGjD,oBAAoB,yBAAyB;IAC7C,YAAY,iBAAiB;CAChC"}

package/dist/session/error-codes.js

@@ -5,6 +5,7 @@ var SessionErrorCode = /* @__PURE__ */ ((SessionErrorCode2) => {
   SessionErrorCode2["SESSION_MAX_SESSIONS_EXCEEDED"] = "session_max_sessions_exceeded";
   SessionErrorCode2["SESSION_STORAGE_FAILED"] = "session_storage_failed";
   SessionErrorCode2["SESSION_RESET_FAILED"] = "session_reset_failed";
+  SessionErrorCode2["SESSION_BUSY"] = "session_busy";
   return SessionErrorCode2;
 })(SessionErrorCode || {});
 export {

package/dist/session/errors.cjs

@@ -86,6 +86,19 @@ class SessionError {
       { sessionId, reason }
     );
   }
+  /**
+   * Session already processing a run
+   */
+  static busy(sessionId) {
+    return new import_DextoRuntimeError.DextoRuntimeError(
+      import_error_codes.SessionErrorCode.SESSION_BUSY,
+      import_types.ErrorScope.SESSION,
+      import_types.ErrorType.CONFLICT,
+      `Session '${sessionId}' is already processing a message`,
+      { sessionId },
+      "Wait for the current run to finish before starting another one"
+    );
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/session/errors.d.ts

@@ -39,5 +39,11 @@ export declare class SessionError {
         sessionId: string;
         reason: string;
     }>;
+    /**
+     * Session already processing a run
+     */
+    static busy(sessionId: string): DextoRuntimeError<{
+        sessionId: string;
+    }>;
 }
 //# sourceMappingURL=errors.d.ts.map

package/dist/session/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/session/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAInE;;;GAGG;AACH,qBAAa,YAAY;IACrB;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM;;;IAUjC;;OAEG;IACH,MAAM,CAAC,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;IAU7D;;OAEG;IACH,MAAM,CAAC,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;;;;IAWpE;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;;IAUzE;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;CASvD"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/session/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAInE;;;GAGG;AACH,qBAAa,YAAY;IACrB;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM;;;IAUjC;;OAEG;IACH,MAAM,CAAC,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;IAU7D;;OAEG;IACH,MAAM,CAAC,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;;;;IAWpE;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;;IAUzE;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;IAUpD;;OAEG;IACH,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM;;;CAUhC"}

package/dist/session/errors.js

@@ -64,6 +64,19 @@ class SessionError {
       { sessionId, reason }
     );
   }
+  /**
+   * Session already processing a run
+   */
+  static busy(sessionId) {
+    return new DextoRuntimeError(
+      SessionErrorCode.SESSION_BUSY,
+      ErrorScope.SESSION,
+      ErrorType.CONFLICT,
+      `Session '${sessionId}' is already processing a message`,
+      { sessionId },
+      "Wait for the current run to finish before starting another one"
+    );
+  }
 }
 export {
   SessionError

package/dist/telemetry/decorators.cjs

@@ -25,6 +25,7 @@ module.exports = __toCommonJS(decorators_exports);
 var import_api = require("@opentelemetry/api");
 var import_utils = require("./utils.js");
 var import_safe_stringify = require("../utils/safe-stringify.js");
+var import_runtime = require("../runtime/index.js");
 function withSpan(options) {
   return function(_target, propertyKey, descriptor) {
     if (!descriptor || typeof descriptor === "number") return;
@@ -53,7 +54,15 @@ function withSpan(options) {
       args.forEach((arg, index) => {
         span.setAttribute(`${spanName}.argument.${index}`, (0, import_safe_stringify.safeStringify)(arg, 8192));
       });
-      const { requestId, componentName, runId, threadId, resourceId, sessionId } = (0, import_utils.getBaggageValues)(ctx);
+      const {
+        requestId,
+        componentName,
+        runId,
+        threadId,
+        resourceId,
+        sessionId,
+        hostRuntime
+      } = (0, import_utils.getBaggageValues)(ctx);
       if (sessionId) {
         span.setAttribute("sessionId", sessionId);
         span.setAttribute("baggage.sessionId", sessionId);
@@ -74,65 +83,73 @@ function withSpan(options) {
         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 (this && typeof this === "object") {
-        const contextObj = this;
-        const inferredName = contextObj.name ?? contextObj.constructor?.name;
-        if (inferredName) {
-          span.setAttribute("componentName", inferredName);
-        }
-        if (contextObj.runId) {
-          span.setAttribute("runId", contextObj.runId);
-          span.setAttribute("baggage.runId", contextObj.runId);
-        }
-        const existingBaggage = import_api.propagation.getBaggage(ctx);
-        const baggageEntries = {};
-        if (existingBaggage) {
-          existingBaggage.getAllEntries().forEach(([key, entry]) => {
-            baggageEntries[key] = entry;
-          });
-        }
-        if (sessionId !== void 0) {
-          baggageEntries.sessionId = {
-            ...baggageEntries.sessionId,
-            value: String(sessionId)
-          };
-        }
-        if (requestId !== void 0) {
-          baggageEntries["http.request_id"] = {
-            ...baggageEntries["http.request_id"],
-            value: String(requestId)
-          };
-        }
-        if (threadId !== void 0) {
-          baggageEntries.threadId = {
-            ...baggageEntries.threadId,
-            value: String(threadId)
-          };
-        }
-        if (resourceId !== void 0) {
-          baggageEntries.resourceId = {
-            ...baggageEntries.resourceId,
-            value: String(resourceId)
-          };
-        }
-        if (inferredName !== void 0) {
-          baggageEntries.componentName = {
-            ...baggageEntries.componentName,
-            value: String(inferredName)
-          };
-        }
-        if (contextObj.runId !== void 0) {
-          baggageEntries.runId = {
-            ...baggageEntries.runId,
-            value: String(contextObj.runId)
-          };
-        }
-        if (Object.keys(baggageEntries).length > 0) {
-          ctx = import_api.propagation.setBaggage(ctx, import_api.propagation.createBaggage(baggageEntries));
-        }
+      } 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) {
+        existingBaggage.getAllEntries().forEach(([key, entry]) => {
+          baggageEntries[key] = entry;
+        });
+      }
+      if (sessionId !== void 0) {
+        baggageEntries.sessionId = {
+          ...baggageEntries.sessionId,
+          value: String(sessionId)
+        };
+      }
+      if (requestId !== void 0) {
+        baggageEntries["http.request_id"] = {
+          ...baggageEntries["http.request_id"],
+          value: String(requestId)
+        };
+      }
+      if (threadId !== void 0) {
+        baggageEntries.threadId = {
+          ...baggageEntries.threadId,
+          value: String(threadId)
+        };
+      }
+      if (resourceId !== void 0) {
+        baggageEntries.resourceId = {
+          ...baggageEntries.resourceId,
+          value: String(resourceId)
+        };
+      }
+      if (componentName === void 0 && inferredComponentName !== void 0) {
+        baggageEntries.componentName = {
+          ...baggageEntries.componentName,
+          value: String(inferredComponentName)
+        };
+      }
+      if (effectiveRunId !== void 0) {
+        baggageEntries.runId = {
+          ...baggageEntries.runId,
+          value: String(effectiveRunId)
+        };
+      }
+      Object.assign(baggageEntries, (0, import_runtime.getHostRuntimeBaggageEntries)(effectiveHostRuntime));
+      if (Object.keys(baggageEntries).length > 0) {
+        ctx = import_api.propagation.setBaggage(ctx, import_api.propagation.createBaggage(baggageEntries));
       }
       let result;
       try {
@@ -197,6 +214,7 @@ function InstrumentClass(options) {
             spanName: options?.prefix ? `${options.prefix}.${method}` : method,
             skipIfNoTelemetry: true,
             spanKind: options?.spanKind || import_api.SpanKind.INTERNAL,
+            componentName: options?.componentName ?? target.name,
             ...options?.tracerName !== void 0 && {
               tracerName: options.tracerName
             }

package/dist/telemetry/decorators.d.ts

@@ -1,12 +1,14 @@
 import { SpanKind } from '@opentelemetry/api';
 export declare function withSpan(options: {
     spanName?: string;
+    componentName?: string;
     skipIfNoTelemetry?: boolean;
     spanKind?: SpanKind;
     tracerName?: string;
 }): any;
 export declare function InstrumentClass(options?: {
     prefix?: string;
+    componentName?: string;
     spanKind?: SpanKind;
     excludeMethods?: string[];
     methodFilter?: (methodName: string) => boolean;

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;AAM5B,wBAAgB,QAAQ,CAAC,OAAO,EAAE;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,GAAG,CAqNN;AAGD,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,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,OA4BrE"}
+{"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"}

package/dist/telemetry/decorators.js

@@ -8,6 +8,7 @@ import {
 } from "@opentelemetry/api";
 import { hasActiveTelemetry, getBaggageValues } from "./utils.js";
 import { safeStringify } from "../utils/safe-stringify.js";
+import { getHostRuntimeAttributes, getHostRuntimeBaggageEntries } from "../runtime/index.js";
 function withSpan(options) {
   return function(_target, propertyKey, descriptor) {
     if (!descriptor || typeof descriptor === "number") return;
@@ -36,7 +37,15 @@ function withSpan(options) {
       args.forEach((arg, index) => {
         span.setAttribute(`${spanName}.argument.${index}`, safeStringify(arg, 8192));
       });
-      const { requestId, componentName, runId, threadId, resourceId, sessionId } = getBaggageValues(ctx);
+      const {
+        requestId,
+        componentName,
+        runId,
+        threadId,
+        resourceId,
+        sessionId,
+        hostRuntime
+      } = getBaggageValues(ctx);
       if (sessionId) {
         span.setAttribute("sessionId", sessionId);
         span.setAttribute("baggage.sessionId", sessionId);
@@ -57,65 +66,73 @@ function withSpan(options) {
         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 (this && typeof this === "object") {
-        const contextObj = this;
-        const inferredName = contextObj.name ?? contextObj.constructor?.name;
-        if (inferredName) {
-          span.setAttribute("componentName", inferredName);
-        }
-        if (contextObj.runId) {
-          span.setAttribute("runId", contextObj.runId);
-          span.setAttribute("baggage.runId", contextObj.runId);
-        }
-        const existingBaggage = propagation.getBaggage(ctx);
-        const baggageEntries = {};
-        if (existingBaggage) {
-          existingBaggage.getAllEntries().forEach(([key, entry]) => {
-            baggageEntries[key] = entry;
-          });
-        }
-        if (sessionId !== void 0) {
-          baggageEntries.sessionId = {
-            ...baggageEntries.sessionId,
-            value: String(sessionId)
-          };
-        }
-        if (requestId !== void 0) {
-          baggageEntries["http.request_id"] = {
-            ...baggageEntries["http.request_id"],
-            value: String(requestId)
-          };
-        }
-        if (threadId !== void 0) {
-          baggageEntries.threadId = {
-            ...baggageEntries.threadId,
-            value: String(threadId)
-          };
-        }
-        if (resourceId !== void 0) {
-          baggageEntries.resourceId = {
-            ...baggageEntries.resourceId,
-            value: String(resourceId)
-          };
-        }
-        if (inferredName !== void 0) {
-          baggageEntries.componentName = {
-            ...baggageEntries.componentName,
-            value: String(inferredName)
-          };
-        }
-        if (contextObj.runId !== void 0) {
-          baggageEntries.runId = {
-            ...baggageEntries.runId,
-            value: String(contextObj.runId)
-          };
-        }
-        if (Object.keys(baggageEntries).length > 0) {
-          ctx = propagation.setBaggage(ctx, propagation.createBaggage(baggageEntries));
-        }
+      } 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) {
+        existingBaggage.getAllEntries().forEach(([key, entry]) => {
+          baggageEntries[key] = entry;
+        });
+      }
+      if (sessionId !== void 0) {
+        baggageEntries.sessionId = {
+          ...baggageEntries.sessionId,
+          value: String(sessionId)
+        };
+      }
+      if (requestId !== void 0) {
+        baggageEntries["http.request_id"] = {
+          ...baggageEntries["http.request_id"],
+          value: String(requestId)
+        };
+      }
+      if (threadId !== void 0) {
+        baggageEntries.threadId = {
+          ...baggageEntries.threadId,
+          value: String(threadId)
+        };
+      }
+      if (resourceId !== void 0) {
+        baggageEntries.resourceId = {
+          ...baggageEntries.resourceId,
+          value: String(resourceId)
+        };
+      }
+      if (componentName === void 0 && inferredComponentName !== void 0) {
+        baggageEntries.componentName = {
+          ...baggageEntries.componentName,
+          value: String(inferredComponentName)
+        };
+      }
+      if (effectiveRunId !== void 0) {
+        baggageEntries.runId = {
+          ...baggageEntries.runId,
+          value: String(effectiveRunId)
+        };
+      }
+      Object.assign(baggageEntries, getHostRuntimeBaggageEntries(effectiveHostRuntime));
+      if (Object.keys(baggageEntries).length > 0) {
+        ctx = propagation.setBaggage(ctx, propagation.createBaggage(baggageEntries));
       }
       let result;
       try {
@@ -180,6 +197,7 @@ function InstrumentClass(options) {
             spanName: options?.prefix ? `${options.prefix}.${method}` : method,
             skipIfNoTelemetry: true,
             spanKind: options?.spanKind || SpanKind.INTERNAL,
+            componentName: options?.componentName ?? target.name,
             ...options?.tracerName !== void 0 && {
               tracerName: options.tracerName
             }

package/dist/telemetry/utils.cjs

@@ -25,6 +25,7 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_api = require("@opentelemetry/api");
 var import_telemetry = require("./telemetry.js");
+var import_runtime = require("../runtime/index.js");
 function hasActiveTelemetry(logger) {
   logger?.silly("hasActiveTelemetry called.");
   try {
@@ -48,8 +49,9 @@ function getBaggageValues(ctx, logger) {
   const threadId = currentBaggage?.getEntry("threadId")?.value;
   const resourceId = currentBaggage?.getEntry("resourceId")?.value;
   const sessionId = currentBaggage?.getEntry("sessionId")?.value;
+  const hostRuntime = (0, import_runtime.getHostRuntimeContextFromBaggage)(ctx);
   logger?.silly(
-    `getBaggageValues: Extracted - requestId: ${requestId}, componentName: ${componentName}, runId: ${runId}, threadId: ${threadId}, resourceId: ${resourceId}, sessionId: ${sessionId}`
+    `getBaggageValues: Extracted - requestId: ${requestId}, componentName: ${componentName}, runId: ${runId}, threadId: ${threadId}, resourceId: ${resourceId}, sessionId: ${sessionId}, hostRuntimeIds: ${JSON.stringify(hostRuntime?.ids ?? {})}`
   );
   return {
     requestId,
@@ -57,15 +59,13 @@ function getBaggageValues(ctx, logger) {
     runId,
     threadId,
     resourceId,
-    sessionId
+    sessionId,
+    hostRuntime
   };
 }
 function addBaggageAttributesToSpan(span, ctx, logger) {
   logger?.debug("addBaggageAttributesToSpan called.");
-  const { requestId, componentName, runId, threadId, resourceId, sessionId } = getBaggageValues(
-    ctx,
-    logger
-  );
+  const { requestId, componentName, runId, threadId, resourceId, sessionId, hostRuntime } = getBaggageValues(ctx, logger);
   if (componentName) {
     span.setAttribute("componentName", componentName);
   }
@@ -84,6 +84,9 @@ function addBaggageAttributesToSpan(span, ctx, logger) {
   if (sessionId) {
     span.setAttribute("sessionId", sessionId);
   }
+  for (const [key, value] of Object.entries((0, import_runtime.getHostRuntimeAttributes)(hostRuntime))) {
+    span.setAttribute(key, value);
+  }
   logger?.debug("addBaggageAttributesToSpan: Baggage attributes added to span.");
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/telemetry/utils.d.ts

@@ -14,6 +14,9 @@ export declare function getBaggageValues(ctx: Context, logger?: Logger): {
     threadId: string | undefined;
     resourceId: string | undefined;
     sessionId: string | undefined;
+    hostRuntime: {
+        ids?: Record<string, string> | undefined;
+    } | undefined;
 };
 /**
  * Attaches baggage values from the given context to the provided span as attributes.

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/telemetry/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,wBAAgB,kBAAkB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAa3D;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM;;;;;;;EAoB7D;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CA0B1F"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/telemetry/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,wBAAgB,kBAAkB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAa3D;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM;;;;;;;;;;EAsB7D;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CA2B1F"}

package/dist/telemetry/utils.js

@@ -1,6 +1,7 @@
 import "../chunk-PTJYTZNU.js";
 import { propagation } from "@opentelemetry/api";
 import { Telemetry } from "./telemetry.js";
+import { getHostRuntimeAttributes, getHostRuntimeContextFromBaggage } from "../runtime/index.js";
 function hasActiveTelemetry(logger) {
   logger?.silly("hasActiveTelemetry called.");
   try {
@@ -24,8 +25,9 @@ function getBaggageValues(ctx, logger) {
   const threadId = currentBaggage?.getEntry("threadId")?.value;
   const resourceId = currentBaggage?.getEntry("resourceId")?.value;
   const sessionId = currentBaggage?.getEntry("sessionId")?.value;
+  const hostRuntime = getHostRuntimeContextFromBaggage(ctx);
   logger?.silly(
-    `getBaggageValues: Extracted - requestId: ${requestId}, componentName: ${componentName}, runId: ${runId}, threadId: ${threadId}, resourceId: ${resourceId}, sessionId: ${sessionId}`
+    `getBaggageValues: Extracted - requestId: ${requestId}, componentName: ${componentName}, runId: ${runId}, threadId: ${threadId}, resourceId: ${resourceId}, sessionId: ${sessionId}, hostRuntimeIds: ${JSON.stringify(hostRuntime?.ids ?? {})}`
   );
   return {
     requestId,
@@ -33,15 +35,13 @@ function getBaggageValues(ctx, logger) {
     runId,
     threadId,
     resourceId,
-    sessionId
+    sessionId,
+    hostRuntime
   };
 }
 function addBaggageAttributesToSpan(span, ctx, logger) {
   logger?.debug("addBaggageAttributesToSpan called.");
-  const { requestId, componentName, runId, threadId, resourceId, sessionId } = getBaggageValues(
-    ctx,
-    logger
-  );
+  const { requestId, componentName, runId, threadId, resourceId, sessionId, hostRuntime } = getBaggageValues(ctx, logger);
   if (componentName) {
     span.setAttribute("componentName", componentName);
   }
@@ -60,6 +60,9 @@ function addBaggageAttributesToSpan(span, ctx, logger) {
   if (sessionId) {
     span.setAttribute("sessionId", sessionId);
   }
+  for (const [key, value] of Object.entries(getHostRuntimeAttributes(hostRuntime))) {
+    span.setAttribute(key, value);
+  }
   logger?.debug("addBaggageAttributesToSpan: Baggage attributes added to span.");
 }
 export {