[profiling] Adapt to new pprof-nodejs API

package.json

@@ -70,7 +70,7 @@
     "@datadog/native-iast-rewriter": "2.0.1",
     "@datadog/native-iast-taint-tracking": "^1.5.0",
     "@datadog/native-metrics": "^2.0.0",
-    "@datadog/pprof": "2.2.3",
+    "@datadog/pprof": "3.0.0",
     "@datadog/sketches-js": "^2.1.0",
     "@opentelemetry/api": "^1.0.0",
     "@opentelemetry/core": "^1.14.0",

packages/dd-trace/src/profiling/config.js

@@ -7,7 +7,6 @@ const { URL, format, pathToFileURL } = require('url')
 const { AgentExporter } = require('./exporters/agent')
 const { FileExporter } = require('./exporters/file')
 const { ConsoleLogger } = require('./loggers/console')
-const CpuProfiler = require('./profilers/cpu')
 const WallProfiler = require('./profilers/wall')
 const SpaceProfiler = require('./profilers/space')
 const { oomExportStrategies, snapshotKinds } = require('./constants')
@@ -202,8 +201,6 @@ function getProfiler (name, options) {
       return new WallProfiler(options)
     case 'space':
       return new SpaceProfiler(options)
-    case 'cpu-experimental':
-      return new CpuProfiler(options)
     default:
       options.logger.error(`Unknown profiler "${name}"`)
   }

packages/dd-trace/src/profiling/index.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const { Profiler, ServerlessProfiler } = require('./profiler')
-const CpuProfiler = require('./profilers/cpu')
 const WallProfiler = require('./profilers/wall')
 const SpaceProfiler = require('./profilers/space')
 const { AgentExporter } = require('./exporters/agent')
@@ -14,7 +13,6 @@ module.exports = {
   profiler,
   AgentExporter,
   FileExporter,
-  CpuProfiler,
   WallProfiler,
   SpaceProfiler,
   ConsoleLogger

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

@@ -3,12 +3,19 @@
 class NativeWallProfiler {
   constructor (options = {}) {
     this.type = 'wall'
-    this._samplingInterval = options.samplingInterval || 1e6 / 99 // 99hz
+    this._samplingIntervalMicros = options.samplingInterval || 1e6 / 99 // 99hz
+    this._flushIntervalMillis = options.flushInterval || 60 * 1e3 // 60 seconds
+    this._codeHotspotsEnabled = !!options.codeHotspotsEnabled
     this._mapper = undefined
     this._pprof = undefined
+
+    this._logger = options.logger
+    this._started = false
   }
 
   start ({ mapper } = {}) {
+    if (this._started) return
+
     this._mapper = mapper
     this._pprof = require('@datadog/pprof')
 
@@ -20,27 +27,32 @@ class NativeWallProfiler {
       process._stopProfilerIdleNotifier = () => {}
     }
 
-    this._record()
+    this._pprof.time.start({
+      intervalMicros: this._samplingIntervalMicros,
+      durationMillis: this._flushIntervalMillis,
+      sourceMapper: this._mapper,
+      customLabels: this._codeHotspotsEnabled,
+      lineNumbers: false
+    })
+
+    this._started = true
   }
 
   profile () {
-    if (!this._stop) return
-    return this._stop(true)
+    if (!this._started) return
+    return this._pprof.time.stop(true)
   }
 
   encode (profile) {
     return this._pprof.encode(profile)
   }
 
   stop () {
-    if (!this._stop) return
-    this._stop()
-    this._stop = undefined
-  }
+    if (!this._started) return
 
-  _record () {
-    this._stop = this._pprof.time.start(this._samplingInterval, null,
-      this._mapper, false)
+    const profile = this._pprof.time.stop()
+    this._started = false
+    return profile
   }
 }
 

packages/dd-trace/test/profiling/config.spec.js

@@ -7,7 +7,6 @@ const os = require('os')
 const path = require('path')
 const { AgentExporter } = require('../../src/profiling/exporters/agent')
 const { FileExporter } = require('../../src/profiling/exporters/file')
-const CpuProfiler = require('../../src/profiling/profilers/cpu')
 const WallProfiler = require('../../src/profiling/profilers/wall')
 const SpaceProfiler = require('../../src/profiling/profilers/space')
 const { ConsoleLogger } = require('../../src/profiling/loggers/console')
@@ -58,7 +57,7 @@ describe('config', () => {
         error () { }
       },
       exporters: 'agent,file',
-      profilers: 'wall,cpu-experimental',
+      profilers: 'wall',
       url: 'http://localhost:1234/'
     }
 
@@ -79,9 +78,8 @@ describe('config', () => {
     expect(config.exporters[0]._url.toString()).to.equal(options.url)
     expect(config.exporters[1]).to.be.an.instanceof(FileExporter)
     expect(config.profilers).to.be.an('array')
-    expect(config.profilers.length).to.equal(2)
+    expect(config.profilers.length).to.equal(1)
     expect(config.profilers[0]).to.be.an.instanceOf(WallProfiler)
-    expect(config.profilers[1]).to.be.an.instanceOf(CpuProfiler)
   })
 
   it('should filter out invalid profilers', () => {