Skip to content
Merged
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
"import-in-the-middle": "^2.0.6"
},
"optionalDependencies": {
"@datadog/libdatadog": "0.7.0",
"@datadog/libdatadog": "0.8.1",
"@datadog/native-appsec": "11.0.1",
"@datadog/native-iast-taint-tracking": "4.1.0",
"@datadog/native-metrics": "3.1.1",
Expand Down
13 changes: 10 additions & 3 deletions packages/dd-trace/src/crashtracking/crashtracker.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ class Crashtracker {
#getConfig (config) {
const url = getAgentUrl(config)

// Out-of-process symbolication currently (crashtracker 27.0.0) works on
// Linux only, does not work on Mac.
const resolveMode = require('os').platform === 'linux'
? 'EnabledWithSymbolsInReceiver'
: 'EnabledWithInprocessSymbols'

return {
additional_files: [],
create_alt_stack: true,
Expand All @@ -67,9 +73,10 @@ class Crashtracker {
},
timeout_ms: 3000,
},
timeout_ms: 5000,
// TODO: Use `EnabledWithSymbolsInReceiver` instead for Linux when fixed.
resolve_frames: 'EnabledWithInprocessSymbols',
timeout: { secs: 5, nanos: 0 },
demangle_names: false,
signals: [],
resolve_frames: resolveMode,
}
}

Expand Down
6 changes: 3 additions & 3 deletions packages/dd-trace/test/crashtracking/crashtracker.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ describeNotWindows('crashtracker', () => {
error: sinon.stub(),
}

sinon.spy(binding, 'init')
sinon.spy(binding, 'updateConfig')
sinon.spy(binding, 'updateMetadata')
sinon.stub(binding, 'init')
sinon.stub(binding, 'updateConfig')
sinon.stub(binding, 'updateMetadata')

crashtracker = proxyquire('../../src/crashtracking/crashtracker', {
'../log': log,
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@
dependencies:
spark-md5 "^3.0.2"

"@datadog/libdatadog@0.7.0":
version "0.7.0"
resolved "https://registry.yarnpkg.com/@datadog/libdatadog/-/libdatadog-0.7.0.tgz#81e07d3040c628892db697ccd01ae3c4d2a76315"
integrity sha512-VVZLspzQcfEU47gmGCVoRkngn7RgFRR4CHjw4YaX8eWT+xz4Q4l6PvA45b7CMk9nlt3MNN5MtGdYttYMIpo6Sg==
"@datadog/libdatadog@0.8.1":
version "0.8.1"
resolved "https://registry.yarnpkg.com/@datadog/libdatadog/-/libdatadog-0.8.1.tgz#370c7aaf03102399740dcdee52c118da41847c1f"
integrity sha512-WeWPw24cVRmEWfRRw3+h4k7f8mf9vbWEq6MYg1eOd+FycG7q4LaV8/uKROWoKFoD6ScoNvZXxOjKHW3AdYgM+A==

"@datadog/native-appsec@11.0.1":
version "11.0.1"
Expand Down
Loading