dd-trace 2.0.0-appsec-beta.4 → 2.0.1

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

@@ -1,17 +0,0 @@
-'use strict'
-
-const tx = require('../../dd-trace/src/plugins/util/promise')
-
-module.exports = [
-  {
-    name: 'promise',
-    file: 'lib/core.js',
-    versions: ['>=7'],
-    patch (Promise, tracer, config) {
-      this.wrap(Promise.prototype, 'then', tx.createWrapThen(tracer, config))
-    },
-    unpatch (Promise) {
-      this.unwrap(Promise.prototype, 'then')
-    }
-  }
-]

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

@@ -1,20 +0,0 @@
-'use strict'
-
-const tx = require('../../dd-trace/src/plugins/util/promise')
-
-module.exports = [
-  {
-    name: 'promise-js',
-    versions: ['>=0.0.3'],
-    patch (Promise, tracer, config) {
-      if (Promise !== global.Promise) {
-        this.wrap(Promise.prototype, 'then', tx.createWrapThen(tracer, config))
-      }
-    },
-    unpatch (Promise) {
-      if (Promise !== global.Promise) {
-        this.unwrap(Promise.prototype, 'then')
-      }
-    }
-  }
-]

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

@@ -1,16 +0,0 @@
-'use strict'
-
-const tx = require('../../dd-trace/src/plugins/util/promise')
-
-module.exports = [
-  {
-    name: 'q',
-    versions: ['>=1'],
-    patch (Q, tracer, config) {
-      this.wrap(Q.makePromise.prototype, 'then', tx.createWrapThen(tracer, config))
-    },
-    unpatch (Q) {
-      this.unwrap(Q.makePromise.prototype, 'then')
-    }
-  }
-]

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

@@ -1,17 +0,0 @@
-'use strict'
-
-const tx = require('../../dd-trace/src/plugins/util/promise')
-
-module.exports = [
-  {
-    name: 'when',
-    file: 'lib/Promise.js',
-    versions: ['>=3'],
-    patch (Promise, tracer, config) {
-      this.wrap(Promise.prototype, 'then', tx.createWrapThen(tracer, config))
-    },
-    unpatch (Promise) {
-      this.unwrap(Promise.prototype, 'then')
-    }
-  }
-]

package/packages/dd-trace/src/appsec/gateway/dc_block.js

@@ -1,68 +0,0 @@
-'use strict'
-
-const dc = require('diagnostics_channel')
-const shimmer = require('shimmer')
-
-let protoCache
-
-function getActiveChannelPrototype () {
-  if (protoCache) return protoCache
-
-  const noop = () => {}
-
-  const channel = dc.channel('dd-trace:temp_getproto')
-
-  // We have to force the channel to switch to ActiveChannel prototype
-  channel.subscribe(noop)
-
-  const activeChannelPrototype = Object.getPrototypeOf(channel)
-
-  channel.unsubscribe(noop)
-
-  protoCache = activeChannelPrototype
-
-  return activeChannelPrototype
-}
-
-function blockingPublish (data) {
-  let firstError
-
-  for (let i = 0; i < this._subscribers.length; i++) {
-    try {
-      const onMessage = this._subscribers[i]
-      onMessage(data, this.name)
-    } catch (err) {
-      if (firstError === undefined && err instanceof DCBlockingError) {
-        firstError = err
-      } else {
-        process.nextTick(() => {
-          throw err
-        })
-      }
-    }
-  }
-
-  if (firstError) throw firstError
-}
-
-function enable () {
-  shimmer.wrap(getActiveChannelPrototype(), 'publish', (originalPublish) => {
-    return blockingPublish
-  })
-}
-
-function disable () {
-  shimmer.unwrap(getActiveChannelPrototype(), 'publish')
-}
-
-class DCBlockingError extends Error {
-  get name () {
-    return this.constructor.name
-  }
-}
-
-module.exports = {
-  enable,
-  disable,
-  DCBlockingError
-}

package/packages/dd-trace/src/plugins/util/promise.js

