dd-trace 5.8.0 → 5.9.0

package/packages/datadog-plugin-apollo/src/gateway/validate.js

@@ -10,11 +10,15 @@ class ApolloGatewayValidatePlugin extends ApolloBasePlugin {
 
   end (ctx) {
     const result = ctx.result
+    const span = ctx.currentStore?.span
+
+    if (!span) return
+
     if (result instanceof Array &&
       result[result.length - 1] && result[result.length - 1].stack && result[result.length - 1].message) {
-      ctx.currentStore.span.setTag('error', result[result.length - 1])
+      span.setTag('error', result[result.length - 1])
     }
-    ctx.currentStore.span.finish()
+    span.finish()
   }
 }
 

package/packages/datadog-plugin-aws-sdk/src/base.js

@@ -37,10 +37,10 @@ class BaseAwsSdkPlugin extends ClientPlugin {
         'service.name': this.serviceName(),
         'aws.operation': operation,
         'aws.region': awsRegion,
-        'region': awsRegion,
-        'aws_service': awsService,
+        region: awsRegion,
+        aws_service: awsService,
         'aws.service': awsService,
-        'component': 'aws-sdk'
+        component: 'aws-sdk'
       }
       if (this.requestTags) this.requestTags.set(request, tags)
 

package/packages/datadog-plugin-aws-sdk/src/services/cloudwatchlogs.js

@@ -13,7 +13,7 @@ class CloudwatchLogs extends BaseAwsSdkPlugin {
     return Object.assign(tags, {
       'resource.name': `${operation} ${params.logGroupName}`,
       'aws.cloudwatch.logs.log_group_name': params.logGroupName,
-      'loggroupname': params.logGroupName
+      loggroupname: params.logGroupName
     })
   }
 }

package/packages/datadog-plugin-aws-sdk/src/services/dynamodb.js

@@ -14,7 +14,7 @@ class DynamoDb extends BaseAwsSdkPlugin {
         Object.assign(tags, {
           'resource.name': `${operation} ${params.TableName}`,
           'aws.dynamodb.table_name': params.TableName,
-          'tablename': params.TableName
+          tablename: params.TableName
         })
       }
 
@@ -30,7 +30,7 @@ class DynamoDb extends BaseAwsSdkPlugin {
             Object.assign(tags, {
               'resource.name': `${operation} ${tableName}`,
               'aws.dynamodb.table_name': tableName,
-              'tablename': tableName
+              tablename: tableName
             })
           }
         }

package/packages/datadog-plugin-aws-sdk/src/services/eventbridge.js

@@ -11,7 +11,7 @@ class EventBridge extends BaseAwsSdkPlugin {
     return {
       'resource.name': operation ? `${operation} ${params.source}` : params.source,
       'aws.eventbridge.source': `${params.source}`,
-      'rulename': `${rulename}`
+      rulename: `${rulename}`
     }
   }
 

package/packages/datadog-plugin-aws-sdk/src/services/kinesis.js

@@ -69,7 +69,7 @@ class Kinesis extends BaseAwsSdkPlugin {
     return {
       'resource.name': `${operation} ${params.StreamName}`,
       'aws.kinesis.stream_name': params.StreamName,
-      'streamname': params.StreamName
+      streamname: params.StreamName
     }
   }
 

package/packages/datadog-plugin-aws-sdk/src/services/lambda.js

@@ -13,7 +13,7 @@ class Lambda extends BaseAwsSdkPlugin {
 
     return Object.assign(tags, {
       'resource.name': `${operation} ${params.FunctionName}`,
-      'functionname': params.FunctionName,
+      functionname: params.FunctionName,
       'aws.lambda': params.FunctionName
     })
   }

package/packages/datadog-plugin-aws-sdk/src/services/redshift.js

@@ -13,7 +13,7 @@ class Redshift extends BaseAwsSdkPlugin {
     return Object.assign(tags, {
       'resource.name': `${operation} ${params.ClusterIdentifier}`,
       'aws.redshift.cluster_identifier': params.ClusterIdentifier,
-      'clusteridentifier': params.ClusterIdentifier
+      clusteridentifier: params.ClusterIdentifier
     })
   }
 }

package/packages/datadog-plugin-aws-sdk/src/services/s3.js

