dd-trace 5.55.0 → 5.57.0

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

@@ -43,10 +43,10 @@ function encodeValue (valueObject) {
       case 'B':
         return Buffer.isBuffer(value) ? value : Buffer.from(value)
       default:
-        log.debug(`Found unknown type while trying to create DynamoDB span pointer: ${type}`)
+        log.debug('Found unknown type while trying to create DynamoDB span pointer:', type)
     }
   } catch (err) {
-    log.debug(`Failed to encode value while trying to create DynamoDB span pointer: ${err.message}`)
+    log.debug('Failed to encode value while trying to create DynamoDB span pointer:', err.message)
   }
 }
 

package/packages/datadog-plugin-azure-functions/src/index.js

@@ -19,14 +19,15 @@ class AzureFunctionsPlugin extends TracingPlugin {
   static get operation () { return 'invoke' }
   static get kind () { return 'server' }
   static get type () { return 'serverless' }
-
   static get prefix () { return 'tracing:datadog:azure:functions:invoke' }
 
   bindStart (ctx) {
-    const { functionName, methodName } = ctx
+    const { functionName, methodName, httpRequest } = ctx
     const store = storage('legacy').getStore()
-
+    // httpRequest.headers is a map
+    const childOf = this._tracer.extract('http_headers', Object.fromEntries(httpRequest.headers))
     const span = this.startSpan(this.operationName(), {
+      childOf,
       service: this.serviceName(),
       type: 'serverless',
       meta: {
@@ -52,7 +53,7 @@ class AzureFunctionsPlugin extends TracingPlugin {
     const path = (new URL(httpRequest.url)).pathname
     const req = {
       method: httpRequest.method,
-      headers: Object.fromEntries(httpRequest.headers.entries()),
+      headers: Object.fromEntries(httpRequest.headers),
       url: path
     }
 

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

@@ -1,8 +1,8 @@
 'use strict'
 
-const LogPlugin = require('../../dd-trace/src/plugins/log_plugin')
+const StructuredLogPlugin = require('../../dd-trace/src/plugins/structured_log_plugin')
 
-class BunyanPlugin extends LogPlugin {
+class BunyanPlugin extends StructuredLogPlugin {
   static get id () {
     return 'bunyan'
   }

package/packages/datadog-plugin-cassandra-driver/src/index.js

@@ -8,7 +8,9 @@ class CassandraDriverPlugin extends DatabasePlugin {
   static get system () { return 'cassandra' }
   static get peerServicePrecursors () { return [CASSANDRA_CONTACT_POINTS_KEY] }
 
-  start ({ keyspace, query, contactPoints = {} }) {
+  bindStart (ctx) {
+    let { keyspace, query, contactPoints = {} } = ctx
+
     if (Array.isArray(query)) {
       query = combine(query)
     }
@@ -24,7 +26,9 @@ class CassandraDriverPlugin extends DatabasePlugin {
         'cassandra.keyspace': keyspace,
         [CASSANDRA_CONTACT_POINTS_KEY]: contactPoints.join(',') || null
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }
 

package/packages/datadog-plugin-confluentinc-kafka-javascript/src/batch-consumer.js

@@ -4,7 +4,7 @@ const KafkajsBatchConsumerPlugin = require('../../datadog-plugin-kafkajs/src/bat
 
 class ConfluentKafkaJsBatchConsumerPlugin extends KafkajsBatchConsumerPlugin {
   static get id () {
-    return '@confluentinc/kafka-javascript'
+    return 'confluentinc-kafka-javascript'
   }
 }
 

package/packages/datadog-plugin-confluentinc-kafka-javascript/src/consumer.js

@@ -4,7 +4,7 @@ const KafkajsConsumerPlugin = require('../../datadog-plugin-kafkajs/src/consumer
 
 class ConfluentKafkaJsConsumerPlugin extends KafkajsConsumerPlugin {
   static get id () {
-    return '@confluentinc/kafka-javascript'
+    return 'confluentinc-kafka-javascript'
   }
 }
 

package/packages/datadog-plugin-confluentinc-kafka-javascript/src/index.js

@@ -6,7 +6,7 @@ const BatchConsumerPlugin = require('./batch-consumer')
 const KafkajsPlugin = require('../../datadog-plugin-kafkajs/src/index')
 
 class ConfluentKafkaJsPlugin extends KafkajsPlugin {
-  static get id () { return '@confluentinc/kafka-javascript' }
+  static get id () { return 'confluentinc-kafka-javascript' }
   static get plugins () {
     return {
       producer: ProducerPlugin,

package/packages/datadog-plugin-confluentinc-kafka-javascript/src/producer.js

@@ -4,7 +4,7 @@ const KafkajsProducerPlugin = require('../../datadog-plugin-kafkajs/src/producer
 
 class ConfluentKafkaJsProducerPlugin extends KafkajsProducerPlugin {
   static get id () {
-    return '@confluentinc/kafka-javascript'
+    return 'confluentinc-kafka-javascript'
   }
 }
 

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

@@ -184,7 +184,8 @@ class CucumberPlugin extends CiPlugin {
           [COMPONENT]: this.constructor.id,
           ...this.testEnvironmentMetadata,
           ...testSuiteMetadata
-        }
+        },
+        integrationName: this.constructor.id
       })
       this.testSuiteSpanByPath[testSuitePath] = testSuiteSpan
 
@@ -295,7 +296,8 @@ class CucumberPlugin extends CiPlugin {
           [COMPONENT]: this.constructor.id,
           'cucumber.step': resource,
           [RESOURCE_NAME]: resource
-        }
+        },
+        integrationName: this.constructor.id
       })
       ctx.parentStore = store
       ctx.currentStore = { ...store, span }

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

@@ -376,7 +376,8 @@ class CypressPlugin {
         [COMPONENT]: TEST_FRAMEWORK_NAME,
         ...this.testEnvironmentMetadata,
         ...testSuiteSpanMetadata
-      }
+      },
+      integrationName: TEST_FRAMEWORK_NAME
     })
   }
 
@@ -443,7 +444,8 @@ class CypressPlugin {
         ...testSpanMetadata,
         ...this.testEnvironmentMetadata,
         ...testSuiteTags
-      }
+      },
+      integrationName: TEST_FRAMEWORK_NAME
     })
   }
 
@@ -550,7 +552,7 @@ class CypressPlugin {
           [TEST_SESSION_NAME]: testSessionName
         }
       }
-      const libraryCapabilitiesTags = getLibraryCapabilitiesTags(this.constructor.id)
+      const libraryCapabilitiesTags = getLibraryCapabilitiesTags(this.constructor.id, false, this.frameworkVersion)
       metadataTags.test = {
         ...metadataTags.test,
         ...libraryCapabilitiesTags
@@ -565,7 +567,8 @@ class CypressPlugin {
         [COMPONENT]: TEST_FRAMEWORK_NAME,
         ...this.testEnvironmentMetadata,
         ...testSessionSpanMetadata
-      }
+      },
+      integrationName: TEST_FRAMEWORK_NAME
     })
     this.ciVisEvent(TELEMETRY_EVENT_CREATED, 'session')
 
