dd-trace 1.5.1 → 1.6.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "1.5.1",
+  "version": "1.6.0-beta.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",

package/packages/dd-trace/lib/version.js

@@ -1 +1 @@
-module.exports = '1.5.1'
+module.exports = '1.6.0-beta.0'

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

@@ -2,16 +2,21 @@
 
 const opentracing = require('opentracing')
 const now = require('performance-now')
+const semver = require('semver')
 const Span = opentracing.Span
 const SpanContext = require('./span_context')
 const constants = require('../constants')
 const id = require('../id')
 const tagger = require('../tagger')
+const metrics = require('../metrics')
 const log = require('../log')
 
 const SAMPLE_RATE_METRIC_KEY = constants.SAMPLE_RATE_METRIC_KEY
 const { DD_TRACE_EXPERIMENTAL_STATE_TRACKING } = process.env
 
+const unfinishedRegistry = createRegistry('unfinished')
+const finishedRegistry = createRegistry('finished')
+
 class DatadogSpan extends Span {
   constructor (tracer, processor, sampler, prioritySampler, fields, debug) {
     super()
@@ -28,6 +33,7 @@ class DatadogSpan extends Span {
     this._sampler = sampler
     this._processor = processor
     this._prioritySampler = prioritySampler
+    this._name = operationName
 
     this._spanContext = this._createContext(parent)
     this._spanContext._name = operationName
@@ -35,6 +41,13 @@ class DatadogSpan extends Span {
     this._spanContext._hostname = hostname
 
     this._startTime = fields.startTime || this._getTime()
+
+    if (this._debug && unfinishedRegistry) {
+      metrics.increment('runtime.node.spans.unfinished')
+      metrics.increment('runtime.node.spans.unfinished.by.name', `span_name:${operationName}`)
+
+      unfinishedRegistry.register(this, operationName, this)
+    }
   }
 
   toString () {
@@ -125,6 +138,16 @@ class DatadogSpan extends Span {
       }
     }
 
+    if (this._debug && finishedRegistry) {
+      metrics.decrement('runtime.node.spans.unfinished')
+      metrics.decrement('runtime.node.spans.unfinished.by.name', `span_name:${this._name}`)
+      metrics.increment('runtime.node.spans.finished')
+      metrics.increment('runtime.node.spans.finished.by.name', `span_name:${this._name}`)
+
+      unfinishedRegistry.unregister(this)
+      finishedRegistry.register(this, this._name)
+    }
+
     finishTime = parseFloat(finishTime) || this._getTime()
 
     this._duration = finishTime - this._startTime
@@ -134,4 +157,13 @@ class DatadogSpan extends Span {
   }
 }
 
+function createRegistry (type) {
+  if (!semver.satisfies(process.version, '>=14.6')) return
+
+  return new global.FinalizationRegistry(name => {
+    metrics.decrement(`runtime.node.spans.${type}`)
+    metrics.decrement(`runtime.node.spans.${type}.by.name`, `span_name:${name}`)
+  })
+}
+
 module.exports = DatadogSpan

package/packages/dd-trace/src/scope/async_resource.js

@@ -1,7 +1,9 @@
 'use strict'
 
 const { createHook, executionAsyncResource } = require('async_hooks')
+const semver = require('semver')
 const Base = require('./base')
+const metrics = require('../metrics')
 
 let singleton = null
 
@@ -14,6 +16,7 @@ class Scope extends Base {
     singleton = this
 
     this._ddResourceStore = Symbol('ddResourceStore')
+    this._registry = this._createRegistry()
     this._config = config
     this._stack = []
     this._hook = createHook({
@@ -76,6 +79,22 @@ class Scope extends Base {
     if (span) {
       resource[this._ddResourceStore] = span
     }
+
+    if (this._registry) {
+      metrics.increment('runtime.node.async.resources')
+      metrics.increment('runtime.node.async.resources.by.type', `resource_type:${type}`)
+
+      this._registry.register(resource, type)
+    }
+  }
+
+  _createRegistry () {
+    if (!this._debug || !semver.satisfies(process.version, '>=14.6')) return
+
+    return new global.FinalizationRegistry(type => {
+      metrics.decrement('runtime.node.async.resources')
+      metrics.decrement('runtime.node.async.resources.by.type', `resource_type:${type}`)
+    })
   }
 }