dd-trace 5.48.0 → 5.48.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.48.0",
+  "version": "5.48.1",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -90,7 +90,7 @@
     "@datadog/native-metrics": "^3.1.1",
     "@datadog/pprof": "5.7.1",
     "@datadog/sketches-js": "^2.1.0",
-    "@datadog/wasm-js-rewriter": "4.0.0",
+    "@datadog/wasm-js-rewriter": "4.0.1",
     "@isaacs/ttlcache": "^1.4.1",
     "@opentelemetry/api": ">=1.0.0 <1.9.0",
     "@opentelemetry/core": "^1.14.0",

package/packages/datadog-instrumentations/src/orchestrion-config/index.js

@@ -1,5 +1,54 @@
-const path = require('path')
-const fs = require('fs')
-
-// TODO this needs to be inlined to prevent issues in bundling
-module.exports = fs.readFileSync(path.join(__dirname, '../../orchestrion.yml'), 'utf8')
+module.exports = `
+version: 1
+dc_module: dc-polyfill
+instrumentations:
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/runnables/base.js
+    function_query:
+      name: invoke
+      type: method
+      kind: async
+      class: RunnableSequence
+    operator: tracePromise
+    channel_name: "RunnableSequence_invoke"
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/runnables/base.js
+    function_query:
+      name: batch
+      type: method
+      kind: async
+      class: RunnableSequence
+    operator: tracePromise
+    channel_name: "RunnableSequence_batch"
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/language_models/chat_models.js
+    function_query:
+      name: generate
+      type: method
+      kind: async
+      class: BaseChatModel
+    operator: tracePromise
+    channel_name: "BaseChatModel_generate"
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/language_models/llms.js
+    function_query:
+      name: generate
+      type: method
+      kind: async
+    operator: tracePromise
+    channel_name: "BaseLLM_generate"
+  - module_name: "@langchain/core"
+    version_range: ">=0.1.0"
+    file_path: dist/embeddings.js
+    function_query:
+      name: constructor
+      type: method
+      kind: sync
+      class: Embeddings
+    operator: traceSync
+    channel_name: "Embeddings_constructor"
+`

package/packages/dd-trace/src/config.js

@@ -825,7 +825,7 @@ class Config {
     this._setValue(env, 'baggageMaxBytes', DD_TRACE_BAGGAGE_MAX_BYTES)
     this._setValue(env, 'baggageMaxItems', DD_TRACE_BAGGAGE_MAX_ITEMS)
     this._setBoolean(env, 'clientIpEnabled', DD_TRACE_CLIENT_IP_ENABLED)
-    this._setString(env, 'clientIpHeader', DD_TRACE_CLIENT_IP_HEADER)
+    this._setString(env, 'clientIpHeader', DD_TRACE_CLIENT_IP_HEADER?.toLowerCase())
     this._setBoolean(env, 'crashtracking.enabled', coalesce(
       DD_CRASHTRACKING_ENABLED,
       !this._isInServerlessEnvironment()
@@ -1032,7 +1032,7 @@ class Config {
     this._setValue(opts, 'appsec.wafTimeout', maybeInt(options.appsec.wafTimeout))
     this._optsUnprocessed['appsec.wafTimeout'] = options.appsec.wafTimeout
     this._setBoolean(opts, 'clientIpEnabled', options.clientIpEnabled)
-    this._setString(opts, 'clientIpHeader', options.clientIpHeader)
+    this._setString(opts, 'clientIpHeader', options.clientIpHeader?.toLowerCase())
     this._setValue(opts, 'baggageMaxBytes', options.baggageMaxBytes)
     this._setValue(opts, 'baggageMaxItems', options.baggageMaxItems)
     this._setBoolean(opts, 'codeOriginForSpans.enabled', options.codeOriginForSpans?.enabled)

package/packages/dd-trace/src/plugins/log_plugin.js

@@ -17,6 +17,11 @@ function messageProxy (message, holder) {
         return holder.dd
       }
 
+      // This is a workaround for a V8 bug that surfaced in Node.js 22
+      if (p === 'stack') {
+        return target.stack
+      }
+
       return Reflect.get(target, p, receiver)
     },
     ownKeys (target) {

package/packages/dd-trace/src/profiling/profilers/wall.js

@@ -115,8 +115,6 @@ class NativeWallProfiler {
   start ({ mapper } = {}) {
     if (this._started) return
 
-    ensureChannelsActivated()
-
     this._mapper = mapper
     this._pprof = require('@datadog/pprof')
     kSampleCount = this._pprof.time.constants.kSampleCount
@@ -147,6 +145,8 @@ class NativeWallProfiler {
         this._profilerState = this._pprof.time.getState()
         this._lastSampleCount = 0
 
+        ensureChannelsActivated()
+
         beforeCh.subscribe(this._enter)
         enterCh.subscribe(this._enter)
         spanFinishCh.subscribe(this._spanFinished)

package/packages/datadog-instrumentations/orchestrion.yml

@@ -1,52 +0,0 @@
-version: 1
-dc_module: dc-polyfill
-instrumentations:
-  - module_name: "@langchain/core"
-    version_range: ">=0.1.0"
-    file_path: dist/runnables/base.js
-    function_query:
-      name: invoke
-      type: method
-      kind: async
-      class: RunnableSequence
-    operator: tracePromise
-    channel_name: "RunnableSequence_invoke"
-  - module_name: "@langchain/core"
-    version_range: ">=0.1.0"
-    file_path: dist/runnables/base.js
-    function_query:
-      name: batch
-      type: method
-      kind: async
-      class: RunnableSequence
-    operator: tracePromise
-    channel_name: "RunnableSequence_batch"
-  - module_name: "@langchain/core"
-    version_range: ">=0.1.0"
-    file_path: dist/language_models/chat_models.js
-    function_query:
-      name: generate
-      type: method
-      kind: async
-      class: BaseChatModel
-    operator: tracePromise
-    channel_name: "BaseChatModel_generate"
-  - module_name: "@langchain/core"
-    version_range: ">=0.1.0"
-    file_path: dist/language_models/llms.js
-    function_query:
-      name: generate
-      type: method
-      kind: async
-    operator: tracePromise
-    channel_name: "BaseLLM_generate"
-  - module_name: "@langchain/core"
-    version_range: ">=0.1.0"
-    file_path: dist/embeddings.js
-    function_query:
-      name: constructor
-      type: method
-      kind: sync
-      class: Embeddings
-    operator: traceSync
-    channel_name: "Embeddings_constructor"