@@ -575,7 +578,8 @@ class CypressPlugin {
         [COMPONENT]: TEST_FRAMEWORK_NAME,
         ...this.testEnvironmentMetadata,
         ...testModuleSpanMetadata
-      }
+      },
+      integrationName: TEST_FRAMEWORK_NAME
     })
     this.ciVisEvent(TELEMETRY_EVENT_CREATED, 'module')
 

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

@@ -5,7 +5,9 @@ const DatabasePlugin = require('../../dd-trace/src/plugins/database')
 class ElasticsearchPlugin extends DatabasePlugin {
   static get id () { return 'elasticsearch' }
 
-  start ({ params }) {
+  bindStart (ctx) {
+    const { params } = ctx
+
     const body = getBody(params.body || params.bulkBody)
 
     this.startSpan(this.operationName(), {
@@ -20,13 +22,19 @@ class ElasticsearchPlugin extends DatabasePlugin {
         [`${this.system}.body`]: body,
         [`${this.system}.params`]: JSON.stringify(params.querystring || params.query)
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 
-  finish ({ params }) {
+  bindFinish (ctx) {
+    const { params } = ctx
+
     const span = this.activeSpan
     this.config.hooks.query(span, params)
-    super.finish({ params })
+    super.finish(ctx)
+
+    return ctx.parentStore
   }
 }
 

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

@@ -38,6 +38,7 @@ class HttpClientPlugin extends ClientPlugin {
     // TODO delegate to super.startspan
     const span = this.startSpan(this.operationName(), {
       childOf,
+      integrationName: this.constructor.id,
       meta: {
         [COMPONENT]: this.constructor.id,
         'span.kind': 'client',

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

@@ -27,13 +27,14 @@ class HttpServerPlugin extends ServerPlugin {
       this.tracer,
       {
         ...this.config,
-        service: this.config.service || this.serviceName()
+        service: this.config.service || this.serviceName(),
       },
       req,
       res,
       this.operationName()
     )
     span.setTag(COMPONENT, this.constructor.id)
+    span._integrationName = this.constructor.id
 
     this._parentStore = store
     this.enter(span, { ...store, req, res })

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

@@ -40,6 +40,7 @@ class Http2ClientPlugin extends ClientPlugin {
     const childOf = store && allowed ? store.span : null
     const span = this.startSpan(this.operationName(), {
       childOf,
+      integrationName: this.constructor.id,
       meta: {
         [COMPONENT]: this.constructor.id,
         [SPAN_KIND]: CLIENT,

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

@@ -30,6 +30,7 @@ class Http2ServerPlugin extends ServerPlugin {
     )
 
     span.setTag(COMPONENT, this.constructor.id)
+    span._integrationName = this.constructor.id
 
     this.enter(span, { ...store, req, res })
 

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

@@ -252,7 +252,8 @@ class JestPlugin extends CiPlugin {
           [COMPONENT]: this.constructor.id,
           ...this.testEnvironmentMetadata,
           ...testSuiteMetadata
-        }
+        },
+        integrationName: this.constructor.id
       })
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_CREATED, 'suite')
       if (_ddTestCodeCoverageEnabled) {
@@ -318,11 +319,11 @@ class JestPlugin extends CiPlugin {
      * because this subscription happens in a different process from the one
      * fetching the ITR config.
      */
-    this.addSub('ci:jest:test-suite:code-coverage', ({ coverageFiles, testSuite }) => {
+    this.addSub('ci:jest:test-suite:code-coverage', ({ coverageFiles, testSuite, mockedFiles }) => {
       if (!coverageFiles.length) {
         this.telemetry.count(TELEMETRY_CODE_COVERAGE_EMPTY)
       }
-      const files = [...coverageFiles, testSuite]
+      const files = [...coverageFiles, ...mockedFiles, testSuite]
 
       const { _traceId, _spanId } = this.testSuiteSpan.context()
       const formattedCoverage = {

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

@@ -6,7 +6,9 @@ const CachePlugin = require('../../dd-trace/src/plugins/cache')
 class MemcachedPlugin extends CachePlugin {
   static get id () { return 'memcached' }
 
-  start ({ client, server, query }) {
+  bindStart (ctx) {
+    const { client, server, query } = ctx
+
     const address = getAddress(client, server, query)
 
     const meta = {
@@ -23,7 +25,9 @@ class MemcachedPlugin extends CachePlugin {
       resource: query.type,
       type: 'memcached',
       meta
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }
 

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

@@ -152,7 +152,8 @@ class MochaPlugin extends CiPlugin {
           [COMPONENT]: this.constructor.id,
           ...this.testEnvironmentMetadata,
           ...testSuiteMetadata
-        }
+        },
+        integrationName: this.constructor.id
       })
       this.telemetry.ciVisEvent(TELEMETRY_EVENT_CREATED, 'suite')
       if (this.libraryConfig?.isCodeCoverageEnabled) {
@@ -450,7 +451,7 @@ class MochaPlugin extends CiPlugin {
             const testSuite = span.meta[TEST_SUITE]
             const testSuiteSpan = this._testSuites.get(testSuite)
             if (!testSuiteSpan) {
-              log.warn(`Test suite span not found for test span with test suite ${testSuite}`)
+              log.warn('Test suite span not found for test span with test suite', testSuite)
               return formattedSpan
             }
             const suiteTags = getTestSuiteLevelVisibilityTags(testSuiteSpan)

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

@@ -7,29 +7,35 @@ class MoleculerClientPlugin extends ClientPlugin {
   static get id () { return 'moleculer' }
   static get operation () { return 'call' }
 
-  start ({ actionName, opts }) {
+  bindStart (ctx) {
+    const { actionName, opts } = ctx
+
     const span = this.startSpan(this.operationName(), {
       service: this.config.service || this.serviceName(),
       resource: actionName,
       kind: 'client'
-    })
+    }, ctx)
 
     this.tracer.inject(span, 'text_map', opts.meta)
+
+    return ctx.currentStore
   }
 
-  finish ({ broker, ctx }) {
-    const span = this.activeSpan
+  finish (ctx) {
+    const { promiseCtx, broker } = ctx
+
+    const span = ctx.currentStore.span || this.activeSpan
 
-    if (ctx) {
-      const endpoint = ctx.endpoint || {}
+    if (promiseCtx) {
+      const endpoint = promiseCtx.endpoint || {}
       const node = endpoint.node || {}
 
-      this.addHost(node.hostname, node.port)
+      this.addHost({ hostname: node.hostname, port: node.port })
 
-      span.addTags(moleculerTags(broker, ctx, this.config))
+      span.addTags(moleculerTags(broker, promiseCtx, this.config))
     }
 
-    super.finish()
+    super.finish(ctx)
   }
 }
 

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

@@ -7,19 +7,23 @@ class MoleculerServerPlugin extends ServerPlugin {
   static get id () { return 'moleculer' }
   static get operation () { return 'action' }
 
-  start ({ action, ctx, broker }) {
-    const followsFrom = this.tracer.extract('text_map', ctx.meta)
+  bindStart (ctx) {
+    const { action, middlewareCtx, broker } = ctx
+
+    const followsFrom = this.tracer.extract('text_map', middlewareCtx.meta)
     this.startSpan(this.operationName(), {
-      childOf: followsFrom || this.activeSpan,
+      childOf: followsFrom || ctx?.currentStore?.span || this.activeSpan,
       service: this.config.service || this.serviceName(),
       resource: action.name,
       kind: 'server',
       type: 'web',
       meta: {
         'resource.name': action.name,
-        ...moleculerTags(broker, ctx, this.config)
+        ...moleculerTags(broker, middlewareCtx, this.config)
       }
-    })
+    }, ctx)
+
+    return ctx.currentStore
   }
 }
 

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

@@ -31,7 +31,8 @@ class NextPlugin extends ServerPlugin {
         'span.type': 'web',
         'span.kind': 'server',
         'http.method': req.method
-      }
+      },
+      integrationName: this.constructor.id
     })
 
     analyticsSampler.sample(span, this.config.measured, true)