dd-trace 5.84.0 → 5.86.0

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

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

@@ -19,8 +19,8 @@ class BaseBullmqProducerPlugin extends ProducerPlugin {
         'span.kind': 'producer',
         'messaging.system': 'bullmq',
         'messaging.operation': 'publish',
-        ...meta
-      }
+        ...meta,
+      },
     }, ctx)
 
     this.injectTraceContext(span, ctx)
@@ -63,8 +63,8 @@ class QueueAddPlugin extends BaseBullmqProducerPlugin {
     return {
       resource: queueName,
       meta: {
-        'messaging.destination.name': ctx.self?.name
-      }
+        'messaging.destination.name': ctx.self?.name,
+      },
     }
   }
 
@@ -81,7 +81,7 @@ class QueueAddPlugin extends BaseBullmqProducerPlugin {
     return {
       queueName: ctx.self?.name || 'bullmq',
       payloadSize: data ? getMessageSize(data) : 0,
-      injectTarget: data
+      injectTarget: data,
     }
   }
 }
@@ -100,8 +100,8 @@ class QueueAddBulkPlugin extends BaseBullmqProducerPlugin {
       resource: queueName,
       meta: {
         'messaging.destination.name': ctx.self?.name,
-        'messaging.batch.message_count': Array.isArray(jobs) ? jobs.length : undefined
-      }
+        'messaging.batch.message_count': Array.isArray(jobs) ? jobs.length : undefined,
+      },
     }
   }
 
@@ -123,7 +123,7 @@ class QueueAddBulkPlugin extends BaseBullmqProducerPlugin {
     return {
       queueName: ctx.self?.name || 'bullmq',
       payloadSize,
-      injectTarget: jobs[0]?.data
+      injectTarget: jobs[0]?.data,
     }
   }
 
@@ -152,8 +152,8 @@ class FlowProducerAddPlugin extends BaseBullmqProducerPlugin {
     return {
       resource: queueName,
       meta: {
-        'messaging.destination.name': flow?.queueName
-      }
+        'messaging.destination.name': flow?.queueName,
+      },
     }
   }
 
@@ -170,7 +170,7 @@ class FlowProducerAddPlugin extends BaseBullmqProducerPlugin {
     return {
       queueName: flow?.queueName || 'bullmq',
       payloadSize: flow?.data ? getMessageSize(flow.data) : 0,
-      injectTarget: flow?.data
+      injectTarget: flow?.data,
     }
   }
 }

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

@@ -24,8 +24,8 @@ class CassandraDriverPlugin extends DatabasePlugin {
         'db.type': 'cassandra',
         'cassandra.query': query,
         'cassandra.keyspace': keyspace,
-        [CASSANDRA_CONTACT_POINTS_KEY]: contactPoints.join(',') || null
-      }
+        [CASSANDRA_CONTACT_POINTS_KEY]: contactPoints.join(',') || null,
+      },
     }, ctx)
 
     return ctx.currentStore

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

