dd-trace 5.102.0 → 5.103.0

package/packages/datadog-instrumentations/src/redis.js

@@ -13,6 +13,7 @@ const errorCh = channel('apm:redis:command:error')
 let createClientUrl
 let createClientName
 const instanceInfo = new WeakMap()
+const connectionInfoCache = new WeakMap()
 
 function wrapAddCommand (addCommand) {
   return function (command) {
@@ -20,10 +21,7 @@ function wrapAddCommand (addCommand) {
       return addCommand.apply(this, arguments)
     }
 
-    const name = command[0]
-    const args = command.slice(1)
-
-    const ctx = getStartCtx(this, name, args)
+    const ctx = getStartCtx(this, command[0], command, 1)
     return startCh.runStores(ctx, () => {
       const res = addCommand.apply(this, arguments)
 
@@ -136,22 +134,33 @@ addHook({ name: 'redis', versions: ['>=0.12 <2.6'] }, redis => {
   return redis
 })
 
-function getStartCtx (client, command, args) {
-  const { url, connectionName } = instanceInfo.get(client) || {}
+function getStartCtx (client, command, args, argsStartIndex) {
+  let cached = connectionInfoCache.get(client)
+  if (cached === undefined) {
+    const info = instanceInfo.get(client)
+    cached = {
+      connectionOptions:
+        client.connection_options || client.connection_option || client.connectionOption || info?.url,
+      connectionName: info?.connectionName,
+    }
+    connectionInfoCache.set(client, cached)
+  }
 
   return {
     db: client.selected_db,
     command,
     args,
-    connectionOptions: client.connection_options || client.connection_option || client.connectionOption || url,
-    connectionName,
+    argsStartIndex,
+    connectionOptions: cached.connectionOptions,
+    connectionName: cached.connectionName,
   }
 }
 
 function wrapCallback (finishCh, errorCh, ctx, callback) {
-  return shimmer.wrapFunction(callback, callback => function (err) {
+  if (typeof callback !== 'function') return callback
+  return function (err) {
     return finish(finishCh, errorCh, ctx, err, callback, this, arguments)
-  })
+  }
 }
 
 function finish (finishCh, errorCh, ctx, error, callback, thisArg, args) {

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

@@ -2,8 +2,7 @@
 
 const { storage } = require('../../../datadog-core')
 const ApolloBasePlugin = require('../../../dd-trace/src/plugins/apollo')
-
-let tools
+const { getSignature } = require('../../../datadog-plugin-graphql/src/utils')
 
 const OPERATION_DEFINITION = 'OperationDefinition'
 const FRAGMENT_DEFINITION = 'FragmentDefinition'
@@ -100,23 +99,4 @@ function buildOperationContext (schema, operationDocument, operationName) {
   }
 }
 
-function getSignature (document, operationName, operationType, calculate) {
-  if (calculate !== false && tools !== false) {
-    try {
-      try {
-        tools = tools || require('../../../datadog-plugin-graphql/src/tools')
-      } catch (e) {
-        tools = false
-        throw e
-      }
-
-      return tools.defaultEngineReportingSignature(document, operationName)
-    } catch {
-      // safety net
-    }
-  }
-
-  return [operationType, operationName].filter(Boolean).join(' ')
-}
-
 module.exports = ApolloGatewayRequestPlugin

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

@@ -3,9 +3,8 @@
 const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
 const ClientPlugin = require('../../dd-trace/src/plugins/client')
 const { storage } = require('../../datadog-core')
-const { isTrue } = require('../../dd-trace/src/util')
 const { tagsFromRequest, tagsFromResponse } = require('../../dd-trace/src/payload-tagging')
-const { getValueFromEnvSources } = require('../../dd-trace/src/config/helper')
+const getConfig = require('../../dd-trace/src/config')
 const { IS_SERVERLESS } = require('../../dd-trace/src/serverless')
 
 const RESPONSE_SKIP_KEYS = new Set(['request', 'requestId', 'error', '$metadata'])
@@ -245,16 +244,15 @@ class BaseAwsSdkPlugin extends ClientPlugin {
     if (!span || !response.request) return
     const params = response.request.params
     const operation = response.request.operation
-    const extraTags = this.generateTags(params, operation, response) || {}
 
-    const tags = {
-      'aws.response.request_id': response.requestId,
-      'resource.name': operation,
-      'span.kind': 'client',
-      ...extraTags,
-    }
+    // `'span.kind': 'client'` is already set by the start-meta; SQS overrides via `generateTags`.
+    span.setTag('aws.response.request_id', response.requestId)
+    span.setTag('resource.name', operation)
 
-    span.addTags(tags)
+    const extraTags = this.generateTags(params, operation, response)
+    if (extraTags) {
+      span.addTags(extraTags)
+    }
 
     if (this.constructor.isPayloadReporter && this.cloudTaggingConfig.response) {
       const maxDepth = this.cloudTaggingConfig.maxDepth
@@ -314,29 +312,25 @@ function normalizeConfig (config, serviceIdentifier) {
   const hooks = getHooks(config)
 
   let specificConfig = config[serviceIdentifier]
-  switch (typeof specificConfig) {
-    case 'undefined':
-      specificConfig = {}
-      break
-    case 'boolean':
-      specificConfig = { enabled: specificConfig }
-      break
+  if (typeof specificConfig === 'boolean') {
+    specificConfig = { enabled: specificConfig }
   }
 
-  // check if AWS batch propagation or AWS_[SERVICE] batch propagation is enabled via env variable
+  // Check if AWS batch propagation or AWS_[SERVICE] batch propagation is enabled via env variable
+  const tracerConfig = getConfig()
   const serviceId = serviceIdentifier.toUpperCase()
-  const batchPropagationEnabled = isTrue(
-    specificConfig.batchPropagationEnabled ??
-    getValueFromEnvSources(`DD_TRACE_AWS_SDK_${serviceId}_BATCH_PROPAGATION_ENABLED`) ??
-    config.batchPropagationEnabled ??
-    getValueFromEnvSources('DD_TRACE_AWS_SDK_BATCH_PROPAGATION_ENABLED')
+  const serviceBatchKey = /** @type {import('../../dd-trace/src/config/config-types').ConfigPath} */(
+    `DD_TRACE_AWS_SDK_${serviceId}_BATCH_PROPAGATION_ENABLED`
   )
+  const batchPropagationEnabled = tracerConfig.getOrigin(serviceBatchKey) === 'default'
+    ? tracerConfig.DD_TRACE_AWS_SDK_BATCH_PROPAGATION_ENABLED
+    : tracerConfig[serviceBatchKey]
 
   // Merge the specific config back into the main config
   return {
+    batchPropagationEnabled,
     ...config,
     ...specificConfig,
-    batchPropagationEnabled,
     hooks,
   }
 }

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

@@ -6,7 +6,7 @@ class CloudwatchLogs extends BaseAwsSdkPlugin {
   static id = 'cloudwatchlogs'
 
   generateTags (params, operation) {
-    if (!params?.logGroupName) return {}
+    if (!params?.logGroupName) return
 
     return {
       'resource.name': `${operation} ${params.logGroupName}`,

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

@@ -7,7 +7,7 @@ class EventBridge extends BaseAwsSdkPlugin {
   static isPayloadReporter = true
 
   generateTags (params, operation, response) {
-    if (!params?.source) return {}
+    if (!params?.source) return
     const rulename = params.Name ?? ''
     return {
       'resource.name': operation ? `${operation} ${params.source}` : params.source,

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

@@ -68,7 +68,7 @@ class Kinesis extends BaseAwsSdkPlugin {
   }
 
   generateTags (params, operation, response) {
-    if (!params || !params.StreamName) return {}
+    if (!params || !params.StreamName) return
 
     return {
       'resource.name': `${operation} ${params.StreamName}`,

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

@@ -7,7 +7,7 @@ class Lambda extends BaseAwsSdkPlugin {
   static id = 'lambda'
 
   generateTags (params, operation, response) {
-    if (!params?.FunctionName) return {}
+    if (!params?.FunctionName) return
 
     return {
       'resource.name': `${operation} ${params.FunctionName}`,

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

@@ -6,7 +6,7 @@ class Redshift extends BaseAwsSdkPlugin {
   static id = 'redshift'
 
   generateTags (params, operation, response) {
-    if (!params?.ClusterIdentifier) return {}
+    if (!params?.ClusterIdentifier) return
 
     return {
       'resource.name': `${operation} ${params.ClusterIdentifier}`,

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

@@ -11,7 +11,7 @@ class S3 extends BaseAwsSdkPlugin {
   static isPayloadReporter = true
 
   generateTags (params, operation, response) {
-    if (!params?.Bucket) return {}
+    if (!params?.Bucket) return
 
     return {
       'resource.name': `${operation} ${params.Bucket}`,

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

@@ -10,9 +10,9 @@ class Sns extends BaseAwsSdkPlugin {
   static isPayloadReporter = true
 
   generateTags (params, operation, response) {
-    if (!params) return {}
+    if (!params) return
 
-    if (!params.TopicArn && !(response.data && response.data.TopicArn)) return {}
+    if (!params.TopicArn && !(response.data && response.data.TopicArn)) return
     const TopicArn = params.TopicArn || response.data.TopicArn
 
     // Get the topic name from the last `:`-delimited segment of the ARN

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

@@ -99,7 +99,7 @@ class Sqs extends BaseAwsSdkPlugin {
   }
 
   generateTags (params, operation, response) {
-    if (!params || (!params.QueueName && !params.QueueUrl)) return {}
+    if (!params || (!params.QueueName && !params.QueueUrl)) return
 
     const queueMetadata = extractQueueMetadata(params.QueueUrl)
     const queueName = queueMetadata?.queueName || params.QueueName

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

@@ -28,7 +28,7 @@ class Stepfunctions extends BaseAwsSdkPlugin {
   //   }
 
   generateTags (params, operation, response) {
-    if (!params) return {}
+    if (!params) return
     const tags = { 'resource.name': params.name ? `${operation} ${params.name}` : `${operation}` }
     if (operation === 'startExecution' || operation === 'startSyncExecution') {
       tags.statemachinearn = `${params.stateMachineArn}`

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

@@ -1,18 +1,49 @@
 'use strict'
 
 const StoragePlugin = require('../../dd-trace/src/plugins/storage')
-const { storage } = require('../../datadog-core')
 
 class CouchBasePlugin extends StoragePlugin {
   static id = 'couchbase'
   static peerServicePrecursors = ['db.couchbase.seed.nodes']
 
-  addBinds (func, start) {
-    this.addBind(`apm:couchbase:${func}:start`, start)
-    this.addSub(`apm:couchbase:${func}:error`, ({ error }) => this.addError(error))
-    this.addSub(`apm:couchbase:${func}:finish`, ctx => this.finish(ctx))
-    this.addBind(`apm:couchbase:${func}:callback:start`, callbackStart)
-    this.addBind(`apm:couchbase:${func}:callback:finish`, callbackFinish)
+  constructor (...args) {
+    super(...args)
+
+    this.#addOpSubs('query', (ctx) => {
+      const { resource, bucket, seedNodes } = ctx
+      this.startSpan(
+        'query',
+        {
+          'span.type': 'sql',
+          'resource.name': resource,
+          'span.kind': this.constructor.kind,
+        },
+        { bucket, seedNodes },
+        ctx
+      )
+      return ctx.currentStore
+    })
+
+    for (const op of ['upsert', 'insert', 'replace']) {
+      this.#addOpSubs(op, (ctx) => {
+        const { bucket, collection, seedNodes } = ctx
+        this.startSpan(op, {}, { bucket, collection, seedNodes }, ctx)
+        return ctx.currentStore
+      })
+    }
+  }
+
+  /**
+   * @param {string} op Operation name (`query`, `upsert`, ...).
+   * @param {(ctx: object) => object} bindStart Operation-specific span starter.
+   */
+  #addOpSubs (op, bindStart) {
+    const prefix = `tracing:apm:couchbase:${op}`
+    this.addBind(`${prefix}:start`, bindStart)
+    this.addBind(`${prefix}:asyncStart`, bindAsyncStart)
+    this.addSub(`${prefix}:asyncEnd`, finishSpan)
+    this.addSub(`${prefix}:end`, finishSpanIfSync)
+    this.addSub(`${prefix}:error`, setSpanError)
   }
 
   startSpan (operation, customTags, { bucket, collection, seedNodes }, ctx) {
@@ -27,8 +58,8 @@ class CouchBasePlugin extends StoragePlugin {
     if (bucket) tags['couchbase.bucket.name'] = bucket.name
     if (collection) tags['couchbase.collection.name'] = collection.name
 
-    for (const tag in customTags) {
-      tags[tag] = customTags[tag]
+    for (const key of Object.keys(customTags)) {
+      tags[key] = customTags[key]
     }
 
     return super.startSpan(
@@ -40,55 +71,30 @@ class CouchBasePlugin extends StoragePlugin {
       ctx
     )
   }
+}
 
-  constructor (...args) {
-    super(...args)
-
-    this.addBinds('query', (ctx) => {
-      const { resource, bucket, seedNodes } = ctx
-
-      this.startSpan(
-        'query',
-        {
-          'span.type': 'sql',
-          'resource.name': resource,
-          'span.kind': this.constructor.kind,
-        },
-        { bucket, seedNodes },
-        ctx
-      )
-
-      return ctx.currentStore
-    })
-    this.addBind('apm:couchbase:bucket:maybeInvoke:callback:start', callbackStart)
-    this.addBind('apm:couchbase:bucket:maybeInvoke:callback:finish', callbackFinish)
-    this.addBind('apm:couchbase:cluster:maybeInvoke:callback:start', callbackStart)
-    this.addBind('apm:couchbase:cluster:maybeInvoke:callback:finish', callbackFinish)
-
-    this._addCommandSubs('upsert')
-    this._addCommandSubs('insert')
-    this._addCommandSubs('replace')
-    this._addCommandSubs('append')
-    this._addCommandSubs('prepend')
-  }
-
-  _addCommandSubs (name) {
-    this.addBinds(name, (ctx) => {
-      const { bucket, collection, seedNodes } = ctx
+function bindAsyncStart (ctx) {
+  return ctx.parentStore
+}
 
-      this.startSpan(name, {}, { bucket, collection, seedNodes }, ctx)
-      return ctx.currentStore
-    })
-  }
+function finishSpan (ctx) {
+  ctx.currentStore?.span?.finish()
 }
 
-function callbackStart (ctx) {
-  ctx.parentStore = storage('legacy').getStore()
-  return ctx.parentStore
+// `end` fires synchronously after the wrapped function returns. For async
+// resolutions ctx.result and ctx.error are still unset at that point and the
+// span is closed later via asyncEnd. For a sync throw or sync-resolved
+// callback, this is the only finalization signal.
+function finishSpanIfSync (ctx) {
+  if ((ctx.error !== undefined || ctx.result !== undefined) && ctx.currentStore?.span) {
+    ctx.currentStore.span.finish()
+  }
 }
 
-function callbackFinish (ctx) {
-  return ctx.parentStore
+function setSpanError (ctx) {
+  if (ctx.error && ctx.currentStore?.span) {
+    ctx.currentStore.span.setTag('error', ctx.error)
+  }
 }
 
 module.exports = CouchBasePlugin

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

@@ -141,6 +141,7 @@ class CucumberPlugin extends CiPlugin {
           'cucumber'
         ),
         ...this.getSessionRequestErrorTags(),
+        ...this.getSessionItrSkippingEnabledTags(),
       }
       if (isUnskippable) {
         this.telemetry.count(TELEMETRY_ITR_UNSKIPPABLE, { testLevel: 'suite' })