npm - dd-trace - Versions diffs - 2.22.0 → 2.22.1 - Mend

dd-trace 2.22.0 → 2.22.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/index.d.ts +32 -32
package/package.json +1 -1
package/packages/datadog-instrumentations/src/connect.js +15 -15
package/packages/datadog-instrumentations/src/http/server.js +11 -12
package/packages/datadog-instrumentations/src/koa.js +32 -32
package/packages/datadog-instrumentations/src/restify.js +5 -2
package/packages/datadog-instrumentations/src/router.js +22 -22
package/packages/datadog-plugin-http/src/server.js +8 -0
package/packages/datadog-plugin-router/src/index.js +7 -1
package/packages/dd-trace/src/plugins/util/web.js +5 -1
package/packages/dd-trace/src/profiling/config.js +3 -1
package/packages/dd-trace/src/profiling/index.js +2 -2
package/packages/dd-trace/src/profiling/profiler.js +35 -6

package/index.d.ts CHANGED Viewed

@@ -15,7 +15,7 @@ export declare interface Tracer extends opentracing.Tracer {
    * @param {SpanOptions} [options] Options for the newly created span.
    * @returns {Span} A new Span object.
    */
-  startSpan(name: string, options?: SpanOptions): Span;
+  startSpan (name: string, options?: SpanOptions): Span;
   /**
    * Injects the given SpanContext instance for cross-process propagation
@@ -27,7 +27,7 @@ export declare interface Tracer extends opentracing.Tracer {
    * @param  {string} format The format of the carrier.
    * @param  {any} carrier The carrier object.
    */
-  inject(spanContext: SpanContext | Span, format: string, carrier: any): void;
+  inject (spanContext: SpanContext | Span, format: string, carrier: any): void;
   /**
    * Returns a SpanContext instance extracted from `carrier` in the given
@@ -38,31 +38,31 @@ export declare interface Tracer extends opentracing.Tracer {
    *         The extracted SpanContext, or null if no such SpanContext could
    *         be found in `carrier`
    */
-  extract(format: string, carrier: any): SpanContext | null;
+  extract (format: string, carrier: any): SpanContext | null;
   /**
    * Initializes the tracer. This should be called before importing other libraries.
    */
-  init(options?: TracerOptions): this;
+  init (options?: TracerOptions): this;
   /**
    * Sets the URL for the trace agent. This should only be called _after_
    * init() is called, only in cases where the URL needs to be set after
    * initialization.
    */
-  setUrl(url: string): this;
+  setUrl (url: string): this;
   /**
    * Enable and optionally configure a plugin.
    * @param plugin The name of a built-in plugin.
    * @param config Configuration options. Can also be `false` to disable the plugin.
    */
-  use<P extends keyof Plugins>(plugin: P, config?: Plugins[P] | boolean): this;
+  use<P extends keyof Plugins> (plugin: P, config?: Plugins[P] | boolean): this;
   /**
    * Returns a reference to the current scope.
    */
-  scope(): Scope;
+  scope (): Scope;
   /**
    * Instruments a function by automatically creating a span activated on its
@@ -81,8 +81,8 @@ export declare interface Tracer extends opentracing.Tracer {
    * If the `orphanable` option is set to false, the function will not be traced
    * unless there is already an active span or `childOf` option.
    */
-  trace<T>(name: string, fn: (span?: Span, fn?: (error?: Error) => any) => T): T;
-  trace<T>(name: string, options: TraceOptions & SpanOptions, fn: (span?: Span, done?: (error?: Error) => string) => T): T;
+  trace<T> (name: string, fn: (span?: Span, fn?: (error?: Error) => any) => T): T;
+  trace<T> (name: string, options: TraceOptions & SpanOptions, fn: (span?: Span, done?: (error?: Error) => string) => T): T;
   /**
    * Wrap a function to automatically create a span activated on its
@@ -98,23 +98,23 @@ export declare interface Tracer extends opentracing.Tracer {
    * * The function doesn't accept a callback and doesn't return a promise, in
    * which case the span will finish at the end of the function execution.
    */
-  wrap<T = (...args: any[]) => any>(name: string, fn: T, requiresParent?: boolean): T;
-  wrap<T = (...args: any[]) => any>(name: string, options: TraceOptions & SpanOptions, fn: T): T;
-  wrap<T = (...args: any[]) => any>(name: string, options: (...args: any[]) => TraceOptions & SpanOptions, fn: T): T;
+  wrap<T = (...args: any[]) => any> (name: string, fn: T, requiresParent?: boolean): T;
+  wrap<T = (...args: any[]) => any> (name: string, options: TraceOptions & SpanOptions, fn: T): T;
+  wrap<T = (...args: any[]) => any> (name: string, options: (...args: any[]) => TraceOptions & SpanOptions, fn: T): T;
   /**
    * Create and return a string that can be included in the <head> of a
    * document to enable RUM tracing to include it. The resulting string
    * should not be cached.
    */
-  getRumData(): string;
+  getRumData (): string;
   /**
    * Links an authenticated user to the current trace.
    * @param {User} user Properties of the authenticated user. Accepts custom fields.
    * @returns {Tracer} The Tracer instance for chaining.
    */
-  setUser(user: User): Tracer;
+  setUser (user: User): Tracer;
 }
 export declare interface TraceOptions extends Analyzable {
@@ -144,7 +144,7 @@ export declare interface TraceOptions extends Analyzable {
  * have children.
  */
 export declare interface Span extends opentracing.Span {
-  context(): SpanContext;
+  context (): SpanContext;
 }
 /**
@@ -161,17 +161,17 @@ export declare interface SpanContext extends opentracing.SpanContext {
   /**
    * Returns the string representation of the internal trace ID.
    */
-  toTraceId(): string;
+  toTraceId (): string;
   /**
    * Returns the string representation of the internal span ID.
    */
-  toSpanId(): string;
+  toSpanId (): string;
   /**
    * Returns the string representation used for DBM integration.
    */
-  toTraceparent(): string;
+  toTraceparent (): string;
 }
 /**
@@ -329,7 +329,7 @@ export declare interface TracerOptions {
    *  Number of spans before partially exporting a trace. This prevents keeping all the spans in memory for very large traces.
    * @default 1000
    */
-   flushMinSpans?: number;
+  flushMinSpans?: number;
   /**
    * Whether to enable runtime metrics.
@@ -382,10 +382,10 @@ export declare interface TracerOptions {
     runtimeId?: boolean
     /**
-     * Whether to write traces to log output, rather than send to an agent
+     * Whether to write traces to log output or agentless, rather than send to an agent
      * @default false
      */
-    exporter?: 'log' | 'agent'
+    exporter?: 'log' | 'agent' | 'datadog'
     /**
      * Whether to enable the experimental `getRumData` method.
@@ -396,7 +396,7 @@ export declare interface TracerOptions {
     /**
      * Configuration of the IAST. Can be a boolean as an alias to `iast.enabled`.
      */
-    iast?: boolean  | {
+    iast?: boolean | {
       /**
        * Whether to enable IAST.
        * @default false
@@ -516,7 +516,7 @@ export declare interface TracerOptions {
 /**
  * User object that can be passed to `tracer.setUser()`.
  */
- export declare interface User {
+export declare interface User {
   /**
    * Unique identifier of the user.
    * Mandatory.
@@ -588,7 +588,7 @@ export declare interface Scope {
    *
    * @returns {Span} The active span.
    */
-  active(): Span | null;
+  active (): Span | null;
   /**
    * Activate a span in the scope of a function.
@@ -597,7 +597,7 @@ export declare interface Scope {
    * @param {Function} fn Function that will have the span activated on its scope.
    * @returns The return value of the provided function.
    */
-  activate<T>(span: Span, fn: ((...args: any[]) => T)): T;
+  activate<T> (span: Span, fn: ((...args: any[]) => T)): T;
   /**
    * Binds a target to the provided span, or the active span if omitted.
@@ -606,9 +606,9 @@ export declare interface Scope {
    * @param {Span} [span=scope.active()] The span to activate.
    * @returns The bound target.
    */
-  bind<T extends (...args: any[]) => void>(fn: T, span?: Span | null): T;
-  bind<V, T extends (...args: any[]) => V>(fn: T, span?: Span | null): T;
-  bind<T>(fn: Promise<T>, span?: Span | null): Promise<T>;
+  bind<T extends (...args: any[]) => void> (fn: T, span?: Span | null): T;
+  bind<V, T extends (...args: any[]) => V> (fn: T, span?: Span | null): T;
+  bind<T> (fn: Promise<T>, span?: Span | null): Promise<T>;
   bind(emitter: EventEmitter, span?: Span | null): EventEmitter;
 }
@@ -1229,7 +1229,7 @@ declare namespace plugins {
    * This plugin automatically instruments the
    * [mariadb](https://github.com/mariadb-corporation/mariadb-connector-nodejs) module.
    */
-   interface mariadb extends mysql {}
+  interface mariadb extends mysql {}
   /**
    * This plugin automatically instruments the
@@ -1253,7 +1253,7 @@ declare namespace plugins {
    * This plugin automatically instruments the
    * [moleculer](https://moleculer.services/) module.
    */
-   interface moleculer extends Moleculer {
+  interface moleculer extends Moleculer {
     /**
      * Configuration for Moleculer clients. Set to false to disable client
      * instrumentation.
@@ -1307,7 +1307,7 @@ declare namespace plugins {
     /**
      * Hooks to run before spans are finished.
      */
-     hooks?: {
+    hooks?: {
       /**
        * Hook to execute just before the request span finishes.
        */
@@ -1336,7 +1336,7 @@ declare namespace plugins {
    * This plugin automatically instruments the
    * [paperplane](https://github.com/articulate/paperplane) module.
    */
-   interface paperplane extends HttpServer {}
+  interface paperplane extends HttpServer {}
   /**
    * This plugin automatically instruments the

package/package.json CHANGED Viewed

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

package/packages/datadog-instrumentations/src/connect.js CHANGED Viewed

@@ -1,12 +1,13 @@
 'use strict'
 const shimmer = require('../../datadog-shimmer')
-const { addHook, channel, AsyncResource } = require('./helpers/instrument')
+const { addHook, channel } = require('./helpers/instrument')
 const enterChannel = channel('apm:connect:middleware:enter')
 const exitChannel = channel('apm:connect:middleware:exit')
 const errorChannel = channel('apm:connect:middleware:error')
 const nextChannel = channel('apm:connect:middleware:next')
+const finishChannel = channel('apm:connect:middleware:finish')
 const handleChannel = channel('apm:connect:request:handle')
 function wrapConnect (connect) {
@@ -61,7 +62,6 @@ function wrapLayerHandle (layer) {
   return shimmer.wrap(original, function () {
     if (!enterChannel.hasSubscribers) return original.apply(this, arguments)
-    const middlewareResource = new AsyncResource('bound-anonymous-fn')
     const lastIndex = arguments.length - 1
     const name = original._name || original.name
     const req = arguments[arguments.length > 3 ? 1 : 0]
@@ -71,21 +71,21 @@ function wrapLayerHandle (layer) {
       arguments[lastIndex] = wrapNext(req, next)
     }
-    return middlewareResource.runInAsyncScope(() => {
-      const route = layer.route
+    const route = layer.route
-      enterChannel.publish({ name, req, route })
+    enterChannel.publish({ name, req, route })
-      try {
-        return original.apply(this, arguments)
-      } catch (error) {
-        errorChannel.publish({ req, error })
-        nextChannel.publish({ req })
-        exitChannel.publish({ req })
+    try {
+      return original.apply(this, arguments)
+    } catch (error) {
+      errorChannel.publish({ req, error })
+      nextChannel.publish({ req })
+      finishChannel.publish({ req })
-        throw error
-      }
-    })
+      throw error
+    } finally {
+      exitChannel.publish({ req })
+    }
   })
 }
@@ -96,7 +96,7 @@ function wrapNext (req, next) {
     }
     nextChannel.publish({ req })
-    exitChannel.publish({ req })
+    finishChannel.publish({ req })
     next.apply(this, arguments)
   }

package/packages/datadog-instrumentations/src/http/server.js CHANGED Viewed

@@ -2,12 +2,12 @@
 const {
   channel,
-  addHook,
-  AsyncResource
+  addHook
 } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
 const startServerCh = channel('apm:http:server:request:start')
+const exitServerCh = channel('apm:http:server:request:exit')
 const errorServerCh = channel('apm:http:server:request:error')
 const finishServerCh = channel('apm:http:server:request:finish')
@@ -45,18 +45,17 @@ function wrapEmit (emit) {
     if (eventName === 'request') {
       res.req = req
-      const asyncResource = new AsyncResource('bound-anonymous-fn')
-      return asyncResource.runInAsyncScope(() => {
-        startServerCh.publish({ req, res })
+      startServerCh.publish({ req, res })
-        try {
-          return emit.apply(this, arguments)
-        } catch (err) {
-          errorServerCh.publish(err)
+      try {
+        return emit.apply(this, arguments)
+      } catch (err) {
+        errorServerCh.publish(err)
-          throw err
-        }
-      })
+        throw err
+      } finally {
+        exitServerCh.publish({ req })
+      }
     }
     return emit.apply(this, arguments)
   }

package/packages/datadog-instrumentations/src/koa.js CHANGED Viewed

@@ -1,12 +1,13 @@
 'use strict'
 const shimmer = require('../../datadog-shimmer')
-const { addHook, channel, AsyncResource } = require('./helpers/instrument')
+const { addHook, channel } = require('./helpers/instrument')
 const enterChannel = channel('apm:koa:middleware:enter')
 const exitChannel = channel('apm:koa:middleware:exit')
 const errorChannel = channel('apm:koa:middleware:error')
 const nextChannel = channel('apm:koa:middleware:next')
+const finishChannel = channel('apm:koa:middleware:finish')
 const handleChannel = channel('apm:koa:request:handle')
 const routeChannel = channel('apm:koa:request:route')
@@ -86,42 +87,41 @@ function wrapMiddleware (fn, layer) {
   return function (ctx, next) {
     if (!ctx || !enterChannel.hasSubscribers) return fn.apply(this, arguments)
-    const middlewareResource = new AsyncResource('bound-anonymous-fn')
     const req = ctx.req
-    return middlewareResource.runInAsyncScope(() => {
-      const path = layer && layer.path
-      const route = typeof path === 'string' && !path.endsWith('(.*)') && !path.endsWith('([^/]*)') && path
+    const path = layer && layer.path
+    const route = typeof path === 'string' && !path.endsWith('(.*)') && !path.endsWith('([^/]*)') && path
-      enterChannel.publish({ req, name, route })
+    enterChannel.publish({ req, name, route })
-      if (typeof next === 'function') {
-        arguments[1] = wrapNext(req, next)
-      }
+    if (typeof next === 'function') {
+      arguments[1] = wrapNext(req, next)
+    }
-      try {
-        const result = fn.apply(this, arguments)
-        if (result && typeof result.then === 'function') {
-          return result.then(
-            result => {
-              fulfill(ctx)
-              return result
-            },
-            err => {
-              fulfill(ctx, err)
-              throw err
-            }
-          )
-        } else {
-          fulfill(ctx)
-          return result
-        }
-      } catch (e) {
-        fulfill(ctx, e)
-        throw e
+    try {
+      const result = fn.apply(this, arguments)
+      if (result && typeof result.then === 'function') {
+        return result.then(
+          result => {
+            fulfill(ctx)
+            return result
+          },
+          err => {
+            fulfill(ctx, err)
+            throw err
+          }
+        )
+      } else {
+        fulfill(ctx)
+        return result
       }
-    })
+    } catch (e) {
+      fulfill(ctx, e)
+      throw e
+    } finally {
+      exitChannel.publish({ req })
+    }
   }
 }
@@ -138,7 +138,7 @@ function fulfill (ctx, error) {
     routeChannel.publish({ req, route })
   }
-  exitChannel.publish({ req })
+  finishChannel.publish({ req })
 }
 function wrapNext (req, next) {

package/packages/datadog-instrumentations/src/restify.js CHANGED Viewed

@@ -9,6 +9,7 @@ const handleChannel = channel('apm:restify:request:handle')
 const errorChannel = channel('apm:restify:middleware:error')
 const enterChannel = channel('apm:restify:middleware:enter')
 const exitChannel = channel('apm:restify:middleware:exit')
+const finishChannel = channel('apm:restify:middleware:finish')
 const nextChannel = channel('apm:restify:middleware:next')
 function wrapSetupRequest (setupRequest) {
@@ -53,8 +54,10 @@ function wrapFn (fn) {
     } catch (error) {
       errorChannel.publish({ req, error })
       nextChannel.publish({ req })
-      exitChannel.publish({ req })
+      finishChannel.publish({ req })
       throw error
+    } finally {
+      exitChannel.publish({ req })
     }
   }
 }
@@ -62,7 +65,7 @@ function wrapFn (fn) {
 function wrapNext (req, next) {
   return function () {
     nextChannel.publish({ req })
-    exitChannel.publish({ req })
+    finishChannel.publish({ req })
     next.apply(this, arguments)
   }

package/packages/datadog-instrumentations/src/router.js CHANGED Viewed

@@ -3,11 +3,12 @@
 const METHODS = require('methods').concat('all')
 const pathToRegExp = require('path-to-regexp')
 const shimmer = require('../../datadog-shimmer')
-const { addHook, channel, AsyncResource } = require('./helpers/instrument')
+const { addHook, channel } = require('./helpers/instrument')
 function createWrapRouterMethod (name) {
   const enterChannel = channel(`apm:${name}:middleware:enter`)
   const exitChannel = channel(`apm:${name}:middleware:exit`)
+  const finishChannel = channel(`apm:${name}:middleware:finish`)
   const errorChannel = channel(`apm:${name}:middleware:error`)
   const nextChannel = channel(`apm:${name}:middleware:next`)
@@ -21,7 +22,6 @@ function createWrapRouterMethod (name) {
       if (!enterChannel.hasSubscribers) return original.apply(this, arguments)
       const matchers = layerMatchers.get(layer)
-      const middlewareResource = new AsyncResource('bound-anonymous-fn')
       const lastIndex = arguments.length - 1
       const name = original._name || original.name
       const req = arguments[arguments.length > 3 ? 1 : 0]
@@ -31,32 +31,32 @@ function createWrapRouterMethod (name) {
         arguments[lastIndex] = wrapNext(req, next)
       }
-      return middlewareResource.runInAsyncScope(() => {
-        let route
+      let route
-        if (matchers) {
-          // Try to guess which path actually matched
-          for (let i = 0; i < matchers.length; i++) {
-            if (matchers[i].test(layer)) {
-              route = matchers[i].path
+      if (matchers) {
+        // Try to guess which path actually matched
+        for (let i = 0; i < matchers.length; i++) {
+          if (matchers[i].test(layer)) {
+            route = matchers[i].path
-              break
-            }
+            break
           }
         }
+      }
-        enterChannel.publish({ name, req, route })
+      enterChannel.publish({ name, req, route })
-        try {
-          return original.apply(this, arguments)
-        } catch (error) {
-          errorChannel.publish({ req, error })
-          nextChannel.publish({ req })
-          exitChannel.publish({ req })
+      try {
+        return original.apply(this, arguments)
+      } catch (error) {
+        errorChannel.publish({ req, error })
+        nextChannel.publish({ req })
+        finishChannel.publish({ req })
-          throw error
-        }
-      })
+        throw error
+      } finally {
+        exitChannel.publish({ req })
+      }
     })
     // This is a workaround for the `loopback` library so that it can find the correct express layer
@@ -95,7 +95,7 @@ function createWrapRouterMethod (name) {
       }
       nextChannel.publish({ req })
-      exitChannel.publish({ req })
+      finishChannel.publish({ req })
       next.apply(this, arguments)
     }

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

@@ -14,12 +14,15 @@ class HttpServerPlugin extends Plugin {
   constructor (...args) {
     super(...args)
+    this._parentStore = undefined
     this.addSub('apm:http:server:request:start', ({ req, res }) => {
       const store = storage.getStore()
       const span = web.startSpan(this.tracer, this.config, req, res, 'http.request')
       span.setTag(COMPONENT, this.constructor.name)
+      this._parentStore = store
       this.enter(span, { ...store, req })
       const context = web.getContext(req)
@@ -38,6 +41,11 @@ class HttpServerPlugin extends Plugin {
       web.addError(error)
     })
+    this.addSub('apm:http:server:request:exit', ({ req }) => {
+      this.enter(this._parentStore)
+      this._parentStore = undefined
+    })
     this.addSub('apm:http:server:request:finish', ({ req }) => {
       const context = web.getContext(req)

package/packages/datadog-plugin-router/src/index.js CHANGED Viewed

@@ -14,6 +14,7 @@ class RouterPlugin extends WebPlugin {
   constructor (...args) {
     super(...args)
+    this._storeStack = []
     this._contexts = new WeakMap()
     this.addSub(`apm:${this.constructor.name}:middleware:enter`, ({ req, name, route }) => {
@@ -28,6 +29,7 @@ class RouterPlugin extends WebPlugin {
         context.middleware.push(span)
       }
+      this._storeStack.push(storage.getStore())
       this.enter(span)
       web.patch(req)
@@ -42,7 +44,7 @@ class RouterPlugin extends WebPlugin {
       context.stack.pop()
     })
-    this.addSub(`apm:${this.constructor.name}:middleware:exit`, ({ req }) => {
+    this.addSub(`apm:${this.constructor.name}:middleware:finish`, ({ req }) => {
       const context = this._contexts.get(req)
       if (!context || context.middleware.length === 0) return
@@ -50,6 +52,10 @@ class RouterPlugin extends WebPlugin {
       context.middleware.pop().finish()
     })
+    this.addSub(`apm:${this.constructor.name}:middleware:exit`, ({ req }) => {
+      this.enter(this._storeStack.pop())
+    })
     this.addSub(`apm:${this.constructor.name}:middleware:error`, ({ req, error }) => {
       web.addError(req, error)

package/packages/dd-trace/src/plugins/util/web.js CHANGED Viewed

@@ -265,7 +265,11 @@ const web = {
   // Extract the parent span from the headers and start a new span as its child
   startChildSpan (tracer, name, headers) {
-    const childOf = tracer.scope().active() || tracer.extract(FORMAT_HTTP_HEADERS, headers)
+    const activeSpan = tracer.scope().active()
+    const spanContext = activeSpan && activeSpan.context()
+    const isLambda = spanContext && spanContext._name === 'aws.lambda'
+    const childOf = (isLambda && activeSpan) || tracer.extract(FORMAT_HTTP_HEADERS, headers)
     const span = tracer.startSpan(name, { childOf })

package/packages/dd-trace/src/profiling/config.js CHANGED Viewed

@@ -33,6 +33,7 @@ class Config {
     const service = options.service || DD_SERVICE || 'node'
     const host = os.hostname()
     const version = coalesce(options.version, DD_VERSION)
+    const functionname = process.env.AWS_LAMBDA_FUNCTION_NAME
     // Must be longer than one minute so pad with five seconds
     const flushInterval = coalesce(options.interval, 65 * 1000)
     const uploadTimeout = coalesce(options.uploadTimeout,
@@ -46,12 +47,13 @@ class Config {
     this.service = service
     this.env = env
     this.host = host
+    this.functionname = functionname
     this.version = version
     this.tags = Object.assign(
       tagger.parse(DD_TAGS),
       tagger.parse(options.tags),
-      tagger.parse({ env, host, service, version })
+      tagger.parse({ env, host, service, version, functionname })
     )
     this.logger = ensureLogger(options.logger)
     this.flushInterval = flushInterval

package/packages/dd-trace/src/profiling/index.js CHANGED Viewed

@@ -1,6 +1,6 @@
 'use strict'
-const { Profiler } = require('./profiler')
+const { Profiler, ServerlessProfiler } = require('./profiler')
 const CpuProfiler = require('./profilers/cpu')
 const WallProfiler = require('./profilers/wall')
 const SpaceProfiler = require('./profilers/space')
@@ -8,7 +8,7 @@ const { AgentExporter } = require('./exporters/agent')
 const { FileExporter } = require('./exporters/file')
 const { ConsoleLogger } = require('./loggers/console')
-const profiler = new Profiler()
+const profiler = process.env.AWS_LAMBDA_FUNCTION_NAME ? new ServerlessProfiler() : new Profiler()
 module.exports = {
   profiler,

package/packages/dd-trace/src/profiling/profiler.js CHANGED Viewed

@@ -5,7 +5,6 @@ const { Config } = require('./config')
 function maybeSourceMap (sourceMap) {
   if (!sourceMap) return
   const { SourceMapper } = require('@datadog/pprof')
   return SourceMapper.create([
     process.cwd()
@@ -20,6 +19,7 @@ class Profiler extends EventEmitter {
     this._config = undefined
     this._timer = undefined
     this._lastStart = undefined
+    this._timeoutInterval = undefined
   }
   start (options) {
@@ -35,6 +35,7 @@ class Profiler extends EventEmitter {
     this._logger = config.logger
     this._enabled = true
+    this._setInterval()
     // Log errors if the source map finder fails, but don't prevent the rest
     // of the profiler from running without source maps.
@@ -52,13 +53,17 @@ class Profiler extends EventEmitter {
         this._logger.debug(`Started ${profiler.type} profiler`)
       }
-      this._capture(config.flushInterval)
+      this._capture(this._timeoutInterval)
     } catch (e) {
       this._logger.error(e)
       this.stop()
     }
   }
+  _setInterval () {
+    this._timeoutInterval = this._config.flushInterval
+  }
   stop () {
     if (!this._enabled) return
@@ -78,8 +83,7 @@ class Profiler extends EventEmitter {
   _capture (timeout) {
     if (!this._enabled) return
     this._lastStart = new Date()
-    if (!this._timer || timeout !== this._config.flushInterval) {
+    if (!this._timer || timeout !== this._timeoutInterval) {
       this._timer = setTimeout(() => this._collect(), timeout)
       this._timer.unref()
     } else {
@@ -106,7 +110,7 @@ class Profiler extends EventEmitter {
         })
       }
-      this._capture(this._config.flushInterval)
+      this._capture(this._timeoutInterval)
       await this._submit(profiles, start, end)
       this._logger.debug('Submitted profiles')
     } catch (err) {
@@ -133,4 +137,29 @@ class Profiler extends EventEmitter {
   }
 }
-module.exports = { Profiler }
+class ServerlessProfiler extends Profiler {
+  constructor () {
+    super()
+    this._profiledIntervals = 0
+    this._interval = 1
+    this._flushAfterIntervals = undefined
+  }
+  _setInterval () {
+    this._timeoutInterval = this._interval * 1000
+    this._flushAfterIntervals = this._config.flushInterval / 1000
+  }
+  async _collect () {
+    if (this._profiledIntervals >= this._flushAfterIntervals) {
+      this._profiledIntervals = 0
+      await super._collect()
+    } else {
+      this._profiledIntervals += 1
+      this._capture(this._timeoutInterval)
+      // Don't submit profile until 65 (flushAfterIntervals) intervals have elapsed
+    }
+  }
+}
+module.exports = { Profiler, ServerlessProfiler }