dd-trace 5.84.0 → 5.85.0

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

@@ -10,7 +10,7 @@ const MODEL_TYPE_IDENTIFIERS = [
   'prompt/',
   'endpoint/',
   'inference-profile/',
-  'default-prompt-router/'
+  'default-prompt-router/',
 ]
 
 const PROVIDER = {
@@ -20,7 +20,7 @@ const PROVIDER = {
   COHERE: 'COHERE',
   META: 'META',
   STABILITY: 'STABILITY',
-  MISTRAL: 'MISTRAL'
+  MISTRAL: 'MISTRAL',
 }
 
 /**
@@ -117,7 +117,7 @@ function extractTextAndResponseReasonFromStream (chunks, modelProvider, modelNam
     inputTokens,
     outputTokens,
     cacheReadTokens,
-    cacheWriteTokens
+    cacheWriteTokens,
   })
 }
 
@@ -130,7 +130,7 @@ class Generation {
     inputTokens,
     outputTokens,
     cacheReadTokens,
-    cacheWriteTokens
+    cacheWriteTokens,
   } = {}) {
     // stringify message as it could be a single generated message as well as a list of embeddings
     this.message = typeof message === 'string' ? message : JSON.stringify(message) || ''
@@ -141,7 +141,7 @@ class Generation {
       inputTokens,
       outputTokens,
       cacheReadTokens,
-      cacheWriteTokens
+      cacheWriteTokens,
     }
   }
 }
@@ -157,7 +157,7 @@ class RequestParams {
     inputType = '',
     truncate = '',
     stream = '',
-    n
+    n,
   } = {}) {
     this.prompt = prompt
     this.temperature = temperature
@@ -233,7 +233,7 @@ function extractRequestParams (params, provider) {
         temperature: requestBody.temperature,
         topP: requestBody.top_p,
         maxTokens: requestBody.max_tokens,
-        stopSequences: requestBody.stop_sequences
+        stopSequences: requestBody.stop_sequences,
       })
     }
     case PROVIDER.AMAZON: {
@@ -247,7 +247,7 @@ function extractRequestParams (params, provider) {
           temperature: textGenerationConfig.temperature,
           topP: textGenerationConfig.topP,
           maxTokens: textGenerationConfig.maxTokenCount,
-          stopSequences: textGenerationConfig.stopSequences
+          stopSequences: textGenerationConfig.stopSequences,
         })
       } else if (Array.isArray(requestBody.messages)) {
         const inferenceConfig = requestBody.inferenceConfig || {}
@@ -256,7 +256,7 @@ function extractRequestParams (params, provider) {
           for (const sysMsg of requestBody.system) {
             messages.push({
               content: sysMsg.text,
-              role: 'system'
+              role: 'system',
             })
           }
         }
@@ -265,7 +265,7 @@ function extractRequestParams (params, provider) {
           if (textBlocks.length > 0) {
             messages.push({
               content: textBlocks.map(block => block.text).join(''),
-              role: message.role
+              role: message.role,
             })
           }
         }
@@ -274,7 +274,7 @@ function extractRequestParams (params, provider) {
           temperature: inferenceConfig.temperature,
           topP: inferenceConfig.topP,
           maxTokens: inferenceConfig.maxTokens,
-          stopSequences: inferenceConfig.stopSequences
+          stopSequences: inferenceConfig.stopSequences,
         })
       }
 
@@ -299,7 +299,7 @@ function extractRequestParams (params, provider) {
         temperature: requestBody.temperature,
         topP: requestBody.top_p,
         maxTokens: requestBody.max_tokens_to_sample ?? requestBody.max_tokens,
-        stopSequences: requestBody.stop_sequences
+        stopSequences: requestBody.stop_sequences,
       })
     }
     case PROVIDER.COHERE: {
@@ -307,7 +307,7 @@ function extractRequestParams (params, provider) {
         return new RequestParams({
           prompt: requestBody.texts,
           inputType: requestBody.input_type,
-          truncate: requestBody.truncate
+          truncate: requestBody.truncate,
         })
       }
       return new RequestParams({
@@ -317,7 +317,7 @@ function extractRequestParams (params, provider) {
         maxTokens: requestBody.max_tokens,
         stopSequences: requestBody.stop_sequences,
         stream: requestBody.stream,
-        n: requestBody.num_generations
+        n: requestBody.num_generations,
       })
     }
     case PROVIDER.META: {
@@ -325,7 +325,7 @@ function extractRequestParams (params, provider) {
         prompt: requestBody.prompt,
         temperature: requestBody.temperature,
         topP: requestBody.top_p,
-        maxTokens: requestBody.max_gen_len
+        maxTokens: requestBody.max_gen_len,
       })
     }
     case PROVIDER.MISTRAL: {
@@ -335,7 +335,7 @@ function extractRequestParams (params, provider) {
         topP: requestBody.top_p,
         maxTokens: requestBody.max_tokens,
         stopSequences: requestBody.stop,
-        topK: requestBody.top_k
+        topK: requestBody.top_k,
       })
     }
     case PROVIDER.STABILITY: {
@@ -363,7 +363,7 @@ function extractTextAndResponseReason (response, provider, modelName) {
               choiceId: shouldSetChoiceIds ? generation.id : undefined,
               role: generation.message.role,
               inputTokens: body.usage?.prompt_tokens,
-              outputTokens: body.usage?.completion_tokens
+              outputTokens: body.usage?.completion_tokens,
             })
           }
         }
@@ -375,7 +375,7 @@ function extractTextAndResponseReason (response, provider, modelName) {
             finishReason: completion?.finishReason,
             choiceId: shouldSetChoiceIds ? completion?.id : undefined,
             inputTokens: body.usage?.prompt_tokens,
-            outputTokens: body.usage?.completion_tokens
+            outputTokens: body.usage?.completion_tokens,
           })
         }
         return new Generation()
@@ -392,7 +392,7 @@ function extractTextAndResponseReason (response, provider, modelName) {
               message: result.outputText,
               finishReason: result.completionReason,
               inputTokens: body.inputTextTokenCount,
-              outputTokens: result.tokenCount
+              outputTokens: result.tokenCount,
             })
           }
         } else if (body.output) {
@@ -404,7 +404,7 @@ function extractTextAndResponseReason (response, provider, modelName) {
             inputTokens: body.usage?.inputTokens,
             outputTokens: body.usage?.outputTokens,
             cacheReadInputTokenCount: body.usage?.cacheReadInputTokenCount,
-            cacheWriteInputTokenCount: body.usage?.cacheWriteInputTokenCount
+            cacheWriteInputTokenCount: body.usage?.cacheWriteInputTokenCount,
           })
         }
         break
@@ -430,7 +430,7 @@ function extractTextAndResponseReason (response, provider, modelName) {
           return new Generation({
             message: body.text,
             finishReason: body.finish_reason,
-            choiceId: shouldSetChoiceIds ? body.response_id : undefined
+            choiceId: shouldSetChoiceIds ? body.response_id : undefined,
           })
         }
 
@@ -440,7 +440,7 @@ function extractTextAndResponseReason (response, provider, modelName) {
           return new Generation({
             message: generation.text,
             finishReason: generation.finish_reason,
-            choiceId: shouldSetChoiceIds ? generation.id : undefined
+            choiceId: shouldSetChoiceIds ? generation.id : undefined,
           })
         }
         break
@@ -450,7 +450,7 @@ function extractTextAndResponseReason (response, provider, modelName) {
           message: body.generation,
           finishReason: body.stop_reason,
           inputTokens: body.prompt_token_count,
-          outputTokens: body.generation_token_count
+          outputTokens: body.generation_token_count,
         })
       }
       case PROVIDER.MISTRAL: {
@@ -483,5 +483,5 @@ module.exports = {
   parseModelId,
   extractRequestParams,
   extractTextAndResponseReason,
-  PROVIDER
+  PROVIDER,
 }

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

@@ -11,7 +11,7 @@ class CloudwatchLogs extends BaseAwsSdkPlugin {
     return {
       'resource.name': `${operation} ${params.logGroupName}`,
       'aws.cloudwatch.logs.log_group_name': params.logGroupName,
-      loggroupname: params.logGroupName
+      loggroupname: params.logGroupName,
     }
   }
 }

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

@@ -12,7 +12,7 @@ class EventBridge extends BaseAwsSdkPlugin {
     return {
       'resource.name': operation ? `${operation} ${params.source}` : params.source,
       'aws.eventbridge.source': `${params.source}`,
-      rulename: `${rulename}`
+      rulename: `${rulename}`,
     }
   }
 

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

@@ -36,9 +36,9 @@ class Kinesis extends BaseAwsSdkPlugin {
             childOf: responseExtraction.maybeChildOf,
             meta: {
               ...this.requestTags.get(request),
-              'span.kind': 'server'
+              'span.kind': 'server',
             },
-            integrationName: 'aws-sdk'
+            integrationName: 'aws-sdk',
           }
           span = plugin.startSpan('aws.response', options, ctx)
           store = ctx.currentStore
@@ -68,7 +68,7 @@ class Kinesis extends BaseAwsSdkPlugin {
     return {
       'resource.name': `${operation} ${params.StreamName}`,
       'aws.kinesis.stream_name': params.StreamName,
-      streamname: params.StreamName
+      streamname: params.StreamName,
     }
   }
 
@@ -93,7 +93,7 @@ class Kinesis extends BaseAwsSdkPlugin {
 
       return {
         maybeChildOf: this.tracer.extract('text_map', decodedData._datadog),
-        parsedAttributes: decodedData._datadog
+        parsedAttributes: decodedData._datadog,
       }
     } catch (e) {
       log.error('Kinesis error extracting response', e)
@@ -109,7 +109,7 @@ class Kinesis extends BaseAwsSdkPlugin {
     // we only want to set the payloadSize on the span if we have one message, not repeatedly
     span = response.Records.length > 1 ? null : span
 
-    response.Records.forEach(record => {
+    for (const record of response.Records) {
       const parsedAttributes = JSON.parse(Buffer.from(record.Data).toString())
 
       const payloadSize = getSizeOrZero(record.Data)
@@ -121,7 +121,7 @@ class Kinesis extends BaseAwsSdkPlugin {
         : ['direction:in', 'type:kinesis']
       this.tracer
         .setCheckpoint(tags, span, payloadSize)
-    })
+    }
   }
 
   // AWS-SDK will b64 kinesis payloads

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

@@ -12,7 +12,7 @@ class Lambda extends BaseAwsSdkPlugin {
     return {
       'resource.name': `${operation} ${params.FunctionName}`,
       functionname: params.FunctionName,
-      'aws.lambda': params.FunctionName
+      'aws.lambda': params.FunctionName,
     }
   }
 
@@ -51,7 +51,7 @@ class Lambda extends BaseAwsSdkPlugin {
     if (request.operation === 'invoke') {
       return this.operationName({
         type: 'web',
-        kind: 'client'
+        kind: 'client',
       })
     }
 
@@ -59,7 +59,7 @@ class Lambda extends BaseAwsSdkPlugin {
       id: 'aws',
       type: 'web',
       kind: 'client',
-      awsService: 'lambda'
+      awsService: 'lambda',
     })
   }
 }

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

@@ -11,7 +11,7 @@ class Redshift extends BaseAwsSdkPlugin {
     return {
       'resource.name': `${operation} ${params.ClusterIdentifier}`,
       'aws.redshift.cluster_identifier': params.ClusterIdentifier,
-      clusteridentifier: params.ClusterIdentifier
+      clusteridentifier: params.ClusterIdentifier,
     }
   }
 }

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

@@ -16,7 +16,7 @@ class S3 extends BaseAwsSdkPlugin {
     return {
       'resource.name': `${operation} ${params.Bucket}`,
       'aws.s3.bucket_name': params.Bucket,
-      bucketname: params.Bucket
+      bucketname: params.Bucket,
     }
   }
 

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

@@ -24,7 +24,7 @@ class Sns extends BaseAwsSdkPlugin {
     return {
       'resource.name': `${operation} ${params.TopicArn || response.data.TopicArn}`,
       'aws.sns.topic_arn': TopicArn,
-      topicname: topicName
+      topicname: topicName,
     }
 
     // TODO: should arn be sanitized or quantized in some way here,
@@ -37,7 +37,7 @@ class Sns extends BaseAwsSdkPlugin {
       case 'publishBatch':
         return this.operationName({
           type: 'messaging',
-          kind: 'producer'
+          kind: 'producer',
         })
     }
 
@@ -45,7 +45,7 @@ class Sns extends BaseAwsSdkPlugin {
       id: 'aws',
       type: 'web',
       kind: 'client',
-      awsService: 'sns'
+      awsService: 'sns',
     })
   }
 
@@ -86,7 +86,7 @@ class Sns extends BaseAwsSdkPlugin {
       // add ddInfo before checking DSM so we can include DD attributes in payload size
       params.MessageAttributes._datadog = {
         DataType: 'Binary',
-        BinaryValue: ddInfo
+        BinaryValue: ddInfo,
       }
     }
 
@@ -94,7 +94,7 @@ class Sns extends BaseAwsSdkPlugin {
       if (!params.MessageAttributes._datadog) {
         params.MessageAttributes._datadog = {
           DataType: 'Binary',
-          BinaryValue: ddInfo
+          BinaryValue: ddInfo,
         }
       }
 

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

@@ -30,9 +30,9 @@ class Sqs extends BaseAwsSdkPlugin {
           childOf: contextExtraction.datadogContext,
           meta: {
             ...this.requestTags.get(request),
-            'span.kind': 'server'
+            'span.kind': 'server',
           },
-          integrationName: 'aws-sdk'
+          integrationName: 'aws-sdk',
         }
         parsedMessageAttributes = contextExtraction.parsedAttributes
         span = this.startSpan('aws.response', options, ctx)
@@ -58,13 +58,13 @@ class Sqs extends BaseAwsSdkPlugin {
       case 'receiveMessage':
         return this.operationName({
           type: 'messaging',
-          kind: 'consumer'
+          kind: 'consumer',
         })
       case 'sendMessage':
       case 'sendMessageBatch':
         return this.operationName({
           type: 'messaging',
-          kind: 'producer'
+          kind: 'producer',
         })
     }
 
@@ -72,7 +72,7 @@ class Sqs extends BaseAwsSdkPlugin {
       id: 'aws',
       type: 'web',
       kind: 'client',
-      awsService: 'sqs'
+      awsService: 'sqs',
     })
   }
 
@@ -149,7 +149,7 @@ class Sqs extends BaseAwsSdkPlugin {
     if (parsedAttributes) {
       return {
         datadogContext: this.tracer.extract('text_map', parsedAttributes),
-        parsedAttributes
+        parsedAttributes,
       }
     }
   }
@@ -177,7 +177,7 @@ class Sqs extends BaseAwsSdkPlugin {
     // we only want to set the payloadSize on the span if we have one message
     span = response.Messages.length > 1 ? null : span
 
-    response.Messages.forEach(message => {
+    for (let message of response.Messages) {
       // we may have already parsed the message attributes when extracting trace context
       if (!parsedAttributes) {
         if (message.Body) {
@@ -198,7 +198,7 @@ class Sqs extends BaseAwsSdkPlugin {
       }
       const payloadSize = getHeadersSize({
         Body: message.Body,
-        MessageAttributes: message.MessageAttributes
+        MessageAttributes: message.MessageAttributes,
       })
       const queue = params.QueueUrl.split('/').pop()
       if (parsedAttributes) {
@@ -206,7 +206,7 @@ class Sqs extends BaseAwsSdkPlugin {
       }
       this.tracer
         .setCheckpoint(['direction:in', `topic:${queue}`, 'type:sqs'], span, payloadSize)
-    })
+    }
   }
 
   requestInject (span, request) {
@@ -258,7 +258,7 @@ class Sqs extends BaseAwsSdkPlugin {
       this.tracer.inject(span, 'text_map', ddInfo)
       params.MessageAttributes._datadog = {
         DataType: 'String',
-        StringValue: JSON.stringify(ddInfo)
+        StringValue: JSON.stringify(ddInfo),
       }
     }
 
@@ -266,7 +266,7 @@ class Sqs extends BaseAwsSdkPlugin {
       if (!params.MessageAttributes._datadog) {
         params.MessageAttributes._datadog = {
           DataType: 'String',
-          StringValue: JSON.stringify(ddInfo)
+          StringValue: JSON.stringify(ddInfo),
         }
       }
 
@@ -286,7 +286,7 @@ class Sqs extends BaseAwsSdkPlugin {
   setDSMCheckpoint (span, params, queueUrl) {
     const payloadSize = getHeadersSize({
       Body: params.MessageBody,
-      MessageAttributes: params.MessageAttributes
+      MessageAttributes: params.MessageAttributes,
     })
     const queue = queueUrl.split('/').pop()
     const dataStreamsContext = this.tracer

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

@@ -147,5 +147,5 @@ module.exports = {
   generatePointerHash,
   encodeValue,
   extractPrimaryKeys,
-  extractQueueMetadata
+  extractQueueMetadata,
 }

package/packages/datadog-plugin-azure-event-hubs/src/index.js

@@ -7,7 +7,7 @@ class AzureEventHubsPlugin extends CompositePlugin {
   static get id () { return 'azure-event-hubs' }
   static get plugins () {
     return {
-      producer: ProducerPlugin
+      producer: ProducerPlugin,
     }
   }
 }

package/packages/datadog-plugin-azure-event-hubs/src/producer.js

@@ -26,7 +26,7 @@ class AzureEventHubsProducerPlugin extends ProducerPlugin {
         'messaging.system': 'eventhubs',
         'messaging.destination.name': entityPath,
         'network.destination.name': qualifiedNamespace,
-      }
+      },
     }, ctx)
 
     if (ctx.functionName === 'tryAdd') {
@@ -55,9 +55,9 @@ class AzureEventHubsProducerPlugin extends ProducerPlugin {
       span.setTag('messaging.batch.message_count', eventDataLength)
 
       if (eventData.constructor.name !== 'EventDataBatchImpl' && Array.isArray(eventData)) {
-        eventData.forEach(event => {
+        for (const event of eventData) {
           injectTraceContext(this.tracer, span, event)
-        })
+        }
       } else {
         if (batchLinksAreEnabled()) {
           const contexts = spanContexts.get(eventData)

package/packages/datadog-plugin-azure-functions/src/index.js

@@ -56,7 +56,7 @@ class AzureFunctionsPlugin extends TracingPlugin {
       const req = {
         method: httpRequest.method,
         headers: Object.fromEntries(httpRequest.headers),
-        url: path
+        url: path,
       }
       const context = web.patch(req)
       context.config = this.config
@@ -79,7 +79,7 @@ class AzureFunctionsPlugin extends TracingPlugin {
 function getMetaForTrigger ({ functionName, methodName, invocationContext }) {
   let meta = {
     'aas.function.name': functionName,
-    'aas.function.trigger': mapTriggerTag(methodName)
+    'aas.function.trigger': mapTriggerTag(methodName),
   }
 
   if (triggerMap[methodName] === 'ServiceBus') {
@@ -91,7 +91,7 @@ function getMetaForTrigger ({ functionName, methodName, invocationContext }) {
       'messaging.system': 'servicebus',
       'messaging.destination.name': triggerEntity,
       'resource.name': `ServiceBus ${functionName}`,
-      'span.kind': 'consumer'
+      'span.kind': 'consumer',
     }
   } else if (triggerMap[methodName] === 'EventHubs') {
     const partitionContext = invocationContext.triggerMetadata.triggerPartitionContext
@@ -101,7 +101,7 @@ function getMetaForTrigger ({ functionName, methodName, invocationContext }) {
       'messaging.operation': 'receive',
       'messaging.system': 'eventhubs',
       'resource.name': `EventHubs ${functionName}`,
-      'span.kind': 'consumer'
+      'span.kind': 'consumer',
     }
   }
 
@@ -113,12 +113,11 @@ function mapTriggerTag (methodName) {
 }
 
 function extractTraceContext (tracer, ctx) {
-  switch (String(triggerMap[ctx.methodName])) {
-    case 'Http':
-      return tracer.extract('http_headers', Object.fromEntries(ctx.httpRequest.headers))
-    default:
-      null
+  if (triggerMap[ctx.methodName] === 'Http') {
+    return tracer.extract('http_headers', Object.fromEntries(ctx.httpRequest.headers))
   }
+  // Returning null indicates that the span is a root span
+  return null
 }
 
 // message & messages & batch with cardinality of 1 == applicationProperties
@@ -145,7 +144,9 @@ function setSpanLinks (triggerType, tracer, span, ctx) {
   }
 
   if (cardinality === 'many' && propertiesArray?.length > 0) {
-    propertiesArray.forEach(addLinkFromProperties)
+    for (const prop of propertiesArray) {
+      addLinkFromProperties(prop)
+    }
   } else if (cardinality === 'one') {
     addLinkFromProperties(properties)
   }

package/packages/datadog-plugin-azure-service-bus/src/index.js

@@ -7,7 +7,7 @@ class AzureServiceBusPlugin extends CompositePlugin {
   static get id () { return 'azure-service-bus' }
   static get plugins () {
     return {
-      producer: ProducerPlugin
+      producer: ProducerPlugin,
     }
   }
 }

package/packages/datadog-plugin-azure-service-bus/src/producer.js

@@ -25,7 +25,7 @@ class AzureServiceBusProducerPlugin extends ProducerPlugin {
         'messaging.operation': 'send',
         'messaging.system': 'servicebus',
         'network.destination.name': qualifiedSenderNamespace,
-      }
+      },
     }, ctx)
 
     if (ctx.functionName === 'tryAddMessage') {
@@ -62,9 +62,9 @@ class AzureServiceBusProducerPlugin extends ProducerPlugin {
         }
       } else if (Array.isArray(messages)) {
         span.setTag('messaging.batch.message_count', messages.length)
-        messages.forEach(event => {
+        for (const event of messages) {
           injectTraceContext(this.tracer, span, event)
-        })
+        }
       } else {
         injectTraceContext(this.tracer, span, messages)
       }

package/packages/datadog-plugin-bullmq/src/consumer.js

@@ -29,8 +29,8 @@ class BullmqConsumerPlugin extends ConsumerPlugin {
         'span.kind': 'consumer',
         'messaging.system': 'bullmq',
         'messaging.destination.name': queueName,
-        'messaging.operation': 'process'
-      }
+        'messaging.operation': 'process',
+      },
     }, ctx)
 
     if (this.config.dsmEnabled) {

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

@@ -11,7 +11,7 @@ class BullmqPlugin extends CompositePlugin {
     queueAdd: BullmqProducerPlugins[0],
     queueAddBulk: BullmqProducerPlugins[1],
     flowProducerAdd: BullmqProducerPlugins[2],
-    consumer: BullmqConsumerPlugin
+    consumer: BullmqConsumerPlugin,
   }
 }