Skip to content

Commit d7e644c

Browse files
szegedigyuheon0h
andauthored
Update libdatadog-nodejs to 0.8.1 (#7525)
* Update libdatadog-nodejs to 0.8.1 * Update config * Remove tests that start the CT more than once (not supported anymore) * On advice from crashtracking team, completing this TODO. * CT tests: stub instead of spy * Restore removed tests --------- Co-authored-by: Gyuheon Oh <[email protected]> Co-authored-by: Gyuheon Oh <[email protected]>
1 parent 3f3c150 commit d7e644c

File tree

4 files changed

+18
-11
lines changed

4 files changed

+18
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
"import-in-the-middle": "^2.0.6"
135135
},
136136
"optionalDependencies": {
137-
"@datadog/libdatadog": "0.7.0",
137+
"@datadog/libdatadog": "0.8.1",
138138
"@datadog/native-appsec": "11.0.1",
139139
"@datadog/native-iast-taint-tracking": "4.1.0",
140140
"@datadog/native-metrics": "3.1.1",

packages/dd-trace/src/crashtracking/crashtracker.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ class Crashtracker {
5252
#getConfig (config) {
5353
const url = getAgentUrl(config)
5454

55+
// Out-of-process symbolication currently (crashtracker 27.0.0) works on
56+
// Linux only, does not work on Mac.
57+
const resolveMode = require('os').platform === 'linux'
58+
? 'EnabledWithSymbolsInReceiver'
59+
: 'EnabledWithInprocessSymbols'
60+
5561
return {
5662
additional_files: [],
5763
create_alt_stack: true,
@@ -67,9 +73,10 @@ class Crashtracker {
6773
},
6874
timeout_ms: 3000,
6975
},
70-
timeout_ms: 5000,
71-
// TODO: Use `EnabledWithSymbolsInReceiver` instead for Linux when fixed.
72-
resolve_frames: 'EnabledWithInprocessSymbols',
76+
timeout: { secs: 5, nanos: 0 },
77+
demangle_names: false,
78+
signals: [],
79+
resolve_frames: resolveMode,
7380
}
7481
}
7582

packages/dd-trace/test/crashtracking/crashtracker.spec.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ describeNotWindows('crashtracker', () => {
3232
error: sinon.stub(),
3333
}
3434

35-
sinon.spy(binding, 'init')
36-
sinon.spy(binding, 'updateConfig')
37-
sinon.spy(binding, 'updateMetadata')
35+
sinon.stub(binding, 'init')
36+
sinon.stub(binding, 'updateConfig')
37+
sinon.stub(binding, 'updateMetadata')
3838

3939
crashtracker = proxyquire('../../src/crashtracking/crashtracker', {
4040
'../log': log,

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@
148148
dependencies:
149149
spark-md5 "^3.0.2"
150150

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

156156
"@datadog/[email protected]":
157157
version "11.0.1"

0 commit comments

Comments
 (0)