dd-trace 5.27.1 → 5.28.0

package/init.js

@@ -2,7 +2,9 @@
 
 /* eslint-disable no-var */
 
-var NODE_MAJOR = require('./version').NODE_MAJOR
+var nodeVersion = require('./version')
+var NODE_MAJOR = nodeVersion.NODE_MAJOR
+var NODE_MINOR = nodeVersion.NODE_MINOR
 
 // We use several things that are not supported by older versions of Node:
 // - AsyncLocalStorage
@@ -11,7 +13,7 @@ var NODE_MAJOR = require('./version').NODE_MAJOR
 // - Mocha (for testing)
 // and probably others.
 // TODO: Remove all these dependencies so that we can report telemetry.
-if (NODE_MAJOR >= 12) {
+if ((NODE_MAJOR === 12 && NODE_MINOR >= 17) || NODE_MAJOR > 12) {
   var path = require('path')
   var Module = require('module')
   var semver = require('semver')

package/initialize.mjs

@@ -12,6 +12,7 @@
 
 import { isMainThread } from 'worker_threads'
 
+import * as Module from 'node:module'
 import { fileURLToPath } from 'node:url'
 import {
   load as origLoad,
@@ -31,11 +32,16 @@ ${result.source}`
   return result
 }
 
+const [NODE_MAJOR, NODE_MINOR] = process.versions.node.split('.').map(x => +x)
+
+const brokenLoaders = NODE_MAJOR === 18 && NODE_MINOR === 0
+
 export async function load (...args) {
-  return insertInit(await origLoad(...args))
+  const loadHook = brokenLoaders ? args[args.length - 1] : origLoad
+  return insertInit(await loadHook(...args))
 }
 
-export const resolve = origResolve
+export const resolve = brokenLoaders ? undefined : origResolve
 
 export const getFormat = origGetFormat
 
@@ -44,12 +50,9 @@ export async function getSource (...args) {
 }
 
 if (isMainThread) {
-  // Need this IIFE for versions of Node.js without top-level await.
-  (async () => {
-    await import('./init.js')
-    const { register } = await import('node:module')
-    if (register) {
-      register('./loader-hook.mjs', import.meta.url)
-    }
-  })()
+  const require = Module.createRequire(import.meta.url)
+  require('./init.js')
+  if (Module.register) {
+    Module.register('./loader-hook.mjs', import.meta.url)
+  }
 }

package/package.json

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

package/packages/datadog-instrumentations/src/azure-functions.js

@@ -6,7 +6,7 @@ const {
 const shimmer = require('../../datadog-shimmer')
 const dc = require('dc-polyfill')
 
-const azureFunctionsChannel = dc.tracingChannel('datadog:azure-functions:invoke')
+const azureFunctionsChannel = dc.tracingChannel('datadog:azure:functions:invoke')
 
 addHook({ name: '@azure/functions', versions: ['>=4'] }, azureFunction => {
   const { app } = azureFunction

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

@@ -20,7 +20,7 @@ class AzureFunctionsPlugin extends TracingPlugin {
   static get kind () { return 'server' }
   static get type () { return 'serverless' }
 
-  static get prefix () { return 'tracing:datadog:azure-functions:invoke' }
+  static get prefix () { return 'tracing:datadog:azure:functions:invoke' }
 
   bindStart (ctx) {
     const { functionName, methodName } = ctx

package/packages/datadog-plugin-langchain/src/handlers/language_models/chat_model.js

@@ -46,7 +46,7 @@ class LangChainChatModelHandler extends LangChainLanguageModelHandler {
 
     this.extractTokenMetrics(ctx.currentStore?.span, result)
 
-    for (const messageSetIdx in result.generations) {
+    for (const messageSetIdx in result?.generations) {
       const messageSet = result.generations[messageSetIdx]
 
       for (const chatCompletionIdx in messageSet) {

package/packages/datadog-plugin-langchain/src/handlers/language_models/llm.js

@@ -37,7 +37,7 @@ class LangChainLLMHandler extends LangChainLanguageModelHandler {
 
     this.extractTokenMetrics(ctx.currentStore?.span, result)
 
-    for (const completionIdx in result.generations) {
+    for (const completionIdx in result?.generations) {
       const completion = result.generations[completionIdx]
       if (this.isPromptCompletionSampled()) {
         tags[`langchain.response.completions.${completionIdx}.text`] = this.normalize(completion[0].text) || ''

package/packages/dd-trace/src/appsec/api_security_sampler.js

@@ -64,7 +64,7 @@ function computeKey (req, res) {
   const status = res.statusCode
 
   if (!method || !status) {
-    log.warn('Unsupported groupkey for API security')
+    log.warn('[ASM] Unsupported groupkey for API security')
     return null
   }
   return method + route + status

package/packages/dd-trace/src/appsec/blocking.js

@@ -101,7 +101,7 @@ function getBlockingData (req, specificType, actionParameters) {
 
 function block (req, res, rootSpan, abortController, actionParameters = defaultBlockingActionParameters) {
   if (res.headersSent) {
-    log.warn('Cannot send blocking response when headers have already been sent')
+    log.warn('[ASM] Cannot send blocking response when headers have already been sent')
     return
   }
 

package/packages/dd-trace/src/appsec/iast/analyzers/cookie-analyzer.js

@@ -2,7 +2,7 @@
 
 const Analyzer = require('./vulnerability-analyzer')
 const { getNodeModulesPaths } = require('../path-line')
-const iastLog = require('../iast-log')
+const log = require('../../../log')
 
 const EXCLUDED_PATHS = getNodeModulesPaths('express/lib/response.js')
 
@@ -16,7 +16,7 @@ class CookieAnalyzer extends Analyzer {
     try {
       this.cookieFilterRegExp = new RegExp(config.iast.cookieFilterPattern)
     } catch {
-      iastLog.error('Invalid regex in cookieFilterPattern')
+      log.error('[ASM] Invalid regex in cookieFilterPattern')
       this.cookieFilterRegExp = /.{32,}/
     }
 

package/packages/dd-trace/src/appsec/iast/iast-plugin.js

@@ -2,7 +2,6 @@
 
 const { channel } = require('dc-polyfill')
 
-const iastLog = require('./iast-log')
 const Plugin = require('../../plugins/plugin')
 const iastTelemetry = require('./telemetry')
 const { getInstrumentedMetric, getExecutedMetric, TagKey, EXECUTED_SOURCE, formatTags } =
@@ -10,6 +9,7 @@ const { getInstrumentedMetric, getExecutedMetric, TagKey, EXECUTED_SOURCE, forma
 const { storage } = require('../../../../datadog-core')
 const { getIastContext } = require('./iast-context')
 const instrumentations = require('../../../../datadog-instrumentations/src/helpers/instrumentations')
+const log = require('../../log')
 
 /**
  * Used by vulnerability sources and sinks to subscribe diagnostic channel events
@@ -65,7 +65,7 @@ class IastPlugin extends Plugin {
       try {
         handler(message, name)
       } catch (e) {
-        iastLog.errorAndPublish(e)
+        log.error('[ASM] Error executing IAST plugin handler', e)
       }
     }
   }
@@ -76,7 +76,7 @@ class IastPlugin extends Plugin {
         const iastContext = getIastContext(storage.getStore())
         iastSub.increaseExecuted(iastContext)
       } catch (e) {
-        iastLog.errorAndPublish(e)
+        log.error('[ASM] Error increasing handler executed metrics', e)
       }
     }
   }
@@ -93,7 +93,7 @@ class IastPlugin extends Plugin {
       }
       return result
     } catch (e) {
-      iastLog.errorAndPublish(e)
+      log.error('[ASM] Error executing handler or increasing metrics', e)
     }
   }
 

package/packages/dd-trace/src/appsec/iast/taint-tracking/operations-taint-object.js

@@ -2,7 +2,7 @@
 
 const TaintedUtils = require('@datadog/native-iast-taint-tracking')
 const { IAST_TRANSACTION_ID } = require('../iast-context')
-const iastLog = require('../iast-log')
+const log = require('../../../log')
 
 function taintObject (iastContext, object, type) {
   let result = object
@@ -33,7 +33,7 @@ function taintObject (iastContext, object, type) {
           }
         }
       } catch (e) {
-        iastLog.error(`Error visiting property : ${property}`).errorAndPublish(e)
+        log.error('[ASM] Error in taintObject when visiting property : %s', property, e)
       }
     }
   }

package/packages/dd-trace/src/appsec/iast/taint-tracking/rewriter.js

@@ -2,12 +2,12 @@
 
 const Module = require('module')
 const shimmer = require('../../../../../datadog-shimmer')
-const iastLog = require('../iast-log')
 const { isPrivateModule, isNotLibraryFile } = require('./filter')
 const { csiMethods } = require('./csi-methods')
 const { getName } = require('../telemetry/verbosity')
 const { getRewriteFunction } = require('./rewriter-telemetry')
 const dc = require('dc-polyfill')
+const log = require('../../../log')
 
 const hardcodedSecretCh = dc.channel('datadog:secrets:result')
 let rewriter
@@ -60,8 +60,7 @@ function getRewriter (telemetryVerbosity) {
         chainSourceMap
       })
     } catch (e) {
-      iastLog.error('Unable to initialize TaintTracking Rewriter')
-        .errorAndPublish(e)
+      log.error('[ASM] Unable to initialize TaintTracking Rewriter', e)
     }
   }
   return rewriter
@@ -99,8 +98,7 @@ function getCompileMethodFn (compileMethod) {
         }
       }
     } catch (e) {
-      iastLog.error(`Error rewriting ${filename}`)
-        .errorAndPublish(e)
+      log.error('[ASM] Error rewriting file %s', filename, e)
     }
     return compileMethod.apply(this, [content, filename])
   }
@@ -117,8 +115,7 @@ function enableRewriter (telemetryVerbosity) {
       shimmer.wrap(Module.prototype, '_compile', compileMethod => getCompileMethodFn(compileMethod))
     }
   } catch (e) {
-    iastLog.error('Error enabling TaintTracking Rewriter')
-      .errorAndPublish(e)
+    log.error('[ASM] Error enabling TaintTracking Rewriter', e)
   }
 }
 
@@ -132,7 +129,7 @@ function disableRewriter () {
 
     Error.prepareStackTrace = originalPrepareStackTrace
   } catch (e) {
-    iastLog.warn(e)
+    log.warn('[ASM] Error disabling TaintTracking rewriter', e)
   }
 }
 

package/packages/dd-trace/src/appsec/iast/taint-tracking/taint-tracking-impl.js

@@ -4,10 +4,10 @@ const dc = require('dc-polyfill')
 const TaintedUtils = require('@datadog/native-iast-taint-tracking')
 const { storage } = require('../../../../../datadog-core')
 const iastContextFunctions = require('../iast-context')
-const iastLog = require('../iast-log')
 const { EXECUTED_PROPAGATION } = require('../telemetry/iast-metric')
 const { isDebugAllowed } = require('../telemetry/verbosity')
 const { taintObject } = require('./operations-taint-object')
+const log = require('../../../log')
 
 const mathRandomCallCh = dc.channel('datadog:random:call')
 const evalCallCh = dc.channel('datadog:eval:call')
@@ -60,8 +60,7 @@ function getFilteredCsiFn (cb, filter, getContext) {
         return cb(transactionId, res, target, ...rest)
       }
     } catch (e) {
-      iastLog.error(`Error invoking CSI ${target}`)
-        .errorAndPublish(e)
+      log.error('[ASM] Error invoking CSI %s', target, e)
     }
     return res
   }
@@ -112,8 +111,7 @@ function csiMethodsOverrides (getContext) {
           return TaintedUtils.concat(transactionId, res, op1, op2)
         }
       } catch (e) {
-        iastLog.error('Error invoking CSI plusOperator')
-          .errorAndPublish(e)
+        log.error('[ASM] Error invoking CSI plusOperator', e)
       }
       return res
     },
@@ -126,8 +124,7 @@ function csiMethodsOverrides (getContext) {
           return TaintedUtils.concat(transactionId, res, ...rest)
         }
       } catch (e) {
-        iastLog.error('Error invoking CSI tplOperator')
-          .errorAndPublish(e)
+        log.error('[ASM] Error invoking CSI tplOperator', e)
       }
       return res
     },
@@ -178,7 +175,7 @@ function csiMethodsOverrides (getContext) {
             }
           }
         } catch (e) {
-          iastLog.error(e)
+          log.error('[ASM] Error invoking CSI JSON.parse', e)
         }
       }
 
@@ -194,7 +191,7 @@ function csiMethodsOverrides (getContext) {
             res = TaintedUtils.arrayJoin(transactionId, res, target, separator)
           }
         } catch (e) {
-          iastLog.error(e)
+          log.error('[ASM] Error invoking CSI join', e)
         }
       }
 
@@ -250,8 +247,7 @@ function lodashTaintTrackingHandler (message) {
       message.result = getLodashTaintedUtilFn(message.operation)(transactionId, message.result, ...message.arguments)
     }
   } catch (e) {
-    iastLog.error(`Error invoking CSI lodash ${message.operation}`)
-      .errorAndPublish(e)
+    log.error('[ASM] Error invoking CSI lodash %s', message.operation, e)
   }
 }
 

package/packages/dd-trace/src/appsec/iast/telemetry/namespaces.js

@@ -4,7 +4,6 @@ const log = require('../../../log')
 const { Namespace } = require('../../../telemetry/metrics')
 const { addMetricsToSpan } = require('./span-tags')
 const { IAST_TRACE_METRIC_PREFIX } = require('../tags')
-const iastLog = require('../iast-log')
 
 const DD_IAST_METRICS_NAMESPACE = Symbol('_dd.iast.request.metrics.namespace')
 
@@ -31,7 +30,7 @@ function finalizeRequestNamespace (context, rootSpan) {
 
     namespace.clear()
   } catch (e) {
-    log.error(e)
+    log.error('[ASM] Error merging request metrics', e)
   } finally {
     if (context) {
       delete context[DD_IAST_METRICS_NAMESPACE]
@@ -79,7 +78,7 @@ class IastNamespace extends Namespace {
 
       if (metrics.size === this.maxMetricTagsSize) {
         metrics.clear()
-        iastLog.warnAndPublish(`Tags cache max size reached for metric ${name}`)
+        log.error('[ASM] Tags cache max size reached for metric %s', name)
       }
 
       metrics.set(tags, metric)

package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-analyzers/command-sensitive-analyzer.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const iastLog = require('../../../iast-log')
+const log = require('../../../../../log')
 
 const COMMAND_PATTERN = '^(?:\\s*(?:sudo|doas)\\s+)?\\b\\S+\\b\\s(.*)'
 const pattern = new RegExp(COMMAND_PATTERN, 'gmi')
@@ -16,7 +16,7 @@ module.exports = function extractSensitiveRanges (evidence) {
       return [{ start, end }]
     }
   } catch (e) {
-    iastLog.debug(e)
+    log.debug('[ASM] Error extracting sensitive ranges', e)
   }
   return []
 }

package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-analyzers/ldap-sensitive-analyzer.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const iastLog = require('../../../iast-log')
+const log = require('../../../../../log')
 
 const LDAP_PATTERN = '\\(.*?(?:~=|=|<=|>=)(?<LITERAL>[^)]+)\\)'
 const pattern = new RegExp(LDAP_PATTERN, 'gmi')
@@ -22,7 +22,7 @@ module.exports = function extractSensitiveRanges (evidence) {
     }
     return tokens
   } catch (e) {
-    iastLog.debug(e)
+    log.debug('[ASM] Error extracting sensitive ranges', e)
   }
   return []
 }

package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-analyzers/sql-sensitive-analyzer.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const iastLog = require('../../../iast-log')
+const log = require('../../../../../log')
 
 const STRING_LITERAL = '\'(?:\'\'|[^\'])*\''
 const POSTGRESQL_ESCAPED_LITERAL = '\\$([^$]*)\\$.*?\\$\\1\\$'
@@ -106,7 +106,7 @@ module.exports = function extractSensitiveRanges (evidence) {
     }
     return tokens
   } catch (e) {
-    iastLog.debug(e)
+    log.debug('[ASM] Error extracting sensitive ranges', e)
   }
   return []
 }

package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-analyzers/url-sensitive-analyzer.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const iastLog = require('../../../iast-log')
+const log = require('../../../../../log')
 
 const AUTHORITY = '^(?:[^:]+:)?//([^@]+)@'
 const QUERY_FRAGMENT = '[?#&]([^=&;]+)=([^?#&]+)'
@@ -33,7 +33,7 @@ module.exports = function extractSensitiveRanges (evidence) {
 
     return ranges
   } catch (e) {
-    iastLog.debug(e)
+    log.debug('[ASM] Error extracting sensitive ranges', e)
   }
 
   return []

package/packages/dd-trace/src/appsec/iast/vulnerabilities-formatter/evidence-redaction/sensitive-handler.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const iastLog = require('../../iast-log')
+const log = require('../../../../log')
 const vulnerabilities = require('../../vulnerabilities')
 
 const { contains, intersects, remove } = require('./range-utils')
@@ -282,7 +282,7 @@ class SensitiveHandler {
       try {
         this._namePattern = new RegExp(redactionNamePattern, 'gmi')
       } catch (e) {
-        iastLog.warn('Redaction name pattern is not valid')
+        log.warn('[ASM] Redaction name pattern is not valid')
       }
     }
 
@@ -290,7 +290,7 @@ class SensitiveHandler {
       try {
         this._valuePattern = new RegExp(redactionValuePattern, 'gmi')
       } catch (e) {
-        iastLog.warn('Redaction value pattern is not valid')
+        log.warn('[ASM] Redaction value pattern is not valid')
       }
     }
   }

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

@@ -78,8 +78,7 @@ function enable (_config) {
     isEnabled = true
     config = _config
   } catch (err) {
-    log.error('Unable to start AppSec')
-    log.error(err)
+    log.error('[ASM] Unable to start AppSec', err)
 
     disable()
   }
@@ -186,7 +185,7 @@ function onPassportVerify ({ credentials, user }) {
   const rootSpan = store?.req && web.root(store.req)
 
   if (!rootSpan) {
-    log.warn('No rootSpan found in onPassportVerify')
+    log.warn('[ASM] No rootSpan found in onPassportVerify')
     return
   }
 

package/packages/dd-trace/src/appsec/rasp/fs-plugin.js

@@ -70,7 +70,7 @@ function enable (mod) {
     fsPlugin.enable()
   }
 
-  log.info(`Enabled AppsecFsPlugin for ${mod}`)
+  log.info('[ASM] Enabled AppsecFsPlugin for %s', mod)
 }
 
 function disable (mod) {
@@ -85,7 +85,7 @@ function disable (mod) {
     fsPlugin = undefined
   }
 
-  log.info(`Disabled AppsecFsPlugin for ${mod}`)
+  log.info('[ASM] Disabled AppsecFsPlugin for %s', mod)
 }
 
 module.exports = {

package/packages/dd-trace/src/appsec/rasp/utils.js

@@ -8,7 +8,7 @@ const log = require('../../log')
 const abortOnUncaughtException = process.execArgv?.includes('--abort-on-uncaught-exception')
 
 if (abortOnUncaughtException) {
-  log.warn('The --abort-on-uncaught-exception flag is enabled. The RASP module will not block operations.')
+  log.warn('[ASM] The --abort-on-uncaught-exception flag is enabled. The RASP module will not block operations.')
 }
 
 const RULE_TYPES = {

package/packages/dd-trace/src/appsec/remote_config/manager.js

@@ -134,7 +134,7 @@ class RemoteConfigManager extends EventEmitter {
       if (statusCode === 404) return cb()
 
       if (err) {
-        log.error(err)
+        log.error('[RC] Error in request', err)
         return cb()
       }
 
@@ -148,7 +148,7 @@ class RemoteConfigManager extends EventEmitter {
         try {
           this.parseConfig(JSON.parse(data))
         } catch (err) {
-          log.error(`Could not parse remote config response: ${err}`)
+          log.error('[RC] Could not parse remote config response', err)
 
           this.state.client.state.has_error = true
           this.state.client.state.error = err.toString()

package/packages/dd-trace/src/appsec/sdk/set_user.js

@@ -11,13 +11,13 @@ function setUserTags (user, rootSpan) {
 
 function setUser (tracer, user) {
   if (!user || !user.id) {
-    log.warn('Invalid user provided to setUser')
+    log.warn('[ASM] Invalid user provided to setUser')
     return
   }
 
   const rootSpan = getRootSpan(tracer)
   if (!rootSpan) {
-    log.warn('Root span not available in setUser')
+    log.warn('[ASM] Root span not available in setUser')
     return
   }
 

package/packages/dd-trace/src/appsec/sdk/track_event.js

@@ -11,13 +11,13 @@ const { keepTrace } = require('../../priority_sampler')
 function trackUserLoginSuccessEvent (tracer, user, metadata) {
   // TODO: better user check here and in _setUser() ?
   if (!user || !user.id) {
-    log.warn('Invalid user provided to trackUserLoginSuccessEvent')
+    log.warn('[ASM] Invalid user provided to trackUserLoginSuccessEvent')
     return
   }
 
   const rootSpan = getRootSpan(tracer)
   if (!rootSpan) {
-    log.warn('Root span not available in trackUserLoginSuccessEvent')
+    log.warn('[ASM] Root span not available in trackUserLoginSuccessEvent')
     return
   }
 
@@ -28,7 +28,7 @@ function trackUserLoginSuccessEvent (tracer, user, metadata) {
 
 function trackUserLoginFailureEvent (tracer, userId, exists, metadata) {
   if (!userId || typeof userId !== 'string') {
-    log.warn('Invalid userId provided to trackUserLoginFailureEvent')
+    log.warn('[ASM] Invalid userId provided to trackUserLoginFailureEvent')
     return
   }
 
@@ -43,7 +43,7 @@ function trackUserLoginFailureEvent (tracer, userId, exists, metadata) {
 
 function trackCustomEvent (tracer, eventName, metadata) {
   if (!eventName || typeof eventName !== 'string') {
-    log.warn('Invalid eventName provided to trackCustomEvent')
+    log.warn('[ASM] Invalid eventName provided to trackCustomEvent')
     return
   }
 
@@ -52,7 +52,7 @@ function trackCustomEvent (tracer, eventName, metadata) {
 
 function trackEvent (eventName, fields, sdkMethodName, rootSpan, mode) {
   if (!rootSpan) {
-    log.warn(`Root span not available in ${sdkMethodName}`)
+    log.warn('[ASM] Root span not available in %s', sdkMethodName)
     return
   }
 

package/packages/dd-trace/src/appsec/sdk/user_blocking.js

@@ -15,7 +15,7 @@ function isUserBlocked (user) {
 
 function checkUserAndSetUser (tracer, user) {
   if (!user || !user.id) {
-    log.warn('Invalid user provided to isUserBlocked')
+    log.warn('[ASM] Invalid user provided to isUserBlocked')
     return false
   }
 
@@ -25,7 +25,7 @@ function checkUserAndSetUser (tracer, user) {
       setUserTags(user, rootSpan)
     }
   } else {
-    log.warn('Root span not available in isUserBlocked')
+    log.warn('[ASM] Root span not available in isUserBlocked')
   }
 
   return isUserBlocked(user)
@@ -41,13 +41,13 @@ function blockRequest (tracer, req, res) {
   }
 
   if (!req || !res) {
-    log.warn('Requests or response object not available in blockRequest')
+    log.warn('[ASM] Requests or response object not available in blockRequest')
     return false
   }
 
   const rootSpan = getRootSpan(tracer)
   if (!rootSpan) {
-    log.warn('Root span not available in blockRequest')
+    log.warn('[ASM] Root span not available in blockRequest')
     return false
   }
 

package/packages/dd-trace/src/appsec/waf/index.js

@@ -41,7 +41,7 @@ function update (newRules) {
   try {
     waf.wafManager.update(newRules)
   } catch (err) {
-    log.error('Could not apply rules from remote config')
+    log.error('[ASM] Could not apply rules from remote config')
     throw err
   }
 }
@@ -50,7 +50,7 @@ function run (data, req, raspRuleType) {
   if (!req) {
     const store = storage.getStore()
     if (!store || !store.req) {
-      log.warn('Request object not available in waf.run')
+      log.warn('[ASM] Request object not available in waf.run')
       return
     }
 

package/packages/dd-trace/src/appsec/waf/waf_context_wrapper.js

@@ -23,7 +23,7 @@ class WAFContextWrapper {
 
   run ({ persistent, ephemeral }, raspRuleType) {
     if (this.ddwafContext.disposed) {
-      log.warn('Calling run on a disposed context')
+      log.warn('[ASM] Calling run on a disposed context')
       return
     }
 
@@ -101,8 +101,7 @@ class WAFContextWrapper {
 
       return result.actions
     } catch (err) {
-      log.error('Error while running the AppSec WAF')
-      log.error(err)
+      log.error('[ASM] Error while running the AppSec WAF', err)
     }
   }
 

package/packages/dd-trace/src/appsec/waf/waf_manager.js

@@ -25,7 +25,7 @@ class WAFManager {
       const { obfuscatorKeyRegex, obfuscatorValueRegex } = this.config
       return new DDWAF(rules, { obfuscatorKeyRegex, obfuscatorValueRegex })
     } catch (err) {
-      log.error('AppSec could not load native package. In-app WAF features will not be available.')
+      log.error('[ASM] AppSec could not load native package. In-app WAF features will not be available.')
 
       throw err
     }

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

@@ -3,7 +3,7 @@ const { identityService } = require('../util')
 const serverless = {
   server: {
     'azure-functions': {
-      opName: () => 'azure-functions.invoke',
+      opName: () => 'azure.functions.invoke',
       serviceName: identityService
     }
   }

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

@@ -3,7 +3,7 @@ const { identityService } = require('../util')
 const serverless = {
   server: {
     'azure-functions': {
-      opName: () => 'azure-functions.invoke',
+      opName: () => 'azure.functions.invoke',
       serviceName: identityService
     }
   }

package/packages/dd-trace/src/appsec/iast/iast-log.js

@@ -1,86 +0,0 @@
-'use strict'
-
-const dc = require('dc-polyfill')
-const log = require('../../log')
-
-const telemetryLog = dc.channel('datadog:telemetry:log')
-
-function getTelemetryLog (data, level) {
-  try {
-    data = typeof data === 'function' ? data() : data
-
-    let message
-    if (typeof data !== 'object' || !data) {
-      message = String(data)
-    } else {
-      message = String(data.message || data)
-    }
-
-    const logEntry = {
-      message,
-      level
-    }
-    if (data.stack) {
-      logEntry.stack_trace = data.stack
-    }
-    return logEntry
-  } catch (e) {
-    log.error(e)
-  }
-}
-
-const iastLog = {
-  debug (data) {
-    log.debug(data)
-    return this
-  },
-
-  info (data) {
-    log.info(data)
-    return this
-  },
-
-  warn (data) {
-    log.warn(data)
-    return this
-  },
-
-  error (data) {
-    log.error(data)
-    return this
-  },
-
-  publish (data, level) {
-    if (telemetryLog.hasSubscribers) {
-      telemetryLog.publish(getTelemetryLog(data, level))
-    }
-    return this
-  },
-
-  debugAndPublish (data) {
-    this.debug(data)
-    return this.publish(data, 'DEBUG')
-  },
-
-  /**
-   * forward 'INFO' log level to 'DEBUG' telemetry log level
-   * see also {@link ../../telemetry/logs#isLevelEnabled } method
-   */
-  infoAndPublish (data) {
-    this.info(data)
-    return this.publish(data, 'DEBUG')
-  },
-
-  warnAndPublish (data) {
-    this.warn(data)
-    return this.publish(data, 'WARN')
-  },
-
-  errorAndPublish (data) {
-    this.error(data)
-    // publish is done automatically by log.error()
-    return this
-  }
-}
-
-module.exports = iastLog