dd-trace 5.79.0 → 5.80.0

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

@@ -118,18 +118,16 @@ module.exports = class Plugin {
    * @returns {void}
    */
   addSub (channelName, handler) {
-    const plugin = this
     /**
-     * @this {unknown}
-     * @returns {unknown}
+     * @type {typeof handler}
      */
-    const wrappedHandler = function () {
+    const wrappedHandler = (...args) => {
       try {
-        return handler.apply(this, arguments)
-      } catch (e) {
-        logger.error('Error in plugin handler:', e)
-        logger.info('Disabling plugin: %s', plugin.id)
-        plugin.configure(false)
+        return handler.apply(this, args)
+      } catch (error) {
+        logger.error('Error in plugin handler:', error)
+        logger.info('Disabling plugin: %s', this.constructor.name)
+        this.configure(false)
       }
     }
     this._subscriptions.push(new Subscription(channelName, wrappedHandler))

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

@@ -58,12 +58,13 @@ async function exportProfile (urls, tags, profileType, profile) {
   }))
 }
 
-/** Expected command line arguments are:
-* - Comma separated list of URLs (eg. "http://127.0.0.1:8126/,file:///tmp/foo.pprof")
-* - Tags (eg. "service:nodejs_oom_test,version:1.0.0")
-* - Profiletype (eg. space,wall,cpu)
-* - JSON profile filepath
-**/
+/**
+ * Expected command line arguments are:
+ * - Comma separated list of URLs (eg. "http://127.0.0.1:8126/,file:///tmp/foo.pprof")
+ * - Tags (eg. "service:nodejs_oom_test,version:1.0.0")
+ * - Profiletype (eg. space,wall,cpu)
+ * - JSON profile filepath
+ */
 const urls = process.argv[2].split(',').map(s => new URL(s))
 const tags = tagger.parse(process.argv[3])
 const profileType = process.argv[4]

package/packages/dd-trace/src/require-package-json.js

@@ -12,7 +12,7 @@ const fs = require('fs')
  * @typedef { import('module').Module } Module
  * @param {string} name
  * @param {Module} module
- * @return {Object} The parsed package.json
+ * @returns {Object} The parsed package.json
  */
 function requirePackageJson (name, module) {
   if (path.isAbsolute(name)) {

package/packages/dd-trace/src/service-naming/index.js

@@ -1,9 +1,16 @@
 'use strict'
 
 class SchemaManager {
-  constructor () {
-    this.schemas = {}
-    this.configure({ spanAttributeSchema: 'v0', spanRemoveIntegrationFromService: false })
+  /**
+   * @type {object}
+   */
+  config = {
+    spanAttributeSchema: 'v0',
+    spanRemoveIntegrationFromService: false
+  }
+
+  schemas = {
+    v0: require('./schemas/v0'),
   }
 
   get schema () {
@@ -18,10 +25,24 @@ class SchemaManager {
     return this.config.spanRemoveIntegrationFromService && this.version === 'v0'
   }
 
+  /**
+   * @param {string} type
+   * @param {string} kind
+   * @param {string} plugin
+   * @param {object} opts
+   * @returns {string}
+   */
   opName (type, kind, plugin, opts) {
     return this.schema.getOpName(type, kind, plugin, opts)
   }
 
+  /**
+   * @param {string} type
+   * @param {string} kind
+   * @param {string} plugin
+   * @param {object} opts
+   * @returns {string}
+   */
   serviceName (type, kind, plugin, opts) {
     const schema = this.shouldUseConsistentServiceNaming
       ? this.schemas.v1
@@ -30,7 +51,13 @@ class SchemaManager {
     return schema.getServiceName(type, kind, plugin, { ...opts, tracerService: this.config.service })
   }
 
-  configure (config = {}) {
+  /**
+   * @param {object} config
+   * @param {string} config.spanAttributeSchema
+   * @param {boolean} config.spanRemoveIntegrationFromService
+   * @param {string} [config.service]
+   */
+  configure (config) {
     const { spanAttributeSchema, spanRemoveIntegrationFromService } = config
 
     if (!this.schemas.v0 && spanAttributeSchema === 'v0') {

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

@@ -1,7 +1,7 @@
 'use strict'
 
 const log = require('./log')
-const format = require('./format')
+const spanFormat = require('./span_format')
 const SpanSampler = require('./span_sampler')
 const GitMetadataTagger = require('./git_metadata_tagger')
 const { getEnvironmentVariable } = require('./config-helper')
@@ -9,9 +9,6 @@ const { getEnvironmentVariable } = require('./config-helper')
 const startedSpans = new WeakSet()
 const finishedSpans = new WeakSet()
 
-const { channel } = require('dc-polyfill')
-const spanProcessCh = channel('dd-trace:span:process')
-
 class SpanProcessor {
   constructor (exporter, prioritySampler, config) {
     this._exporter = exporter
@@ -29,6 +26,12 @@ class SpanProcessor {
     this._gitMetadataTagger = new GitMetadataTagger(config)
   }
 
+  sample (span) {
+    const spanContext = span.context()
+    this._prioritySampler.sample(spanContext)
+    this._spanSampler.sample(spanContext)
+  }
+
   process (span) {
     const spanContext = span.context()
     const active = []
@@ -43,8 +46,7 @@ class SpanProcessor {
       return
     }
     if (started.length === finished.length || finished.length >= flushMinSpans) {
-      this._prioritySampler.sample(spanContext)
-      this._spanSampler.sample(spanContext)
+      this.sample(span)
       this._gitMetadataTagger.tagGitMetadata(spanContext)
 
       let isChunkRoot = true
@@ -53,12 +55,10 @@ class SpanProcessor {
         if (span._duration === undefined) {
           active.push(span)
         } else {
-          const formattedSpan = format(span, isChunkRoot)
+          const formattedSpan = spanFormat(span, isChunkRoot)
           isChunkRoot = false
           this._stats?.onSpanFinished(formattedSpan)
           formatted.push(formattedSpan)
-
-          spanProcessCh.publish({ span })
         }
       }