dd-trace 5.53.0 → 5.54.0

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

@@ -47,27 +47,27 @@ class Generation {
 class RequestParams {
   constructor ({
     prompt = '',
-    temperature = undefined,
-    topP = undefined,
-    topK = undefined,
-    maxTokens = undefined,
+    temperature,
+    topP,
+    topK,
+    maxTokens,
     stopSequences = [],
     inputType = '',
     truncate = '',
     stream = '',
-    n = undefined
+    n
   } = {}) {
     // stringify prompt as it could be a single prompt as well as a list of message objects
     this.prompt = typeof prompt === 'string' ? prompt : JSON.stringify(prompt) || ''
-    this.temperature = temperature !== undefined ? temperature : undefined
-    this.topP = topP !== undefined ? topP : undefined
-    this.topK = topK !== undefined ? topK : undefined
-    this.maxTokens = maxTokens !== undefined ? maxTokens : undefined
+    this.temperature = temperature === undefined ? undefined : temperature
+    this.topP = topP === undefined ? undefined : topP
+    this.topK = topK === undefined ? undefined : topK
+    this.maxTokens = maxTokens === undefined ? undefined : maxTokens
     this.stopSequences = stopSequences || []
     this.inputType = inputType || ''
     this.truncate = truncate || ''
     this.stream = stream || ''
-    this.n = n !== undefined ? n : undefined
+    this.n = n === undefined ? undefined : n
   }
 }
 
@@ -92,7 +92,7 @@ function parseModelId (modelId) {
     if (modelMeta.length < 2) {
       return { modelProvider: 'custom', modelName: modelMeta[0] }
     }
-    return { modelProvider: modelMeta[modelMeta.length - 2], modelName: modelMeta[modelMeta.length - 1] }
+    return { modelProvider: modelMeta.at(-2), modelName: modelMeta.at(-1) }
   }
 
   for (const identifier of MODEL_TYPE_IDENTIFIERS) {
@@ -105,7 +105,7 @@ function parseModelId (modelId) {
       if (modelMeta.length < 2) {
         return { modelProvider: 'custom', modelName: modelId }
       }
-      return { modelProvider: modelMeta[modelMeta.length - 2], modelName: modelMeta[modelMeta.length - 1] }
+      return { modelProvider: modelMeta.at(-2), modelName: modelMeta.at(-1) }
     }
     return { modelProvider: 'custom', modelName: modelId }
   }
@@ -296,7 +296,7 @@ function extractTextAndResponseReason (response, provider, modelName) {
         return new Generation()
       }
     }
-  } catch (error) {
+  } catch {
     log.warn('Unable to extract text/finishReason from response body. Defaulting to empty text/finishReason.')
     return new Generation()
   }

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

