dd-trace 5.84.0 → 5.85.0

package/packages/datadog-plugin-cypress/src/support.js

@@ -12,6 +12,8 @@ let isModifiedTest = false
 let isTestIsolationEnabled = false
 // Array of test names that have been retried and the reason
 const retryReasonsByTestName = new Map()
+// Track quarantined test errors - we catch them in Cypress.on('fail') but need to report to Datadog
+const quarantinedTestErrors = new Map()
 
 // We need to grab the original window as soon as possible,
 // in case the test changes the origin. If the test does change the origin,
@@ -46,17 +48,41 @@ function getTestProperties (testName) {
   return { isAttemptToFix, isDisabled, isQuarantined }
 }
 
+// Catch test failures for quarantined tests and suppress them
+// By not re-throwing the error, Cypress marks the test as passed
+// This allows quarantined tests to run but not affect the exit code
+Cypress.on('fail', (err, runnable) => {
+  if (!isTestManagementEnabled) {
+    throw err
+  }
+
+  const testName = runnable.fullTitle()
+  const { isQuarantined, isAttemptToFix } = getTestProperties(testName)
+
+  // For pure quarantined tests (not attemptToFix), suppress the failure
+  // This makes the test "pass" from Cypress's perspective while we still track the error
+  if (isQuarantined && !isAttemptToFix) {
+    // Store the error so we can report it to Datadog in afterEach
+    quarantinedTestErrors.set(testName, err)
+    // Don't re-throw - this prevents Cypress from marking the test as failed
+    return
+  }
+
+  // For all other tests (including attemptToFix), let the error propagate normally
+  throw err
+})
+
 function getRetriedTests (test, numRetries, tags) {
   const retriedTests = []
   for (let retryIndex = 0; retryIndex < numRetries; retryIndex++) {
     // TODO: signal in framework logs that this is a retry.
     // TODO: Change it so these tests are allowed to fail.
     const clonedTest = test.clone()
-    tags.forEach(tag => {
+    for (const tag of tags) {
       if (tag) {
         clonedTest[tag] = true
       }
-    })
+    }
     retriedTests.push(clonedTest)
   }
   return retriedTests
@@ -108,7 +134,7 @@ Cypress.mocha.getRunner().runTests = function (suite, fn) {
       retriedTests = getRetriedTests(test, earlyFlakeDetectionNumRetries, [
         '_ddIsModified',
         '_ddIsEfdRetry',
-        isKnownTestsEnabled && isNewTest(test) && '_ddIsNew'
+        isKnownTestsEnabled && isNewTest(test) && '_ddIsNew',
       ])
     } else if (isNew && isEarlyFlakeDetectionEnabled) {
       retryMessage = 'to detect flakes because it is new'
@@ -141,7 +167,7 @@ beforeEach(function () {
 
   cy.task('dd:beforeEach', {
     testName,
-    testSuite: Cypress.mocha.getRootSuite().file
+    testSuite: Cypress.mocha.getRootSuite().file,
   }).then(({ traceId, shouldSkip }) => {
     Cypress.env('traceId', traceId)
     if (shouldSkip) {
@@ -156,7 +182,7 @@ beforeEach(function () {
 before(function () {
   cy.task('dd:testSuiteStart', {
     testSuite: Cypress.mocha.getRootSuite().file,
-    testSuiteAbsolutePath: Cypress.spec && Cypress.spec.absolute
+    testSuiteAbsolutePath: Cypress.spec && Cypress.spec.absolute,
   }).then((suiteConfig) => {
     if (suiteConfig) {
       isEarlyFlakeDetectionEnabled = suiteConfig.isEarlyFlakeDetectionEnabled
@@ -185,16 +211,31 @@ after(() => {
 
 afterEach(function () {
   const currentTest = Cypress.mocha.getRunner().suite.ctx.currentTest
+  const testName = currentTest.fullTitle()
+
+  // Check if this was a quarantined test that we suppressed the failure for
+  const quarantinedError = quarantinedTestErrors.get(testName)
+  const isQuarantinedTestThatFailed = !!quarantinedError
+
+  // For quarantined tests, convert Error to a serializable format for cy.task
+  const errorToReport = isQuarantinedTestThatFailed
+    ? { message: quarantinedError.message, stack: quarantinedError.stack }
+    : currentTest.err
+
   const testInfo = {
-    testName: currentTest.fullTitle(),
+    testName,
     testSuite: Cypress.mocha.getRootSuite().file,
     testSuiteAbsolutePath: Cypress.spec && Cypress.spec.absolute,
-    state: currentTest.state,
-    error: currentTest.err,
+    // For quarantined tests, report the actual state (failed) to Datadog, not what Cypress thinks (passed)
+    state: isQuarantinedTestThatFailed ? 'failed' : currentTest.state,
+    // For quarantined tests, include the actual error that was suppressed
+    error: errorToReport,
     isNew: currentTest._ddIsNew,
     isEfdRetry: currentTest._ddIsEfdRetry,
     isAttemptToFix: currentTest._ddIsAttemptToFix,
-    isModified: currentTest._ddIsModified
+    isModified: currentTest._ddIsModified,
+    // Mark quarantined tests that failed so the plugin knows to tag them appropriately
+    isQuarantined: isQuarantinedTestThatFailed,
   }
   try {
     testInfo.testSourceLine = Cypress.mocha.getRunner().currentRunnable.invocationDetails.line
@@ -209,5 +250,11 @@ afterEach(function () {
   } catch {
     // ignore error and continue
   }
+
+  // Clean up the quarantined error tracking
+  if (isQuarantinedTestThatFailed) {
+    quarantinedTestErrors.delete(testName)
+  }
+
   cy.task('dd:afterEach', { test: testInfo, coverage })
 })

package/packages/datadog-plugin-dd-trace-api/src/index.js

@@ -30,7 +30,7 @@ module.exports = class DdTraceApiPlugin extends Plugin {
       const counter = apiMetrics.count('public_api.called', [
         `name:${name.replaceAll(':', '.')}`,
         'api_version:v1',
-        injectionEnabledTag
+        injectionEnabledTag,
       ])
 
       // For v1, APIs are 1:1 with their internal equivalents, so we can just

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

@@ -15,7 +15,7 @@ class DNSPlugin extends CompositePlugin {
       lookup: DNSLookupPlugin,
       lookup_service: DNSLookupServicePlugin,
       resolve: DNSResolvePlugin,
-      reverse: DNSReversePlugin
+      reverse: DNSReversePlugin,
     }
   }
 }

package/packages/datadog-plugin-dns/src/lookup.js

@@ -16,8 +16,8 @@ class DNSLookupPlugin extends ClientPlugin {
       meta: {
         'dns.hostname': hostname,
         'dns.address': '',
-        'dns.addresses': ''
-      }
+        'dns.addresses': '',
+      },
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-dns/src/lookup_service.js

@@ -14,11 +14,11 @@ class DNSLookupServicePlugin extends ClientPlugin {
       resource: `${address}:${port}`,
       kind: 'client',
       meta: {
-        'dns.address': address
+        'dns.address': address,
       },
       metrics: {
-        'dns.port': port
-      }
+        'dns.port': port,
+      },
     }, ctx)
 
     return ctx.currentStore

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

@@ -16,8 +16,8 @@ class DNSResolvePlugin extends ClientPlugin {
       kind: 'client',
       meta: {
         'dns.hostname': hostname,
-        'dns.rrtype': rrtype
-      }
+        'dns.rrtype': rrtype,
+      },
     }, ctx)
 
     return ctx.currentStore

package/packages/datadog-plugin-dns/src/reverse.js

@@ -14,8 +14,8 @@ class DNSReversePlugin extends ClientPlugin {
       resource: ip,
       kind: 'client',
       meta: {
-        'dns.ip': ip
-      }
+        'dns.ip': ip,
+      },
     }, ctx)
 
     return ctx.currentStore

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

@@ -20,8 +20,8 @@ class ElasticsearchPlugin extends DatabasePlugin {
         [`${this.system}.url`]: params.path,
         [`${this.system}.method`]: params.method,
         [`${this.system}.body`]: body,
-        [`${this.system}.params`]: JSON.stringify(params.querystring || params.query)
-      }
+        [`${this.system}.params`]: JSON.stringify(params.querystring || params.query),
+      },
     }, ctx)
 
     return ctx.currentStore

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

@@ -9,7 +9,7 @@ class ExpressPlugin extends CompositePlugin {
   static get plugins () {
     return {
       tracing: ExpressTracingPlugin,
-      codeOriginForSpans: ExpressCodeOriginForSpansPlugin
+      codeOriginForSpans: ExpressCodeOriginForSpansPlugin,
     }
   }
 }

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

@@ -9,7 +9,7 @@ class FastifyPlugin extends CompositePlugin {
   static get plugins () {
     return {
       tracing: FastifyTracingPlugin,
-      codeOriginForSpans: FastifyCodeOriginForSpansPlugin
+      codeOriginForSpans: FastifyCodeOriginForSpansPlugin,
     }
   }
 }

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

@@ -37,8 +37,8 @@ class FsPlugin extends TracingPlugin {
         'file.mode': mode,
         'file.path': path || '',
         'file.src': params.src || params.oldPath || params.existingPath || params.target,
-        'file.uid': uid || ''
-      }
+        'file.uid': uid || '',
+      },
     }, ctx)
 
     return ctx.currentStore

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

@@ -18,8 +18,8 @@ class GoogleCloudPubsubClientPlugin extends ClientPlugin {
       kind: this.constructor.kind,
       meta: {
         'pubsub.method': api,
-        'gcloud.project_id': projectId
-      }
+        'gcloud.project_id': projectId,
+      },
     }
 
     /**

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