dd-trace 3.12.1 → 3.15.0

package/packages/datadog-plugin-cypress/src/support.js

@@ -8,7 +8,12 @@ beforeEach(() => {
   })
 })
 
+before(() => {
+  cy.task('dd:testSuiteStart', Cypress.mocha.getRootSuite().file)
+})
+
 after(() => {
+  cy.task('dd:testSuiteFinish', Cypress.mocha.getRunner().stats)
   cy.window().then(win => {
     win.dispatchEvent(new Event('beforeunload'))
   })

package/packages/datadog-plugin-fs/src/index.js

@@ -0,0 +1,45 @@
+'use strict'
+
+const TracingPlugin = require('../../dd-trace/src/plugins/tracing')
+
+class FsPlugin extends TracingPlugin {
+  static get name () { return 'fs' }
+  static get operation () { return 'operation' }
+
+  configure (...args) {
+    return super.configure(...args)
+  }
+
+  start ({ operation, ...params }) {
+    if (!this.activeSpan) return this.skip()
+
+    const lowerOp = operation.toLowerCase()
+    const flag = params.flag || params.flags || (params.options && (params.options.flag || params.options.flags))
+    const defaultFlag = ((lowerOp.includes('open') || lowerOp.includes('read')) && 'r') ||
+      (lowerOp.includes('write') && 'w') ||
+      (lowerOp.includes('append') && 'a')
+    const fd = params.fd || (typeof params.file === 'number' && params.file)
+    const path = params.path || params.prefix || params.filename || (typeof params.file === 'string' && params.file)
+    const uid = typeof params.uid === 'number' && params.uid.toString()
+    const gid = typeof params.gid === 'number' && params.gid.toString()
+    const mode = typeof params.mode === 'number' ? params.mode.toString(8) : params.mode
+
+    this.startSpan('fs.operation', {
+      service: this.config.service,
+      resource: operation,
+      kind: 'internal',
+      meta: {
+        'file.descriptor': (typeof fd === 'object' || typeof fd === 'number') ? fd.toString() : '',
+        'file.dest': params.dest || params.newPath || (params.target && params.path),
+        'file.flag': String(flag || defaultFlag || ''),
+        'file.gid': gid || '',
+        'file.mode': mode,
+        'file.path': path || '',
+        'file.src': params.src || params.oldPath || params.existingPath || params.target,
+        'file.uid': uid || ''
+      }
+    })
+  }
+}
+
+module.exports = FsPlugin

package/packages/datadog-plugin-hapi/src/index.js

@@ -26,7 +26,11 @@ class HapiPlugin extends RouterPlugin {
       web.setRoute(req, route)
     })
 
-    this.addSub(`apm:hapi:request:error`, this.addError)
+    this.addSub('apm:hapi:request:error', error => {
+      if (!error || !error.isBoom || !this.config.validateStatus(error.output.statusCode)) {
+        this.addError(error)
+      }
+    })
 
     this.addSub('apm:hapi:extension:enter', ({ req }) => {
       this.enter(this._requestSpans.get(req))

package/packages/datadog-plugin-http/src/server.js

@@ -23,7 +23,7 @@ class HttpServerPlugin extends Plugin {
       span.setTag(COMPONENT, this.constructor.name)
 
       this._parentStore = store
-      this.enter(span, { ...store, req })
+      this.enter(span, { ...store, req, res })
 
       const context = web.getContext(req)
 

package/packages/datadog-plugin-http2/src/server.js

@@ -22,7 +22,7 @@ class Http2ServerPlugin extends Plugin {
 
       span.setTag(COMPONENT, this.constructor.name)
 
-      this.enter(span, { ...store, req })
+      this.enter(span, { ...store, req, res })
 
       const context = web.getContext(req)
 

package/packages/datadog-plugin-jest/src/index.js

@@ -6,18 +6,12 @@ const {
   JEST_TEST_RUNNER,
   finishAllTraceSpans,
   getTestEnvironmentMetadata,
-  getTestParentSpan,
-  getTestSessionCommonTags,
   getTestSuiteCommonTags,
+  addIntelligentTestRunnerSpanTags,
   TEST_PARAMETERS,
   getCodeOwnersFileEntries,
-  TEST_SESSION_ID,
-  TEST_SUITE_ID,
   TEST_COMMAND,
-  TEST_ITR_TESTS_SKIPPED,
-  TEST_SESSION_CODE_COVERAGE_ENABLED,
-  TEST_SESSION_ITR_SKIPPING_ENABLED,
-  TEST_CODE_COVERAGE_LINES_TOTAL
+  TEST_FRAMEWORK_VERSION
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 
@@ -49,22 +43,6 @@ class JestPlugin extends CiPlugin {
     this.testEnvironmentMetadata = getTestEnvironmentMetadata('jest', this.config)
     this.codeOwnersEntries = getCodeOwnersFileEntries()
 
-    this.addSub('ci:jest:session:start', (command) => {
-      const store = storage.getStore()
-      const childOf = getTestParentSpan(this.tracer)
-      const testSessionSpanMetadata = getTestSessionCommonTags(command, this.tracer._version)
-
-      const testSessionSpan = this.tracer.startSpan('jest.test_session', {
-        childOf,
-        tags: {
-          [COMPONENT]: this.constructor.name,
-          ...this.testEnvironmentMetadata,
-          ...testSessionSpanMetadata
-        }
-      })
-      this.enter(testSessionSpan, store)
-    })
-
     this.addSub('ci:jest:session:finish', ({
       status,
       isSuitesSkipped,
@@ -72,18 +50,18 @@ class JestPlugin extends CiPlugin {
       isCodeCoverageEnabled,
       testCodeCoverageLinesTotal
     }) => {
-      const testSessionSpan = storage.getStore().span
-
-      testSessionSpan.setTag(TEST_STATUS, status)
-      testSessionSpan.setTag(TEST_ITR_TESTS_SKIPPED, isSuitesSkipped ? 'true' : 'false')
-      testSessionSpan.setTag(TEST_SESSION_ITR_SKIPPING_ENABLED, isSuitesSkippingEnabled ? 'true' : 'false')
-      testSessionSpan.setTag(TEST_SESSION_CODE_COVERAGE_ENABLED, isCodeCoverageEnabled ? 'true' : 'false')
-
-      if (testCodeCoverageLinesTotal !== undefined) {
-        testSessionSpan.setTag(TEST_CODE_COVERAGE_LINES_TOTAL, testCodeCoverageLinesTotal)
-      }
-      testSessionSpan.finish()
-      finishAllTraceSpans(testSessionSpan)
+      this.testSessionSpan.setTag(TEST_STATUS, status)
+      this.testModuleSpan.setTag(TEST_STATUS, status)
+
+      addIntelligentTestRunnerSpanTags(
+        this.testSessionSpan,
+        this.testModuleSpan,
+        { isSuitesSkipped, isSuitesSkippingEnabled, isCodeCoverageEnabled, testCodeCoverageLinesTotal }
+      )
+
+      this.testModuleSpan.finish()
+      this.testSessionSpan.finish()
+      finishAllTraceSpans(this.testSessionSpan)
       this.tracer._exporter.flush()
     })
 
@@ -91,26 +69,28 @@ class JestPlugin extends CiPlugin {
     // This subscriber changes the configuration objects from jest to inject the trace id
     // of the test session to the processes that run the test suites.
     this.addSub('ci:jest:session:configuration', configs => {
-      const testSessionSpan = storage.getStore().span
       configs.forEach(config => {
-        config._ddTestSessionId = testSessionSpan.context()._traceId.toString(10)
-        config._ddTestCommand = testSessionSpan.context()._tags[TEST_COMMAND]
+        config._ddTestSessionId = this.testSessionSpan.context().toTraceId()
+        config._ddTestModuleId = this.testModuleSpan.context().toSpanId()
+        config._ddTestCommand = this.testSessionSpan.context()._tags[TEST_COMMAND]
       })
     })
 
-    this.addSub('ci:jest:test-suite:start', ({ testSuite, testEnvironmentOptions }) => {
-      const { _ddTestSessionId: testSessionId, _ddTestCommand: testCommand } = testEnvironmentOptions
-
-      const store = storage.getStore()
+    this.addSub('ci:jest:test-suite:start', ({ testSuite, testEnvironmentOptions, frameworkVersion }) => {
+      const {
+        _ddTestSessionId: testSessionId,
+        _ddTestCommand: testCommand,
+        _ddTestModuleId: testModuleId
+      } = testEnvironmentOptions
 
       const testSessionSpanContext = this.tracer.extract('text_map', {
         'x-datadog-trace-id': testSessionId,
-        'x-datadog-parent-id': '0000000000000000'
+        'x-datadog-parent-id': testModuleId
       })
 
-      const testSuiteMetadata = getTestSuiteCommonTags(testCommand, this.tracer._version, testSuite)
+      const testSuiteMetadata = getTestSuiteCommonTags(testCommand, frameworkVersion, testSuite)
 
-      const testSuiteSpan = this.tracer.startSpan('jest.test_suite', {
+      this.testSuiteSpan = this.tracer.startSpan('jest.test_suite', {
         childOf: testSessionSpanContext,
         tags: {
           [COMPONENT]: this.constructor.name,
@@ -118,19 +98,17 @@ class JestPlugin extends CiPlugin {
           ...testSuiteMetadata
         }
       })
-      this.enter(testSuiteSpan, store)
     })
 
     this.addSub('ci:jest:test-suite:finish', ({ status, errorMessage }) => {
-      const testSuiteSpan = storage.getStore().span
-      testSuiteSpan.setTag(TEST_STATUS, status)
+      this.testSuiteSpan.setTag(TEST_STATUS, status)
       if (errorMessage) {
-        testSuiteSpan.setTag('error', new Error(errorMessage))
+        this.testSuiteSpan.setTag('error', new Error(errorMessage))
       }
-      testSuiteSpan.finish()
+      this.testSuiteSpan.finish()
       // Suites potentially run in a different process than the session,
       // so calling finishAllTraceSpans on the session span is not enough
-      finishAllTraceSpans(testSuiteSpan)
+      finishAllTraceSpans(this.testSuiteSpan)
     })
 
     /**
@@ -139,8 +117,7 @@ class JestPlugin extends CiPlugin {
      * fetching the ITR config.
      */
     this.addSub('ci:jest:test-suite:code-coverage', (coverageFiles) => {
-      const testSuiteSpan = storage.getStore().span
-      this.tracer._exporter.exportCoverage({ span: testSuiteSpan, coverageFiles })
+      this.tracer._exporter.exportCoverage({ span: this.testSuiteSpan, coverageFiles })
     })
 
     this.addSub('ci:jest:test:start', (test) => {
@@ -159,9 +136,12 @@ class JestPlugin extends CiPlugin {
 
     this.addSub('ci:jest:test:err', (error) => {
       if (error) {
-        const span = storage.getStore().span
-        span.setTag(TEST_STATUS, 'fail')
-        span.setTag('error', error)
+        const store = storage.getStore()
+        if (store && store.span) {
+          const span = store.span
+          span.setTag(TEST_STATUS, 'fail')
+          span.setTag('error', error)
+        }
       }
     })
 
@@ -173,25 +153,15 @@ class JestPlugin extends CiPlugin {
   }
 
   startTestSpan (test) {
-    const suiteTags = {}
-    const store = storage.getStore()
-    const testSuiteSpan = store ? store.span : undefined
-    if (testSuiteSpan) {
-      const testSuiteId = testSuiteSpan.context()._spanId.toString(10)
-      suiteTags[TEST_SUITE_ID] = testSuiteId
-      suiteTags[TEST_SESSION_ID] = testSuiteSpan.context()._traceId.toString(10)
-      suiteTags[TEST_COMMAND] = testSuiteSpan.context()._tags[TEST_COMMAND]
-    }
-
-    const { suite, name, runner, testParameters } = test
+    const { suite, name, runner, testParameters, frameworkVersion } = test
 
     const extraTags = {
       [JEST_TEST_RUNNER]: runner,
       [TEST_PARAMETERS]: testParameters,
-      ...suiteTags
+      [TEST_FRAMEWORK_VERSION]: frameworkVersion
     }
 
-    return super.startTestSpan(name, suite, extraTags)
+    return super.startTestSpan(name, suite, this.testSuiteSpan, extraTags)
   }
 }
 

package/packages/datadog-plugin-mocha/src/index.js

@@ -8,16 +8,9 @@ const {
   TEST_PARAMETERS,
   finishAllTraceSpans,
   getTestSuitePath,
-  getTestParentSpan,
   getTestParametersString,
-  getTestSessionCommonTags,
   getTestSuiteCommonTags,
-  TEST_SUITE_ID,
-  TEST_SESSION_ID,
-  TEST_COMMAND,
-  TEST_ITR_TESTS_SKIPPED,
-  TEST_SESSION_CODE_COVERAGE_ENABLED,
-  TEST_SESSION_ITR_SKIPPING_ENABLED
+  addIntelligentTestRunnerSpanTags
 } = require('../../dd-trace/src/plugins/util/test')
 const { COMPONENT } = require('../../dd-trace/src/constants')
 
@@ -48,30 +41,15 @@ class MochaPlugin extends CiPlugin {
       })
     })
 
-    this.addSub('ci:mocha:session:start', (command) => {
-      const childOf = getTestParentSpan(this.tracer)
-      const testSessionSpanMetadata = getTestSessionCommonTags(command, this.tracer._version)
-
-      this.command = command
-      this.testSessionSpan = this.tracer.startSpan('mocha.test_session', {
-        childOf,
-        tags: {
-          [COMPONENT]: this.constructor.name,
-          ...this.testEnvironmentMetadata,
-          ...testSessionSpanMetadata
-        }
-      })
-    })
-
     this.addSub('ci:mocha:test-suite:start', (suite) => {
       const store = storage.getStore()
       const testSuiteMetadata = getTestSuiteCommonTags(
         this.command,
-        this.tracer._version,
+        this.frameworkVersion,
         getTestSuitePath(suite.file, this.sourceRoot)
       )
       const testSuiteSpan = this.tracer.startSpan('mocha.test_suite', {
-        childOf: this.testSessionSpan,
+        childOf: this.testModuleSpan,
         tags: {
           [COMPONENT]: this.constructor.name,
           ...this.testEnvironmentMetadata,
@@ -83,18 +61,24 @@ class MochaPlugin extends CiPlugin {
     })
 
     this.addSub('ci:mocha:test-suite:finish', (status) => {
-      const span = storage.getStore().span
-      // the test status of the suite may have been set in ci:mocha:test-suite:error already
-      if (!span.context()._tags[TEST_STATUS]) {
-        span.setTag(TEST_STATUS, status)
+      const store = storage.getStore()
+      if (store && store.span) {
+        const span = storage.getStore().span
+        // the test status of the suite may have been set in ci:mocha:test-suite:error already
+        if (!span.context()._tags[TEST_STATUS]) {
+          span.setTag(TEST_STATUS, status)
+        }
+        span.finish()
       }
-      span.finish()
     })
 
     this.addSub('ci:mocha:test-suite:error', (err) => {
-      const span = storage.getStore().span
-      span.setTag('error', err)
-      span.setTag(TEST_STATUS, 'fail')
+      const store = storage.getStore()
+      if (store && store.span) {
+        const span = storage.getStore().span
+        span.setTag('error', err)
+        span.setTag(TEST_STATUS, 'fail')
+      }
     })
 
     this.addSub('ci:mocha:test:start', (test) => {
@@ -105,12 +89,16 @@ class MochaPlugin extends CiPlugin {
     })
 
     this.addSub('ci:mocha:test:finish', (status) => {
-      const span = storage.getStore().span
+      const store = storage.getStore()
 
-      span.setTag(TEST_STATUS, status)
+      if (store && store.span) {
+        const span = storage.getStore().span
+
+        span.setTag(TEST_STATUS, status)
 
-      span.finish()
-      finishAllTraceSpans(span)
+        span.finish()
+        finishAllTraceSpans(span)
+      }
     })
 
     this.addSub('ci:mocha:test:skip', (test) => {
@@ -124,8 +112,9 @@ class MochaPlugin extends CiPlugin {
     })
 
     this.addSub('ci:mocha:test:error', (err) => {
-      if (err) {
-        const span = storage.getStore().span
+      const store = storage.getStore()
+      if (err && store && store.span) {
+        const span = store.span
         if (err.constructor.name === 'Pending' && !this.forbidPending) {
           span.setTag(TEST_STATUS, 'skip')
         } else {
@@ -143,10 +132,15 @@ class MochaPlugin extends CiPlugin {
       if (this.testSessionSpan) {
         const { isSuitesSkippingEnabled, isCodeCoverageEnabled } = this.itrConfig || {}
         this.testSessionSpan.setTag(TEST_STATUS, status)
-        this.testSessionSpan.setTag(TEST_ITR_TESTS_SKIPPED, isSuitesSkipped ? 'true' : 'false')
-        this.testSessionSpan.setTag(TEST_SESSION_ITR_SKIPPING_ENABLED, isSuitesSkippingEnabled ? 'true' : 'false')
-        this.testSessionSpan.setTag(TEST_SESSION_CODE_COVERAGE_ENABLED, isCodeCoverageEnabled ? 'true' : 'false')
+        this.testModuleSpan.setTag(TEST_STATUS, status)
 
+        addIntelligentTestRunnerSpanTags(
+          this.testSessionSpan,
+          this.testModuleSpan,
+          { isSuitesSkipped, isSuitesSkippingEnabled, isCodeCoverageEnabled }
+        )
+
+        this.testModuleSpan.finish()
         this.testSessionSpan.finish()
         finishAllTraceSpans(this.testSessionSpan)
       }
@@ -156,33 +150,19 @@ class MochaPlugin extends CiPlugin {
   }
 
   startTestSpan (test) {
-    const testSuiteTags = {}
-    const testSuiteSpan = this._testSuites.get(test.parent.file)
-    if (testSuiteSpan) {
-      const testSuiteId = testSuiteSpan.context()._spanId.toString(10)
-      testSuiteTags[TEST_SUITE_ID] = testSuiteId
-    }
+    const testName = test.fullTitle()
+    const { file: testSuiteAbsolutePath, title } = test
 
-    if (this.testSessionSpan) {
-      const testSessionId = this.testSessionSpan.context()._traceId.toString(10)
-      testSuiteTags[TEST_SESSION_ID] = testSessionId
-      testSuiteTags[TEST_COMMAND] = this.command
-    }
-
-    const { file: testSuiteAbsolutePath } = test
-    const fullTestName = test.fullTitle()
-    const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.sourceRoot)
-
-    const extraTags = {
-      ...testSuiteTags
-    }
-
-    const testParametersString = getTestParametersString(this._testNameToParams, test.title)
+    const extraTags = {}
+    const testParametersString = getTestParametersString(this._testNameToParams, title)
     if (testParametersString) {
       extraTags[TEST_PARAMETERS] = testParametersString
     }
 
-    return super.startTestSpan(fullTestName, testSuite, extraTags)
+    const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.sourceRoot)
+    const testSuiteSpan = this._testSuites.get(testSuiteAbsolutePath)
+
+    return super.startTestSpan(testName, testSuite, testSuiteSpan, extraTags)
   }
 }
 

package/packages/datadog-plugin-mysql/src/index.js

@@ -6,22 +6,23 @@ class MySQLPlugin extends DatabasePlugin {
   static get name () { return 'mysql' }
   static get system () { return 'mysql' }
 
-  start ({ sql, conf: dbConfig }) {
-    const service = getServiceName(this.config, dbConfig)
+  start (payload) {
+    const service = getServiceName(this.config, payload.conf)
 
     this.startSpan(`${this.system}.query`, {
       service,
-      resource: sql,
+      resource: payload.sql,
       type: 'sql',
       kind: 'client',
       meta: {
         'db.type': this.system,
-        'db.user': dbConfig.user,
-        'db.name': dbConfig.database,
-        'out.host': dbConfig.host,
-        'out.port': dbConfig.port
+        'db.user': payload.conf.user,
+        'db.name': payload.conf.database,
+        'out.host': payload.conf.host,
+        'out.port': payload.conf.port
       }
     })
+    payload.sql = this.injectDbmQuery(payload.sql, service)
   }
 }
 

package/packages/datadog-plugin-playwright/src/index.js

@@ -0,0 +1,112 @@
+'use strict'
+
+const { storage } = require('../../datadog-core')
+const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
+
+const {
+  TEST_STATUS,
+  finishAllTraceSpans,
+  getTestSuitePath,
+  getTestSuiteCommonTags
+} = require('../../dd-trace/src/plugins/util/test')
+const { RESOURCE_NAME } = require('../../../ext/tags')
+const { COMPONENT } = require('../../dd-trace/src/constants')
+
+class PlaywrightPlugin extends CiPlugin {
+  static get name () {
+    return 'playwright'
+  }
+
+  constructor (...args) {
+    super(...args)
+
+    this._testSuites = new Map()
+
+    this.addSub('ci:playwright:session:finish', ({ status, onDone }) => {
+      this.testModuleSpan.setTag(TEST_STATUS, status)
+      this.testSessionSpan.setTag(TEST_STATUS, status)
+
+      this.testModuleSpan.finish()
+      this.testSessionSpan.finish()
+      finishAllTraceSpans(this.testSessionSpan)
+      this.tracer._exporter.flush(onDone)
+    })
+
+    this.addSub('ci:playwright:test-suite:start', (testSuiteAbsolutePath) => {
+      const store = storage.getStore()
+      const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.rootDir)
+
+      const testSuiteMetadata = getTestSuiteCommonTags(
+        this.command,
+        this.frameworkVersion,
+        testSuite
+      )
+
+      const testSuiteSpan = this.tracer.startSpan('playwright.test_suite', {
+        childOf: this.testModuleSpan,
+        tags: {
+          [COMPONENT]: this.constructor.name,
+          ...this.testEnvironmentMetadata,
+          ...testSuiteMetadata
+        }
+      })
+      this.enter(testSuiteSpan, store)
+
+      this._testSuites.set(testSuite, testSuiteSpan)
+    })
+
+    this.addSub('ci:playwright:test-suite:finish', (status) => {
+      const store = storage.getStore()
+      const span = store && store.span
+      if (!span) return
+      span.setTag(TEST_STATUS, status)
+      span.finish()
+    })
+
+    this.addSub('ci:playwright:test:start', ({ testName, testSuiteAbsolutePath }) => {
+      const store = storage.getStore()
+      const testSuite = getTestSuitePath(testSuiteAbsolutePath, this.rootDir)
+      const span = this.startTestSpan(testName, testSuite)
+
+      this.enter(span, store)
+    })
+    this.addSub('ci:playwright:test:finish', ({ testStatus, steps, error }) => {
+      const store = storage.getStore()
+      const span = store && store.span
+      if (!span) return
+
+      span.setTag(TEST_STATUS, testStatus)
+
+      if (error) {
+        span.setTag('error', error)
+      }
+
+      steps.forEach(step => {
+        const stepStartTime = step.startTime.getTime()
+        const stepSpan = this.tracer.startSpan('playwright.step', {
+          childOf: span,
+          startTime: stepStartTime,
+          tags: {
+            [COMPONENT]: this.constructor.name,
+            'playwright.step': step.title,
+            [RESOURCE_NAME]: step.title
+          }
+        })
+        if (step.error) {
+          stepSpan.setTag('error', step.error)
+        }
+        stepSpan.finish(stepStartTime + step.duration)
+      })
+
+      span.finish()
+      finishAllTraceSpans(span)
+    })
+  }
+
+  startTestSpan (testName, testSuite) {
+    const testSuiteSpan = this._testSuites.get(testSuite)
+    return super.startTestSpan(testName, testSuite, testSuiteSpan)
+  }
+}
+
+module.exports = PlaywrightPlugin

package/packages/datadog-shimmer/src/shimmer.js

@@ -10,7 +10,11 @@ function copyProperties (original, wrapped) {
   const keys = Reflect.ownKeys(props)
 
   for (const key of keys) {
-    Object.defineProperty(wrapped, key, props[key])
+    try {
+      Object.defineProperty(wrapped, key, props[key])
+    } catch (e) {
+      // TODO: figure out how to handle this without a try/catch
+    }
   }
 }
 
@@ -33,28 +37,41 @@ function wrapFn (original, delegate) {
 
 function wrapMethod (target, name, wrapper) {
   assertMethod(target, name)
-  assertNotClass(target[name]) // TODO: support constructors of native classes
   assertFunction(wrapper)
 
   const original = target[name]
   const wrapped = wrapper(original)
   const descriptor = Object.getOwnPropertyDescriptor(target, name)
 
+  const attributes = {
+    configurable: true,
+    ...descriptor
+  }
+
+  copyProperties(original, wrapped)
+
   if (descriptor) {
     unwrappers.set(wrapped, () => Object.defineProperty(target, name, descriptor))
+
+    if (descriptor.get || descriptor.set) {
+      attributes.get = () => wrapped
+    } else {
+      attributes.value = wrapped
+    }
+
+    // TODO: create a single object for multiple wrapped methods
+    if (descriptor.configurable === false) {
+      return Object.create(target, {
+        [name]: attributes
+      })
+    }
   } else { // no descriptor means original was on the prototype
     unwrappers.set(wrapped, () => delete target[name])
+    attributes.value = wrapped
+    attributes.writable = true
   }
 
-  Object.defineProperty(target, name, {
-    configurable: true,
-    writable: true,
-    enumerable: false,
-    ...descriptor,
-    value: wrapped
-  })
-
-  copyProperties(original, wrapped)
+  Object.defineProperty(target, name, attributes)
 
   return target
 }

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

@@ -16,5 +16,7 @@ module.exports = {
   HTTP_INCOMING_REMOTE_IP: 'server.request.client_ip',
   HTTP_INCOMING_REMOTE_PORT: 'server.request.client_port',
 
-  HTTP_CLIENT_IP: 'http.client_ip'
+  HTTP_CLIENT_IP: 'http.client_ip',
+
+  USER_ID: 'usr.id'
 }