dd-trace 5.101.0 → 5.102.0

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

@@ -10,6 +10,8 @@ const pushReceiveSpans = new WeakMap()
 
 class GoogleCloudPubsubPushSubscriptionPlugin extends TracingPlugin {
   static get id () { return 'google-cloud-pubsub-push-subscription' }
+  static type = 'messaging'
+  static kind = 'consumer'
 
   constructor (...args) {
     super(...args)
@@ -150,7 +152,7 @@ class GoogleCloudPubsubPushSubscriptionPlugin extends TracingPlugin {
       childOf: parentContext,
       startTime,
       kind: 'consumer',
-      service: this.config.service || { name: `${this.tracer._service}-pubsub`, source: this.tracer._service },
+      service: this.config.service || this.serviceName(),
       meta: {
         component: 'google-cloud-pubsub',
         'pubsub.method': 'receive',

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

@@ -79,11 +79,7 @@ class HttpClientPlugin extends ClientPlugin {
   }
 
   shouldInjectTraceHeaders (options, uri) {
-    if (!this.config.propagationFilter(uri)) {
-      return false
-    }
-
-    return true
+    return Boolean(this.config.propagationFilter(uri))
   }
 
   bindAsyncStart ({ parentStore }) {

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

@@ -3,7 +3,7 @@
 const { readFileSync } = require('fs')
 const { parse } = require('../../../vendor/dist/jest-docblock')
 
-const { getTestSuitePath, getEfdRetryCount } = require('../../dd-trace/src/plugins/util/test')
+const { getTestSuitePath } = require('../../dd-trace/src/plugins/util/test')
 const log = require('../../dd-trace/src/log')
 
 /**
@@ -172,5 +172,4 @@ module.exports = {
   getJestTestName,
   getJestSuitesToRun,
   isMarkedAsUnskippable,
-  getEfdRetryCount,
 }

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

@@ -218,12 +218,16 @@ class MochaPlugin extends CiPlugin {
       isAttemptToFixRetry,
       isAtrRetry,
       finalStatus,
+      earlyFlakeAbortReason,
     }) => {
       if (span) {
         span.setTag(TEST_STATUS, status)
         if (finalStatus) {
           span.setTag(TEST_FINAL_STATUS, finalStatus)
         }
+        if (earlyFlakeAbortReason) {
+          span.setTag(TEST_EARLY_FLAKE_ABORT_REASON, earlyFlakeAbortReason)
+        }
         if (hasBeenRetried) {
           span.setTag(TEST_IS_RETRY, 'true')
           if (isAtrRetry) {

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

@@ -173,9 +173,10 @@ function limitDepth (input) {
       } else if (shouldSimplify(child)) {
         output[key] = child
       } else {
+        output[key] = {}
         queue.push({
           input: child,
-          output: output[key] = {},
+          output: output[key],
           depth: nextDepth,
         })
       }

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

@@ -560,9 +560,8 @@ function createResponseResponseExtraction (tags, body, openaiStore) {
 
 // The server almost always responds with JSON
 function coerceResponseBody (body, methodName) {
-  switch (methodName) {
-    case 'downloadFile':
-      return { file: body }
+  if (methodName === 'downloadFile') {
+    return { file: body }
   }
 
   const type = typeof body
@@ -574,9 +573,8 @@ function coerceResponseBody (body, methodName) {
     }
   } else if (type === 'object') {
     return body
-  } else {
-    return {}
   }
+  return {}
 }
 
 // This method is used to replace a dynamic URL segment with an asterisk
@@ -594,28 +592,19 @@ function lookupOperationEndpoint (operationId, methodName, url) {
       return '/v1/files/*/content'
 
     case 'retrieveFineTune':
-      switch (methodName) {
-        case 'fine_tuning.jobs.retrieve':
-          return '/v1/fine_tuning/jobs/*'
-        default:
-          return '/v1/fine-tunes/*'
-      }
+      return methodName === 'fine_tuning.jobs.retrieve'
+        ? '/v1/fine_tuning/jobs/*'
+        : '/v1/fine-tunes/*'
 
     case 'listFineTuneEvents':
-      switch (methodName) {
-        case 'fine_tuning.jobs.listEvents':
-          return '/v1/fine_tuning/jobs/*/events'
-        default:
-          return '/v1/fine-tunes/*/events'
-      }
+      return methodName === 'fine_tuning.jobs.listEvents'
+        ? '/v1/fine_tuning/jobs/*/events'
+        : '/v1/fine-tunes/*/events'
 
     case 'cancelFineTune':
-      switch (methodName) {
-        case 'fine_tuning.jobs.cancel':
-          return '/v1/fine_tuning/jobs/*/cancel'
-        default:
-          return '/v1/fine-tunes/*/cancel'
-      }
+      return methodName === 'fine_tuning.jobs.cancel'
+        ? '/v1/fine_tuning/jobs/*/cancel'
+        : '/v1/fine-tunes/*/cancel'
   }
 
   return url

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

@@ -491,7 +491,7 @@ class PlaywrightPlugin extends CiPlugin {
       [TEST_SOURCE_START]: testSourceLine,
     }
     if (testSourceFile) {
-      extraTags[TEST_SOURCE_FILE] = testSourceFile || testSuite
+      extraTags[TEST_SOURCE_FILE] = testSourceFile
     }
     if (browserName) {
       // Added as parameter too because it should affect the test fingerprint

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

@@ -213,13 +213,16 @@ class VitestPlugin extends CiPlugin {
       return ctx.currentStore
     })
 
-    this.addSub('ci:vitest:test:pass', ({ span, task, finalStatus }) => {
+    this.addSub('ci:vitest:test:pass', ({ span, task, finalStatus, earlyFlakeAbortReason }) => {
       if (span) {
         this.telemetry.ciVisEvent(TELEMETRY_EVENT_FINISHED, 'test', this.getTestTelemetryTags(span))
         span.setTag(TEST_STATUS, 'pass')
         if (finalStatus) {
           span.setTag(TEST_FINAL_STATUS, finalStatus)
         }
+        if (earlyFlakeAbortReason) {
+          span.setTag(TEST_EARLY_FLAKE_ABORT_REASON, earlyFlakeAbortReason)
+        }
         span.finish(this.taskToFinishTime.get(task))
         finishAllTraceSpans(span)
       }
@@ -234,6 +237,7 @@ class VitestPlugin extends CiPlugin {
       hasFailedAllRetries,
       attemptToFixFailed,
       finalStatus,
+      earlyFlakeAbortReason,
     }) => {
       if (!span) {
         return
@@ -262,6 +266,9 @@ class VitestPlugin extends CiPlugin {
       if (finalStatus) {
         span.setTag(TEST_FINAL_STATUS, finalStatus)
       }
+      if (earlyFlakeAbortReason) {
+        span.setTag(TEST_EARLY_FLAKE_ABORT_REASON, earlyFlakeAbortReason)
+      }
       if (duration) {
         span.finish(span._startTime + duration - MILLISECONDS_TO_SUBTRACT_FROM_FAILED_TEST_DURATION) // milliseconds
       } else {

package/packages/datadog-shimmer/src/shimmer.js

@@ -267,7 +267,13 @@ function assertMethod (target, name, method) {
  * @throws {Error} If the target is a class constructor.
  */
 function assertNotClass (target) {
-  if (Function.prototype.toString.call(target).startsWith('class')) {
+  // Class constructors have a non-writable `prototype` property; functions have a
+  // writable one and arrows / async / method-shorthand have none at all. The
+  // `'prototype' in target` gate skips the descriptor lookup for the no-prototype
+  // shapes; the `in` operator is cheaper than reading `target.prototype` since
+  // it returns a boolean instead of materialising the prototype reference.
+  if ('prototype' in target &&
+      Object.getOwnPropertyDescriptor(target, 'prototype').writable === false) {
     throw new TypeError('Target is a native class constructor and cannot be wrapped.')
   }
 }

package/packages/dd-trace/src/appsec/iast/analyzers/hardcoded-password-rules.js

@@ -5,7 +5,7 @@ const { NameAndValue } = require('./hardcoded-rule-type')
 module.exports = [
   {
     id: 'hardcoded-password',
-    regex: /(?:pwd|pswd|pass|secret)(?:[0-9a-z\-_\t.]{0,20})(?:[\s|']|[\s|""]){0,3}(?:=|>|:{1,3}=|\|\|:|<=|=>|:|\?=)(?:'|""|\s|=|\x60){0,5}([0-9a-z\-_.=]{10,150})(?:['"\s\x60;]|$)/i,
+    regex: /(?:pwd|pswd|pass|secret)(?:[0-9a-z\-_\t.]{0,20})(?:[\s|']|[\s|"]){0,3}(?:=|>|:{1,3}=|\|\|:|<=|=>|:|\?=)(?:'|""|\s|=|\x60){0,5}([0-9a-z\-_.=]{10,150})(?:['"\s\x60;]|$)/i,
     type: NameAndValue,
   },
 ]