dd-trace 5.63.1 → 5.63.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.63.1",
+  "version": "5.63.3",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -174,7 +174,7 @@
     "jszip": "^3.10.1",
     "mocha": "^11.6.0",
     "multer": "^2.0.2",
-    "nock": "^11.9.1",
+    "nock": "^13.5.6",
     "nyc": "^15.1.0",
     "octokit": "^5.0.3",
     "proxyquire": "^1.8.0",

package/packages/datadog-instrumentations/src/jest.js

@@ -166,6 +166,9 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
           this.knownTestsForThisSuite = hasKnownTests
             ? (knownTests?.jest?.[this.testSuite] || [])
             : this.getKnownTestsForSuite(this.testEnvironmentOptions._ddKnownTests)
+          log.debug(`this.knownTestsForThisSuite is an array: ${Array.isArray(this.knownTestsForThisSuite)}`)
+          log.debug(`this.knownTestsForThisSuite is null: ${this.knownTestsForThisSuite === null}`)
+          log.debug(`this.knownTestsForThisSuite is undefined: ${this.knownTestsForThisSuite === undefined}`)
         } catch {
           // If there has been an error parsing the tests, we'll disable Early Flake Deteciton
           this.isEarlyFlakeDetectionEnabled = false
@@ -469,7 +472,10 @@ function getWrappedEnvironment (BaseEnvironment, jestVersion) {
           }
         }
         if (this.isKnownTestsEnabled) {
-          const isNew = !this.knownTestsForThisSuite?.includes(originalTestName)
+          // Check if knownTestsForThisSuite is an array, since the worker may not have provided this information.
+          // If it's null or undefined, we can't determine if the test is new.
+          const isNew = Array.isArray(this.knownTestsForThisSuite) &&
+            !this.knownTestsForThisSuite.includes(originalTestName)
           if (isNew && !isSkipped && !retriedTestsToNumAttempts.has(originalTestName)) {
             retriedTestsToNumAttempts.set(originalTestName, 0)
             if (this.isEarlyFlakeDetectionEnabled) {

package/packages/datadog-plugin-prisma/src/engine.js

@@ -53,8 +53,8 @@ class PrismaEngine extends DatabasePlugin {
       options.resource = originalStatement
       options.type = type || engineSpan.attributes['db.system']
       options.meta['db.type'] = dbType || engineSpan.attributes['db.system']
-      options.meta['db.instance'] = dbConfig?.database
-      options.meta['db.name'] = dbConfig?.user
+      options.meta['db.name'] = dbConfig?.database
+      options.meta['db.user'] = dbConfig?.user
       options.meta['out.host'] = dbConfig?.host
       options.meta[CLIENT_PORT_KEY] = dbConfig?.port
     }

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