dd-trace 5.83.0 → 5.85.0

package/packages/datadog-plugin-google-cloud-pubsub/src/consumer.js

@@ -68,7 +68,9 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
       }
 
       if (api === 'acknowledge') {
-        ackIds.forEach(ackId => ackIdToMessage.delete(ackId))
+        for (const ackId of ackIds) {
+          ackIdToMessage.delete(ackId)
+        }
       }
     })
   }
@@ -90,7 +92,7 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
     return new SpanContext({
       traceId,
       spanId: parentId,
-      tags
+      tags,
     })
   }
 
@@ -130,7 +132,7 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
       'pubsub.span_type': 'message_processing',
       'messaging.operation': 'receive',
       base_service: baseService,
-      service_override_type: 'custom'
+      service_override_type: 'custom',
     }
 
     if (batchRequestTraceId && batchRequestSpanId) {
@@ -139,12 +141,12 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
       meta['_dd.span_links'] = JSON.stringify([{
         trace_id: batchRequestTraceId,
         span_id: batchRequestSpanId,
-        flags: 0
+        flags: 0,
       }])
     }
 
     const metrics = {
-      'pubsub.ack': 0
+      'pubsub.ack': 0,
     }
 
     if (batchSize) {
@@ -166,7 +168,7 @@ class GoogleCloudPubsubConsumerPlugin extends ConsumerPlugin {
       type: 'worker',
       service: serviceName,
       meta,
-      metrics
+      metrics,
     }, ctx)
 
     if (message.id) {

package/packages/datadog-plugin-google-cloud-pubsub/src/index.js

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

package/packages/datadog-plugin-google-cloud-pubsub/src/producer.js

@@ -64,7 +64,7 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
           traceId: firstAttrs['x-datadog-trace-id'],
           spanId: firstAttrs['x-datadog-parent-id'],
           traceIdUpper: firstAttrs['_dd.p.tid'],
-          samplingPriority: firstAttrs['x-datadog-sampling-priority']
+          samplingPriority: firstAttrs['x-datadog-sampling-priority'],
         }
       : null
 
@@ -81,12 +81,12 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
         '_dd.base_service': this.tracer._service,
         '_dd.serviceoverride.type': 'integration',
         'pubsub.linked_message_count': spanLinkData.length || undefined,
-        operation: messageCount > 1 ? 'batched.pubsub.request' : 'pubsub.request'
+        operation: messageCount > 1 ? 'batched.pubsub.request' : 'pubsub.request',
       },
       metrics: {
         'pubsub.batch.message_count': messageCount,
-        'pubsub.batch': messageCount > 1 ? true : undefined
-      }
+        'pubsub.batch': messageCount > 1 ? true : undefined,
+      },
     }, ctx)
 
     const spanCtx = batchSpan.context()
@@ -102,12 +102,13 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
         spanLinkData.map(link => ({
           trace_id: link.traceId,
           span_id: link.spanId,
-          flags: link.samplingPriority || 0
+          flags: link.samplingPriority || 0,
         }))
       ))
     }
 
-    messages.forEach((msg, i) => {
+    for (let i = 0; i < messages.length; i++) {
+      const msg = messages[i]
       msg.attributes ??= {}
 
       if (!hasTraceContext) {
@@ -121,7 +122,7 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
         '_dd.batch.index': String(i),
         'gcloud.project_id': projectId,
         'pubsub.topic': topic,
-        'x-dd-publish-start-time': String(Math.floor(batchSpan._startTime))
+        'x-dd-publish-start-time': String(Math.floor(batchSpan._startTime)),
       })
 
       if (batchTraceIdUpper) {
@@ -136,7 +137,7 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
         )
         DsmPathwayCodec.encode(dataStreamsContext, msg.attributes)
       }
-    })
+    }
 
     ctx.batchSpan = batchSpan
     return ctx.currentStore
@@ -171,14 +172,14 @@ class GoogleCloudPubsubProducerPlugin extends ProducerPlugin {
       spanId: spanIdHex,
       samplingPriority: attrs['x-datadog-sampling-priority']
         ? Number.parseInt(attrs['x-datadog-sampling-priority'], 10)
-        : undefined
+        : undefined,
     }
   }
 
   #extractParentContext (data) {
     const carrier = {
       'x-datadog-trace-id': data.traceId,
-      'x-datadog-parent-id': data.spanId
+      'x-datadog-parent-id': data.spanId,
     }
     if (data.traceIdUpper) carrier['_dd.p.tid'] = data.traceIdUpper
     if (data.samplingPriority) carrier['x-datadog-sampling-priority'] = String(data.samplingPriority)

