@dexto/core 1.6.25 → 1.6.27

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/errors.cjs

@@ -80,9 +80,9 @@ class TelemetryError {
       import_error_codes.TelemetryErrorCode.NOT_INITIALIZED,
       import_types.ErrorScope.TELEMETRY,
       import_types.ErrorType.USER,
-      "Telemetry not initialized. Call Telemetry.init() first.",
+      "Telemetry not initialized. Call Telemetry.init() or Telemetry.registerGlobal() first.",
       {
-        hint: "Ensure telemetry is initialized before accessing the global instance."
+        hint: "Ensure telemetry is initialized via Telemetry.init() or Telemetry.registerGlobal() before accessing the global instance."
       }
     );
   }

package/dist/telemetry/errors.js

@@ -58,9 +58,9 @@ class TelemetryError {
       TelemetryErrorCode.NOT_INITIALIZED,
       ErrorScope.TELEMETRY,
       ErrorType.USER,
-      "Telemetry not initialized. Call Telemetry.init() first.",
+      "Telemetry not initialized. Call Telemetry.init() or Telemetry.registerGlobal() first.",
       {
-        hint: "Ensure telemetry is initialized before accessing the global instance."
+        hint: "Ensure telemetry is initialized via Telemetry.init() or Telemetry.registerGlobal() before accessing the global instance."
       }
     );
   }

package/dist/telemetry/index.d.ts

@@ -1,4 +1,4 @@
-export { Telemetry } from './telemetry.js';
+export { Telemetry, type TelemetryRegistrationOptions, type TelemetryShutdownHandler, } from './telemetry.js';
 export { OtelConfigurationSchema } from './schemas.js';
 export type { OtelConfiguration } from './schemas.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/telemetry/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,SAAS,EACT,KAAK,4BAA4B,EACjC,KAAK,wBAAwB,GAChC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC"}

package/dist/telemetry/index.js

@@ -1,5 +1,7 @@
 import "../chunk-PTJYTZNU.js";
-import { Telemetry } from "./telemetry.js";
+import {
+  Telemetry
+} from "./telemetry.js";
 import { OtelConfigurationSchema } from "./schemas.js";
 export {
   OtelConfigurationSchema,

package/dist/telemetry/telemetry.cjs

@@ -40,17 +40,17 @@ class Telemetry {
   name = "dexto-service";
   _isInitialized = false;
   _sdk;
+  _shutdownHandler;
   static _initPromise;
   static _signalHandlers;
-  constructor(config, enabled, sdk) {
+  constructor(config, options) {
     const serviceName = config.serviceName ?? "dexto-service";
     const tracerName = config.tracerName ?? serviceName;
     this.name = serviceName;
     this.tracer = import_api.trace.getTracer(tracerName);
-    if (sdk) {
-      this._sdk = sdk;
-    }
-    this._isInitialized = enabled && !!sdk;
+    this._sdk = options.sdk;
+    this._shutdownHandler = options.shutdown;
+    this._isInitialized = options.initialized;
   }
   static async buildTraceExporter(config) {
     const e = config?.export;
@@ -178,7 +178,10 @@ class Telemetry {
             process.once("SIGINT", sigint);
             Telemetry._signalHandlers = { sigterm, sigint };
           }
-          globalThis.__TELEMETRY__ = new Telemetry(config, enabled, sdk);
+          globalThis.__TELEMETRY__ = new Telemetry(config, {
+            initialized: enabled && !!sdk,
+            ...sdk !== void 0 && { sdk }
+          });
         }
         return globalThis.__TELEMETRY__;
       })();
@@ -194,6 +197,38 @@ class Telemetry {
       );
     }
   }
