dd-trace 5.7.0 → 5.9.0

package/packages/dd-trace/src/config.js

@@ -23,13 +23,10 @@ const fromEntries = Object.fromEntries || (entries =>
 
 // eslint-disable-next-line max-len
 const qsRegex = '(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?|access_?|secret_?)key(?:_?id)?|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:(?:\\s|%20)*(?:=|%3D)[^&]+|(?:"|%22)(?:\\s|%20)*(?::|%3A)(?:\\s|%20)*(?:"|%22)(?:%2[^2]|%[^2]|[^"%])+(?:"|%22))|bearer(?:\\s|%20)+[a-z0-9\\._\\-]+|token(?::|%3A)[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L](?:[\\w=-]|%3D)+\\.ey[I-L](?:[\\w=-]|%3D)+(?:\\.(?:[\\w.+\\/=-]|%3D|%2F|%2B)+)?|[\\-]{5}BEGIN(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY[\\-]{5}[^\\-]+[\\-]{5}END(?:[a-z\\s]|%20)+PRIVATE(?:\\s|%20)KEY|ssh-rsa(?:\\s|%20)*(?:[a-z0-9\\/\\.+]|%2F|%5C|%2B){100,}'
-const defaultWafObfuscatorKeyRegex = `(?i)(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?\
-|public_?)key)|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)|bearer|authorization`
-const defaultWafObfuscatorValueRegex =
-`(?i)(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?|access_?|secret_?)key(?:_?id)?|to\
-ken|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:\\s*=[^;]|"\\s*:\\s*"[^"]+")|bearer\
-\\s+[a-z0-9\\._\\-]+|token:[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L][\\w=-]+\\.ey[I-L][\\w=-]+(?:\\.[\\w.+\\/=-]+)?\
-|[\\-]{5}BEGIN[a-z\\s]+PRIVATE\\sKEY[\\-]{5}[^\\-]+[\\-]{5}END[a-z\\s]+PRIVATE\\sKEY|ssh-rsa\\s*[a-z0-9\\/\\.+]{100,}`
+// eslint-disable-next-line max-len
+const defaultWafObfuscatorKeyRegex = '(?i)(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?)key)|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)|bearer|authorization'
+// eslint-disable-next-line max-len
+const defaultWafObfuscatorValueRegex = '(?i)(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?|access_?|secret_?)key(?:_?id)?|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:\\s*=[^;]|"\\s*:\\s*"[^"]+")|bearer\\s+[a-z0-9\\._\\-]+|token:[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L][\\w=-]+\\.ey[I-L][\\w=-]+(?:\\.[\\w.+\\/=-]+)?|[\\-]{5}BEGIN[a-z\\s]+PRIVATE\\sKEY[\\-]{5}[^\\-]+[\\-]{5}END[a-z\\s]+PRIVATE\\sKEY|ssh-rsa\\s*[a-z0-9\\/\\.+]{100,}'
 
 function maybeFile (filepath) {
   if (!filepath) return
@@ -132,9 +129,11 @@ class Config {
 
     const DD_SERVICE_MAPPING = coalesce(
       options.serviceMapping,
-      process.env.DD_SERVICE_MAPPING ? fromEntries(
-        process.env.DD_SERVICE_MAPPING.split(',').map(x => x.trim().split(':'))
-      ) : {}
+      process.env.DD_SERVICE_MAPPING
+        ? fromEntries(
+          process.env.DD_SERVICE_MAPPING.split(',').map(x => x.trim().split(':'))
+        )
+        : {}
     )
 
     const DD_API_KEY = coalesce(
@@ -704,7 +703,7 @@ class Config {
   _isCiVisibility () {
     return coalesce(
       this.options.isCiVisibility,
-      this._defaults['isCiVisibility']
+      this._defaults.isCiVisibility
     )
   }
 
@@ -717,7 +716,8 @@ class Config {
 
   _getHostname () {
     const DD_CIVISIBILITY_AGENTLESS_URL = process.env.DD_CIVISIBILITY_AGENTLESS_URL
-    const url = DD_CIVISIBILITY_AGENTLESS_URL ? new URL(DD_CIVISIBILITY_AGENTLESS_URL)
+    const url = DD_CIVISIBILITY_AGENTLESS_URL
+      ? new URL(DD_CIVISIBILITY_AGENTLESS_URL)
       : getAgentUrl(this._getTraceAgentUrl(), this.options)
     const DD_AGENT_HOST = coalesce(
       this.options.hostname,
@@ -808,7 +808,7 @@ class Config {
     }
     this._setString(calc, 'dogstatsd.hostname', this._getHostname())
     this._setBoolean(calc, 'isGitUploadEnabled',
-      calc['isIntelligentTestRunnerEnabled'] && !isFalse(this._isCiVisibilityGitUploadEnabled()))
+      calc.isIntelligentTestRunnerEnabled && !isFalse(this._isCiVisibilityGitUploadEnabled()))
     this._setBoolean(calc, 'spanComputePeerService', this._getSpanComputePeerService())
     this._setBoolean(calc, 'stats.enabled', this._isTraceStatsComputationEnabled())
   }

package/packages/dd-trace/src/datastreams/pathway.js

@@ -22,7 +22,7 @@ function computeHash (service, env, edgeTags, parentHash) {
     return cache.get(key)
   }
   const currentHash = shaHash(`${service}${env}` + edgeTags.join(''))
-  const buf = Buffer.concat([ currentHash, parentHash ], 16)
+  const buf = Buffer.concat([currentHash, parentHash], 16)
   const val = shaHash(buf.toString())
   cache.set(key, val)
   return val

package/packages/dd-trace/src/datastreams/processor.js

@@ -273,12 +273,12 @@ class DataStreamsProcessor {
     const edgeLatencyNs = nowNs - edgeStartNs
     const pathwayLatencyNs = nowNs - pathwayStartNs
     const dataStreamsContext = {
-      hash: hash,
-      edgeStartNs: edgeStartNs,
-      pathwayStartNs: pathwayStartNs,
+      hash,
+      edgeStartNs,
+      pathwayStartNs,
       previousDirection: direction,
-      closestOppositeDirectionHash: closestOppositeDirectionHash,
-      closestOppositeDirectionEdgeStart: closestOppositeDirectionEdgeStart
+      closestOppositeDirectionHash,
+      closestOppositeDirectionEdgeStart
     }
     if (direction === 'direction:out') {
       // Add the header for this now, as the callee doesn't have access to context when producing
@@ -289,12 +289,12 @@ class DataStreamsProcessor {
     }
     const checkpoint = {
       currentTimestamp: nowNs,
-      parentHash: parentHash,
-      hash: hash,
-      edgeTags: edgeTags,
-      edgeLatencyNs: edgeLatencyNs,
-      pathwayLatencyNs: pathwayLatencyNs,
-      payloadSize: payloadSize
+      parentHash,
+      hash,
+      edgeTags,
+      edgeLatencyNs,
+      pathwayLatencyNs,
+      payloadSize
     }
     this.recordCheckpoint(checkpoint, span)
     return dataStreamsContext
@@ -320,7 +320,7 @@ class DataStreamsProcessor {
     // TimeBuckets
     const serializedBuckets = []
 
-    for (const [ timeNs, bucket ] of this.buckets.entries()) {
+    for (const [timeNs, bucket] of this.buckets.entries()) {
       const points = []
 
       // bucket: StatsBucket
@@ -354,9 +354,9 @@ class DataStreamsProcessor {
 }
 
 module.exports = {
-  DataStreamsProcessor: DataStreamsProcessor,
-  StatsPoint: StatsPoint,
-  StatsBucket: StatsBucket,
+  DataStreamsProcessor,
+  StatsPoint,
+  StatsBucket,
   Backlog,
   TimeBuckets,
   getMessageSize,

package/packages/dd-trace/src/encode/agentless-ci-visibility.js

@@ -328,8 +328,8 @@ class AgentlessCiVisibilityEncoder extends AgentEncoder {
       version: ENCODING_VERSION,
       metadata: {
         '*': {
-          'language': 'javascript',
-          'library_version': ddTraceVersion
+          language: 'javascript',
+          library_version: ddTraceVersion
         }
       },
       events: []

package/packages/dd-trace/src/encode/coverage-ci-visibility.js

@@ -108,7 +108,7 @@ class CoverageCIVisibilityEncoder extends AgentEncoder {
       'coverage1',
       buffer,
       {
-        filename: `coverage1.msgpack`,
+        filename: 'coverage1.msgpack',
         contentType: 'application/msgpack'
       }
     )

package/packages/dd-trace/src/exporters/common/request.js

@@ -6,6 +6,7 @@
 const { Readable } = require('stream')
 const http = require('http')
 const https = require('https')
+// eslint-disable-next-line n/no-deprecated-api
 const { parse: urlParse } = require('url')
 const zlib = require('zlib')
 

package/packages/dd-trace/src/exporters/span-stats/writer.js

@@ -1,4 +1,3 @@
-
 const { SpanStatsEncoder } = require('../../encode/span-stats')
 
 const pkg = require('../../../../../package.json')

package/packages/dd-trace/src/external-logger/src/index.js

@@ -51,11 +51,11 @@ class ExternalLogger {
 
     const payload = {
       ...log,
-      'timestamp': Date.now(),
-      'hostname': log.hostname || this.hostname,
-      'ddsource': log.ddsource || this.ddsource,
-      'service': log.service || this.service,
-      'ddtags': logTags || undefined
+      timestamp: Date.now(),
+      hostname: log.hostname || this.hostname,
+      ddsource: log.ddsource || this.ddsource,
+      service: log.service || this.service,
+      ddtags: logTags || undefined
     }
 
     this.enqueue(payload)

package/packages/dd-trace/src/opentelemetry/span.js

@@ -161,9 +161,11 @@ class Span {
   get resource () {
     return this._parentTracer.resource
   }
+
   get instrumentationLibrary () {
     return this._parentTracer.instrumentationLibrary
   }
+
   get _spanProcessor () {
     return this._parentTracer.getActiveSpanProcessor()
   }

package/packages/dd-trace/src/opentracing/propagation/text_map.js

@@ -321,7 +321,7 @@ class TextMapPropagator {
     }
     const matches = headerValue.trim().match(traceparentExpr)
     if (matches.length) {
-      const [ version, traceId, spanId, flags, tail ] = matches.slice(1)
+      const [version, traceId, spanId, flags, tail] = matches.slice(1)
       const traceparent = { version }
       const tracestate = TraceState.fromString(carrier.tracestate)
       if (invalidSegment.test(traceId)) return null

package/packages/dd-trace/src/opentracing/span.js

@@ -210,7 +210,7 @@ class DatadogSpan {
           // Wrap the value as a string if it's not already a string
           sanitizedAttributes[key] = typeof maybeScalar === 'string' ? maybeScalar : String(maybeScalar)
         } else {
-          log.warn(`Dropping span link attribute. It is not of an allowed type`)
+          log.warn('Dropping span link attribute. It is not of an allowed type')
         }
       }
     }

package/packages/dd-trace/src/plugin_manager.js

@@ -4,7 +4,6 @@ const { channel } = require('dc-polyfill')
 const { isFalse } = require('./util')
 const plugins = require('./plugins')
 const log = require('./log')
-const Nomenclature = require('./service-naming')
 
 const loadChannel = channel('dd-trace:instrumentation:load')
 
@@ -102,7 +101,7 @@ module.exports = class PluginManager {
   // like instrumenter.enable()
   configure (config = {}) {
     this._tracerConfig = config
-    Nomenclature.configure(config)
+    this._tracer._nomenclature.configure(config)
 
     for (const name in pluginClasses) {
       this.loadPlugin(name)

package/packages/dd-trace/src/plugins/apollo.js

@@ -0,0 +1,52 @@
+const TracingPlugin = require('./tracing')
+const { storage } = require('../../../datadog-core')
+
+class ApolloBasePlugin extends TracingPlugin {
+  static get id () { return 'apollo.gateway' }
+  static get type () { return 'web' }
+  static get kind () { return 'server' }
+
+  bindStart (ctx) {
+    const store = storage.getStore()
+    const childOf = store ? store.span : null
+
+    const span = this.startSpan(this.getOperationName(), {
+      childOf,
+      service: this.getServiceName(),
+      type: this.constructor.type,
+      kind: this.constructor.kind,
+      meta: {}
+    }, false)
+
+    ctx.parentStore = store
+    ctx.currentStore = { ...store, span }
+
+    return ctx.currentStore
+  }
+
+  end (ctx) {
+    // Only synchronous operations would have `result` or `error` on `end`.
+    if (!ctx.hasOwnProperty('result') && !ctx.hasOwnProperty('error')) return
+    ctx?.currentStore?.span?.finish()
+  }
+
+  asyncStart (ctx) {
+    ctx?.currentStore?.span.finish()
+    return ctx.parentStore
+  }
+
+  getServiceName () {
+    return this.serviceName({
+      id: `${this.constructor.id}.${this.constructor.operation}`,
+      pluginConfig: this.config
+    })
+  }
+
+  getOperationName () {
+    return this.operationName({
+      id: `${this.constructor.id}.${this.constructor.operation}`
+    })
+  }
+}
+
+module.exports = ApolloBasePlugin

package/packages/dd-trace/src/plugins/ci_plugin.js

@@ -42,7 +42,7 @@ module.exports = class CiPlugin extends Plugin {
       }
       this.tracer._exporter.getLibraryConfiguration(this.testConfiguration, (err, libraryConfig) => {
         if (err) {
-          log.error(`Intelligent Test Runner configuration could not be fetched. ${err.message}`)
+          log.error(`Library configuration could not be fetched. ${err.message}`)
         } else {
           this.libraryConfig = libraryConfig
         }
@@ -123,6 +123,7 @@ module.exports = class CiPlugin extends Plugin {
       this.tracer._exporter.getKnownTests(this.testConfiguration, (err, knownTests) => {
         if (err) {
           log.error(`Known tests could not be fetched. ${err.message}`)
+          this.libraryConfig.isEarlyFlakeDetectionEnabled = false
         }
         onDone({ err, knownTests })
       })

package/packages/dd-trace/src/plugins/composite.js

@@ -12,11 +12,11 @@ class CompositePlugin extends Plugin {
   }
 
   configure (config) {
+    super.configure(config)
     for (const name in this.constructor.plugins) {
-      const pluginConfig = config[name] === false ? false : {
-        ...config,
-        ...config[name]
-      }
+      const pluginConfig = config[name] === false
+        ? false
+        : { ...config, ...config[name] }
 
       this[name].configure(pluginConfig)
     }

package/packages/dd-trace/src/plugins/database.js

@@ -20,6 +20,7 @@ class DatabasePlugin extends StoragePlugin {
       encodedDdpv: ''
     }
   }
+
   encodingServiceTags (serviceTag, encodeATag, spanConfig) {
     if (serviceTag !== spanConfig) {
       this.serviceTags[serviceTag] = spanConfig

package/packages/dd-trace/src/plugins/index.js

@@ -1,6 +1,7 @@
 'use strict'
 
 module.exports = {
+  get '@apollo/gateway' () { return require('../../../datadog-plugin-apollo/src') },
   get '@aws-sdk/smithy-client' () { return require('../../../datadog-plugin-aws-sdk/src') },
   get '@cucumber/cucumber' () { return require('../../../datadog-plugin-cucumber/src') },
   get '@playwright/test' () { return require('../../../datadog-plugin-playwright/src') },
@@ -17,66 +18,66 @@ module.exports = {
   get '@opensearch-project/opensearch' () { return require('../../../datadog-plugin-opensearch/src') },
   get '@redis/client' () { return require('../../../datadog-plugin-redis/src') },
   get '@smithy/smithy-client' () { return require('../../../datadog-plugin-aws-sdk/src') },
-  get 'aerospike' () { return require('../../../datadog-plugin-aerospike/src') },
-  get 'amqp10' () { return require('../../../datadog-plugin-amqp10/src') },
-  get 'amqplib' () { return require('../../../datadog-plugin-amqplib/src') },
+  get aerospike () { return require('../../../datadog-plugin-aerospike/src') },
+  get amqp10 () { return require('../../../datadog-plugin-amqp10/src') },
+  get amqplib () { return require('../../../datadog-plugin-amqplib/src') },
   get 'aws-sdk' () { return require('../../../datadog-plugin-aws-sdk/src') },
-  get 'bunyan' () { return require('../../../datadog-plugin-bunyan/src') },
+  get bunyan () { return require('../../../datadog-plugin-bunyan/src') },
   get 'cassandra-driver' () { return require('../../../datadog-plugin-cassandra-driver/src') },
-  get 'child_process' () { return require('../../../datadog-plugin-child_process/src') },
-  get 'connect' () { return require('../../../datadog-plugin-connect/src') },
-  get 'couchbase' () { return require('../../../datadog-plugin-couchbase/src') },
-  get 'cypress' () { return require('../../../datadog-plugin-cypress/src') },
-  get 'dns' () { return require('../../../datadog-plugin-dns/src') },
-  get 'elasticsearch' () { return require('../../../datadog-plugin-elasticsearch/src') },
-  get 'express' () { return require('../../../datadog-plugin-express/src') },
-  get 'fastify' () { return require('../../../datadog-plugin-fastify/src') },
+  get child_process () { return require('../../../datadog-plugin-child_process/src') },
+  get connect () { return require('../../../datadog-plugin-connect/src') },
+  get couchbase () { return require('../../../datadog-plugin-couchbase/src') },
+  get cypress () { return require('../../../datadog-plugin-cypress/src') },
+  get dns () { return require('../../../datadog-plugin-dns/src') },
+  get elasticsearch () { return require('../../../datadog-plugin-elasticsearch/src') },
+  get express () { return require('../../../datadog-plugin-express/src') },
+  get fastify () { return require('../../../datadog-plugin-fastify/src') },
   get 'find-my-way' () { return require('../../../datadog-plugin-find-my-way/src') },
-  get 'graphql' () { return require('../../../datadog-plugin-graphql/src') },
-  get 'grpc' () { return require('../../../datadog-plugin-grpc/src') },
-  get 'hapi' () { return require('../../../datadog-plugin-hapi/src') },
-  get 'http' () { return require('../../../datadog-plugin-http/src') },
-  get 'http2' () { return require('../../../datadog-plugin-http2/src') },
-  get 'https' () { return require('../../../datadog-plugin-http/src') },
-  get 'ioredis' () { return require('../../../datadog-plugin-ioredis/src') },
+  get graphql () { return require('../../../datadog-plugin-graphql/src') },
+  get grpc () { return require('../../../datadog-plugin-grpc/src') },
+  get hapi () { return require('../../../datadog-plugin-hapi/src') },
+  get http () { return require('../../../datadog-plugin-http/src') },
+  get http2 () { return require('../../../datadog-plugin-http2/src') },
+  get https () { return require('../../../datadog-plugin-http/src') },
+  get ioredis () { return require('../../../datadog-plugin-ioredis/src') },
   get 'jest-circus' () { return require('../../../datadog-plugin-jest/src') },
   get 'jest-config' () { return require('../../../datadog-plugin-jest/src') },
   get 'jest-environment-node' () { return require('../../../datadog-plugin-jest/src') },
   get 'jest-environment-jsdom' () { return require('../../../datadog-plugin-jest/src') },
   get 'jest-jasmine2' () { return require('../../../datadog-plugin-jest/src') },
   get 'jest-worker' () { return require('../../../datadog-plugin-jest/src') },
-  get 'koa' () { return require('../../../datadog-plugin-koa/src') },
+  get koa () { return require('../../../datadog-plugin-koa/src') },
   get 'koa-router' () { return require('../../../datadog-plugin-koa/src') },
-  get 'kafkajs' () { return require('../../../datadog-plugin-kafkajs/src') },
-  get 'mariadb' () { return require('../../../datadog-plugin-mariadb/src') },
-  get 'memcached' () { return require('../../../datadog-plugin-memcached/src') },
+  get kafkajs () { return require('../../../datadog-plugin-kafkajs/src') },
+  get mariadb () { return require('../../../datadog-plugin-mariadb/src') },
+  get memcached () { return require('../../../datadog-plugin-memcached/src') },
   get 'microgateway-core' () { return require('../../../datadog-plugin-microgateway-core/src') },
-  get 'mocha' () { return require('../../../datadog-plugin-mocha/src') },
+  get mocha () { return require('../../../datadog-plugin-mocha/src') },
   get 'mocha-each' () { return require('../../../datadog-plugin-mocha/src') },
-  get 'moleculer' () { return require('../../../datadog-plugin-moleculer/src') },
-  get 'mongodb' () { return require('../../../datadog-plugin-mongodb-core/src') },
+  get moleculer () { return require('../../../datadog-plugin-moleculer/src') },
+  get mongodb () { return require('../../../datadog-plugin-mongodb-core/src') },
   get 'mongodb-core' () { return require('../../../datadog-plugin-mongodb-core/src') },
-  get 'mysql' () { return require('../../../datadog-plugin-mysql/src') },
-  get 'mysql2' () { return require('../../../datadog-plugin-mysql2/src') },
-  get 'net' () { return require('../../../datadog-plugin-net/src') },
-  get 'next' () { return require('../../../datadog-plugin-next/src') },
+  get mysql () { return require('../../../datadog-plugin-mysql/src') },
+  get mysql2 () { return require('../../../datadog-plugin-mysql2/src') },
+  get net () { return require('../../../datadog-plugin-net/src') },
+  get next () { return require('../../../datadog-plugin-next/src') },
   get 'node:dns' () { return require('../../../datadog-plugin-dns/src') },
   get 'node:http' () { return require('../../../datadog-plugin-http/src') },
   get 'node:http2' () { return require('../../../datadog-plugin-http2/src') },
   get 'node:https' () { return require('../../../datadog-plugin-http/src') },
   get 'node:net' () { return require('../../../datadog-plugin-net/src') },
-  get 'oracledb' () { return require('../../../datadog-plugin-oracledb/src') },
-  get 'openai' () { return require('../../../datadog-plugin-openai/src') },
-  get 'paperplane' () { return require('../../../datadog-plugin-paperplane/src') },
-  get 'pg' () { return require('../../../datadog-plugin-pg/src') },
-  get 'pino' () { return require('../../../datadog-plugin-pino/src') },
+  get oracledb () { return require('../../../datadog-plugin-oracledb/src') },
+  get openai () { return require('../../../datadog-plugin-openai/src') },
+  get paperplane () { return require('../../../datadog-plugin-paperplane/src') },
+  get pg () { return require('../../../datadog-plugin-pg/src') },
+  get pino () { return require('../../../datadog-plugin-pino/src') },
   get 'pino-pretty' () { return require('../../../datadog-plugin-pino/src') },
-  get 'playwright' () { return require('../../../datadog-plugin-playwright/src') },
-  get 'redis' () { return require('../../../datadog-plugin-redis/src') },
-  get 'restify' () { return require('../../../datadog-plugin-restify/src') },
-  get 'rhea' () { return require('../../../datadog-plugin-rhea/src') },
-  get 'router' () { return require('../../../datadog-plugin-router/src') },
-  get 'sharedb' () { return require('../../../datadog-plugin-sharedb/src') },
-  get 'tedious' () { return require('../../../datadog-plugin-tedious/src') },
-  get 'winston' () { return require('../../../datadog-plugin-winston/src') }
+  get playwright () { return require('../../../datadog-plugin-playwright/src') },
+  get redis () { return require('../../../datadog-plugin-redis/src') },
+  get restify () { return require('../../../datadog-plugin-restify/src') },
+  get rhea () { return require('../../../datadog-plugin-rhea/src') },
+  get router () { return require('../../../datadog-plugin-router/src') },
+  get sharedb () { return require('../../../datadog-plugin-sharedb/src') },
+  get tedious () { return require('../../../datadog-plugin-tedious/src') },
+  get winston () { return require('../../../datadog-plugin-winston/src') }
 }

package/packages/dd-trace/src/plugins/plugin.js

@@ -84,7 +84,7 @@ module.exports = class Plugin {
 
     if (!store || !store.span) return
 
-    if (!store.span._spanContext._tags['error']) {
+    if (!store.span._spanContext._tags.error) {
       store.span.setTag('error', error || 1)
     }
   }

package/packages/dd-trace/src/plugins/tracing.js

@@ -4,7 +4,6 @@ const Plugin = require('./plugin')
 const { storage } = require('../../../datadog-core')
 const analyticsSampler = require('../analytics_sampler')
 const { COMPONENT } = require('../constants')
-const Nomenclature = require('../service-naming')
 
 class TracingPlugin extends Plugin {
   constructor (...args) {
@@ -29,7 +28,7 @@ class TracingPlugin extends Plugin {
       kind = this.constructor.kind
     } = opts
 
-    return Nomenclature.serviceName(type, kind, id, opts)
+    return this._tracer._nomenclature.serviceName(type, kind, id, opts)
   }
 
   operationName (opts = {}) {
@@ -39,7 +38,7 @@ class TracingPlugin extends Plugin {
       kind = this.constructor.kind
     } = opts
 
-    return Nomenclature.opName(type, kind, id, opts)
+    return this._tracer._nomenclature.opName(type, kind, id, opts)
   }
 
   configure (config) {
@@ -58,8 +57,12 @@ class TracingPlugin extends Plugin {
     this.activeSpan?.finish()
   }
 
-  error (error) {
-    this.addError(error)
+  error (ctxOrError) {
+    if (ctxOrError?.currentStore) {
+      ctxOrError.currentStore?.span.setTag('error', ctxOrError?.error)
+      return
+    }
+    this.addError(ctxOrError)
   }
 
   addTraceSubs () {
@@ -91,7 +94,7 @@ class TracingPlugin extends Plugin {
   }
 
   addError (error, span = this.activeSpan) {
-    if (!span._spanContext._tags['error']) {
+    if (!span._spanContext._tags.error) {
       // Errors may be wrapped in a context.
       error = (error && error.error) || error
       span.setTag('error', error || 1)

package/packages/dd-trace/src/plugins/util/test.js

@@ -288,7 +288,8 @@ function getTestSuitePath (testSuiteAbsolutePath, sourceRoot) {
     return sourceRoot
   }
   const testSuitePath = testSuiteAbsolutePath === sourceRoot
-    ? testSuiteAbsolutePath : path.relative(sourceRoot, testSuiteAbsolutePath)
+    ? testSuiteAbsolutePath
+    : path.relative(sourceRoot, testSuiteAbsolutePath)
 
   return testSuitePath.replace(path.sep, '/')
 }

package/packages/dd-trace/src/plugins/util/web.js

@@ -63,7 +63,7 @@ const web = {
     if (!span) return
 
     span.context()._name = `${name}.request`
-    span.context()._tags['component'] = name
+    span.context()._tags.component = name
 
     web.setConfig(req, config)
   },
@@ -263,7 +263,7 @@ const web = {
     const context = contexts.get(req)
     const span = context.span
     const error = context.error
-    const hasExistingError = span.context()._tags['error'] || span.context()._tags[ERROR_MESSAGE]
+    const hasExistingError = span.context()._tags.error || span.context()._tags[ERROR_MESSAGE]
 
     if (!hasExistingError && !context.config.validateStatus(statusCode)) {
       span.setTag(ERROR, error || true)
@@ -405,7 +405,7 @@ function addAllowHeaders (req, res, headers) {
 }
 
 function isOriginAllowed (req, headers) {
-  const origin = req.headers['origin']
+  const origin = req.headers.origin
   const allowOrigin = headers['access-control-allow-origin']
 
   return origin && (allowOrigin === '*' || allowOrigin === origin)
@@ -498,7 +498,7 @@ function extractURL (req) {
     return `${headers[HTTP2_HEADER_SCHEME]}://${headers[HTTP2_HEADER_AUTHORITY]}${headers[HTTP2_HEADER_PATH]}`
   } else {
     const protocol = getProtocol(req)
-    return `${protocol}://${req.headers['host']}${req.originalUrl || req.url}`
+    return `${protocol}://${req.headers.host}${req.originalUrl || req.url}`
   }
 }
 

package/packages/dd-trace/src/profiling/config.js

@@ -237,7 +237,7 @@ function ensureOOMExportStrategies (strategies, options) {
     }
   }
 
-  return [ ...new Set(strategies) ]
+  return [...new Set(strategies)]
 }
 
 function getExporter (name, options) {

package/packages/dd-trace/src/profiling/loggers/console.js

@@ -12,7 +12,7 @@ const mapping = {
 
 class ConsoleLogger {
   constructor (options = {}) {
-    this._level = mapping[options.level] || mapping['error']
+    this._level = mapping[options.level] || mapping.error
   }
 
   debug (message) {