Skip to content

Commit 29344db

Browse files
rochdevrochdev
authored
fix missing pprof dependency (#711)
1 parent 814d7c1 commit 29344db

4 files changed

Lines changed: 50 additions & 24 deletions

File tree

‎Dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,18 @@ RUN cp -rf node_modules/* /nodejs/node_modules
3131
RUN rm -rf /nodejs/node_modules/aws-sdk
3232
RUN rm -rf /nodejs/node_modules/aws-xray-sdk-core/node_modules/aws-sdk
3333

34+
# Remove heavy files from @datadog/pprof which aren't used in a lambda environment
35+
RUN rm -rf /nodejs/node_modules/@datadog/pprof/prebuilds/darwin-arm64
36+
RUN rm -rf /nodejs/node_modules/@datadog/pprof/prebuilds/darwin-x64
37+
RUN rm -rf /nodejs/node_modules/@datadog/pprof/prebuilds/linux-arm
38+
RUN rm -rf /nodejs/node_modules/@datadog/pprof/prebuilds/linuxmusl-arm64
39+
RUN rm -rf /nodejs/node_modules/@datadog/pprof/prebuilds/linuxmusl-x64
40+
RUN rm -rf /nodejs/node_modules/@datadog/pprof/prebuilds/win32-ia32
41+
RUN rm -rf /nodejs/node_modules/@datadog/pprof/prebuilds/win32-x64
42+
RUN rm -rf /nodejs/node_modules/@datadog/pprof/prebuilds/*/node-111.node
43+
RUN rm -rf /nodejs/node_modules/@datadog/pprof/prebuilds/*/node-120.node
44+
RUN rm -rf /nodejs/node_modules/@datadog/pprof/prebuilds/*/node-131.node
45+
RUN rm -rf /nodejs/node_modules/@datadog/pprof/prebuilds/*/node-141.node
46+
3447
FROM scratch
3548
COPY --from=builder /nodejs /

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@
2222
"devDependencies": {
2323
"@aws-sdk/client-kms": "^3.366.0",
2424
"@aws-sdk/client-secrets-manager": "^3.721.0",
25+
"@datadog/pprof": "*",
2526
"@types/aws-lambda": "^8.10.136",
2627
"@types/aws-sdk": "^2.7.0",
2728
"@types/jest": "^27.5.2",
2829
"@types/mock-fs": "4.13.0",
2930
"@types/node": "^20.12.10",
3031
"@types/promise-retry": "^1.1.3",
3132
"@types/shimmer": "^1.0.1",
32-
"dd-trace": "^5.82.0",
33+
"dd-trace": "^5.83.0",
3334
"jest": "^27.0.1",
3435
"mock-fs": "4.14.0",
3536
"nock": "13.5.4",

‎scripts/move_ddtrace_dependency.js‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@
44
// USAGE: ./move_dd_trace_dependency.js "$(cat package.json)" > package.json
55

66
const file = JSON.parse(process.argv[2]);
7-
const ddTraceVersion = file.devDependencies["dd-trace"];
8-
delete file.devDependencies["dd-trace"];
9-
file.dependencies["dd-trace"] = ddTraceVersion;
7+
8+
moveDependency('dd-trace')
9+
moveDependency('@datadog/pprof')
10+
1011
console.log(JSON.stringify(file, null, 2));
12+
13+
function moveDependency (name) {
14+
const ddTraceVersion = file.devDependencies[name];
15+
delete file.devDependencies[name];
16+
file.dependencies[name] = ddTraceVersion;
17+
}

‎yarn.lock‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,10 +1186,10 @@
11861186
"@datadog/flagging-core" "0.2.0"
11871187
"@openfeature/server-sdk" "~1.18.0"
11881188

1189-
"@datadog/pprof@5.13.1":
1190-
version "5.13.1"
1191-
resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-5.13.1.tgz#51c540d75cf4471806db65d0686cbe0a96125ce2"
1192-
integrity sha512-7yXQco1xOUFFEHN3UsRw/55603lQTctHcGx9N7PgkcgLGL8t/i5qKalF0AhOKBsLBUnbQ9Iv+ecC2YJErJ07PQ==
1189+
"@datadog/pprof@*", "@datadog/pprof@5.13.2":
1190+
version "5.13.2"
1191+
resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-5.13.2.tgz#9361809e712417e04c21e7f7ea239bfb3513c358"
1192+
integrity sha512-Th8u7pvoguTfbUx/mlZLHD9TxFCHO+wRAvlEaYFAYAmMvbPLww4YowvTy1UMvpi8LbUbwil3Fo8rKCrilvXHhQ==
11931193
dependencies:
11941194
delay "^5.0.0"
11951195
node-gyp-build "<4.0"
@@ -2339,7 +2339,7 @@ acorn@^7.1.1:
23392339
resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
23402340
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
23412341

2342-
acorn@^8.14.0, acorn@^8.2.4:
2342+
acorn@^8.15.0, acorn@^8.2.4:
23432343
version "8.15.0"
23442344
resolved "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz"
23452345
integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
@@ -2638,11 +2638,16 @@ ci-info@^3.2.0:
26382638
resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz"
26392639
integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
26402640

2641-
cjs-module-lexer@^1.0.0, cjs-module-lexer@^1.2.2:
2641+
cjs-module-lexer@^1.0.0:
26422642
version "1.4.1"
26432643
resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz"
26442644
integrity sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==
26452645

2646+
cjs-module-lexer@^2.2.0:
2647+
version "2.2.0"
2648+
resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-2.2.0.tgz#b3ca5101843389259ade7d88c77bd06ce55849ca"
2649+
integrity sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==
2650+
26462651
cliui@^7.0.2:
26472652
version "7.0.4"
26482653
resolved "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"
@@ -2758,20 +2763,20 @@ dc-polyfill@^0.1.3:
27582763
resolved "https://registry.npmjs.org/dc-polyfill/-/dc-polyfill-0.1.9.tgz"
27592764
integrity sha512-D5mJThEEk9hf+CJPwTf9JFsrWdlWp8Pccjxkhf7uUT/E/cU9Mx3ebWe2Bz2OawRmJ6WS9eaDPBkeBE4uOKq9uw==
27602765

2761-
dd-trace@^5.82.0:
2762-
version "5.82.0"
2763-
resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-5.82.0.tgz#00f3d71b66debf1e5326cdf415c9b039fecf7158"
2764-
integrity sha512-syHzhuQw6USxnAdaNho3BhAz4c3L3Ze79WJXiBAE28WRn6JZuyrYkTKT9+FKvCtK0eyDCx5zCjApohl1BIB0uA==
2766+
dd-trace@^5.83.0:
2767+
version "5.83.0"
2768+
resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-5.83.0.tgz#3f641c512c7f140d2b85cc7709b45aa2cf3f2787"
2769+
integrity sha512-12seR3wGc5Wp+NAHBO6gShCtg8wz0+p+rC6tc3G5MrSgowMqV0XdNqahOHqeM8kMRmSy1OnWRQcK8xjxVfnsew==
27652770
dependencies:
27662771
dc-polyfill "^0.1.10"
2767-
import-in-the-middle "2.0.0"
2772+
import-in-the-middle "2.0.3"
27682773
optionalDependencies:
27692774
"@datadog/libdatadog" "0.7.0"
27702775
"@datadog/native-appsec" "10.3.0"
27712776
"@datadog/native-iast-taint-tracking" "4.1.0"
27722777
"@datadog/native-metrics" "3.1.1"
27732778
"@datadog/openfeature-node-server" "^0.2.0"
2774-
"@datadog/pprof" "5.13.1"
2779+
"@datadog/pprof" "5.13.2"
27752780
"@datadog/wasm-js-rewriter" "5.0.1"
27762781
"@opentelemetry/api" ">=1.0.0 <1.10.0"
27772782
"@opentelemetry/api-logs" "<1.0.0"
@@ -3238,15 +3243,15 @@ ieee754@^1.1.4:
32383243
resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
32393244
integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
32403245

3241-
import-in-the-middle@2.0.0:
3242-
version "2.0.0"
3243-
resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-2.0.0.tgz#295948cee94d0565314824c6bd75379d13e5b1a5"
3244-
integrity sha512-yNZhyQYqXpkT0AKq3F3KLasUSK4fHvebNH5hOsKQw2dhGSALvQ4U0BqUc5suziKvydO5u5hgN2hy1RJaho8U5A==
3246+
import-in-the-middle@2.0.3:
3247+
version "2.0.3"
3248+
resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-2.0.3.tgz#2ba36d716faa3531a7946c4ee52a8e553f6ee0bd"
3249+
integrity sha512-BhJ3Rc6x+kA3EE0apAuGc4rsihsUrEj31lCkXRfwGzLKqgzlSyBLvthIinsvLg6J4bCCTgVAoAgD+KwkISjmBQ==
32453250
dependencies:
3246-
acorn "^8.14.0"
3251+
acorn "^8.15.0"
32473252
acorn-import-attributes "^1.9.5"
3248-
cjs-module-lexer "^1.2.2"
3249-
module-details-from-path "^1.0.3"
3253+
cjs-module-lexer "^2.2.0"
3254+
module-details-from-path "^1.0.4"
32503255

32513256
import-local@^3.0.2:
32523257
version "3.2.0"
@@ -4000,7 +4005,7 @@ mock-fs@4.14.0:
40004005
resolved "https://registry.npmjs.org/mock-fs/-/mock-fs-4.14.0.tgz"
40014006
integrity sha512-qYvlv/exQ4+svI3UOvPUpLDF0OMX5euvUH0Ny4N5QyRyhNdgAgUrVH3iUINSzEPLvx0kbo/Bp28GJKIqvE7URw==
40024007

4003-
module-details-from-path@^1.0.3:
4008+
module-details-from-path@^1.0.3, module-details-from-path@^1.0.4:
40044009
version "1.0.4"
40054010
resolved "https://registry.npmjs.org/module-details-from-path/-/module-details-from-path-1.0.4.tgz"
40064011
integrity sha512-EGWKgxALGMgzvxYF1UyGTy0HXX/2vHLkw6+NvDKW2jypWbHpjQuj4UMcqQWXHERJhVGKikolT06G3bcKe4fi7w==

0 commit comments

Comments
 (0)