dd-trace 5.63.0 → 5.63.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.63.0",
+  "version": "5.63.2",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",

package/packages/datadog-instrumentations/src/moleculer/client.js

@@ -21,19 +21,18 @@ function wrapCall (call) {
       ctx.promiseCtx = promise.ctx
       ctx.broker = broker
 
-      return promise
+      promise
         .then(
           result => {
             finishChannel.publish(ctx)
-            return result
           },
           error => {
             ctx.error = error
             errorChannel.publish(ctx)
             finishChannel.publish(ctx)
-            throw error
           }
         )
+      return promise
     })
   }
 }

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

@@ -252,6 +252,12 @@ const sourcesOrder = [
 ]
 
 class Config {
+  /**
+   * parsed DD_TAGS, usable as a standalone tag set across products
+   * @type {Record<string, string> | undefined}
+   */
+  #parsedDdTags = {}
+
   constructor (options = {}) {
     if (!isInServerlessEnvironment()) {
       // Bail out early if we're in a serverless environment, stable config isn't supported
@@ -431,6 +437,10 @@ class Config {
     }
   }
 
+  get parsedDdTags () {
+    return this.#parsedDdTags
+  }
+
   // Supports only a subset of options for now.
   configure (options, remote) {
     if (remote) {
@@ -823,8 +833,10 @@ class Config {
     const env = setHiddenProperty(this, '_env', {})
     setHiddenProperty(this, '_envUnprocessed', {})
 
+    tagger.add(this.#parsedDdTags, parseSpaceSeparatedTags(DD_TAGS))
+
     tagger.add(tags, parseSpaceSeparatedTags(handleOtel(OTEL_RESOURCE_ATTRIBUTES)))
-    tagger.add(tags, parseSpaceSeparatedTags(DD_TAGS))
+    tagger.add(tags, this.#parsedDdTags)
     tagger.add(tags, DD_TRACE_TAGS)
     tagger.add(tags, DD_TRACE_GLOBAL_TAGS)
 

package/packages/dd-trace/src/llmobs/span_processor.js

@@ -178,6 +178,7 @@ class LLMObsSpanProcessor {
 
   _processTags (span, mlApp, sessionId, error) {
     let tags = {
+      ...this._config.parsedDdTags,
       version: this._config.version,
       env: this._config.env,
       service: this._config.service,
@@ -187,6 +188,7 @@ class LLMObsSpanProcessor {
       error: Number(!!error) || 0,
       language: 'javascript'
     }
+
     const errType = span.context()._tags[ERROR_TYPE] || error?.name
     if (errType) tags.error_type = errType
     if (sessionId) tags.session_id = sessionId

package/packages/dd-trace/src/llmobs/writers/base.js

@@ -120,7 +120,11 @@ class BaseLLMObsWriter {
     }
 
     const { hostname, port } = this._config
-    const base = this._config.url || new URL(format({
+
+    const overrideOriginEnv = getEnvironmentVariable('_DD_LLMOBS_OVERRIDE_ORIGIN')
+    const overrideOriginUrl = overrideOriginEnv && new URL(overrideOriginEnv)
+
+    const base = overrideOriginUrl ?? this._config.url ?? new URL(format({
       protocol: 'http:',
       hostname,
       port

package/packages/dd-trace/src/opentracing/propagation/text_map.js

@@ -148,13 +148,13 @@ class TextMapPropagator {
 
         // Check for item count limit exceeded
         if (itemCounter > this._config.baggageMaxItems) {
-          tracerMetrics.count('context_header_style.truncated', ['truncation_reason:baggage_item_count_exceeded']).inc()
+          tracerMetrics.count('context_header.truncated', ['truncation_reason:baggage_item_count_exceeded']).inc()
           break
         }
 
         // Check for byte count limit exceeded
         if (byteCounter > this._config.baggageMaxBytes) {
-          tracerMetrics.count('context_header_style.truncated', ['truncation_reason:baggage_byte_count_exceeded']).inc()
+          tracerMetrics.count('context_header.truncated', ['truncation_reason:baggage_byte_count_exceeded']).inc()
           break
         }
 

package/packages/dd-trace/src/supported-configurations.json

@@ -118,6 +118,7 @@
     "DD_PLAYWRIGHT_WORKER": ["A"],
     "DD_PROFILING_CODEHOTSPOTS_ENABLED": ["A"],
     "DD_PROFILING_CPU_ENABLED": ["A"],
+    "DD_PROFILING_DEBUG_SOURCE_MAPS": ["A"],
     "DD_PROFILING_DEBUG_UPLOAD_COMPRESSION": ["A"],
     "DD_PROFILING_ENABLED": ["A"],
     "DD_PROFILING_ENDPOINT_COLLECTION_ENABLED": ["A"],
@@ -127,10 +128,13 @@
     "DD_PROFILING_EXPERIMENTAL_OOM_MONITORING_ENABLED": ["A"],
     "DD_PROFILING_EXPORTERS": ["A"],
     "DD_PROFILING_HEAP_ENABLED": ["A"],
+    "DD_PROFILING_HEAP_SAMPLING_INTERVAL": ["A"],
+    "DD_PROFILING_PPROF_PREFIX": ["A"],
     "DD_PROFILING_PROFILERS": ["A"],
     "DD_PROFILING_SOURCE_MAP": ["A"],
     "DD_PROFILING_TIMELINE_ENABLED": ["A"],
     "DD_PROFILING_UPLOAD_PERIOD": ["A"],
+    "DD_PROFILING_UPLOAD_TIMEOUT": ["A"],
     "DD_PROFILING_V8_PROFILER_BUG_WORKAROUND": ["A"],
     "DD_PROFILING_WALLTIME_ENABLED": ["A"],
     "DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS": ["A"],