Skip to content

Commit 9786d83

Browse files
authored
chore(crashtracking): remove guard for arm64 alpine and bump libdatadog to 0.9.3 (#7962)
1 parent 3686699 commit 9786d83

3 files changed

Lines changed: 6 additions & 12 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
"import-in-the-middle": "^3.0.1"
145145
},
146146
"optionalDependencies": {
147-
"@datadog/libdatadog": "0.9.2",
147+
"@datadog/libdatadog": "0.9.3",
148148
"@datadog/native-appsec": "11.0.1",
149149
"@datadog/native-iast-taint-tracking": "4.1.0",
150150
"@datadog/native-metrics": "3.1.1",

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
'use strict'
22

3-
const { existsSync } = require('node:fs')
43
const { isMainThread } = require('worker_threads')
54
const log = require('../log')
65

7-
// libdatadog v29 crashtracker segfaults during init on ARM64 musl (Alpine).
8-
// The segfault bypasses JS try/catch so we must avoid loading it entirely.
9-
// See: https://github.com/DataDog/libdatadog-nodejs/issues/114
10-
const isArm64Musl = process.arch === 'arm64' && existsSync('/etc/alpine-release')
11-
12-
if (isMainThread && !isArm64Musl) {
6+
if (isMainThread) {
137
try {
148
module.exports = require('./crashtracker')
159
} catch (e) {

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@
197197
dependencies:
198198
spark-md5 "^3.0.2"
199199

200-
"@datadog/libdatadog@0.9.2":
201-
version "0.9.2"
202-
resolved "https://registry.yarnpkg.com/@datadog/libdatadog/-/libdatadog-0.9.2.tgz#d7a0193ab656bd9cc40649f300ef6c54d9bea52d"
203-
integrity sha512-grOerTYuU3wHuFIOBGg3jB144A3KEthEdVEL3meeiXYo7E7fBXXGRgAOwVE42VXFXfl0r8kDKCL7KupBc511tg==
200+
"@datadog/libdatadog@0.9.3":
201+
version "0.9.3"
202+
resolved "https://registry.yarnpkg.com/@datadog/libdatadog/-/libdatadog-0.9.3.tgz#c9a26946e1f4a750889594790b3434070997b8fa"
203+
integrity sha512-L+scIlcRRRF0qjeSU3VQLQlqezfQHkDdnOdbmx/gLjPqewKSyqVGp7XRdKXYo2vZTzmG8dH6rPKXwgI68UQufw==
204204

205205
"@datadog/native-appsec@11.0.1":
206206
version "11.0.1"

0 commit comments

Comments
 (0)