@@ -25,18 +25,17 @@ class DynamoDb extends BaseAwsSdkPlugin {
       // batch operations have different format, collect table name for batch
       // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB.html#batchGetItem-property`
       // dynamoDB batch TableName
-      if (params.RequestItems !== null) {
-        if (typeof params.RequestItems === 'object') {
-          if (Object.keys(params.RequestItems).length === 1) {
-            const tableName = Object.keys(params.RequestItems)[0]
-
-            // also add span type to match serverless convention
-            Object.assign(tags, {
-              'resource.name': `${operation} ${tableName}`,
-              'aws.dynamodb.table_name': tableName,
-              tablename: tableName
-            })
-          }
+      if (params.RequestItems !== null && typeof params.RequestItems === 'object') {
+        const requestItemsKeys = Object.keys(params.RequestItems)
+        if (requestItemsKeys.length === 1) {
+          const tableName = requestItemsKeys[0]
+
+          // also add span type to match serverless convention
+          Object.assign(tags, {
+            'resource.name': `${operation} ${tableName}`,
+            'aws.dynamodb.table_name': tableName,
+            tablename: tableName
+          })
         }
       }
 
@@ -81,10 +80,12 @@ class DynamoDb extends BaseAwsSdkPlugin {
             const hash =
               DynamoDb.calculatePutItemHash(item.Put.TableName, item.Put.Item, this.getPrimaryKeyConfig())
             if (hash) hashes.push(hash)
-          } else if (item.Update || item.Delete) {
-            const operation = item.Update ? item.Update : item.Delete
-            const hash = DynamoDb.calculateHashWithKnownKeys(operation.TableName, operation.Key)
-            if (hash) hashes.push(hash)
+          } else {
+            const operation = item.Update || item.Delete
+            if (operation) {
+              const hash = DynamoDb.calculateHashWithKnownKeys(operation.TableName, operation.Key)
+              if (hash) hashes.push(hash)
+            }
           }
         }
         break
@@ -136,7 +137,7 @@ class DynamoDb extends BaseAwsSdkPlugin {
       const config = {}
       for (const [tableName, primaryKeys] of Object.entries(parsedConfig)) {
         if (Array.isArray(primaryKeys) && primaryKeys.length > 0 && primaryKeys.length <= 2) {
-          config[tableName] = new Set(primaryKeys)
+          config[tableName] = primaryKeys
         } else {
           log.warn(`Invalid primary key configuration for table: ${tableName}.` +
             'Please fix the DD_TRACE_DYNAMODB_TABLE_PRIMARY_KEYS env var.')
@@ -154,7 +155,7 @@ class DynamoDb extends BaseAwsSdkPlugin {
    * Calculates a hash for DynamoDB PutItem operations using table's configured primary keys.
    * @param {string} tableName - Name of the DynamoDB table.
    * @param {Object} item - Complete PutItem item parameter to be put.
-   * @param {Object.<string, Set<string>>} primaryKeyConfig - Mapping of table names to Sets of primary key names
+   * @param {Object.<string, Array<string>>} primaryKeyConfig - Mapping of table names to an Array of primary key names
    *                                                         loaded from DD_TRACE_DYNAMODB_TABLE_PRIMARY_KEYS.
    * @returns {string|undefined} Hash combining table name and primary key/value pairs, or undefined if unable.
    */
@@ -163,19 +164,11 @@ class DynamoDb extends BaseAwsSdkPlugin {
       log.debug('Unable to calculate hash because missing required parameters')
       return
     }
-    if (!primaryKeyConfig) {
-      return
-    }
-    const primaryKeySet = primaryKeyConfig[tableName]
-    if (!primaryKeySet || !(primaryKeySet instanceof Set) || primaryKeySet.size === 0 || primaryKeySet.size > 2) {
-      log.warn(
-        `span pointers: failed to extract PutItem span pointer: table ${tableName} ` +
-        'not found in primary key names or the DD_TRACE_DYNAMODB_TABLE_PRIMARY_KEYS env var was invalid.' +
-        'Please update the env var.'
-      )
+    const keyNames = primaryKeyConfig?.[tableName]
+    if (!keyNames) {
       return
     }
-    const keyValues = extractPrimaryKeys(primaryKeySet, item)
+    const keyValues = extractPrimaryKeys(keyNames, item)
     if (keyValues) {
       return generatePointerHash([tableName, ...keyValues])
     }
@@ -196,8 +189,8 @@ class DynamoDb extends BaseAwsSdkPlugin {
       log.debug('Unable to calculate hash because missing parameters')
       return
     }
-    const keyNamesSet = new Set(Object.keys(keysObject))
-    const keyValues = extractPrimaryKeys(keyNamesSet, keysObject)
+    const keyNames = Object.keys(keysObject)
+    const keyValues = extractPrimaryKeys(keyNames, keysObject)
     if (keyValues) {
       return generatePointerHash([tableName, ...keyValues])
     }

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

@@ -7,8 +7,8 @@ class EventBridge extends BaseAwsSdkPlugin {
   static get isPayloadReporter () { return true }
 
   generateTags (params, operation, response) {
-    if (!params || !params.source) return {}
-    const rulename = params.Name ? params.Name : ''
+    if (!params?.source) return {}
+    const rulename = params.Name ?? ''
     return {
       'resource.name': operation ? `${operation} ${params.source}` : params.source,
       'aws.eventbridge.source': `${params.source}`,

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

@@ -128,12 +128,12 @@ class Kinesis extends BaseAwsSdkPlugin {
   _tryParse (body) {
     try {
       return JSON.parse(body)
-    } catch (e) {
+    } catch {
       log.info('Not JSON string. Trying Base64 encoded JSON string')
     }
     try {
       return JSON.parse(Buffer.from(body, 'base64').toString('ascii'), true)
-    } catch (e) {
+    } catch {
       return null
     }
   }
@@ -145,17 +145,17 @@ class Kinesis extends BaseAwsSdkPlugin {
     let stream
     switch (operation) {
       case 'putRecord':
-        stream = params.StreamArn ? params.StreamArn : (params.StreamName ? params.StreamName : '')
+        stream = params.StreamArn ?? params.StreamName ?? ''
         this.injectToMessage(span, params, stream, true)
         break
       case 'putRecords':
-        stream = params.StreamArn ? params.StreamArn : (params.StreamName ? params.StreamName : '')
+        stream = params.StreamArn ?? params.StreamName ?? ''
         for (let i = 0; i < params.Records.length; i++) {
           this.injectToMessage(
             span,
             params.Records[i],
             stream,
-            i === 0 || (this.config.batchPropagationEnabled)
+            i === 0 || this.config.batchPropagationEnabled
           )
         }
     }
@@ -192,7 +192,7 @@ class Kinesis extends BaseAwsSdkPlugin {
       const byteSize = finalData.length
       // Kinesis max payload size is 1MB
       // So we must ensure adding DD context won't go over that (512b is an estimate)
-      if (byteSize >= 1048576) {
+      if (byteSize >= 1_048_576) {
         log.info('Payload size too large to pass context')
         return
       }

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

@@ -33,7 +33,7 @@ class Lambda extends BaseAwsSdkPlugin {
           // Check to see if there's already a config on the request
           let clientContext = {}
           if (request.params.ClientContext) {
-            const clientContextJson = Buffer.from(request.params.ClientContext, 'base64').toString('utf-8')
+            const clientContextJson = Buffer.from(request.params.ClientContext, 'base64').toString('utf8')
             clientContext = JSON.parse(clientContextJson)
           }
           if (!clientContext.custom) {

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

@@ -19,7 +19,7 @@ class Sns extends BaseAwsSdkPlugin {
     const arnParts = TopicArn.split(':')
 
     // Get the topic name from the last part of the ARN
-    const topicName = arnParts[arnParts.length - 1]
+    const topicName = arnParts.at(-1)
 
     return {
       'resource.name': `${operation} ${params.TopicArn || response.data.TopicArn}`,

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

@@ -20,7 +20,6 @@ class Sqs extends BaseAwsSdkPlugin {
     this.addSub('apm:aws:response:start:sqs', obj => {
       const { request, response } = obj
       const store = storage('legacy').getStore()
-      const plugin = this
       const contextExtraction = this.responseExtract(request.params, request.operation, response)
       let span
       let parsedMessageAttributes = null
@@ -35,7 +34,7 @@ class Sqs extends BaseAwsSdkPlugin {
           )
         }
         parsedMessageAttributes = contextExtraction.parsedAttributes
-        span = plugin.tracer.startSpan('aws.response', options)
+        span = this.tracer.startSpan('aws.response', options)
         this.enter(span, store)
       }
       // extract DSM context after as we might not have a parent-child but may have a DSM context
@@ -96,7 +95,7 @@ class Sqs extends BaseAwsSdkPlugin {
     // 'https://sqs.us-east-1.amazonaws.com/123456789012/my-queue';
     let queueName = params.QueueName
     if (params.QueueUrl) {
-      queueName = params.QueueUrl.split('/')[params.QueueUrl.split('/').length - 1]
+      queueName = params.QueueUrl.split('/').at(-1)
     }
 
     Object.assign(tags, {
@@ -134,7 +133,7 @@ class Sqs extends BaseAwsSdkPlugin {
         if (body.Type === 'Notification') {
           message = body
         }
-      } catch (e) {
+      } catch {
         // SQS to SQS
       }
     }
@@ -186,7 +185,7 @@ class Sqs extends BaseAwsSdkPlugin {
             if (body.Type === 'Notification') {
               message = body
             }
-          } catch (e) {
+          } catch {
             // SQS to SQS
           }
         }

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

@@ -54,7 +54,7 @@ class Stepfunctions extends BaseAwsSdkPlugin {
           const newInput = JSON.stringify(inputObj)
           request.params.input = newInput
         }
-      } catch (e) {
+      } catch {
         log.info('Unable to treat input as JSON')
       }
     }

package/packages/datadog-plugin-aws-sdk/src/util.js

@@ -13,7 +13,7 @@ function generatePointerHash (components) {
   // If passing S3's ETag as a component, make sure any quotes have already been removed!
   const dataToHash = components.join('|')
   const hash = crypto.createHash('sha256').update(dataToHash).digest('hex')
-  return hash.substring(0, 32)
+  return hash.slice(0, 32)
 }
 
 /**
@@ -54,18 +54,17 @@ function encodeValue (valueObject) {
  * Extracts and encodes primary key values from a DynamoDB item.
  * Handles tables with single-key and two-key scenarios.
  *
- * @param {Set<string>} keySet - Set of primary key names.
+ * @param {Array<string>} keyNames - Set of primary key names.
  * @param {Object} keyValuePairs - Object containing key/value pairs.
  * @returns {Array|undefined} [key1Name, key1Value, key2Name, key2Value], or undefined if invalid input.
  *                            key2 entries are empty strings in the single-key case.
  * @example
- * extractPrimaryKeys(new Set(['userId']), {userId: {S: "user123"}})
+ * extractPrimaryKeys(['userId'], {userId: {S: "user123"}})
  * // Returns ["userId", Buffer("user123"), "", ""]
- * extractPrimaryKeys(new Set(['userId', 'timestamp']), {userId: {S: "user123"}, timestamp: {N: "1234}})
+ * extractPrimaryKeys(['userId', 'timestamp'], {userId: {S: "user123"}, timestamp: {N: "1234}})
  * // Returns ["timestamp", Buffer.from("1234"), "userId", Buffer.from("user123")]
  */
-const extractPrimaryKeys = (keySet, keyValuePairs) => {
-  const keyNames = Array.from(keySet)
+const extractPrimaryKeys = (keyNames, keyValuePairs) => {
   if (keyNames.length === 0) {
     return
   }

package/packages/datadog-plugin-cassandra-driver/src/index.js

@@ -37,7 +37,7 @@ function combine (queries) {
 function trim (str, size) {
   if (!str || str.length <= size) return str
 
-  return `${str.substr(0, size - 3)}...`
+  return `${str.slice(0, size - 3)}...`
 }
 
 module.exports = CassandraDriverPlugin

package/packages/datadog-plugin-child_process/src/index.js

@@ -17,7 +17,7 @@ function truncateCommand (cmdFields) {
 
     const argLen = cmdFields[i].length
     if (size < MAX_ARG_SIZE && size + argLen > MAX_ARG_SIZE) {
-      cmdFields[i] = cmdFields[i].substring(0, 2)
+      cmdFields[i] = cmdFields[i].slice(0, 2)
       truncated = true
     }
 
@@ -66,12 +66,12 @@ class ChildProcessPlugin extends TracingPlugin {
 
     if (result !== undefined) {
       exitCode = result?.status || 0
-    } else if (error !== undefined) {
-      exitCode = error?.status || error?.code || 0
-    } else {
+    } else if (error === undefined) {
       // TracingChannels call start, end synchronously. Later when the promise is resolved then asyncStart asyncEnd.
       // Therefore in the case of calling end with neither result nor error means that they will come in the asyncEnd.
       return
+    } else {
+      exitCode = error?.status || error?.code || 0
     }
 
     this.activeSpan?.setTag('cmd.exit_code', `${exitCode}`)

package/packages/datadog-plugin-child_process/src/scrub-cmd-params.js

@@ -2,14 +2,14 @@
 
 const shellParser = require('shell-quote/parse')
 
-const ALLOWED_ENV_VARIABLES = ['LD_PRELOAD', 'LD_LIBRARY_PATH', 'PATH']
-const PROCESS_DENYLIST = ['md5']
+const ALLOWED_ENV_VARIABLES = new Set(['LD_PRELOAD', 'LD_LIBRARY_PATH', 'PATH'])
+const PROCESS_DENYLIST = new Set(['md5'])
 
 const VARNAMES_REGEX = /\$([\w\d_]*)(?:[^\w\d_]|$)/gmi
-// eslint-disable-next-line @stylistic/js/max-len
+// eslint-disable-next-line @stylistic/max-len
 const PARAM_PATTERN = '^-{0,2}(?:p(?:ass(?:w(?:or)?d)?)?|address|api[-_]?key|e?mail|secret(?:[-_]?key)?|a(?:ccess|uth)[-_]?token|mysql_pwd|credentials|(?:stripe)?token)$'
 const regexParam = new RegExp(PARAM_PATTERN, 'i')
-const ENV_PATTERN = '^(\\w+=\\w+;)*\\w+=\\w+;?$'
+const ENV_PATTERN = String.raw`^(\w+=\w+;)*\w+=\w+;?$`
 const envVarRegex = new RegExp(ENV_PATTERN)
 const REDACTED = '?'
 
@@ -71,25 +71,39 @@ function scrubChildProcessCmd (expression) {
         } else if (token.comment) {
           result.push(`#${token.comment}`)
         }
-      } else if (!foundBinary) {
+      } else if (foundBinary) {
+        const paramKeyValue = token.split('=')
+        const paramKey = paramKeyValue[0]
+
+        if (regexParam.test(paramKey)) {
+          if (paramKeyValue.length === 1) {
+            expressionTokens[index + 1] = REDACTED
+            result.push(token)
+          } else {
+            result.push(`${paramKey}=${REDACTED}`)
+          }
+        } else {
+          result.push(token)
+        }
+      } else {
         if (envVarRegex.test(token)) {
           const envSplit = token.split('=')
 
-          if (!ALLOWED_ENV_VARIABLES.includes(envSplit[0])) {
+          if (ALLOWED_ENV_VARIABLES.has(envSplit[0])) {
+            result.push(token)
+          } else {
             envSplit[1] = REDACTED
 
             const newToken = envSplit.join('=')
             expressionTokens[index] = newToken
 
             result.push(newToken)
-          } else {
-            result.push(token)
           }
         } else {
           foundBinary = true
           result.push(token)
 
-          if (PROCESS_DENYLIST.includes(token)) {
+          if (PROCESS_DENYLIST.has(token)) {
             for (index++; index < expressionTokens.length; index++) {
               const token = expressionTokens[index]
 
@@ -103,20 +117,6 @@ function scrubChildProcessCmd (expression) {
             break
           }
         }
-      } else {
-        const paramKeyValue = token.split('=')
-        const paramKey = paramKeyValue[0]
-
-        if (regexParam.test(paramKey)) {
-          if (paramKeyValue.length === 1) {
-            expressionTokens[index + 1] = REDACTED
-            result.push(token)
-          } else {
-            result.push(`${paramKey}=${REDACTED}`)
-          }
-        } else {
-          result.push(token)
-        }
       }
     }
   })

package/packages/datadog-plugin-cucumber/src/index.js

@@ -34,7 +34,10 @@ const {
   TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
   TEST_HAS_FAILED_ALL_RETRIES,
   TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
-  TEST_RETRY_REASON_TYPES
+  TEST_RETRY_REASON_TYPES,
+  TEST_IS_MODIFIED,
+  isModifiedTest,
+  getTestEndLine
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT, ERROR_MESSAGE } = require('../../dd-trace/src/constants')
@@ -345,7 +348,8 @@ class CucumberPlugin extends CiPlugin {
       hasPassedAllRetries,
       hasFailedAttemptToFix,
       isDisabled,
-      isQuarantined
+      isQuarantined,
+      isModified
     }) => {
       const statusTag = isStep ? 'step.status' : TEST_STATUS
 
@@ -400,6 +404,14 @@ class CucumberPlugin extends CiPlugin {
         span.setTag(TEST_MANAGEMENT_IS_QUARANTINED, 'true')
       }
 
+      if (isModified) {
+        span.setTag(TEST_IS_MODIFIED, 'true')
+        if (isEfdRetry) {
+          span.setTag(TEST_IS_RETRY, 'true')
+          span.setTag(TEST_RETRY_REASON, TEST_RETRY_REASON_TYPES.efd)
+        }
+      }
+
       span.finish()
       if (!isStep) {
         const spanTags = span.context()._tags
@@ -442,6 +454,49 @@ class CucumberPlugin extends CiPlugin {
     this.addBind('ci:cucumber:test:fn', (ctx) => {
       return ctx.currentStore
     })
+
+    this.addSub('ci:cucumber:is-modified-test', ({
+      scenarios,
+      testFileAbsolutePath,
+      modifiedTests,
+      stepIds,
+      stepDefinitions,
+      setIsModified
+    }) => {
+      const testScenarioPath = getTestSuitePath(testFileAbsolutePath, this.repositoryRoot || process.cwd())
+      for (const scenario of scenarios) {
+        const isModified = isModifiedTest(
+          testScenarioPath,
+          scenario.location.line,
+          scenario.steps[scenario.steps.length - 1].location.line,
+          modifiedTests,
+          'cucumber'
+        )
+        if (isModified) {
+          setIsModified(true)
+          return
+        }
+      }
+      for (const stepDefinition of stepDefinitions) {
+        if (!stepIds?.includes(stepDefinition.id)) {
+          continue
+        }
+        const testStartLineStep = stepDefinition.line
+        const testEndLineStep = getTestEndLine(stepDefinition.code, testStartLineStep)
+        const isModified = isModifiedTest(
+          stepDefinition.uri,
+          testStartLineStep,
+          testEndLineStep,
+          modifiedTests,
+          'cucumber'
+        )
+        if (isModified) {
+          setIsModified(true)
+          return
+        }
+      }
+      setIsModified(false)
+    })
   }
 
   startTestSpan (testName, testSuite, extraTags) {