@@ -48,7 +48,7 @@ class ChildProcessPlugin extends TracingPlugin {
 
     const meta = {
       component: 'subprocess',
-      [property]: (shell === true) ? cmdFields.join(' ') : JSON.stringify(cmdFields)
+      [property]: (shell === true) ? cmdFields.join(' ') : JSON.stringify(cmdFields),
     }
 
     if (truncated) {
@@ -59,7 +59,7 @@ class ChildProcessPlugin extends TracingPlugin {
       service: this.config.service || this._tracerConfig.service,
       resource: (shell === true) ? 'sh' : cmdFields[0],
       type: 'system',
-      meta
+      meta,
     }, ctx)
 
     return ctx.currentStore

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

@@ -33,7 +33,7 @@ function getTokensByExpression (expressionTokens) {
   let wipExpressionTokens = []
   let isNewExpression = true
 
-  expressionTokens.forEach(token => {
+  for (const token of expressionTokens) {
     if (isNewExpression) {
       expressionListTokens.push(wipExpressionTokens)
       isNewExpression = false
@@ -45,7 +45,7 @@ function getTokensByExpression (expressionTokens) {
       wipExpressionTokens = []
       isNewExpression = true
     }
-  })
+  }
   return expressionListTokens
 }
 
@@ -56,14 +56,14 @@ function scrubChildProcessCmd (expression) {
   const expressionListTokens = getTokensByExpression(expressionTokens)
 
   const result = []
-  expressionListTokens.forEach((expressionTokens) => {
+  for (const expressionTokens of expressionListTokens) {
     let foundBinary = false
     for (let index = 0; index < expressionTokens.length; index++) {
       const token = expressionTokens[index]
 
       if (token === null) {
         continue
-      } else if (typeof token === 'object') { // eslint-disable-line eslint-rules/eslint-safe-typeof-object
+      } else if (typeof token === 'object') {
         if (token.pattern) {
           result.push(token.pattern)
         } else if (token.op) {
@@ -119,7 +119,7 @@ function scrubChildProcessCmd (expression) {
         }
       }
     }
-  })
+  }
 
   return result
 }

package/packages/datadog-plugin-confluentinc-kafka-javascript/src/index.js

@@ -17,7 +17,7 @@ class ConfluentKafkaJsPlugin extends KafkajsPlugin {
     return {
       producer: ProducerPlugin,
       consumer: ConsumerPlugin,
-      batchConsumer: BatchConsumerPlugin
+      batchConsumer: BatchConsumerPlugin,
     }
   }
 }

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

@@ -21,7 +21,7 @@ class CouchBasePlugin extends StoragePlugin {
       component: 'couchbase',
       'resource.name': `couchbase.${operation}`,
       'span.kind': this.constructor.kind,
-      'db.couchbase.seed.nodes': seedNodes
+      'db.couchbase.seed.nodes': seedNodes,
     }
 
     if (bucket) tags['couchbase.bucket.name'] = bucket.name
@@ -35,7 +35,7 @@ class CouchBasePlugin extends StoragePlugin {
       this.operationName({ operation }),
       {
         service: this.serviceName({ pluginConfig: this.config }),
-        meta: tags
+        meta: tags,
       },
       ctx
     )
@@ -52,7 +52,7 @@ class CouchBasePlugin extends StoragePlugin {
         {
           'span.type': 'sql',
           'resource.name': resource,
-          'span.kind': this.constructor.kind
+          'span.kind': this.constructor.kind,
         },
         { bucket, seedNodes },
         ctx

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

@@ -13,7 +13,6 @@ const {
   isModifiedTest,
   CUCUMBER_IS_PARALLEL,
   ITR_CORRELATION_ID,
-  TEST_BROWSER_DRIVER,
   TEST_CODE_OWNERS,
   TEST_EARLY_FLAKE_ABORT_REASON,
   TEST_EARLY_FLAKE_ENABLED,
@@ -21,7 +20,6 @@ const {
   TEST_IS_MODIFIED,
   TEST_IS_NEW,
   TEST_IS_RETRY,
-  TEST_IS_RUM_ACTIVE,
   TEST_ITR_FORCED_RUN,
   TEST_ITR_UNSKIPPABLE,
   TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
@@ -47,7 +45,7 @@ const {
   TELEMETRY_EVENT_FINISHED,
   TELEMETRY_ITR_FORCED_TO_RUN,
   TELEMETRY_ITR_UNSKIPPABLE,
-  TELEMETRY_TEST_SESSION
+  TELEMETRY_TEST_SESSION,
 } = require('../../dd-trace/src/ci-visibility/telemetry')
 
 const BREAKPOINT_HIT_GRACE_PERIOD_MS = 200
@@ -73,7 +71,7 @@ class CucumberPlugin extends CiPlugin {
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
-      isParallel
+      isParallel,
     }) => {
       const { isSuitesSkippingEnabled, isCodeCoverageEnabled } = this.libraryConfig || {}
       addIntelligentTestRunnerSpanTags(
@@ -87,7 +85,7 @@ class CucumberPlugin extends CiPlugin {
           skippingCount: numSkippedSuites,
           skippingType: 'suite',
           hasUnskippableSuites,
-          hasForcedToRunSuites
+          hasForcedToRunSuites,
         }
       )
       if (isEarlyFlakeDetectionEnabled) {
@@ -108,11 +106,13 @@ class CucumberPlugin extends CiPlugin {
       this.testModuleSpan.finish()
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'module')
       this.testSessionSpan.finish()
-      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session')
+      this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'session', {
+        hasFailedTestReplay: this.libraryConfig?.isDiEnabled || undefined,
+      })
       finishAllTraceSpans(this.testSessionSpan)
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
+        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER'),
       })
 
       this.libraryConfig = null
@@ -123,7 +123,7 @@ class CucumberPlugin extends CiPlugin {
       testFileAbsolutePath,
       isUnskippable,
       isForcedToRun,
-      itrCorrelationId
+      itrCorrelationId,
     }) => {
       const testSuitePath = getTestSuitePath(testFileAbsolutePath, process.cwd())
       const testSourceFile = getTestSuitePath(testFileAbsolutePath, this.repositoryRoot)
@@ -160,9 +160,9 @@ class CucumberPlugin extends CiPlugin {
         tags: {
           [COMPONENT]: this.constructor.id,
           ...this.testEnvironmentMetadata,
-          ...testSuiteMetadata
+          ...testSuiteMetadata,
         },
-        integrationName: this.constructor.id
+        integrationName: this.constructor.id,
       })
       this._testSuiteSpansByTestSuite.set(testSuitePath, testSuiteSpan)
 
@@ -196,7 +196,7 @@ class CucumberPlugin extends CiPlugin {
       const formattedCoverage = {
         sessionId: testSuiteSpan.context()._traceId,
         suiteId: testSuiteSpan.context()._spanId,
-        files: relativeCoverageFiles
+        files: relativeCoverageFiles,
       }
 
       this.tracer._exporter.exportCoverage(formattedCoverage)
@@ -211,7 +211,7 @@ class CucumberPlugin extends CiPlugin {
 
       const extraTags = {
         [TEST_SOURCE_START]: testSourceLine,
-        [TEST_SOURCE_FILE]: testSourceFile
+        [TEST_SOURCE_FILE]: testSourceFile,
       }
       if (isParallel) {
         extraTags[CUCUMBER_IS_PARALLEL] = 'true'
@@ -272,9 +272,9 @@ class CucumberPlugin extends CiPlugin {
         tags: {
           [COMPONENT]: this.constructor.id,
           'cucumber.step': resource,
-          [RESOURCE_NAME]: resource
+          [RESOURCE_NAME]: resource,
         },
-        integrationName: this.constructor.id
+        integrationName: this.constructor.id,
       })
       ctx.parentStore = store
       ctx.currentStore = { ...store, span }
@@ -299,7 +299,7 @@ class CucumberPlugin extends CiPlugin {
       hasFailedAttemptToFix,
       isDisabled,
       isQuarantined,
-      isModified
+      isModified,
     }) => {
       const statusTag = isStep ? 'step.status' : TEST_STATUS
 
@@ -362,13 +362,7 @@ class CucumberPlugin extends CiPlugin {
         }
       }
 
-      const spanTags = span.context()._tags
-      const telemetryTags = {
-        hasCodeOwners: !!spanTags[TEST_CODE_OWNERS],
-        isNew,
-        isRum: spanTags[TEST_IS_RUM_ACTIVE] === 'true',
-        browserDriver: spanTags[TEST_BROWSER_DRIVER]
-      }
+      const telemetryTags = this.getTestTelemetryTags(span)
       span.finish()
       if (!isStep) {
         this.telemetry.ciVisEvent(
@@ -412,7 +406,7 @@ class CucumberPlugin extends CiPlugin {
       modifiedFiles,
       stepIds,
       stepDefinitions,
-      setIsModified
+      setIsModified,
     }) => {
       const testScenarioPath = getTestSuitePath(testFileAbsolutePath, this.repositoryRoot || process.cwd())
       for (const scenario of scenarios) {