dd-trace 5.83.0 → 5.85.0

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

@@ -6,6 +6,7 @@ const { getEnvironmentVariable, getValueFromEnvSources } = require('../../dd-tra
 
 const {
   TEST_STATUS,
+  TEST_FINAL_STATUS,
   JEST_TEST_RUNNER,
   finishAllTraceSpans,
   getTestSuiteCommonTags,
@@ -35,7 +36,7 @@ const {
   TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
   TEST_HAS_FAILED_ALL_RETRIES,
   TEST_RETRY_REASON_TYPES,
-  TEST_IS_MODIFIED
+  TEST_IS_MODIFIED,
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const id = require('../../dd-trace/src/id')
@@ -48,7 +49,7 @@ const {
   TELEMETRY_CODE_COVERAGE_EMPTY,
   TELEMETRY_ITR_UNSKIPPABLE,
   TELEMETRY_CODE_COVERAGE_NUM_FILES,
-  TELEMETRY_TEST_SESSION
+  TELEMETRY_TEST_SESSION,
 } = require('../../dd-trace/src/ci-visibility/telemetry')
 const log = require('../../dd-trace/src/log')
 
@@ -118,7 +119,7 @@ class JestPlugin extends CiPlugin {
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
       isTestManagementTestsEnabled,
-      onDone
+      onDone,
     }) => {
       this.testSessionSpan.setTag(TEST_STATUS, status)
       this.testModuleSpan.setTag(TEST_STATUS, status)
@@ -139,7 +140,7 @@ class JestPlugin extends CiPlugin {
           skippingType: 'suite',
           skippingCount: numSkippedSuites,
           hasUnskippableSuites,
-          hasForcedToRunSuites
+          hasForcedToRunSuites,
         }
       )
 
@@ -161,7 +162,7 @@ class JestPlugin extends CiPlugin {
 
       this.telemetry.count(TELEMETRY_TEST_SESSION, {
         provider: this.ciProviderName,
-        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER')
+        autoInjected: !!getValueFromEnvSources('DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER'),
       })
 
       this.tracer._exporter.flush(() => {
@@ -175,7 +176,7 @@ class JestPlugin extends CiPlugin {
     // This subscriber changes the configuration objects from jest to inject the trace id
     // of the test session to the processes that run the test suites, and other data.
     this.addSub('ci:jest:session:configuration', configs => {
-      configs.forEach(config => {
+      for (const config of configs) {
         config._ddTestSessionId = this.testSessionSpan.context().toTraceId()
         config._ddTestModuleId = this.testModuleSpan.context().toSpanId()
         config._ddTestCommand = this.testSessionSpan.context()._tags[TEST_COMMAND]
@@ -190,7 +191,7 @@ class JestPlugin extends CiPlugin {
         config._ddIsDiEnabled = this.libraryConfig?.isDiEnabled ?? false
         config._ddIsKnownTestsEnabled = this.libraryConfig?.isKnownTestsEnabled ?? false
         config._ddIsImpactedTestsEnabled = this.libraryConfig?.isImpactedTestsEnabled ?? false
-      })
+      }
     })
 
     this.addSub('ci:jest:test-suite:start', ({
@@ -199,7 +200,7 @@ class JestPlugin extends CiPlugin {
       testEnvironmentOptions,
       frameworkVersion,
       displayName,
-      testSuiteAbsolutePath
+      testSuiteAbsolutePath,
     }) => {
       const {
         _ddTestSessionId: testSessionId,
@@ -208,12 +209,12 @@ class JestPlugin extends CiPlugin {
         _ddItrCorrelationId: itrCorrelationId,
         _ddForcedToRun,
         _ddUnskippable,
-        _ddTestCodeCoverageEnabled
+        _ddTestCodeCoverageEnabled,
       } = testEnvironmentOptions
 
       const testSessionSpanContext = this.tracer.extract('text_map', {
         'x-datadog-trace-id': testSessionId,
-        'x-datadog-parent-id': testModuleId
+        'x-datadog-parent-id': testModuleId,
       })
 
       const testSuiteMetadata = getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite, 'jest')
@@ -254,9 +255,9 @@ class JestPlugin extends CiPlugin {
         tags: {
           [COMPONENT]: this.constructor.id,
           ...this.testEnvironmentMetadata,
-          ...testSuiteMetadata
+          ...testSuiteMetadata,
         },
-        integrationName: this.constructor.id
+        integrationName: this.constructor.id,
       })
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_CREATED, 'suite')
       if (_ddTestCodeCoverageEnabled) {
@@ -269,11 +270,11 @@ class JestPlugin extends CiPlugin {
       const formattedCoverages = JSON.parse(data).map(coverage => ({
         sessionId: id(coverage.sessionId),
         suiteId: id(coverage.suiteId),
-        files: coverage.files
+        files: coverage.files,
       }))
-      formattedCoverages.forEach(formattedCoverage => {
+      for (const formattedCoverage of formattedCoverages) {
         this.tracer._exporter.exportCoverage(formattedCoverage)
-      })
+      }
     })
 
     this.addSub('ci:jest:test-suite:finish', ({ status, errorMessage, error, testSuiteAbsolutePath }) => {
@@ -336,7 +337,7 @@ class JestPlugin extends CiPlugin {
       const formattedCoverage = {
         sessionId: _traceId,
         suiteId: _spanId,
-        files
+        files,
       }
 
       this.tracer._exporter.exportCoverage(formattedCoverage)
@@ -367,9 +368,13 @@ class JestPlugin extends CiPlugin {
       attemptToFixPassed,
       failedAllTests,
       attemptToFixFailed,
-      isAtrRetry
+      isAtrRetry,
+      finalStatus,
     }) => {
       span.setTag(TEST_STATUS, status)
+      if (finalStatus) {
+        span.setTag(TEST_FINAL_STATUS, finalStatus)
+      }
       if (testStartLine) {
         span.setTag(TEST_SOURCE_START, testStartLine)
       }
@@ -394,7 +399,7 @@ class JestPlugin extends CiPlugin {
           hasCodeOwners: !!spanTags[TEST_CODE_OWNERS],
           isNew: spanTags[TEST_IS_NEW] === 'true',
           isRum: spanTags[TEST_IS_RUM_ACTIVE] === 'true',
-          browserDriver: spanTags[TEST_BROWSER_DRIVER]
+          browserDriver: spanTags[TEST_BROWSER_DRIVER],
         }
       )
 
@@ -419,17 +424,29 @@ class JestPlugin extends CiPlugin {
 
     this.addSub('ci:jest:test:skip', ({
       test,
-      isDisabled
+      isDisabled,
     }) => {
       const span = this.startTestSpan(test)
       span.setTag(TEST_STATUS, 'skip')
-
+      span.setTag(TEST_FINAL_STATUS, 'skip')
       if (isDisabled) {
         span.setTag(TEST_MANAGEMENT_IS_DISABLED, 'true')
       }
 
       span.finish()
     })
+
+    this.addSub('ci:jest:coverage-report', ({ rootDir, onDone }) => {
+      if (!this.libraryConfig?.isCoverageReportUploadEnabled) {
+        onDone()
+        return
+      }
+      this.uploadCoverageReports({
+        rootDir,
+        testEnvironmentMetadata: this.testEnvironmentMetadata,
+        onDone,
+      })
+    })
   }
 
   startTestSpan (test) {
@@ -449,13 +466,13 @@ class JestPlugin extends CiPlugin {
       isDisabled,
       isQuarantined,
       isModified,
-      testSuiteAbsolutePath
+      testSuiteAbsolutePath,
     } = test
 
     const extraTags = {
       [JEST_TEST_RUNNER]: 'jest-circus',
       [TEST_PARAMETERS]: testParameters,
-      [TEST_FRAMEWORK_VERSION]: frameworkVersion
+      [TEST_FRAMEWORK_VERSION]: frameworkVersion,
     }
     if (testStartLine) {
       extraTags[TEST_SOURCE_START] = testStartLine

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

@@ -162,7 +162,7 @@ function getJestSuitesToRun (skippableSuites, originalTests, rootDir) {
     skippedSuites,
     suitesToRun,
     hasUnskippableSuites,
-    hasForcedToRunSuites
+    hasForcedToRunSuites,
   }
 }
 

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

@@ -46,7 +46,7 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
       topic,
       type: 'kafka_commit',
       offset: Number(offset),
-      consumer_group: groupId
+      consumer_group: groupId,
     }
   }
 
@@ -57,7 +57,7 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
       'type',
       'partition',
       'offset',
-      'topic'
+      'topic',
     ]
     for (const commit of commitList.map(this.transformCommit)) {
       if (keys.some(key => !commit.hasOwnProperty(key))) continue
@@ -81,11 +81,11 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
         component: this.constructor.id,
         'kafka.topic': topic,
         'kafka.cluster_id': clusterId,
-        [MESSAGING_DESTINATION_KEY]: topic
+        [MESSAGING_DESTINATION_KEY]: topic,
       },
       metrics: {
-        'kafka.partition': partition
-      }
+        'kafka.partition': partition,
+      },
     }, ctx)
     if (message?.offset) span.setTag('kafka.message.offset', message?.offset)
 

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

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

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

@@ -45,7 +45,7 @@ class KafkajsProducerPlugin extends ProducerPlugin {
       type: 'kafka_produce',
       partition,
       offset: offsetAsLong ? Number(offsetAsLong) : undefined,
-      topic
+      topic,
     }
   }
 
@@ -63,7 +63,7 @@ class KafkajsProducerPlugin extends ProducerPlugin {
       'type',
       'partition',
       'offset',
-      'topic'
+      'topic',
     ]
     for (const commit of commitList.map(this.transformProduceResponse)) {
       if (keys.some(key => !commit.hasOwnProperty(key))) continue
@@ -79,11 +79,11 @@ class KafkajsProducerPlugin extends ProducerPlugin {
         component: this.constructor.id,
         'kafka.topic': topic,
         'kafka.cluster_id': clusterId,
-        [MESSAGING_DESTINATION_KEY]: topic
+        [MESSAGING_DESTINATION_KEY]: topic,
       },
       metrics: {
-        'kafka.batch_size': messages.length
-      }
+        'kafka.batch_size': messages.length,
+      },
     }, ctx)
     if (bootstrapServers) {
       span.setTag(BOOTSTRAP_SERVERS_KEY, bootstrapServers)

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

@@ -23,5 +23,5 @@ function convertToTextMap (bufferMap) {
 }
 
 module.exports = {
-  convertToTextMap
+  convertToTextMap,
 }

package/packages/datadog-plugin-langchain/src/tokens.js

@@ -4,7 +4,7 @@ function getTokensFromLlmOutput (result) {
   const tokens = {
     input: 0,
     output: 0,
-    total: 0
+    total: 0,
   }
   const { llmOutput } = result
   if (!llmOutput) return tokens
@@ -31,5 +31,5 @@ function getTokensFromLlmOutput (result) {
 }
 
 module.exports = {
-  getTokensFromLlmOutput
+  getTokensFromLlmOutput,
 }

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

@@ -27,7 +27,7 @@ class BaseLangChainTracingPlugin extends TracingPlugin {
       chat_model: new LangChainLanguageModelHandler(this._tracerConfig),
       llm: new LangChainLanguageModelHandler(this._tracerConfig),
       embedding: new LangChainEmbeddingHandler(this._tracerConfig),
-      default: new LangChainHandler(this._tracerConfig)
+      default: new LangChainHandler(this._tracerConfig),
     }
   }
 
@@ -59,8 +59,8 @@ class BaseLangChainTracingPlugin extends TracingPlugin {
       resource,
       kind: 'client',
       meta: {
-        [MEASURED]: 1
-      }
+        [MEASURED]: 1,
+      },
     }, false)
 
     const tags = {}
@@ -151,5 +151,5 @@ module.exports = [
   EmbeddingsEmbedDocumentsPlugin,
   ToolInvokePlugin,
   VectorStoreSimilaritySearchPlugin,
-  VectorStoreSimilaritySearchWithScorePlugin
+  VectorStoreSimilaritySearchWithScorePlugin,
 ]

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

@@ -13,7 +13,7 @@ class MemcachedPlugin extends CachePlugin {
 
     const meta = {
       'out.host': address[0],
-      [CLIENT_PORT_KEY]: address[1]
+      [CLIENT_PORT_KEY]: address[1],
     }
 
     if (this.config.memcachedCommandEnabled) {
@@ -24,7 +24,7 @@ class MemcachedPlugin extends CachePlugin {
       service: this.serviceName({ pluginConfig: this.config, system: this.system }),
       resource: query.type,
       type: 'memcached',
-      meta
+      meta,
     }, ctx)
 
     return ctx.currentStore

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

@@ -34,7 +34,7 @@ const {
   TEST_MANAGEMENT_ATTEMPT_TO_FIX_PASSED,
   TEST_RETRY_REASON_TYPES,
   TEST_IS_MODIFIED,
-  isModifiedTest
+  isModifiedTest,
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 const {
@@ -46,7 +46,7 @@ const {
   TELEMETRY_CODE_COVERAGE_EMPTY,
   TELEMETRY_ITR_UNSKIPPABLE,
   TELEMETRY_CODE_COVERAGE_NUM_FILES,
-  TELEMETRY_TEST_SESSION
+  TELEMETRY_TEST_SESSION,
 } = require('../../dd-trace/src/ci-visibility/telemetry')
 
 const BREAKPOINT_SET_GRACE_PERIOD_MS = 200
@@ -79,7 +79,7 @@ class MochaPlugin extends CiPlugin {
       const formattedCoverage = {
         sessionId: _traceId,
         suiteId: _spanId,
-        files: relativeCoverageFiles
+        files: relativeCoverageFiles,
       }
 
       this.tracer._exporter.exportCoverage(formattedCoverage)
@@ -126,9 +126,9 @@ class MochaPlugin extends CiPlugin {
         tags: {
           [COMPONENT]: this.constructor.id,
           ...this.testEnvironmentMetadata,
-          ...testSuiteMetadata
+          ...testSuiteMetadata,
         },
-        integrationName: this.constructor.id
+        integrationName: this.constructor.id,
       })
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_CREATED, 'suite')
       if (this.libraryConfig?.isCodeCoverageEnabled) {
@@ -211,7 +211,7 @@ class MochaPlugin extends CiPlugin {
       attemptToFixPassed,
       attemptToFixFailed,
       isAttemptToFixRetry,
-      isAtrRetry
+      isAtrRetry,
     }) => {
       if (span) {
         span.setTag(TEST_STATUS, status)
@@ -244,7 +244,7 @@ class MochaPlugin extends CiPlugin {
             hasCodeOwners: !!spanTags[TEST_CODE_OWNERS],
             isNew: spanTags[TEST_IS_NEW] === 'true',
             isRum: spanTags[TEST_IS_RUM_ACTIVE] === 'true',
-            browserDriver: spanTags[TEST_BROWSER_DRIVER]
+            browserDriver: spanTags[TEST_BROWSER_DRIVER],
           }
         )
 
@@ -318,7 +318,7 @@ class MochaPlugin extends CiPlugin {
             hasCodeOwners: !!spanTags[TEST_CODE_OWNERS],
             isNew: spanTags[TEST_IS_NEW] === 'true',
             isRum: spanTags[TEST_IS_RUM_ACTIVE] === 'true',
-            browserDriver: spanTags[TEST_BROWSER_DRIVER]
+            browserDriver: spanTags[TEST_BROWSER_DRIVER],
           }
         )
         if (isFirstAttempt && willBeRetried && this.di && this.libraryConfig?.isDiEnabled) {
@@ -357,7 +357,7 @@ class MochaPlugin extends CiPlugin {
       isEarlyFlakeDetectionEnabled,
       isEarlyFlakeDetectionFaulty,
       isTestManagementEnabled,
-      isParallel
+      isParallel,
     }) => {
       if (this.testSessionSpan) {
         const { isSuitesSkippingEnabled, isCodeCoverageEnabled } = this.libraryConfig || {}
@@ -388,7 +388,7 @@ class MochaPlugin extends CiPlugin {
             skippingCount: numSkippedSuites,
             skippingType: 'suite',
             hasForcedToRunSuites,
-            hasUnskippableSuites
+            hasUnskippableSuites,
           }
         )
 
@@ -406,7 +406,7 @@ class MochaPlugin 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
@@ -430,7 +430,7 @@ class MochaPlugin extends CiPlugin {
       isAttemptToFix,
       isDisabled,
       isQuarantined,
-      isModified
+      isModified,
     } = testInfo
 
     const extraTags = {}

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

@@ -13,7 +13,7 @@ class MoleculerClientPlugin extends ClientPlugin {
     const span = this.startSpan(this.operationName(), {
       service: this.config.service || this.serviceName(),
       resource: actionName,
-      kind: 'client'
+      kind: 'client',
     }, ctx)
 
     this.tracer.inject(span, 'text_map', opts.meta)

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

@@ -11,7 +11,7 @@ class MoleculerPlugin extends CompositePlugin {
   static get plugins () {
     return {
       server: MoleculerServerPlugin,
-      client: MoleculerClientPlugin
+      client: MoleculerClientPlugin,
     }
   }
 }

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

@@ -19,8 +19,8 @@ class MoleculerServerPlugin extends ServerPlugin {
       type: 'web',
       meta: {
         'resource.name': action.name,
-        ...moleculerTags(broker, middlewareCtx, this.config)
-      }
+        ...moleculerTags(broker, middlewareCtx, this.config),
+      },
     }, ctx)
 
     return ctx.currentStore

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

@@ -14,7 +14,7 @@ function moleculerTags (broker, ctx, config) {
     'moleculer.context.request_id': ctx.requestID,
     'moleculer.context.service': service.name,
     'moleculer.namespace': broker.namespace,
-    'moleculer.node_id': broker.nodeID
+    'moleculer.node_id': broker.nodeID,
   }
 }
 

package/packages/datadog-plugin-mongodb-core/src/index.js

@@ -46,8 +46,8 @@ class MongodbCorePlugin extends DatabasePlugin {
         'db.name': ns,
         'mongodb.query': query,
         'out.host': options.host,
-        'out.port': options.port
-      }
+        'out.port': options.port,
+      },
     }, ctx)
     const comment = this.injectDbmComment(span, ops.comment, service)
     if (comment) {
@@ -157,12 +157,12 @@ function limitDepth (input) {
   const queue = [{
     input,
     output,
-    depth: 0
+    depth: 0,
   }]
 
   while (queue.length) {
     const {
-      input, output, depth
+      input, output, depth,
     } = queue.pop()
     const nextDepth = depth + 1
     for (const key in input) {
@@ -182,7 +182,7 @@ function limitDepth (input) {
         queue.push({
           input: child,
           output: output[key] = {},
-          depth: nextDepth
+          depth: nextDepth,
         })
       }
     }

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

@@ -30,8 +30,8 @@ class MySQLPlugin extends DatabasePlugin {
         'db.user': ctx.conf.user,
         'db.name': ctx.conf.database,
         'out.host': ctx.conf.host,
-        [CLIENT_PORT_KEY]: ctx.conf.port
-      }
+        [CLIENT_PORT_KEY]: ctx.conf.port,
+      },
     }, ctx)
     ctx.sql = this.injectDbmQuery(span, ctx.sql, service)
 