@@ -14,7 +14,7 @@ class S3 extends BaseAwsSdkPlugin {
     return Object.assign(tags, {
       'resource.name': `${operation} ${params.Bucket}`,
       'aws.s3.bucket_name': params.Bucket,
-      'bucketname': params.Bucket
+      bucketname: params.Bucket
     })
   }
 }

package/packages/datadog-plugin-aws-sdk/src/services/sns.js

@@ -23,7 +23,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,

package/packages/datadog-plugin-aws-sdk/src/services/sqs.js

@@ -101,7 +101,7 @@ class Sqs extends BaseAwsSdkPlugin {
     Object.assign(tags, {
       'resource.name': `${operation} ${params.QueueName || params.QueueUrl}`,
       'aws.sqs.queue_name': params.QueueName || params.QueueUrl,
-      'queuename': queueName
+      queuename: queueName
     })
 
     switch (operation) {
@@ -146,7 +146,7 @@ class Sqs extends BaseAwsSdkPlugin {
     if (parsedAttributes) {
       return {
         datadogContext: this.tracer.extract('text_map', parsedAttributes),
-        parsedAttributes: parsedAttributes
+        parsedAttributes
       }
     }
   }

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

@@ -45,7 +45,7 @@ class ChildProcessPlugin extends TracingPlugin {
     const property = (shell === true) ? 'cmd.shell' : 'cmd.exec'
 
     const meta = {
-      'component': 'subprocess',
+      component: 'subprocess',
       [property]: (shell === true) ? cmdFields.join(' ') : JSON.stringify(cmdFields)
     }
 

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

@@ -16,7 +16,7 @@ class CouchBasePlugin extends StoragePlugin {
   startSpan (operation, customTags, store, { bucket, collection, seedNodes }) {
     const tags = {
       'db.type': 'couchbase',
-      'component': 'couchbase',
+      component: 'couchbase',
       'resource.name': `couchbase.${operation}`,
       'span.kind': this.constructor.kind,
       'db.couchbase.seed.nodes': seedNodes
@@ -61,6 +61,7 @@ class CouchBasePlugin extends StoragePlugin {
     this._addCommandSubs('append')
     this._addCommandSubs('prepend')
   }
+
   _addCommandSubs (name) {
     this.addSubs(name, ({ bucket, collection, seedNodes }) => {
       const store = storage.getStore()

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

@@ -327,6 +327,7 @@ class CypressPlugin {
       )
       if (knownTestsResponse.err) {
         log.error(knownTestsResponse.err)
+        this.isEarlyFlakeDetectionEnabled = false
       } else {
         // We use TEST_FRAMEWORK_NAME for the name of the module
         this.knownTestsByTestSuite = knownTestsResponse.knownTests[TEST_FRAMEWORK_NAME]

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

@@ -4,7 +4,7 @@ const HttpClientPlugin = require('../../datadog-plugin-http/src/client')
 
 class FetchPlugin extends HttpClientPlugin {
   static get id () { return 'fetch' }
-  static get prefix () { return `apm:fetch:request` }
+  static get prefix () { return 'apm:fetch:request' }
 
   addTraceSub (eventName, handler) {
     this.addSub(`apm:${this.constructor.id}:${this.operation}:${eventName}`, handler)

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

@@ -126,7 +126,7 @@ function getResolverInfo (info, args) {
   if (Array.isArray(directives)) {
     for (const directive of directives) {
       const argList = {}
-      for (const argument of directive['arguments']) {
+      for (const argument of directive.arguments) {
         argList[argument.name.value] = argument.value.value
       }
 

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

@@ -8,7 +8,7 @@ const { addMetadataTags, getFilter, getMethodMetadata } = require('./util')
 class GrpcClientPlugin extends ClientPlugin {
   static get id () { return 'grpc' }
   static get operation () { return 'client:request' }
-  static get prefix () { return `apm:grpc:client:request` }
+  static get prefix () { return 'apm:grpc:client:request' }
   static get peerServicePrecursors () { return ['rpc.service'] }
 
   constructor (...args) {
@@ -30,7 +30,7 @@ class GrpcClientPlugin extends ClientPlugin {
       kind: 'client',
       type: 'http',
       meta: {
-        'component': 'grpc',
+        component: 'grpc',
         'grpc.method.kind': method.kind,
         'grpc.method.path': method.path,
         'grpc.method.name': method.name,

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

@@ -8,7 +8,7 @@ const { addMetadataTags, getFilter, getMethodMetadata } = require('./util')
 class GrpcServerPlugin extends ServerPlugin {
   static get id () { return 'grpc' }
   static get operation () { return 'server:request' }
-  static get prefix () { return `apm:grpc:server:request` }
+  static get prefix () { return 'apm:grpc:server:request' }
 
   constructor (...args) {
     super(...args)
@@ -39,7 +39,7 @@ class GrpcServerPlugin extends ServerPlugin {
       kind: 'server',
       type: 'web',
       meta: {
-        'component': 'grpc',
+        component: 'grpc',
         'grpc.method.kind': method.kind,
         'grpc.method.path': method.path,
         'grpc.method.name': method.name,

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

@@ -17,7 +17,7 @@ const HTTP_RESPONSE_HEADERS = tags.HTTP_RESPONSE_HEADERS
 
 class HttpClientPlugin extends ClientPlugin {
   static get id () { return 'http' }
-  static get prefix () { return `apm:http:client:request` }
+  static get prefix () { return 'apm:http:client:request' }
 
   bindStart (message) {
     const { args, http = {} } = message
@@ -227,7 +227,7 @@ function hasAmazonSignature (options) {
       return true
     }
 
-    if ([].concat(headers['authorization']).some(startsWith('AWS4-HMAC-SHA256'))) {
+    if ([].concat(headers.authorization).some(startsWith('AWS4-HMAC-SHA256'))) {
       return true
     }
   }

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

@@ -25,7 +25,7 @@ const HTTP2_METHOD_GET = 'GET'
 
 class Http2ClientPlugin extends ClientPlugin {
   static get id () { return 'http2' }
-  static get prefix () { return `apm:http2:client:request` }
+  static get prefix () { return 'apm:http2:client:request' }
 
   bindStart (message) {
     const { authority, options, headers = {} } = message
@@ -122,7 +122,8 @@ function extractSessionDetails (authority, options) {
 
   const protocol = authority.protocol || options.protocol || 'https:'
   let port = '' + (authority.port !== ''
-    ? authority.port : (authority.protocol === 'http:' ? 80 : 443))
+    ? authority.port
+    : (authority.protocol === 'http:' ? 80 : 443))
   let host = authority.hostname || authority.host || 'localhost'
 
   if (protocol === 'https:' && options) {
@@ -144,7 +145,7 @@ function hasAmazonSignature (headers, path) {
       return true
     }
 
-    if ([].concat(headers['authorization']).some(startsWith('AWS4-HMAC-SHA256'))) {
+    if ([].concat(headers.authorization).some(startsWith('AWS4-HMAC-SHA256'))) {
       return true
     }
   }

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

@@ -51,6 +51,7 @@ class JestPlugin extends CiPlugin {
     }
     return this.unskippableSuites
   }
+
   getForcedToRunSuites (forcedToRunSuitesList) {
     if (!this.forcedToRunSuites) {
       this.forcedToRunSuites = JSON.parse(forcedToRunSuitesList)

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

@@ -70,7 +70,7 @@ class KafkajsConsumerPlugin extends ConsumerPlugin {
       resource: topic,
       type: 'worker',
       meta: {
-        'component': 'kafkajs',
+        component: 'kafkajs',
         'kafka.topic': topic,
         'kafka.message.offset': message.offset
       },

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

@@ -70,7 +70,7 @@ class KafkajsProducerPlugin extends ProducerPlugin {
     const span = this.startSpan({
       resource: topic,
       meta: {
-        'component': 'kafkajs',
+        component: 'kafkajs',
         'kafka.topic': topic
       },
       metrics: {

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

@@ -58,7 +58,7 @@ class NextPlugin extends ServerPlugin {
     if (!store) return
 
     const span = store.span
-    const error = span.context()._tags['error']
+    const error = span.context()._tags.error
     const requestError = req.error || nextRequest.error
 
     if (requestError) {

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

@@ -89,7 +89,7 @@ class OpenApiPlugin extends TracingPlugin {
       store.prompt = prompt
       if (typeof prompt === 'string' || (Array.isArray(prompt) && typeof prompt[0] === 'number')) {
         // This is a single prompt, either String or [Number]
-        tags[`openai.request.prompt`] = normalizeStringOrTokenArray(prompt, true)
+        tags['openai.request.prompt'] = normalizeStringOrTokenArray(prompt, true)
       } else if (Array.isArray(prompt)) {
         // This is multiple prompts, either [String] or [[Number]]
         for (let i = 0; i < prompt.length; i++) {
@@ -101,7 +101,7 @@ class OpenApiPlugin extends TracingPlugin {
     // createEdit, createEmbedding, createModeration
     if ('input' in payload) {
       const normalized = normalizeStringOrTokenArray(payload.input, false)
-      tags[`openai.request.input`] = truncateText(normalized)
+      tags['openai.request.input'] = truncateText(normalized)
       store.input = normalized
     }
 
@@ -203,7 +203,7 @@ class OpenApiPlugin extends TracingPlugin {
 
     // We don't know most information about the request when it fails
 
-    const tags = [`error:1`]
+    const tags = ['error:1']
     this.metrics.distribution('openai.request.duration', span._duration * 1000, tags)
     this.metrics.increment('openai.request.error', 1, tags)
 
@@ -215,7 +215,7 @@ class OpenApiPlugin extends TracingPlugin {
       `org:${headers['openai-organization']}`,
       `endpoint:${endpoint}`, // just "/v1/models", no method
       `model:${headers['openai-model']}`,
-      `error:0`
+      'error:0'
     ]
 
     this.metrics.distribution('openai.request.duration', duration * 1000, tags)

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

@@ -13,7 +13,8 @@ const {
   TEST_SOURCE_FILE,
   TEST_CONFIGURATION_BROWSER_NAME,
   TEST_IS_NEW,
-  TEST_IS_RETRY
+  TEST_IS_RETRY,
+  TEST_EARLY_FLAKE_IS_ENABLED
 } = require('../../dd-trace/src/plugins/util/test')
 const { RESOURCE_NAME } = require('../../../ext/tags')
 const { COMPONENT } = require('../../dd-trace/src/constants')
@@ -35,10 +36,14 @@ class PlaywrightPlugin extends CiPlugin {
     this.numFailedTests = 0
     this.numFailedSuites = 0
 
-    this.addSub('ci:playwright:session:finish', ({ status, onDone }) => {
+    this.addSub('ci:playwright:session:finish', ({ status, isEarlyFlakeDetectionEnabled, onDone }) => {
       this.testModuleSpan.setTag(TEST_STATUS, status)
       this.testSessionSpan.setTag(TEST_STATUS, status)
 
+      if (isEarlyFlakeDetectionEnabled) {
+        this.testSessionSpan.setTag(TEST_EARLY_FLAKE_IS_ENABLED, 'true')
+      }
+
       if (this.numFailedSuites > 0) {
         let errorMessage = `Test suites failed: ${this.numFailedSuites}.`
         if (this.numFailedTests > 0) {

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

@@ -26,7 +26,7 @@ class RheaConsumerPlugin extends ConsumerPlugin {
       resource: name,
       type: 'worker',
       meta: {
-        'component': 'rhea',
+        component: 'rhea',
         'amqp.link.source.address': name,
         'amqp.link.role': 'receiver'
       }

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

@@ -19,7 +19,7 @@ class RheaProducerPlugin extends ProducerPlugin {
     this.startSpan({
       resource: name,
       meta: {
-        'component': 'rhea',
+        component: 'rhea',
         'amqp.link.target.address': name,
         'amqp.link.role': 'sender',
         'out.host': host,

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

@@ -71,7 +71,7 @@ class RouterPlugin extends WebPlugin {
       span.setTag('error', error)
     })
 
-    this.addSub(`apm:http:server:request:finish`, ({ req }) => {
+    this.addSub('apm:http:server:request:finish', ({ req }) => {
       const context = this._contexts.get(req)
 
       if (!context) return

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

@@ -16,7 +16,7 @@ class TediousPlugin extends DatabasePlugin {
       kind: 'client',
       meta: {
         'db.type': 'mssql',
-        'component': 'tedious',
+        component: 'tedious',
         'out.host': connectionConfig.server,
         [CLIENT_PORT_KEY]: connectionConfig.options.port,
         'db.user': connectionConfig.userName || connectionConfig.authentication.options.userName,

package/packages/dd-trace/src/appsec/blocking.js

@@ -28,7 +28,7 @@ function getBlockWithRedirectData (rootSpan) {
     statusCode = 303
   }
   const headers = {
-    'Location': blockingConfiguration.parameters.location
+    Location: blockingConfiguration.parameters.location
   }
 
   rootSpan.addTags({

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

@@ -1,21 +1,21 @@
 'use strict'
 
 module.exports = {
-  'COMMAND_INJECTION_ANALYZER': require('./command-injection-analyzer'),
-  'HARCODED_SECRET_ANALYZER': require('./hardcoded-secret-analyzer'),
-  'HEADER_INJECTION_ANALYZER': require('./header-injection-analyzer'),
-  'HSTS_HEADER_MISSING_ANALYZER': require('./hsts-header-missing-analyzer'),
-  'INSECURE_COOKIE_ANALYZER': require('./insecure-cookie-analyzer'),
-  'LDAP_ANALYZER': require('./ldap-injection-analyzer'),
-  'NO_HTTPONLY_COOKIE_ANALYZER': require('./no-httponly-cookie-analyzer'),
-  'NO_SAMESITE_COOKIE_ANALYZER': require('./no-samesite-cookie-analyzer'),
-  'NOSQL_MONGODB_INJECTION': require('./nosql-injection-mongodb-analyzer'),
-  'PATH_TRAVERSAL_ANALYZER': require('./path-traversal-analyzer'),
-  'SQL_INJECTION_ANALYZER': require('./sql-injection-analyzer'),
-  'SSRF': require('./ssrf-analyzer'),
-  'UNVALIDATED_REDIRECT_ANALYZER': require('./unvalidated-redirect-analyzer'),
-  'WEAK_CIPHER_ANALYZER': require('./weak-cipher-analyzer'),
-  'WEAK_HASH_ANALYZER': require('./weak-hash-analyzer'),
-  'WEAK_RANDOMNESS_ANALYZER': require('./weak-randomness-analyzer'),
-  'XCONTENTTYPE_HEADER_MISSING_ANALYZER': require('./xcontenttype-header-missing-analyzer')
+  COMMAND_INJECTION_ANALYZER: require('./command-injection-analyzer'),
+  HARCODED_SECRET_ANALYZER: require('./hardcoded-secret-analyzer'),
+  HEADER_INJECTION_ANALYZER: require('./header-injection-analyzer'),
+  HSTS_HEADER_MISSING_ANALYZER: require('./hsts-header-missing-analyzer'),
+  INSECURE_COOKIE_ANALYZER: require('./insecure-cookie-analyzer'),
+  LDAP_ANALYZER: require('./ldap-injection-analyzer'),
+  NO_HTTPONLY_COOKIE_ANALYZER: require('./no-httponly-cookie-analyzer'),
+  NO_SAMESITE_COOKIE_ANALYZER: require('./no-samesite-cookie-analyzer'),
+  NOSQL_MONGODB_INJECTION: require('./nosql-injection-mongodb-analyzer'),
+  PATH_TRAVERSAL_ANALYZER: require('./path-traversal-analyzer'),
+  SQL_INJECTION_ANALYZER: require('./sql-injection-analyzer'),
+  SSRF: require('./ssrf-analyzer'),
+  UNVALIDATED_REDIRECT_ANALYZER: require('./unvalidated-redirect-analyzer'),
+  WEAK_CIPHER_ANALYZER: require('./weak-cipher-analyzer'),
+  WEAK_HASH_ANALYZER: require('./weak-hash-analyzer'),
+  WEAK_RANDOMNESS_ANALYZER: require('./weak-randomness-analyzer'),
+  XCONTENTTYPE_HEADER_MISSING_ANALYZER: require('./xcontenttype-header-missing-analyzer')
 }

package/packages/dd-trace/src/appsec/iast/analyzers/cookie-analyzer.js

@@ -34,6 +34,7 @@ class CookieAnalyzer extends Analyzer {
   _getExcludedPaths () {
     return EXCLUDED_PATHS
   }
+
   _checkOCE (context, value) {
     if (value && value.location) {
       return true