package/packages/datadog-plugin-google-cloud-pubsub/src/pubsub-push-subscription.js

@@ -53,8 +53,8 @@ class GoogleCloudPubsubPushSubscriptionPlugin extends TracingPlugin {
     }
 
     log.warn(
-      '[PubSub] No x-goog-pubsub-* headers detected. pubsub.push.receive spans will not be created. ' +
-      'Add --push-no-wrapper-write-metadata to your subscription.'
+      // eslint-disable-next-line @stylistic/max-len
+      '[PubSub] No x-goog-pubsub-* headers detected. pubsub.push.receive spans will not be created. Add --push-no-wrapper-write-metadata to your subscription.'
     )
     return false
   }
@@ -96,7 +96,7 @@ class GoogleCloudPubsubPushSubscriptionPlugin extends TracingPlugin {
     const subscription = req.headers['x-goog-pubsub-subscription-name']
     const message = {
       messageId: req.headers['x-goog-pubsub-message-id'],
-      publishTime: req.headers['x-goog-pubsub-publish-time']
+      publishTime: req.headers['x-goog-pubsub-publish-time'],
     }
 
     const topicName = req.headers['pubsub.topic'] || 'push-subscription-topic'
@@ -136,7 +136,7 @@ class GoogleCloudPubsubPushSubscriptionPlugin extends TracingPlugin {
     return new SpanContext({
       traceId,
       spanId: parentId,
-      tags
+      tags,
     })
   }
 
@@ -165,8 +165,8 @@ class GoogleCloudPubsubPushSubscriptionPlugin extends TracingPlugin {
         'pubsub.topic': topicName,
         '_dd.base_service': baseService,
         '_dd.serviceoverride.type': 'integration',
-        'resource.name': `Push Subscription ${subscriptionName}`
-      }
+        'resource.name': `Push Subscription ${subscriptionName}`,
+      },
     })
 
     if (!span) {

package/packages/datadog-plugin-google-cloud-vertexai/src/index.js

@@ -9,7 +9,7 @@ class GoogleCloudVertexAIPlugin extends CompositePlugin {
   static get plugins () {
     return {
       llmobs: VertexAILLMObsPlugin,
-      tracing: GoogleVertexAITracingPlugin
+      tracing: GoogleVertexAITracingPlugin,
     }
   }
 }

package/packages/datadog-plugin-google-cloud-vertexai/src/tracing.js

@@ -28,8 +28,8 @@ class GoogleCloudVertexAITracingPlugin extends TracingPlugin {
       kind: 'client',
       meta: {
         [MEASURED]: 1,
-        'vertexai.request.model': extractModel(instance)
-      }
+        'vertexai.request.model': extractModel(instance),
+      },
     }, false)
 
     const store = storage('legacy').getStore() || {}

package/packages/datadog-plugin-google-cloud-vertexai/src/utils.js

@@ -17,5 +17,5 @@ function extractSystemInstructions (instance) {
 
 module.exports = {
   extractModel,
-  extractSystemInstructions
+  extractSystemInstructions,
 }

package/packages/datadog-plugin-google-genai/src/index.js

@@ -9,7 +9,7 @@ class GenAiPlugin extends CompositePlugin {
   static get plugins () {
     return {
       llmobs: GenAiLLMObsPlugin,
-      tracing: GenAiTracingPlugin
+      tracing: GenAiTracingPlugin,
     }
   }
 }

package/packages/datadog-plugin-google-genai/src/tracing.js

@@ -20,8 +20,8 @@ class GenAiTracingPlugin extends TracingPlugin {
       meta: {
         'resource.name': methodName,
         'google_genai.request.model': model,
-        'google_genai.request.provider': 'google'
-      }
+        'google_genai.request.provider': 'google',
+      },
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-graphql/src/execute.js

@@ -27,8 +27,8 @@ class GraphQLExecutePlugin extends TracingPlugin {
       meta: {
         'graphql.operation.type': type,
         'graphql.operation.name': name,
-        'graphql.source': source
-      }
+        'graphql.source': source,
+      },
     }, ctx)
 
     addVariableTags(this.config, span, args.variableValues)

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

