dd-trace 5.49.0 → 5.49.1

package/LICENSE-3rdparty.csv

@@ -20,6 +20,7 @@ require,limiter,MIT,Copyright 2011 John Hurliman
 require,lodash.sortby,MIT,Copyright JS Foundation and other contributors
 require,lru-cache,ISC,Copyright (c) 2010-2022 Isaac Z. Schlueter and Contributors
 require,module-details-from-path,MIT,Copyright 2016 Thomas Watson Steen
+require,mutexify,MIT,Copyright (c) 2014 Mathias Buus
 require,opentracing,MIT,Copyright 2016 Resonance Labs Inc
 require,path-to-regexp,MIT,Copyright 2014 Blake Embrey
 require,pprof-format,MIT,Copyright 2022 Stephen Belanger
@@ -31,7 +32,6 @@ require,semifies,Apache license 2.0,Copyright Authors
 require,shell-quote,mit,Copyright (c) 2013 James Halliday
 require,source-map,BSD-3-Clause,Copyright (c) 2009-2011, Mozilla Foundation and contributors
 require,ttl-set,MIT,Copyright (c) 2024 Thomas Watson
-dev,@apollo/server,MIT,Copyright (c) 2016-2020 Apollo Graph, Inc. (Formerly Meteor Development Group, Inc.)
 dev,@babel/helpers,MIT,Copyright (c) 2014-present Sebastian McKenzie and other contributors
 dev,@types/node,MIT,Copyright Authors
 dev,@eslint/eslintrc,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
@@ -39,7 +39,6 @@ dev,@eslint/js,MIT,Copyright OpenJS Foundation and other contributors, <www.open
 dev,@msgpack/msgpack,ISC,Copyright 2019 The MessagePack Community
 dev,@stylistic/eslint-plugin-js,MIT,Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
 dev,autocannon,MIT,Copyright 2016 Matteo Collina
-dev,aws-sdk,Apache 2.0,Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 dev,axios,MIT,Copyright 2014-present Matt Zabriskie
 dev,benchmark,MIT,Copyright 2010-2016 Mathias Bynens Robert Kieffer John-David Dalton
 dev,body-parser,MIT,Copyright 2014 Jonathan Ong 2014-2015 Douglas Christopher Wilson
@@ -48,7 +47,6 @@ dev,chalk,MIT,Copyright Sindre Sorhus
 dev,checksum,MIT,Copyright Daniel D. Shaw
 dev,cli-table3,MIT,Copyright 2014 James Talmage
 dev,dotenv,BSD-2-Clause,Copyright 2015 Scott Motte
-dev,esbuild,MIT,Copyright (c) 2020 Evan Wallace
 dev,eslint,MIT,Copyright JS Foundation and other contributors https://js.foundation
 dev,eslint-config-standard,MIT,Copyright Feross Aboukhadijeh
 dev,eslint-plugin-import,MIT,Copyright 2015 Ben Mosher
@@ -62,7 +60,6 @@ dev,glob,ISC,Copyright Isaac Z. Schlueter and Contributors
 dev,globals,MIT,Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
 dev,graphql,MIT,Copyright 2015 Facebook Inc.
 dev,jszip,MIT,Copyright 2015-2016 Stuart Knightley and contributors
-dev,knex,MIT,Copyright (c) 2013-present Tim Griesser
 dev,mkdirp,MIT,Copyright 2010 James Halliday
 dev,mocha,MIT,Copyright 2011-2018 JS Foundation and contributors https://js.foundation
 dev,multer,MIT,Copyright 2014 Hage Yaapa

package/README.md