@@ -1,31 +0,0 @@
-'use strict'
-
-module.exports = {
-  createWrapThen (tracer, config) {
-    return function wrapThen (then) {
-      return function thenWithTrace (onFulfilled, onRejected, onProgress) {
-        arguments[0] = wrapCallback(tracer, onFulfilled)
-        arguments[1] = wrapCallback(tracer, onRejected)
-
-        // not standard but sometimes supported
-        if (onProgress) {
-          arguments[2] = wrapCallback(tracer, onProgress)
-        }
-
-        return then.apply(this, arguments)
-      }
-    }
-  }
-}
-
-function wrapCallback (tracer, callback) {
-  if (typeof callback !== 'function') return callback
-
-  const span = tracer.scope().active()
-
-  return function () {
-    return tracer.scope().activate(span, () => {
-      return callback.apply(this, arguments)
-    })
-  }
-}

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

@@ -1,91 +0,0 @@
-'use strict'
-
-// TODO: use sourceRoot when set, possibly from source-map-resolve
-
-const fs = require('fs')
-const { SourceMapConsumer } = require('source-map')
-const sourceMapResolve = require('source-map-resolve')
-const { fileURLToPath, pathToFileURL } = require('url')
-
-class SourceMapper {
-  constructor () {
-    this._consumers = Object.create(null)
-    this._sources = Object.create(null)
-  }
-
-  async getSource (callFrame) {
-    const { url, lineNumber, columnNumber, functionName } = callFrame
-    const key = `${url}:${functionName}:${lineNumber}:${columnNumber}`
-
-    if (!this._sources[key]) {
-      this._sources[key] = await this._getMapping(callFrame)
-    }
-
-    return this._sources[key]
-  }
-
-  async _getConsumer (url) {
-    if (this._consumers[url] === undefined) {
-      this._consumers[url] = this._createConsumer(url)
-    }
-
-    return this._consumers[url]
-  }
-
-  async _createConsumer (url) {
-    try {
-      const map = await this._resolve(url)
-
-      return map ? new SourceMapConsumer(map) : null
-    } catch (e) {
-      return null
-    }
-  }
-
-  async _getMapping (callFrame) {
-    const { url, functionName, lineNumber, columnNumber } = callFrame
-
-    // Runtime.CallFrame is 0-based for both line and column numbers.
-    // When the line or column number is not known the value is -1.
-    // https://chromedevtools.github.io/devtools-protocol/v8/Runtime/#type-CallFrame
-    if (lineNumber < 0 || columnNumber < 0) return callFrame
-
-    const consumer = await this._getConsumer(url)
-
-    if (!consumer) return callFrame
-
-    // SourceMapConsumer is 1-based for lines and 0-based for columns
-    // https://github.com/mozilla/source-map/blob/0.7.3/lib/source-map-consumer.js#L464-L487
-    const map = consumer.originalPositionFor({
-      line: lineNumber + 1,
-      column: columnNumber
-    })
-
-    if (!map || !map.source || !map.line) return callFrame
-
-    return {
-      url: pathToFileURL(map.source).href,
-      lineNumber: map.line - 1, // reset to 0-based from 1-based
-      columnNumber: map.column !== null ? map.column : -1,
-      functionName: map.name || functionName
-    }
-  }
-
-  async _resolve (url) {
-    const filename = fileURLToPath(url)
-    const code = (await fs.promises.readFile(filename)).toString()
-
-    return new Promise((resolve, reject) => {
-      sourceMapResolve.resolve(code, filename, fs.readFile, (error, result) => {
-        if (!result || error) return resolve(null)
-
-        result.map.sourcesContent = result.sourcesContent
-        result.map.sources = result.sourcesResolved
-
-        resolve(result.map)
-      })
-    })
-  }
-}
-
-module.exports = { SourceMapper }

package/packages/dd-trace/src/scope/noop/scope_manager.js

@@ -1,28 +0,0 @@
-'use strict'
-
-const Span = require('opentracing').Span
-const Scope = require('./scope')
-
-let singleton = null
-
-const span = new Span()
-
-class ScopeManager {
-  constructor () {
-    if (!singleton) {
-      singleton = this
-    }
-
-    return singleton
-  }
-
-  active () {
-    return new Scope(span)
-  }
-
-  activate (span, finishSpanOnClose) {
-    return new Scope(span, finishSpanOnClose)
-  }
-}
-
-module.exports = ScopeManager