package/packages/datadog-plugin-net/src/ipc.js

@@ -12,8 +12,8 @@ class NetIPCPlugin extends ClientPlugin {
       resource: ctx.options.path,
       kind: 'client',
       meta: {
-        'ipc.path': ctx.options.path
-      }
+        'ipc.path': ctx.options.path,
+      },
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-net/src/tcp.js

@@ -19,7 +19,7 @@ class NetTCPPlugin extends ClientPlugin {
 
       span.addTags({
         'tcp.local.address': ctx.socket.localAddress,
-        'tcp.local.port': ctx.socket.localPort
+        'tcp.local.port': ctx.socket.localPort,
       })
     })
   }
@@ -37,13 +37,13 @@ class NetTCPPlugin extends ClientPlugin {
         'tcp.remote.host': host,
         'tcp.family': `IPv${family}`,
         'tcp.local.address': '',
-        'out.host': host
+        'out.host': host,
       },
       metrics: {
         'tcp.remote.port': port,
         'tcp.local.port': 0,
-        [CLIENT_PORT_KEY]: port
-      }
+        [CLIENT_PORT_KEY]: port,
+      },
     }, ctx)
 
     return ctx.currentStore

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

@@ -28,9 +28,9 @@ class NextPlugin extends ServerPlugin {
         'resource.name': req.method,
         'span.type': 'web',
         'span.kind': 'server',
-        'http.method': req.method
+        'http.method': req.method,
       },
-      integrationName: this.constructor.id
+      integrationName: this.constructor.id,
     })
 
     analyticsSampler.sample(span, this.config.measured, true)
@@ -77,7 +77,7 @@ class NextPlugin extends ServerPlugin {
     }
 
     span.addTags({
-      'http.status_code': res.statusCode
+      'http.status_code': res.statusCode,
     })
 
     this.config.hooks.request(span, req, res)
@@ -125,7 +125,7 @@ class NextPlugin extends ServerPlugin {
     span.addTags({
       [COMPONENT]: this.constructor.id,
       'resource.name': `${req.method} ${page}`.trim(),
-      'next.page': page
+      'next.page': page,
     })
     web.setRoute(req, page)
   }