dd-trace 4.47.0 → 4.48.0

package/packages/dd-trace/src/profiling/profilers/wall.js

@@ -20,7 +20,7 @@ const enterCh = dc.channel('dd-trace:storage:enter')
 const spanFinishCh = dc.channel('dd-trace:span:finish')
 const profilerTelemetryMetrics = telemetryMetrics.manager.namespace('profilers')
 
-const MemoizedWebTags = Symbol('NativeWallProfiler.MemoizedWebTags')
+const ProfilingContext = Symbol('NativeWallProfiler.ProfilingContext')
 
 let kSampleCount
 
@@ -44,36 +44,42 @@ function endpointNameFromTags (tags) {
   ].filter(v => v).join(' ')
 }
 
-function getWebTags (startedSpans, i, span) {
-  // Are web tags for this span already memoized?
-  const memoizedWebTags = span[MemoizedWebTags]
-  if (memoizedWebTags !== undefined) {
-    return memoizedWebTags
-  }
-  // No, we'll have to memoize a new value
-  function memoize (tags) {
-    span[MemoizedWebTags] = tags
-    return tags
-  }
-  // Is this span itself a web span?
-  const context = span.context()
-  const tags = context._tags
-  if (isWebServerSpan(tags)) {
-    return memoize(tags)
-  }
-  // It isn't. Get parent's web tags (memoize them too recursively.)
-  // There might be several webspans, for example with next.js, http plugin creates the first span
-  // and then next.js plugin creates a child span, and this child span has the correct endpoint
-  // information. That's why we always use the tags of the closest ancestor web span.
-  const parentId = context._parentId
-  while (--i >= 0) {
-    const ispan = startedSpans[i]
-    if (ispan.context()._spanId === parentId) {
-      return memoize(getWebTags(startedSpans, i, ispan))
+let channelsActivated = false
+function ensureChannelsActivated () {
+  if (channelsActivated) return
+
+  const { AsyncLocalStorage, createHook } = require('async_hooks')
+  const shimmer = require('../../../../datadog-shimmer')
+
+  createHook({ before: () => beforeCh.publish() }).enable()
+
+  let inRun = false
+  shimmer.wrap(AsyncLocalStorage.prototype, 'enterWith', function (original) {
+    return function (...args) {
+      const retVal = original.apply(this, args)
+      if (!inRun) enterCh.publish()
+      return retVal
     }
-  }
-  // Local root span with no web span
-  return memoize(null)
+  })
+
+  shimmer.wrap(AsyncLocalStorage.prototype, 'run', function (original) {
+    return function (store, callback, ...args) {
+      const wrappedCb = shimmer.wrapFunction(callback, cb => function (...args) {
+        inRun = false
+        enterCh.publish()
+        const retVal = cb.apply(this, args)
+        inRun = true
+        return retVal
+      })
+      inRun = true
+      const retVal = original.call(this, store, wrappedCb, ...args)
+      enterCh.publish()
+      inRun = false
+      return retVal
+    }
+  })
+
+  channelsActivated = true
 }
 
 class NativeWallProfiler {
@@ -121,6 +127,8 @@ class NativeWallProfiler {
   start ({ mapper } = {}) {
     if (this._started) return
 
+    ensureChannelsActivated()
+
     this._mapper = mapper
     this._pprof = require('@datadog/pprof')
     kSampleCount = this._pprof.time.constants.kSampleCount
@@ -144,14 +152,10 @@ class NativeWallProfiler {
     })
 
     if (this._withContexts) {
-      this._currentContext = {}
-      this._pprof.time.setContext(this._currentContext)
+      this._setNewContext()
 
       if (this._captureSpanData) {
         this._profilerState = this._pprof.time.getState()
-        this._lastSpan = undefined
-        this._lastStartedSpans = undefined
-        this._lastWebTags = undefined
         this._lastSampleCount = 0
 
         beforeCh.subscribe(this._enter)
@@ -169,51 +173,78 @@ class NativeWallProfiler {
     const sampleCount = this._profilerState[kSampleCount]
     if (sampleCount !== this._lastSampleCount) {
       this._lastSampleCount = sampleCount
-      const context = this._currentContext
-      this._currentContext = {}
-      this._pprof.time.setContext(this._currentContext)
+      const context = this._currentContext.ref
+      this._setNewContext()
 
       this._updateContext(context)
     }
 
     const span = getActiveSpan()
-    if (span) {
+    this._currentContext.ref = span ? this._getProfilingContext(span) : {}
+  }
+
+  _getProfilingContext (span) {
+    let profilingContext = span[ProfilingContext]
+    if (profilingContext === undefined) {
       const context = span.context()
-      this._lastSpan = span
       const startedSpans = getStartedSpans(context)
-      this._lastStartedSpans = startedSpans
+
+      let spanId
+      let rootSpanId
+      if (this._codeHotspotsEnabled) {
+        spanId = context._spanId
+        rootSpanId = startedSpans.length ? startedSpans[0].context()._spanId : context._spanId
+      }
+
+      let webTags
       if (this._endpointCollectionEnabled) {
-        this._lastWebTags = getWebTags(startedSpans, startedSpans.length, span)
+        const tags = context._tags
+        if (isWebServerSpan(tags)) {
+          webTags = tags
+        } else {
+          // Get parent's context's web tags
+          const parentId = context._parentId
+          for (let i = startedSpans.length; --i >= 0;) {
+            const ispan = startedSpans[i]
+            if (ispan.context()._spanId === parentId) {
+              webTags = this._getProfilingContext(ispan).webTags
+              break
+            }
+          }
+        }
       }
-    } else {
-      this._lastStartedSpans = undefined
-      this._lastSpan = undefined
-      this._lastWebTags = undefined
+
+      profilingContext = { spanId, rootSpanId, webTags }
+      span[ProfilingContext] = profilingContext
     }
+    return profilingContext
+  }
+
+  _setNewContext () {
+    this._pprof.time.setContext(
+      this._currentContext = {
+        ref: {}
+      }
+    )
   }
 
   _updateContext (context) {
-    if (!this._lastSpan) {
-      return
+    if (typeof context.spanId === 'object') {
+      context.spanId = context.spanId.toString(10)
     }
-    if (this._codeHotspotsEnabled) {
-      context.spanId = this._lastSpan.context().toSpanId()
-      const rootSpan = this._lastStartedSpans[0]
-      if (rootSpan) {
-        context.rootSpanId = rootSpan.context().toSpanId()
-      }
+    if (typeof context.rootSpanId === 'object') {
+      context.rootSpanId = context.rootSpanId.toString(10)
     }
-    if (this._lastWebTags) {
-      context.webTags = this._lastWebTags
+    if (context.webTags !== undefined && context.endpoint === undefined) {
       // endpoint may not be determined yet, but keep it as fallback
       // if tags are not available anymore during serialization
-      context.endpoint = endpointNameFromTags(this._lastWebTags)
+      context.endpoint = endpointNameFromTags(context.webTags)
     }
   }
 
   _spanFinished (span) {
-    if (span[MemoizedWebTags]) {
-      span[MemoizedWebTags] = undefined
+    if (span[ProfilingContext] !== undefined) {
+      span[ProfilingContext] = undefined
     }
   }
 
@@ -248,9 +279,6 @@ class NativeWallProfiler {
         enterCh.unsubscribe(this._enter)
         spanFinishCh.unsubscribe(this._spanFinished)
         this._profilerState = undefined
-        this._lastSpan = undefined
-        this._lastStartedSpans = undefined
-        this._lastWebTags = undefined
       }
       this._started = false
     }
@@ -273,20 +301,20 @@ class NativeWallProfiler {
 
     const labels = { ...getThreadLabels() }
 
-    const { context: { spanId, rootSpanId, webTags, endpoint }, timestamp } = context
+    const { context: { ref: { spanId, rootSpanId, webTags, endpoint } }, timestamp } = context
 
     if (this._timelineEnabled) {
       // Incoming timestamps are in microseconds, we emit nanos.
       labels[END_TIMESTAMP_LABEL] = timestamp * 1000n
     }
 
-    if (spanId) {
+    if (spanId !== undefined) {
       labels[SPAN_ID_LABEL] = spanId
     }
-    if (rootSpanId) {
+    if (rootSpanId !== undefined) {
       labels[LOCAL_ROOT_SPAN_ID_LABEL] = rootSpanId
     }
-    if (webTags && Object.keys(webTags).length !== 0) {
+    if (webTags !== undefined && Object.keys(webTags).length !== 0) {
       labels['trace endpoint'] = endpointNameFromTags(webTags)
     } else if (endpoint) {
       // fallback to endpoint computed when sample was taken

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

@@ -162,6 +162,18 @@ class Tracer extends NoopProxy {
           this._testApiManualPlugin.configure({ ...config, enabled: true })
         }
       }
+      if (config.ciVisAgentlessLogSubmissionEnabled) {
+        if (process.env.DD_API_KEY) {
+          const LogSubmissionPlugin = require('./ci-visibility/log-submission/log-submission-plugin')
+          const automaticLogPlugin = new LogSubmissionPlugin(this)
+          automaticLogPlugin.configure({ ...config, enabled: true })
+        } else {
+          log.warn(
+            'DD_AGENTLESS_LOG_SUBMISSION_ENABLED is set, ' +
+            'but DD_API_KEY is undefined, so no automatic log submission will be performed.'
+          )
+        }
+      }
     } catch (e) {
       log.error(e)
     }

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

@@ -3,5 +3,6 @@ const messaging = require('./messaging')
 const storage = require('./storage')
 const graphql = require('./graphql')
 const web = require('./web')
+const serverless = require('./serverless')
 
-module.exports = new SchemaDefinition({ messaging, storage, web, graphql })
+module.exports = new SchemaDefinition({ messaging, storage, web, graphql, serverless })

package/packages/dd-trace/src/service-naming/schemas/v0/serverless.js

@@ -0,0 +1,12 @@
+const { identityService } = require('../util')
+
+const serverless = {
+  server: {
+    'azure-functions': {
+      opName: () => 'azure-functions.invoke',
+      serviceName: identityService
+    }
+  }
+}
+
+module.exports = serverless

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

@@ -3,5 +3,6 @@ const messaging = require('./messaging')
 const storage = require('./storage')
 const graphql = require('./graphql')
 const web = require('./web')
+const serverless = require('./serverless')
 
-module.exports = new SchemaDefinition({ messaging, storage, web, graphql })
+module.exports = new SchemaDefinition({ messaging, storage, web, graphql, serverless })

package/packages/dd-trace/src/service-naming/schemas/v1/serverless.js

@@ -0,0 +1,12 @@
+const { identityService } = require('../util')
+
+const serverless = {
+  server: {
+    'azure-functions': {
+      opName: () => 'azure-functions.invoke',
+      serviceName: identityService
+    }
+  }
+}
+
+module.exports = serverless

package/packages/datadog-core/src/storage/async_resource.js

@@ -1,108 +0,0 @@
-'use strict'
-
-const { createHook, executionAsyncResource } = require('async_hooks')
-const { channel } = require('dc-polyfill')
-
-const beforeCh = channel('dd-trace:storage:before')
-const afterCh = channel('dd-trace:storage:after')
-const enterCh = channel('dd-trace:storage:enter')
-
-let PrivateSymbol = Symbol
-function makePrivateSymbol () {
-  // eslint-disable-next-line no-new-func
-  PrivateSymbol = new Function('name', 'return %CreatePrivateSymbol(name)')
-}
-
-try {
-  makePrivateSymbol()
-} catch (e) {
-  try {
-    const v8 = require('v8')
-    v8.setFlagsFromString('--allow-natives-syntax')
-    makePrivateSymbol()
-    v8.setFlagsFromString('--no-allow-natives-syntax')
-  // eslint-disable-next-line no-empty
-  } catch (e) {}
-}
-
-class AsyncResourceStorage {
-  constructor () {
-    this._ddResourceStore = PrivateSymbol('ddResourceStore')
-    this._enabled = false
-    this._hook = createHook(this._createHook())
-  }
-
-  disable () {
-    if (!this._enabled) return
-
-    this._hook.disable()
-    this._enabled = false
-  }
-
-  getStore () {
-    if (!this._enabled) return
-
-    const resource = this._executionAsyncResource()
-
-    return resource[this._ddResourceStore]
-  }
-
-  enterWith (store) {
-    this._enable()
-
-    const resource = this._executionAsyncResource()
-
-    resource[this._ddResourceStore] = store
-    enterCh.publish()
-  }
-
-  run (store, callback, ...args) {
-    this._enable()
-
-    const resource = this._executionAsyncResource()
-    const oldStore = resource[this._ddResourceStore]
-
-    resource[this._ddResourceStore] = store
-    enterCh.publish()
-
-    try {
-      return callback(...args)
-    } finally {
-      resource[this._ddResourceStore] = oldStore
-      enterCh.publish()
-    }
-  }
-
-  _createHook () {
-    return {
-      init: this._init.bind(this),
-      before () {
-        beforeCh.publish()
-      },
-      after () {
-        afterCh.publish()
-      }
-    }
-  }
-
-  _enable () {
-    if (this._enabled) return
-
-    this._enabled = true
-    this._hook.enable()
-  }
-
-  _init (asyncId, type, triggerAsyncId, resource) {
-    const currentResource = this._executionAsyncResource()
-
-    if (Object.prototype.hasOwnProperty.call(currentResource, this._ddResourceStore)) {
-      resource[this._ddResourceStore] = currentResource[this._ddResourceStore]
-    }
-  }
-
-  _executionAsyncResource () {
-    return executionAsyncResource() || {}
-  }
-}
-
-module.exports = AsyncResourceStorage

package/packages/datadog-core/src/storage/index.js

@@ -1,5 +0,0 @@
-'use strict'
-
-// TODO: default to AsyncLocalStorage when it supports triggerAsyncResource
-
-module.exports = require('./async_resource')