weflayr 0.30.0 → 0.31.0

package/dist/src/propagate-metadata-to-gateway.js

@@ -2,10 +2,15 @@
 /**
  * Send the metadata of a call to the Weflayr AI gateway in a request header.
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._state = exports.PUBLIC_GATEWAY_HOST = exports.WEFLAYR_METADATA_HEADER = void 0;
 exports.buildMetadataHeaderValue = buildMetadataHeaderValue;
 exports.enablePropagateMetadataToGateway = enablePropagateMetadataToGateway;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
 const api_1 = require("@opentelemetry/api");
 const logger_1 = require("./logger");
 const propagation_1 = require("./otel/propagation");
@@ -155,6 +160,30 @@ function addMetadataHeader(client, options) {
         (0, logger_1.debug)('enablePropagateMetadataToGateway: could not add the metadata header');
     }
 }
+// The ES module build sits next to the CommonJS one (`index.mjs` next to
+// `index.js`), as openai's package exports name it.
+function requireEsmOpenAI() {
+    const esmEntryPath = node_path_1.default.join(node_path_1.default.dirname(require.resolve('openai')), 'index.mjs');
+    // An openai version with no ES module build has only its CommonJS class.
+    if (!node_fs_1.default.existsSync(esmEntryPath)) {
+        return undefined;
+    }
+    return require(esmEntryPath).OpenAI;
+}
+function patchPrepareOptions(OpenAI) {
+    // `prepareOptions` is the openai client's documented hook for mutating a
+    // request's options, and it runs for every endpoint, streaming or not.
+    const originalPrepareOptions = OpenAI.prototype.prepareOptions;
+    if (typeof originalPrepareOptions !== 'function') {
+        throw new Error('weflayr.enablePropagateMetadataToGateway: the openai client has no ' +
+            'prepareOptions hook, so the installed openai version cannot send the ' +
+            'metadata header.');
+    }
+    OpenAI.prototype.prepareOptions = async function prepareOptions(options) {
+        await originalPrepareOptions.call(this, options);
+        addMetadataHeader(this, options);
+    };
+}
 /**
  * Send `propagateMetadata` and `setCallName` values to the Weflayr AI gateway.
  *
@@ -196,18 +225,16 @@ function enablePropagateMetadataToGateway(gatewayBaseUrl) {
             'call the Weflayr AI gateway. Install it with: npm install openai\n' +
             `Underlying error: ${err.message}`);
     }
-    // `prepareOptions` is the openai client's documented hook for mutating a
-    // request's options, and it runs for every endpoint, streaming or not.
-    const originalPrepareOptions = OpenAI.prototype.prepareOptions;
-    if (typeof originalPrepareOptions !== 'function') {
-        throw new Error('weflayr.enablePropagateMetadataToGateway: the openai client has no ' +
-            'prepareOptions hook, so the installed openai version cannot send the ' +
-            'metadata header.');
+    // openai ships a CommonJS and an ES module build, each with its own client
+    // class: an app writing `import OpenAI from 'openai'` gets the ES module one,
+    // which `require` never returns. Node loads that build with `require` too.
+    // It is loaded before any class is patched, so a build failing to load
+    // leaves both unpatched and a later call patches each once.
+    const esmOpenAI = requireEsmOpenAI();
+    patchPrepareOptions(OpenAI);
+    if (esmOpenAI !== undefined && esmOpenAI !== OpenAI) {
+        patchPrepareOptions(esmOpenAI);
     }
-    OpenAI.prototype.prepareOptions = async function prepareOptions(options) {
-        await originalPrepareOptions.call(this, options);
-        addMetadataHeader(this, options);
-    };
     exports._state.openaiClientsPatched = true;
     (0, logger_1.debug)('enablePropagateMetadataToGateway: patched the openai client gatewayHostAndPort=%s', exports._state.gatewayHostAndPort ?? exports.PUBLIC_GATEWAY_HOST);
 }

package/dist/src/setup.js

@@ -4,7 +4,9 @@ exports._state = void 0;
 exports.setup = setup;
 exports.flush = flush;
 const api_1 = require("@opentelemetry/api");
-const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
+const context_async_hooks_1 = require("@opentelemetry/context-async-hooks");
+const core_1 = require("@opentelemetry/core");
+const sdk_trace_1 = require("@opentelemetry/sdk-trace");
 const resources_1 = require("@opentelemetry/resources");
 const exporter_1 = require("./otel/exporter");
 const span_processor_1 = require("./otel/span-processor");
@@ -18,7 +20,7 @@ exports._state = {
     beforeExitListener: null,
 };
 // `trace.getTracerProvider()` returns a ProxyTracerProvider that forwards to
-// whoever called `.register()` last. Unwrap it to reach the real provider.
+// whoever called `trace.setGlobalTracerProvider()` first. Unwrap it to reach the real provider.
 // The delegate/registration internals aren't part of the public TracerProvider
 // type, so this reaches into them dynamically.
 function _unwrapTracerProvider(p) {
@@ -28,7 +30,7 @@ function _unwrapTracerProvider(p) {
     }
     return p;
 }
-// `NodeTracerProvider` 2.x dropped the public `addSpanProcessor` API —
+// The SDK `TracerProvider` has no public `addSpanProcessor` API —
 // processors are construction-time only. To attach to a provider somebody
 // else owns, we splice into the internal MultiSpanProcessor. This matches
 // the actual public OTel JS guidance for composing post-construction.
@@ -47,6 +49,16 @@ function _attachProcessorToExistingProvider(provider, processor) {
     }
     return false;
 }
+// Registers the provider, an AsyncLocalStorage context manager (which
+// `propagateMetadata` relies on) and the W3C trace context + baggage
+// propagators. Each global is kept if something else already set it.
+function _registerGlobally(tracerProvider) {
+    api_1.trace.setGlobalTracerProvider(tracerProvider);
+    api_1.context.setGlobalContextManager(new context_async_hooks_1.AsyncLocalStorageContextManager().enable());
+    api_1.propagation.setGlobalPropagator(new core_1.CompositePropagator({
+        propagators: [new core_1.W3CTraceContextPropagator(), new core_1.W3CBaggagePropagator()],
+    }));
+}
 /**
  * Configure the Weflayr SDK.
  *
@@ -88,7 +100,7 @@ function setup(options) {
     });
     // Adopt an existing TracerProvider when there is one — e.g. the user already
     // configured Datadog/Honeycomb/OTel, or called weflayr.setup() before.
-    // provider.register() silently refuses to override the proxy if another
+    // trace.setGlobalTracerProvider() silently refuses to override the proxy if another
     // provider is already wired in, so naively creating a new provider would
     // leave our processor attached to a dead one and we'd drop every LLM span.
     const currentTracerProvider = _unwrapTracerProvider(api_1.trace.getTracerProvider());
@@ -97,15 +109,15 @@ function setup(options) {
         tracerProvider = currentTracerProvider;
     }
     else {
-        const nodeTracerProvider = new sdk_trace_node_1.NodeTracerProvider({
+        const sdkTracerProvider = new sdk_trace_1.TracerProvider({
             resource: (0, resources_1.resourceFromAttributes)({
                 sdk_version: package_json_1.version,
                 sdk_language: SDK_LANGUAGE,
             }),
             spanProcessors: [processor],
         });
-        nodeTracerProvider.register();
-        tracerProvider = nodeTracerProvider;
+        _registerGlobally(sdkTracerProvider);
+        tracerProvider = sdkTracerProvider;
     }
     // beforeExit fires when the event loop empties on a clean exit, giving us a
     // last async tick to drain buffered spans. It does NOT fire on process.exit()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weflayr",
-  "version": "0.30.0",
+  "version": "0.31.0",
   "description": "Weflayr JS/TS SDK — instrument any LLM client",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -27,15 +27,16 @@
   "author": "Weflayr <contact@weflayr.com>",
   "license": "Elastic-2.0",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.15.0"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.9.1",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.223.0",
-    "@opentelemetry/instrumentation": "^0.223.0",
-    "@opentelemetry/resources": "^2.8.0",
-    "@opentelemetry/sdk-trace-base": "^2.8.0",
-    "@opentelemetry/sdk-trace-node": "^2.8.0",
+    "@opentelemetry/api": "^1.10.0",
+    "@opentelemetry/context-async-hooks": "^3.0.0",
+    "@opentelemetry/core": "^3.0.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.300.0",
+    "@opentelemetry/instrumentation": "^0.300.0",
+    "@opentelemetry/resources": "^3.0.0",
+    "@opentelemetry/sdk-trace": "^3.0.0",
     "async-retry": "^1.3.3"
   },
   "overrides": {
@@ -43,7 +44,6 @@
   },
   "devDependencies": {
     "@hey-api/openapi-ts": "^0.99.0",
-    "@opentelemetry/context-async-hooks": "^2.8.0",
     "@types/async-retry": "^1.4.9",
     "@types/node": "^26.1.1",
     "eslint": "^10.8.0",