@@ -15,7 +15,7 @@
 Most of the documentation for `dd-trace` is available on these webpages:
 
 - [Tracing Node.js Applications](https://docs.datadoghq.com/tracing/languages/nodejs/) - most project documentation, including setup instructions
-- [Configuring the NodeJS Tracing Library](https://docs.datadoghq.com/tracing/trace_collection/library_config/nodejs) - environment variables and config options
+- [Configuring the Node.js Tracing Library](https://docs.datadoghq.com/tracing/trace_collection/library_config/nodejs) - environment variables and config options
 - [API Documentation](https://datadog.github.io/dd-trace-js) - method signatures, plugin list, and some usage examples
 - [APM Terms and Concepts](https://docs.datadoghq.com/tracing/visualization/) - a glossary of concepts applicable across all languages
 
@@ -59,7 +59,7 @@ When a new release line is introduced the previous release line then enters main
 Once that year is up the release line enters End of Life and will not receive new updates.
 The library also follows the Node.js LTS lifecycle wherein new release lines drop compatibility with Node.js versions that reach end-of-life (with the maintenance release line still receiving updates for a year).
 
-For more information about library versioning and compatibility, see the [NodeJS Compatibility Requirements](https://docs.datadoghq.com/tracing/trace_collection/compatibility/nodejs/#releases) page.
+For more information about library versioning and compatibility, see the [Node.js Compatibility Requirements](https://docs.datadoghq.com/tracing/trace_collection/compatibility/nodejs/#releases) page.
 
 Changes associated with each individual release are documented on the [GitHub Releases](https://github.com/DataDog/dd-trace-js/releases) screen.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.49.0",
+  "version": "5.49.1",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -106,6 +106,7 @@
     "lodash.sortby": "^4.7.0",
     "lru-cache": "^7.14.0",
     "module-details-from-path": "^1.0.3",
+    "mutexify": "^1.4.0",
     "opentracing": ">=0.12.1",
     "path-to-regexp": "^0.1.12",
     "pprof-format": "^2.1.0",
@@ -119,7 +120,6 @@
     "ttl-set": "^1.0.0"
   },
   "devDependencies": {
-    "@apollo/server": "^4.11.0",
     "@babel/helpers": "^7.26.10",
     "@eslint/eslintrc": "^3.2.0",
     "@eslint/js": "^9.19.0",
@@ -127,7 +127,6 @@
     "@stylistic/eslint-plugin-js": "^3.0.1",
     "@types/node": "^16.0.0",
     "autocannon": "^4.5.2",
-    "aws-sdk": "^2.1446.0",
     "axios": "^1.8.2",
     "benchmark": "^2.1.4",
     "body-parser": "^1.20.3",
@@ -136,7 +135,6 @@
     "checksum": "^1.0.0",
     "cli-table3": "^0.6.3",
     "dotenv": "16.3.1",
-    "esbuild": "^0.25.0",
     "eslint": "^9.19.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-import": "^2.31.0",
@@ -145,12 +143,11 @@
     "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-unicorn": "^57.0.0",
     "express": "^4.21.2",
-    "get-port": "^3.2.0",
+    "get-port": "^5.1.1",
     "glob": "^7.1.6",
     "globals": "^15.10.0",
     "graphql": "0.13.2",
     "jszip": "^3.5.0",
-    "knex": "^2.4.2",
     "mkdirp": "^3.0.1",
     "mocha": "^10",
     "multer": "^1.4.5-lts.1",

package/packages/datadog-plugin-aws-sdk/src/services/dynamodb.js

@@ -164,7 +164,6 @@ class DynamoDb extends BaseAwsSdkPlugin {
       return
     }
     if (!primaryKeyConfig) {
-      log.warn('Missing DD_TRACE_DYNAMODB_TABLE_PRIMARY_KEYS env variable')
       return
     }
     const primaryKeySet = primaryKeyConfig[tableName]

package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-analyzers/ldap-sensitive-analyzer.js

@@ -13,7 +13,7 @@ module.exports = function extractSensitiveRanges (evidence) {
     let regexResult = pattern.exec(evidence.value)
     while (regexResult != null) {
       if (!regexResult.groups.LITERAL) continue
-      // Computing indices manually since NodeJs 12 does not support d flag on regular expressions
+      // Computing indices manually since Node.js 12 does not support d flag on regular expressions
       // TODO Get indices from group by adding d flag in regular expression
       const start = regexResult.index + (regexResult[0].length - regexResult.groups.LITERAL.length - 1)
       const end = start + regexResult.groups.LITERAL.length

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

@@ -594,10 +594,10 @@ class Config {
     this._setValue(defaults, 'url', undefined)
     this._setValue(defaults, 'version', pkg.version)
     this._setValue(defaults, 'instrumentation_config_id', undefined)
-    this._setValue(defaults, 'aws.dynamoDb.tablePrimaryKeys', undefined)
     this._setValue(defaults, 'vertexai.spanCharLimit', 128)
     this._setValue(defaults, 'vertexai.spanPromptCompletionSampleRate', 1.0)
     this._setValue(defaults, 'trace.aws.addSpanPointers', true)
+    this._setValue(defaults, 'trace.dynamoDb.tablePrimaryKeys', undefined)
     this._setValue(defaults, 'trace.nativeSpanEvents', false)
   }
 

package/packages/dd-trace/src/debugger/devtools_client/breakpoints.js

@@ -1,7 +1,7 @@
 'use strict'
 
+const lock = require('mutexify/promise')()
 const { getGeneratedPosition } = require('./source-maps')
-const lock = require('./lock')()
 const session = require('./session')
 const { compile: compileCondition, compileSegments, templateRequiresEvaluation } = require('./condition')
 const { MAX_SNAPSHOTS_PER_SECOND_PER_PROBE, MAX_NON_SNAPSHOTS_PER_SECOND_PER_PROBE } = require('./defaults')
@@ -64,14 +64,14 @@ async function addBreakpoint (probe) {
   const release = await lock()
 
   try {
-    log.debug(
-      '[debugger:devtools_client] Adding breakpoint at %s:%d:%d (probe: %s, version: %d)',
-      url, lineNumber, columnNumber, probe.id, probe.version
-    )
-
     const locationKey = generateLocationKey(scriptId, lineNumber, columnNumber)
     const breakpoint = locationToBreakpoint.get(locationKey)
 
+    log.debug(
+      '[debugger:devtools_client] %s breakpoint at %s:%d:%d (probe: %s, version: %d)',
+      breakpoint ? 'Updating' : 'Adding', url, lineNumber, columnNumber, probe.id, probe.version
+    )
+
     if (breakpoint) {
       // A breakpoint already exists at this location, so we need to add the probe to the existing breakpoint
       await updateBreakpoint(breakpoint, probe)
@@ -82,10 +82,15 @@ async function addBreakpoint (probe) {
         lineNumber: lineNumber - 1, // Beware! lineNumber is zero-indexed
         columnNumber
       }
-      const result = await session.post('Debugger.setBreakpoint', {
-        location,
-        condition: probe.condition
-      })
+      let result
+      try {
+        result = await session.post('Debugger.setBreakpoint', {
+          location,
+          condition: probe.condition
+        })
+      } catch (err) {
+        throw new Error(`Error setting breakpoint for probe ${probe.id}`, { cause: err })
+      }
       probeToLocation.set(probe.id, locationKey)
       locationToBreakpoint.set(locationKey, { id: result.breakpointId, location, locationKey })
       breakpointToProbes.set(result.breakpointId, new Map([[probe.id, probe]]))
@@ -120,7 +125,11 @@ async function removeBreakpoint ({ id }) {
       if (breakpointToProbes.size === 0) {
         await stop() // TODO: Will this actually delete the breakpoint?
       } else {
-        await session.post('Debugger.removeBreakpoint', { breakpointId: breakpoint.id })
+        try {
+          await session.post('Debugger.removeBreakpoint', { breakpointId: breakpoint.id })
+        } catch (err) {
+          throw new Error(`Error removing breakpoint for probe ${id}`, { cause: err })
+        }
       }
     } else {
       await updateBreakpoint(breakpoint)
@@ -144,12 +153,21 @@ async function updateBreakpoint (breakpoint, probe) {
   const condition = compileCompoundCondition(Array.from(probesAtLocation.values()))
 
   if (condition || conditionBeforeNewProbe !== condition) {
-    await session.post('Debugger.removeBreakpoint', { breakpointId: breakpoint.id })
+    try {
+      await session.post('Debugger.removeBreakpoint', { breakpointId: breakpoint.id })
+    } catch (err) {
+      throw new Error(`Error removing breakpoint for probe ${probe.id}`, { cause: err })
+    }
     breakpointToProbes.delete(breakpoint.id)
-    const result = await session.post('Debugger.setBreakpoint', {
-      location: breakpoint.location,
-      condition
-    })
+    let result
+    try {
+      result = await session.post('Debugger.setBreakpoint', {
+        location: breakpoint.location,
+        condition
+      })
+    } catch (err) {
+      throw new Error(`Error setting breakpoint for probe ${probe.id}`, { cause: err })
+    }
     breakpoint.id = result.breakpointId
     breakpointToProbes.set(result.breakpointId, probesAtLocation)
   }

package/packages/dd-trace/src/debugger/devtools_client/remote_config.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const { workerData: { rcPort } } = require('node:worker_threads')
-const lock = require('./lock')()
+const lock = require('mutexify/promise')()
 const { addBreakpoint, removeBreakpoint } = require('./breakpoints')
 const { ackReceived, ackInstalled, ackError } = require('./status')
 const log = require('../../log')

package/packages/dd-trace/src/debugger/devtools_client/send.js

@@ -26,7 +26,7 @@ const ddtags = [
   ['host_name', hostname],
   [GIT_COMMIT_SHA, config.commitSHA],
   [GIT_REPOSITORY_URL, config.repositoryUrl]
-].map((pair) => pair.join(':')).join(',')
+].filter(([, value]) => value !== undefined).map((pair) => pair.join(':')).join(',')
 
 const path = `/debugger/v1/input?${stringify({ ddtags })}`
 

package/packages/dd-trace/src/debugger/devtools_client/lock.js

@@ -1,8 +0,0 @@
-'use strict'
-
-module.exports = () => async function lock () {
-  if (lock.p) await lock.p
-  let resolve
-  lock.p = new Promise((_resolve) => { resolve = _resolve }).then(() => { lock.p = null })
-  return resolve
-}