dd-trace 5.84.0 → 5.86.0

package/packages/datadog-plugin-ai/src/utils.js

@@ -24,5 +24,5 @@ function getModelProvider (tags) {
 }
 
 module.exports = {
-  getModelProvider
+  getModelProvider,
 }

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

@@ -23,8 +23,8 @@ class Amqp10ConsumerPlugin extends ConsumerPlugin {
         'amqp.link.handle': link.handle,
         'amqp.connection.host': address.host,
         'amqp.connection.port': address.port,
-        'amqp.connection.user': address.user
-      }
+        'amqp.connection.user': address.user,
+      },
     }, ctx)
 
     return ctx.currentStore

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

@@ -9,7 +9,7 @@ class Amqp10Plugin extends CompositePlugin {
   static get plugins () {
     return {
       producer: ProducerPlugin,
-      consumer: ConsumerPlugin
+      consumer: ConsumerPlugin,
     }
   }
 }

package/packages/datadog-plugin-amqp10/src/producer.js

@@ -26,8 +26,8 @@ class Amqp10ProducerPlugin extends ProducerPlugin {
         'amqp.link.handle': link.handle,
         'amqp.connection.host': address.host,
         'amqp.connection.port': address.port,
-        'amqp.connection.user': address.user
-      }
+        'amqp.connection.user': address.user,
+      },
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-amqplib/src/client.js

@@ -29,8 +29,8 @@ class AmqplibClientPlugin extends ClientPlugin {
         'amqp.routingKey': fields.routingKey,
         'amqp.consumerTag': fields.consumerTag,
         'amqp.source': fields.source,
-        'amqp.destination': fields.destination
-      }
+        'amqp.destination': fields.destination,
+      },
     }, ctx)
 
     fields.headers = fields.headers || {}

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

@@ -27,8 +27,8 @@ class AmqplibConsumerPlugin extends ConsumerPlugin {
         'amqp.routingKey': fields.routingKey,
         'amqp.consumerTag': fields.consumerTag,
         'amqp.source': fields.source,
-        'amqp.destination': fields.destination
-      }
+        'amqp.destination': fields.destination,
+      },
     }, ctx)
 
     if (

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

@@ -12,7 +12,7 @@ class AmqplibPlugin extends CompositePlugin {
     return {
       producer: ProducerPlugin,
       consumer: ConsumerPlugin,
-      client: ClientPlugin
+      client: ClientPlugin,
     }
   }
 }

package/packages/datadog-plugin-amqplib/src/producer.js

@@ -26,8 +26,8 @@ class AmqplibProducerPlugin extends ProducerPlugin {
         'amqp.routingKey': fields.routingKey,
         'amqp.consumerTag': fields.consumerTag,
         'amqp.source': fields.source,
-        'amqp.destination': fields.destination
-      }
+        'amqp.destination': fields.destination,
+      },
     }, ctx)
 
     fields.headers = fields.headers || {}

package/packages/datadog-plugin-amqplib/src/util.js

@@ -7,7 +7,7 @@ function getResourceName (method, fields = {}) {
     fields.routingKey,
     fields.queue,
     fields.source,
-    fields.destination
+    fields.destination,
   ].filter(Boolean).join(' ')
 }
 

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

@@ -9,7 +9,7 @@ class AnthropicPlugin extends CompositePlugin {
   static get plugins () {
     return {
       llmobs: AnthropicLLMObsPlugin,
-      tracing: AnthropicTracingPlugin
+      tracing: AnthropicTracingPlugin,
     }
   }
 }

package/packages/datadog-plugin-anthropic/src/tracing.js

@@ -14,8 +14,8 @@ class AnthropicTracingPlugin extends TracingPlugin {
     this.startSpan('anthropic.request', {
       meta: {
         'resource.name': `Messages.${resource}`,
-        'anthropic.request.model': options.model
-      }
+        'anthropic.request.model': options.model,
+      },
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-apollo/src/gateway/fetch.js

@@ -15,7 +15,7 @@ class ApolloGatewayFetchPlugin extends ApolloBasePlugin {
       childOf,
       service: this.getServiceName(),
       type: this.constructor.type,
-      meta: {}
+      meta: {},
     }
 
     const serviceName = ctx?.attributes?.service

package/packages/datadog-plugin-apollo/src/gateway/index.js

@@ -18,7 +18,7 @@ class ApolloGatewayPlugin extends CompositePlugin {
       request: ApolloGatewayRequestPlugin,
       plan: ApolloGatewayPlanPlugin,
       fetch: ApolloGatewayFetchPlugin,
-      validate: ApolloGatewayValidatePlugin
+      validate: ApolloGatewayValidatePlugin,
     }
   }
 

package/packages/datadog-plugin-apollo/src/gateway/request.js

@@ -21,7 +21,7 @@ class ApolloGatewayRequestPlugin extends ApolloBasePlugin {
         { id: `${this.constructor.id}.${this.constructor.operation}`, pluginConfig: this.config }),
       type: this.constructor.type,
       kind: this.constructor.kind,
-      meta: {}
+      meta: {},
     }
 
     const { requestContext, gateway } = ctx
