Skip to content

Bump profiler version to 2.2.3 #3286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 23, 2023
Merged

Bump profiler version to 2.2.3 #3286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b990421
Add DD_PROFILING_DEBUG_SOURCE_MAPS option
nsavoire Jun 23, 2023
45a34b1
Bump profiler version to 2.2.3
nsavoire Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2",
"@datadog/pprof": "2.2.3",
"@datadog/sketches-js": "^2.1.0",
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/core": "^1.14.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/dd-trace/src/profiling/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class Config {
DD_TRACE_AGENT_URL,
DD_AGENT_HOST,
DD_TRACE_AGENT_PORT,
DD_PROFILING_DEBUG_SOURCE_MAPS,
DD_PROFILING_UPLOAD_TIMEOUT,
DD_PROFILING_SOURCE_MAP,
DD_PROFILING_UPLOAD_PERIOD,
Expand Down Expand Up @@ -70,6 +71,7 @@ class Config {
this.flushInterval = flushInterval
this.uploadTimeout = uploadTimeout
this.sourceMap = sourceMap
this.debugSourceMaps = isTrue(coalesce(options.debugSourceMaps, DD_PROFILING_DEBUG_SOURCE_MAPS, false))
this.endpointCollection = endpointCollection
this.pprofPrefix = pprofPrefix

Expand Down
14 changes: 8 additions & 6 deletions packages/dd-trace/src/profiling/profiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ const { EventEmitter } = require('events')
const { Config } = require('./config')
const { snapshotKinds } = require('./constants')

function maybeSourceMap (sourceMap) {
function maybeSourceMap (sourceMap, SourceMapper, debug) {
if (!sourceMap) return
const { SourceMapper } = require('@datadog/pprof')
return SourceMapper.create([
process.cwd()
])
], debug)
}

class Profiler extends EventEmitter {
Expand Down Expand Up @@ -42,12 +41,15 @@ class Profiler extends EventEmitter {
// of the profiler from running without source maps.
let mapper
try {
mapper = await maybeSourceMap(config.sourceMap)
if (mapper) {
const { setLogger, SourceMapper } = require('@datadog/pprof')
setLogger(config.logger)

mapper = await maybeSourceMap(config.sourceMap, SourceMapper, config.debugSourceMaps)
if (config.SourceMap && config.debugSourceMaps) {
this._logger.debug(() => {
return mapper.infoMap.size === 0
? 'Found no source maps'
: `Found source-maps for following files: [${Array.from(mapper.infoMap.keys()).join(', ')}]`
: `Found source maps for following files: [${Array.from(mapper.infoMap.keys()).join(', ')}]`
})
}
} catch (err) {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,10 @@
node-addon-api "^6.1.0"
node-gyp-build "^3.9.0"

"@datadog/[email protected].2":
version "2.2.2"
resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-2.2.2.tgz#5cc8aa2c198bb594bc8ecd85c94adbfac6e75563"
integrity sha512-6FVmgQoYvHVnpnAzfTHRIONJQprEJ6PdrfA3Kn4dfVEXZMH42PBRLSNWe4qoi5AKmr4SoIc6Ay7VAlHb/cDNjA==
"@datadog/[email protected].3":
version "2.2.3"
resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-2.2.3.tgz#a22ca30e386f5aa8559f4b2e297b76c80551c26d"
integrity sha512-cZXvNBBzvTMUx2xOxp49cZJ7/HOF7geVxqeRbveeJUVKwi8ZxmU1rQGcWPFX4iEEtfQu1M3NqbhmNtYsMJdEsQ==
dependencies:
delay "^5.0.0"
node-gyp-build "^3.9.0"
Expand Down