+  /**
+   * Register a global telemetry instance after a host installs its own provider/exporter lifecycle.
+   *
+   * This keeps core instrumentation active without forcing the default Node SDK bootstrap path.
+   */
+  static async registerGlobal(options = {}) {
+    try {
+      if (globalThis.__TELEMETRY__) return globalThis.__TELEMETRY__;
+      if (Telemetry._initPromise) return Telemetry._initPromise;
+      const config = options.config ?? {};
+      const initialized = options.initialized ?? true;
+      Telemetry._initPromise = Promise.resolve().then(() => {
+        if (!globalThis.__TELEMETRY__) {
+          globalThis.__TELEMETRY__ = new Telemetry(config, {
+            initialized,
+            ...options.shutdown !== void 0 && { shutdown: options.shutdown }
+          });
+        }
+        return globalThis.__TELEMETRY__;
+      });
+      return await Telemetry._initPromise;
+    } catch (error) {
+      Telemetry._initPromise = void 0;
+      if (error instanceof import_DextoRuntimeError.DextoRuntimeError) {
+        throw error;
+      }
+      throw import_errors.TelemetryError.initializationFailed(
+        error instanceof Error ? error.message : String(error),
+        error
+      );
+    }
+  }
   static getActiveSpan() {
     const span = import_api.trace.getActiveSpan();
     return span;
@@ -275,25 +310,31 @@ class Telemetry {
    * This ensures agent switching works even when telemetry export fails.
    */
   async shutdown() {
-    if (this._sdk) {
-      try {
+    try {
+      if (this._shutdownHandler) {
+        await this._shutdownHandler();
+      } else if (this._sdk) {
         await this._sdk.shutdown();
-      } catch (error) {
-        const errorMsg = error instanceof Error ? error.message : String(error);
-        import_logger.logger.warn(`Telemetry shutdown failed to flush spans (non-blocking): ${errorMsg}`);
-      } finally {
-        this._isInitialized = false;
-        globalThis.__TELEMETRY__ = void 0;
-        if (Telemetry._signalHandlers) {
-          process.off("SIGTERM", Telemetry._signalHandlers.sigterm);
-          process.off("SIGINT", Telemetry._signalHandlers.sigint);
-          Telemetry._signalHandlers = void 0;
-        }
-        this._sdk = void 0;
-        Telemetry._initPromise = void 0;
       }
+    } catch (error) {
+      const errorMsg = error instanceof Error ? error.message : String(error);
+      import_logger.logger.warn(`Telemetry shutdown failed to flush spans (non-blocking): ${errorMsg}`);
+    } finally {
+      this.cleanupAfterShutdown();
     }
   }
+  cleanupAfterShutdown() {
+    this._isInitialized = false;
+    globalThis.__TELEMETRY__ = void 0;
+    if (Telemetry._signalHandlers) {
+      process.off("SIGTERM", Telemetry._signalHandlers.sigterm);
+      process.off("SIGINT", Telemetry._signalHandlers.sigint);
+      Telemetry._signalHandlers = void 0;
+    }
+    this._sdk = void 0;
+    this._shutdownHandler = void 0;
+    Telemetry._initPromise = void 0;
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/telemetry/telemetry.d.ts

@@ -1,5 +1,11 @@
 import type { Tracer, Context, BaggageEntry } from '@opentelemetry/api';
 import type { OtelConfiguration } from './schemas.js';
+export type TelemetryShutdownHandler = () => Promise<void>;
+export type TelemetryRegistrationOptions = {
+    config?: OtelConfiguration | undefined;
+    initialized?: boolean | undefined;
+    shutdown?: TelemetryShutdownHandler | undefined;
+};
 declare global {
     var __TELEMETRY__: Telemetry | undefined;
 }
@@ -17,6 +23,7 @@ export declare class Telemetry {
     name: string;
     private _isInitialized;
     private _sdk?;
+    private _shutdownHandler?;
     private static _initPromise?;
     private static _signalHandlers?;
     private constructor();
@@ -28,6 +35,12 @@ export declare class Telemetry {
      * @returns Telemetry instance that can be used for tracing
      */
     static init(config?: OtelConfiguration, exporter?: import('@opentelemetry/sdk-trace-base').SpanExporter): Promise<Telemetry>;
+    /**
+     * Register a global telemetry instance after a host installs its own provider/exporter lifecycle.
+     *
+     * This keeps core instrumentation active without forcing the default Node SDK bootstrap path.
+     */
+    static registerGlobal(options?: TelemetryRegistrationOptions): Promise<Telemetry>;
     static getActiveSpan(): import("@opentelemetry/api").Span | undefined;
     /**
      * Get the global telemetry instance
@@ -70,5 +83,6 @@ export declare class Telemetry {
      * This ensures agent switching works even when telemetry export fails.
      */
     shutdown(): Promise<void>;
+    private cleanupAfterShutdown;
 }
 //# sourceMappingURL=telemetry.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/telemetry/telemetry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAYtD,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,aAAa,EAAE,SAAS,GAAG,SAAS,CAAC;CAC5C;AAED;;;;;;;;GAQG;AACH,qBAAa,SAAS;IACX,MAAM,EAAE,MAAM,CAA4B;IACjD,IAAI,EAAE,MAAM,CAAmB;IAC/B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,IAAI,CAAC,CAA0B;IACvC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAiC;IAC7D,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAA0D;IAEzF,OAAO;mBAYc,kBAAkB;IA0DvC;;;;;OAKG;WACU,IAAI,CACb,MAAM,GAAE,iBAAsB,EAC9B,QAAQ,CAAC,EAAE,OAAO,+BAA+B,EAAE,YAAY,GAChE,OAAO,CAAC,SAAS,CAAC;IA8HrB,MAAM,CAAC,aAAa;IAKpB;;;;OAIG;IACH,MAAM,CAAC,GAAG,IAAI,SAAS;IAOvB;;;OAGG;IACH,MAAM,CAAC,iBAAiB,IAAI,OAAO;IAInC;;;;;OAKG;WACU,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAS5C;;;OAGG;IACI,aAAa,IAAI,OAAO;IAI/B,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,GAAE,OAA8B;IAc5F,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,IAAI;IAI/C;;;OAGG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAUxC;;;;;;;;;OASG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CA8BzC"}
+{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/telemetry/telemetry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAUtD,MAAM,MAAM,wBAAwB,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AAE3D,MAAM,MAAM,4BAA4B,GAAG;IACvC,MAAM,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACvC,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,EAAE,wBAAwB,GAAG,SAAS,CAAC;CACnD,CAAC;AASF,OAAO,CAAC,MAAM,CAAC;IACX,IAAI,aAAa,EAAE,SAAS,GAAG,SAAS,CAAC;CAC5C;AAED;;;;;;;;GAQG;AACH,qBAAa,SAAS;IACX,MAAM,EAAE,MAAM,CAA4B;IACjD,IAAI,EAAE,MAAM,CAAmB;IAC/B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,IAAI,CAAC,CAA0B;IACvC,OAAO,CAAC,gBAAgB,CAAC,CAAuC;IAChE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAiC;IAC7D,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAA0D;IAEzF,OAAO;mBAWc,kBAAkB;IA0DvC;;;;;OAKG;WACU,IAAI,CACb,MAAM,GAAE,iBAAsB,EAC9B,QAAQ,CAAC,EAAE,OAAO,+BAA+B,EAAE,YAAY,GAChE,OAAO,CAAC,SAAS,CAAC;IAiIrB;;;;OAIG;WACU,cAAc,CAAC,OAAO,GAAE,4BAAiC,GAAG,OAAO,CAAC,SAAS,CAAC;IAiC3F,MAAM,CAAC,aAAa;IAKpB;;;;OAIG;IACH,MAAM,CAAC,GAAG,IAAI,SAAS;IAOvB;;;OAGG;IACH,MAAM,CAAC,iBAAiB,IAAI,OAAO;IAInC;;;;;OAKG;WACU,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAS5C;;;OAGG;IACI,aAAa,IAAI,OAAO;IAI/B,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,GAAG,GAAE,OAA8B;IAc5F,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,IAAI;IAI/C;;;OAGG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAUxC;;;;;;;;;OASG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBtC,OAAO,CAAC,oBAAoB;CAiB/B"}

package/dist/telemetry/telemetry.js

@@ -8,17 +8,17 @@ class Telemetry {
   name = "dexto-service";
   _isInitialized = false;
   _sdk;
+  _shutdownHandler;
   static _initPromise;
   static _signalHandlers;
-  constructor(config, enabled, sdk) {
+  constructor(config, options) {
     const serviceName = config.serviceName ?? "dexto-service";
     const tracerName = config.tracerName ?? serviceName;
     this.name = serviceName;
     this.tracer = trace.getTracer(tracerName);
-    if (sdk) {
-      this._sdk = sdk;
-    }
-    this._isInitialized = enabled && !!sdk;
+    this._sdk = options.sdk;
+    this._shutdownHandler = options.shutdown;
+    this._isInitialized = options.initialized;
   }
   static async buildTraceExporter(config) {
     const e = config?.export;
@@ -146,7 +146,10 @@ class Telemetry {
             process.once("SIGINT", sigint);
             Telemetry._signalHandlers = { sigterm, sigint };
           }
-          globalThis.__TELEMETRY__ = new Telemetry(config, enabled, sdk);
+          globalThis.__TELEMETRY__ = new Telemetry(config, {
+            initialized: enabled && !!sdk,
+            ...sdk !== void 0 && { sdk }
+          });
         }
         return globalThis.__TELEMETRY__;
       })();
@@ -162,6 +165,38 @@ class Telemetry {
       );
     }
   }
+  /**
+   * Register a global telemetry instance after a host installs its own provider/exporter lifecycle.
+   *
+   * This keeps core instrumentation active without forcing the default Node SDK bootstrap path.
+   */
+  static async registerGlobal(options = {}) {
+    try {
+      if (globalThis.__TELEMETRY__) return globalThis.__TELEMETRY__;
+      if (Telemetry._initPromise) return Telemetry._initPromise;
+      const config = options.config ?? {};
+      const initialized = options.initialized ?? true;
+      Telemetry._initPromise = Promise.resolve().then(() => {
+        if (!globalThis.__TELEMETRY__) {
+          globalThis.__TELEMETRY__ = new Telemetry(config, {
+            initialized,
+            ...options.shutdown !== void 0 && { shutdown: options.shutdown }
+          });
+        }
+        return globalThis.__TELEMETRY__;
+      });
+      return await Telemetry._initPromise;
+    } catch (error) {
+      Telemetry._initPromise = void 0;
+      if (error instanceof DextoRuntimeError) {
+        throw error;
+      }
+      throw TelemetryError.initializationFailed(
+        error instanceof Error ? error.message : String(error),
+        error
+      );
+    }
+  }
   static getActiveSpan() {
     const span = trace.getActiveSpan();
     return span;
@@ -243,25 +278,31 @@ class Telemetry {
    * This ensures agent switching works even when telemetry export fails.
    */
   async shutdown() {
-    if (this._sdk) {
-      try {
+    try {
+      if (this._shutdownHandler) {
+        await this._shutdownHandler();
+      } else if (this._sdk) {
         await this._sdk.shutdown();
-      } catch (error) {
-        const errorMsg = error instanceof Error ? error.message : String(error);
-        logger.warn(`Telemetry shutdown failed to flush spans (non-blocking): ${errorMsg}`);
-      } finally {
-        this._isInitialized = false;
-        globalThis.__TELEMETRY__ = void 0;
-        if (Telemetry._signalHandlers) {
-          process.off("SIGTERM", Telemetry._signalHandlers.sigterm);
-          process.off("SIGINT", Telemetry._signalHandlers.sigint);
-          Telemetry._signalHandlers = void 0;
-        }
-        this._sdk = void 0;
-        Telemetry._initPromise = void 0;
       }
+    } catch (error) {
+      const errorMsg = error instanceof Error ? error.message : String(error);
+      logger.warn(`Telemetry shutdown failed to flush spans (non-blocking): ${errorMsg}`);
+    } finally {
+      this.cleanupAfterShutdown();
     }
   }
+  cleanupAfterShutdown() {
+    this._isInitialized = false;
+    globalThis.__TELEMETRY__ = void 0;
+    if (Telemetry._signalHandlers) {
+      process.off("SIGTERM", Telemetry._signalHandlers.sigterm);
+      process.off("SIGINT", Telemetry._signalHandlers.sigint);
+      Telemetry._signalHandlers = void 0;
+    }
+    this._sdk = void 0;
+    this._shutdownHandler = void 0;
+    Telemetry._initPromise = void 0;
+  }
 }
 export {
   Telemetry

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 {