@@ -69,12 +69,12 @@ function buildOperationContext (schema, operationDocument, operationName) {
   let operationCount = 0
   const fragments = Object.create(null)
   try {
-    operationDocument.definitions.forEach(definition => {
+    for (const definition of operationDocument.definitions) {
       switch (definition.kind) {
         case OPERATION_DEFINITION:
           operationCount++
           if (!operationName && operationCount > 1) {
-            return
+            continue
           }
           if (
             !operationName ||
@@ -87,7 +87,7 @@ function buildOperationContext (schema, operationDocument, operationName) {
           fragments[definition.name.value] = definition
           break
       }
-    })
+    }
   } catch {
     // safety net
   }
@@ -95,7 +95,7 @@ function buildOperationContext (schema, operationDocument, operationName) {
   return {
     schema,
     operation,
-    fragments
+    fragments,
   }
 }
 

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

@@ -7,7 +7,7 @@ class ApolloPlugin extends CompositePlugin {
   static id = 'apollo'
   static get plugins () {
     return {
-      gateway: ApolloGatewayPlugin
+      gateway: ApolloGatewayPlugin,
     }
   }
 }

package/packages/datadog-plugin-avsc/src/schema_iterator.js

@@ -7,11 +7,11 @@ const {
   SCHEMA_NAME,
   SCHEMA_OPERATION,
   SCHEMA_WEIGHT,
-  SCHEMA_TYPE
+  SCHEMA_TYPE,
 } = require('../../dd-trace/src/constants')
 const log = require('../../dd-trace/src/log')
 const {
-  SchemaBuilder
+  SchemaBuilder,
 } = require('../../dd-trace/src/datastreams')
 
 class SchemaExtractor {
@@ -32,7 +32,7 @@ class SchemaExtractor {
       enum: 'string',
       array: 'array',
       map: 'object',
-      fixed: 'string'
+      fixed: 'string',
     }
     const typeName = type.typeName ?? type.name ?? type
     return typeName === 'null' ? typeName : typeMapping[typeName] || 'string'

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

@@ -6,6 +6,7 @@ const { storage } = require('../../datadog-core')
 const { isTrue } = require('../../dd-trace/src/util')
 const { tagsFromRequest, tagsFromResponse } = require('../../dd-trace/src/payload-tagging')
 const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
+const { IS_SERVERLESS } = require('../../dd-trace/src/serverless')
 
 class BaseAwsSdkPlugin extends ClientPlugin {
   static id = 'aws'
@@ -17,7 +18,7 @@ class BaseAwsSdkPlugin extends ClientPlugin {
       configurable: true,
       writable: true,
       enumerable: true,
-      value: id
+      value: id,
     })
     return id
   }
@@ -40,7 +41,7 @@ class BaseAwsSdkPlugin extends ClientPlugin {
         request,
         operation,
         awsRegion,
-        awsService
+        awsService,
       } = ctx
 
       const parentStore = ctx.parentStore = storage('legacy').getStore()
@@ -61,14 +62,14 @@ class BaseAwsSdkPlugin extends ClientPlugin {
         'aws.partition': getPartition(awsRegion),
         aws_service: awsService,
         'aws.service': awsService,
-        component: 'aws-sdk'
+        component: 'aws-sdk',
       }
       if (this.requestTags) this.requestTags.set(request, meta)
 
       const span = this.startSpan(this.operationFromRequest(request), {
         childOf,
         meta,
-        integrationName: 'aws-sdk'
+        integrationName: 'aws-sdk',
       }, ctx)
 
       analyticsSampler.sample(span, this.config.measured)
@@ -87,7 +88,7 @@ class BaseAwsSdkPlugin extends ClientPlugin {
     })
 
     this.addSub(`apm:aws:request:start:${this.serviceIdentifier}`, (ctx) => {
-      if (!this._tracerConfig?._isInServerlessEnvironment()) return
+      if (!IS_SERVERLESS) return
 
       const { awsRegion, awsService, currentStore, request } = ctx
       const peerServerlessStorage = storage('peerServerless')
@@ -120,7 +121,7 @@ class BaseAwsSdkPlugin extends ClientPlugin {
         span.setTag('aws.partition', partition)
       }
 
-      if (!this._tracerConfig?._isInServerlessEnvironment()) return
+      if (!IS_SERVERLESS) return
 
       const hostname = getHostname(store, region)
       if (!hostname) return
@@ -174,7 +175,7 @@ class BaseAwsSdkPlugin extends ClientPlugin {
       id: 'aws',
       type: 'web',
       kind: 'client',
-      awsService: this.serviceIdentifier
+      awsService: this.serviceIdentifier,
     })
   }
 
@@ -184,7 +185,7 @@ class BaseAwsSdkPlugin extends ClientPlugin {
         id: 'aws',
         type: 'web',
         kind: 'client',
-        awsService: this.serviceIdentifier
+        awsService: this.serviceIdentifier,
       })
   }
 
@@ -204,7 +205,7 @@ class BaseAwsSdkPlugin extends ClientPlugin {
       'aws.response.request_id': response.requestId,
       'resource.name': operation,
       'span.kind': 'client',
-      ...extraTags
+      ...extraTags,
     }
 
     span.addTags(tags)
@@ -283,7 +284,7 @@ function normalizeConfig (config, serviceIdentifier) {
     ...config,
     ...specificConfig,
     batchPropagationEnabled,
-    hooks
+    hooks,
   }
 }
 

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

@@ -9,7 +9,7 @@ class BedrockRuntimePlugin extends CompositePlugin {
   static get plugins () {
     return {
       llmobs: BedrockRuntimeLLMObsPlugin,
-      tracing: BedrockRuntimeTracing
+      tracing: BedrockRuntimeTracing,
     }
   }
 }

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

@@ -23,7 +23,7 @@ class BedrockRuntime extends BaseAwsSdkPlugin {
     return {
       'resource.name': operation,
       'aws.bedrock.request.model': modelName,
-      'aws.bedrock.request.model_provider': modelProvider.toLowerCase()
+      'aws.bedrock.request.model_provider': modelProvider.toLowerCase(),
     }
   }
 }

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,
     }
   }