@@ -15,7 +15,7 @@ class GraphQLPlugin extends CompositePlugin {
       execute: GraphQLExecutePlugin,
       parse: GraphQLParsePlugin,
       validate: GraphQLValidatePlugin,
-      resolve: GraphQLResolvePlugin
+      resolve: GraphQLResolvePlugin,
     }
   }
 
@@ -35,7 +35,7 @@ function validateConfig (config) {
     depth: getDepth(config),
     variables: getVariablesFilter(config),
     collapse: config.collapse === undefined || !!config.collapse,
-    hooks: getHooks(config)
+    hooks: getHooks(config),
   }
 }
 

package/packages/datadog-plugin-graphql/src/parse.js

@@ -10,7 +10,7 @@ class GraphQLParsePlugin extends TracingPlugin {
     this.startSpan('graphql.parse', {
       service: this.config.service,
       type: 'graphql',
-      meta: {}
+      meta: {},
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-graphql/src/resolve.js

@@ -50,19 +50,19 @@ class GraphQLResolvePlugin extends TracingPlugin {
         'graphql.field.name': info.fieldName,
         'graphql.field.path': computedPathString,
         'graphql.field.type': info.returnType.name,
-        'graphql.source': source
-      }
+        'graphql.source': source,
+      },
     }, fieldCtx)
 
     if (fieldNode && this.config.variables && fieldNode.arguments) {
       const variables = this.config.variables(info.variableValues)
 
-      fieldNode.arguments
-        .filter(arg => arg.value?.name && arg.value.kind === 'Variable' && variables[arg.value.name.value])
-        .forEach(arg => {
+      for (const arg of fieldNode.arguments) {
+        if (arg.value?.name && arg.value.kind === 'Variable' && variables[arg.value.name.value]) {
           const name = arg.value.name.value
           span.setTag(`graphql.variables.${name}`, variables[name])
-        })
+        }
+      }
     }
 
     if (this.resolverStartCh.hasSubscribers) {

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

@@ -45,5 +45,5 @@ function extractErrorIntoSpanEvent (config, span, exc) {
 }
 
 module.exports = {
-  extractErrorIntoSpanEvent
+  extractErrorIntoSpanEvent,
 }

package/packages/datadog-plugin-graphql/src/validate.js

@@ -15,8 +15,8 @@ class GraphQLValidatePlugin extends TracingPlugin {
       service: this.config.service,
       type: 'graphql',
       meta: {
-        'graphql.source': source
-      }
+        'graphql.source': source,
+      },
     }, ctx)
 
     return ctx.currentStore

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

@@ -35,11 +35,11 @@ class GrpcClientPlugin extends ClientPlugin {
         'grpc.method.path': method.path,
         'grpc.method.name': method.name,
         'grpc.method.service': method.service,
-        'grpc.method.package': method.package
+        'grpc.method.package': method.package,
       },
       metrics: {
-        'grpc.status.code': 0
-      }
+        'grpc.status.code': 0,
+      },
     }, false)
     // needed as precursor for peer.service
     if (method.service && method.package) {

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

@@ -9,7 +9,7 @@ class GrpcPlugin extends CompositePlugin {
   static get plugins () {
     return {
       server: GrpcServerPlugin,
-      client: GrpcClientPlugin
+      client: GrpcClientPlugin,
     }
   }
 }

package/packages/datadog-plugin-grpc/src/server.js

@@ -44,11 +44,11 @@ class GrpcServerPlugin extends ServerPlugin {
         'grpc.method.path': method.path,
         'grpc.method.name': method.name,
         'grpc.method.service': method.service,
-        'grpc.method.package': method.package
+        'grpc.method.package': method.package,
       },
       metrics: {
-        'grpc.status.code': 0
-      }
+        'grpc.status.code': 0,
+      },
     })
 
     addMetadataTags(span, metadata, metadataFilter, 'request')

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

@@ -14,7 +14,7 @@ module.exports = {
       kind,
       name: '',
       service: '',
-      package: ''
+      package: '',
     }
 
     if (typeof path !== 'string') return tags
@@ -62,5 +62,5 @@ module.exports = {
     }
 
     return getEmptyObject
-  }
+  },
 }

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

