dd-trace 5.83.0 → 5.85.0

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

@@ -5,49 +5,49 @@ const { storage } = require('../../datadog-core')
 const { getEnvironmentVariable, getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
 
 const {
-  TEST_SKIP_REASON,
-  TEST_STATUS,
-  TEST_SOURCE_START,
+  addIntelligentTestRunnerSpanTags,
   finishAllTraceSpans,
-  getTestSuitePath,
+  getTestEndLine,
   getTestSuiteCommonTags,
-  addIntelligentTestRunnerSpanTags,
-  TEST_ITR_UNSKIPPABLE,
-  TEST_ITR_FORCED_RUN,
-  TEST_CODE_OWNERS,
+  getTestSuitePath,
+  isModifiedTest,
+  CUCUMBER_IS_PARALLEL,
   ITR_CORRELATION_ID,
-  TEST_SOURCE_FILE,
-  TEST_EARLY_FLAKE_ENABLED,
+  TEST_BROWSER_DRIVER,
+  TEST_CODE_OWNERS,
   TEST_EARLY_FLAKE_ABORT_REASON,
+  TEST_EARLY_FLAKE_ENABLED,
+  TEST_HAS_FAILED_ALL_RETRIES,
+  TEST_IS_MODIFIED,
   TEST_IS_NEW,
   TEST_IS_RETRY,
-  CUCUMBER_IS_PARALLEL,
-  TEST_RETRY_REASON,
+  TEST_IS_RUM_ACTIVE,
+  TEST_ITR_FORCED_RUN,
+  TEST_ITR_UNSKIPPABLE,
+  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
   TEST_MANAGEMENT_ENABLED,
-  TEST_MANAGEMENT_IS_QUARANTINED,
-  TEST_MANAGEMENT_IS_DISABLED,
   TEST_MANAGEMENT_IS_ATTEMPT_TO_FIX,
-  TEST_HAS_FAILED_ALL_RETRIES,
-  TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
+  TEST_MANAGEMENT_IS_DISABLED,
+  TEST_MANAGEMENT_IS_QUARANTINED,
   TEST_RETRY_REASON_TYPES,
-  TEST_IS_MODIFIED,
-  isModifiedTest,
-  getTestEndLine
+  TEST_RETRY_REASON,
+  TEST_SKIP_REASON,
+  TEST_SOURCE_FILE,
+  TEST_SOURCE_START,
+  TEST_STATUS,
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT, ERROR_MESSAGE } = require('../../dd-trace/src/constants')
 const {
+  TELEMETRY_CODE_COVERAGE_EMPTY,
+  TELEMETRY_CODE_COVERAGE_FINISHED,
+  TELEMETRY_CODE_COVERAGE_NUM_FILES,
+  TELEMETRY_CODE_COVERAGE_STARTED,
   TELEMETRY_EVENT_CREATED,
   TELEMETRY_EVENT_FINISHED,
-  TELEMETRY_CODE_COVERAGE_STARTED,
-  TELEMETRY_CODE_COVERAGE_FINISHED,
   TELEMETRY_ITR_FORCED_TO_RUN,
-  TELEMETRY_CODE_COVERAGE_EMPTY,
   TELEMETRY_ITR_UNSKIPPABLE,
-  TELEMETRY_CODE_COVERAGE_NUM_FILES,
-  TEST_IS_RUM_ACTIVE,
-  TEST_BROWSER_DRIVER,
-  TELEMETRY_TEST_SESSION
+  TELEMETRY_TEST_SESSION,
 } = require('../../dd-trace/src/ci-visibility/telemetry')
 
 const BREAKPOINT_HIT_GRACE_PERIOD_MS = 200
@@ -73,7 +73,7 @@ class CucumberPlugin extends CiPlugin {
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
-      isParallel
+      isParallel,
     }) => {
       const { isSuitesSkippingEnabled, isCodeCoverageEnabled } = this.libraryConfig || {}
       addIntelligentTestRunnerSpanTags(
@@ -87,7 +87,7 @@ class CucumberPlugin extends CiPlugin {
           skippingCount: numSkippedSuites,
           skippingType: 'suite',
           hasUnskippableSuites,
-          hasForcedToRunSuites
+          hasForcedToRunSuites,
         }
       )
       if (isEarlyFlakeDetectionEnabled) {
@@ -112,7 +112,7 @@ class CucumberPlugin extends CiPlugin {
       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,18 +362,19 @@ 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],
+      }
       span.finish()
       if (!isStep) {
-        const spanTags = span.context()._tags
         this.telemetry.ciVisEvent(
           TELEMETRY_EVENT_FINISHED,
           'test',
-          {
-            hasCodeOwners: !!spanTags[TEST_CODE_OWNERS],
-            isNew,
-            isRum: spanTags[TEST_IS_RUM_ACTIVE] === 'true',
-            browserDriver: spanTags[TEST_BROWSER_DRIVER]
-          }
+          telemetryTags
         )
         finishAllTraceSpans(span)
         // If it's a worker, flushing is cheap, as it's just sending data to the main process
@@ -411,7 +412,7 @@ class CucumberPlugin extends CiPlugin {
       modifiedFiles,
       stepIds,
       stepDefinitions,
-      setIsModified
+      setIsModified,
     }) => {
       const testScenarioPath = getTestSuitePath(testFileAbsolutePath, this.repositoryRoot || process.cwd())
       for (const scenario of scenarios) {