@@ -48,11 +48,11 @@ class HttpClientPlugin extends ClientPlugin {
         'span.type': 'http',
         'http.method': method,
         'http.url': uri,
-        'out.host': hostname
+        'out.host': hostname,
       },
       metrics: {
-        [CLIENT_PORT_KEY]: Number.parseInt(options.port)
-      }
+        [CLIENT_PORT_KEY]: Number.parseInt(options.port),
+      },
     }, false)
 
     // TODO: Figure out a better way to do this for any span.
@@ -120,7 +120,7 @@ class HttpClientPlugin extends ClientPlugin {
       span.addTags({
         [ERROR_TYPE]: error.name,
         [ERROR_MESSAGE]: error.message || error.code,
-        [ERROR_STACK]: error.stack
+        [ERROR_STACK]: error.stack,
       })
     } else {
       // conditions for no error:
@@ -144,13 +144,13 @@ function addResponseHeaders (res, span, config) {
     ? Object.fromEntries(res.headers.entries())
     : res.headers
 
-  config.headers.forEach(([key, tag]) => {
+  for (const [key, tag] of config.headers) {
     const value = headers[key]
 
     if (value) {
       span.setTag(tag || `${HTTP_RESPONSE_HEADERS}.${key}`, value)
     }
-  })
+  }
 }
 
 function addRequestHeaders (req, span, config) {
@@ -158,13 +158,13 @@ function addRequestHeaders (req, span, config) {
     ? Object.fromEntries(req.headers.entries())
     : req.headers || req.getHeaders()
 
-  config.headers.forEach(([key, tag]) => {
+  for (const [key, tag] of config.headers) {
     const value = Array.isArray(headers[key]) ? headers[key].toString() : headers[key]
 
     if (value) {
       span.setTag(tag || `${HTTP_REQUEST_HEADERS}.${key}`, value)
     }
-  })
+  }
 }
 
 function normalizeClientConfig (config) {
@@ -180,7 +180,7 @@ function normalizeClientConfig (config) {
     filter,
     propagationFilter,
     headers,
-    hooks
+    hooks,
   }
 }
 
@@ -214,7 +214,7 @@ function getHeaders (config) {
         ? [header, undefined]
         : [
             header.slice(0, separatorIndex).toLowerCase(),
-            header.slice(separatorIndex + 1)
+            header.slice(separatorIndex + 1),
           ]
       )
     }

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

@@ -23,7 +23,7 @@ class HttpPlugin extends CompositePlugin {
         plugins['pubsub-push-subscription'] = PushSubscriptionPlugin
         log.debug('Loaded GCP Pub/Sub Push Subscription plugin for HTTP requests')
       } catch (e) {
-        log.debug(`Failed to load GCP Pub/Sub Push Subscription plugin: ${e.message}`)
+        log.debug('Failed to load GCP Pub/Sub Push Subscription plugin:', e)
       }
     }
 

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

@@ -49,11 +49,11 @@ class Http2ClientPlugin extends ClientPlugin {
         'span.type': 'http',
         'http.method': method,
         'http.url': uri,
-        'out.host': sessionDetails.host
+        'out.host': sessionDetails.host,
       },
       metrics: {
-        [CLIENT_PORT_KEY]: Number.parseInt(sessionDetails.port)
-      }
+        [CLIENT_PORT_KEY]: Number.parseInt(sessionDetails.port),
+      },
     }, false)
 
     // TODO: Figure out a better way to do this for any span.
@@ -184,7 +184,7 @@ function normalizeConfig (config) {
     ...config,
     validateStatus,
     filter,
-    headers
+    headers,
   }
 }
 
@@ -197,13 +197,13 @@ function getFilter (config) {
 function addHeaderTags (span, headers, prefix, config) {
   if (!headers) return
 
-  config.headers.forEach(key => {
+  for (const key of config.headers) {
     const value = headers[key]
 
     if (value) {
       span.setTag(`${prefix}.${key}`, value)
     }
-  })
+  }
 }
 
 function getHeaders (config) {

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

@@ -9,7 +9,7 @@ class Http2Plugin extends CompositePlugin {
   static get plugins () {
     return {
       server: Http2ServerPlugin,
-      client: Http2ClientPlugin
+      client: Http2ClientPlugin,
     }
   }
 }

package/packages/datadog-plugin-http2/src/server.js

@@ -23,7 +23,7 @@ class Http2ServerPlugin extends ServerPlugin {
       this.tracer,
       {
         ...this.config,
-        service: this.config.service || this.serviceName()
+        service: this.config.service || this.serviceName(),
       },
       req,
       res,