Skip to content

Commit 14da053

Browse files
astuyvehelen278
andauthored
[breaking] Upgrade to dd-trace-js version 3.x (#375)
* feat: dd-trace-3.x * feat: Update snapshots * feat: Bump layer limit by 1mb * feat: docs --------- Co-authored-by: helen278 <[email protected]>
1 parent def89b9 commit 14da053

File tree

4 files changed

+35
-38
lines changed

4 files changed

+35
-38
lines changed

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,12 @@ The 6.x.x release introduces support for the node 16 runtime and esm modules.
3838

3939
The 7.x.x release drops support for Node12, and upgrades dd-trace-js to version 3.x
4040

41-
#### Breaking Changes
42-
If you are using node 12 and installing the NPM module instead of the layer, redirecting your handler to the path `node_modules/datadog-lambda-js/dist/handler.handler` will no longer work. The path should be updated to `node_modules/datadog-lambda-js/dist/handler.handler.cjs`. This won't affect users of node 14, 16, or users of node 12 with the lambda layer.
41+
There is a full migration guide available [here](https://github.com/DataDog/dd-trace-js/blob/master/MIGRATING.md).
42+
Some changes are more likely to impact Serverless users:
43+
- `HTTP Operation Name Changed`. HTTP requests will no longer appear as a separate client under `*-http-client`, which polluted the APM service catalog.
44+
- `tracer.currentSpan()` has been deprecated for a long time, and is now removed.
45+
- `tracer.bindEmitter()` is similarly removed after being deprecated.
46+
- It is no longer possible to [bind promises or event emitters with tracer.scope().bind(...)](https://github.com/DataDog/dd-trace-js/blob/master/MIGRATING.md#scope-binding-for-promises-and-event-emitters)
4347

4448
## Opening Issues
4549

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@types/node": "^15.6.1",
2626
"@types/promise-retry": "^1.1.3",
2727
"@types/shimmer": "^1.0.1",
28-
"dd-trace": "^2.30.1",
28+
"dd-trace": "^3.17.0",
2929
"jest": "^27.0.1",
3030
"mock-fs": "4.14.0",
3131
"nock": "13.0.11",

scripts/check_layer_size.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
# Compares layer size to threshold, and fails if below that threshold
99

10-
# 6 mb size limit
11-
MAX_LAYER_COMPRESSED_SIZE_KB=$(expr 6 \* 1024)
10+
# 7 mb size limit
11+
MAX_LAYER_COMPRESSED_SIZE_KB=$(expr 7 \* 1024)
1212
MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 18 \* 1024)
1313

1414

yarn.lock

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -299,17 +299,17 @@
299299
dependencies:
300300
node-gyp-build "^3.9.0"
301301

302-
"@datadog/native-iast-rewriter@1.1.2":
303-
version "1.1.2"
304-
resolved "https://registry.yarnpkg.com/@datadog/native-iast-rewriter/-/native-iast-rewriter-1.1.2.tgz#793cbf92d218ec80d645be0830023656b81018ea"
305-
integrity sha512-pigRfRtAjZjMjqIXyXb98S4aDnuHz/EmqpoxAajFZsNjBLM87YonwSY5zoBdCsOyA46ddKOJRoCQd5ZalpOFMQ==
302+
"@datadog/native-iast-rewriter@2.0.1":
303+
version "2.0.1"
304+
resolved "https://registry.yarnpkg.com/@datadog/native-iast-rewriter/-/native-iast-rewriter-2.0.1.tgz#dc4a23796870f2d840053ae879c61547eda6bb89"
305+
integrity sha512-Mm+FG3XxEbPrAfJQPOMHts7iZZXRvg9gnGeeFRGkyirmRcQcOpZO4wFe/8K61DUVa5pXpgAJQ2ZkBGYF1O9STg==
306306
dependencies:
307307
node-gyp-build "^4.5.0"
308308

309-
"@datadog/[email protected].0":
310-
version "1.1.0"
311-
resolved "https://registry.yarnpkg.com/@datadog/native-iast-taint-tracking/-/native-iast-taint-tracking-1.1.0.tgz#8f7d0016157b32dbf5c01b15b8afb1c4286b4a18"
312-
integrity sha512-TOrngpt6Qh52zWFOz1CkFXw0g43rnuUziFBtIMUsOLGzSHr9wdnTnE6HAyuvKy3f3ecAoZESlMfilGRKP93hXQ==
309+
"@datadog/[email protected].1":
310+
version "1.1.1"
311+
resolved "https://registry.yarnpkg.com/@datadog/native-iast-taint-tracking/-/native-iast-taint-tracking-1.1.1.tgz#cbeace022b6c1f3a0a40dc0000cc40079c6d4895"
312+
integrity sha512-VkESVYpVlLHqw38UHqqEYsJaJTp3+JpKIJhfB9nlQO13dYBc3Sgq/QJZNdPViU73SVsCJtuw4D0SXRyjTXP1IA==
313313
dependencies:
314314
node-gyp-build "^3.9.0"
315315

@@ -320,17 +320,16 @@
320320
dependencies:
321321
node-gyp-build "^3.9.0"
322322

323-
"@datadog/pprof@^1.1.1":
324-
version "1.1.1"
325-
resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-1.1.1.tgz#17e86035140523ac3a96f3662e5dd29822042d61"
326-
integrity sha512-5lYXUpikQhrJwzODtJ7aFM0oKmPccISnTCecuWhjxIj4/7UJv0DamkLak634bgEW+kiChgkKFDapHSesuXRDXQ==
323+
"@datadog/pprof@^2.1.0":
324+
version "2.1.0"
325+
resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-2.1.0.tgz#acc8a7a2a74442cfd725abc620a5f8505dbe1807"
326+
integrity sha512-nHZ16CuwKfscNF2PKAEPMqdn5AsxHmvurwiFmPd65VoDXKWLX2Ourj/izgL/HJ4Q5LZS/yiV4lsM4d7Xwmw0zQ==
327327
dependencies:
328328
delay "^5.0.0"
329-
findit2 "^2.2.3"
330329
node-gyp-build "^3.9.0"
331330
p-limit "^3.1.0"
332331
pify "^5.0.0"
333-
protobufjs "^7.0.0"
332+
pprof-format "^2.0.6"
334333
source-map "^0.7.3"
335334
split "^1.0.1"
336335

@@ -745,11 +744,6 @@
745744
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.5.tgz#4a13a6445862159303fc38586598a9396fc408b3"
746745
integrity sha512-CRT4tMK/DHYhw1fcCEBwME9CSaZNclxfzVMe7GsO6ULSwsttbj70wSiX6rZdIjGblu93sTJxLdhNIT85KKI7Qw==
747746

748-
"@types/node@<18.13":
749-
version "18.11.19"
750-
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.19.tgz#35e26df9ec441ab99d73e99e9aca82935eea216d"
751-
integrity sha512-YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw==
752-
753747
"@types/node@^15.6.1":
754748
version "15.14.9"
755749
resolved "https://registry.yarnpkg.com/@types/node/-/node-15.14.9.tgz#bc43c990c3c9be7281868bbc7b8fdd6e2b57adfa"
@@ -1219,18 +1213,17 @@ data-urls@^2.0.0:
12191213
whatwg-mimetype "^2.3.0"
12201214
whatwg-url "^8.0.0"
12211215

1222-
dd-trace@^2.27.0:
1223-
version "2.27.1"
1224-
resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-2.27.1.tgz#5d3f66893e126d8d1fa837e4e0a36c06430afab1"
1225-
integrity sha512-TCg17UIkxkphub47jT9BOdIZnHhRT6nzF0BXd4GibI2ZNEQP15WIE4CWFdmXBOkF9Ja83OZj/5gGomYBZKjjwg==
1216+
dd-trace@^3.16.0:
1217+
version "3.16.0"
1218+
resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-3.16.0.tgz#baa76f9cfe047f16a995ace3d515d21d81944ed6"
1219+
integrity sha512-ogRsTotTF/dMzGVrULzEPShCf9MP6aHxNS5LQS0igvx7I/gJof0MTCXNGDhLY8X3KYRczolTkYTcJ3S4siiyGg==
12261220
dependencies:
12271221
"@datadog/native-appsec" "2.0.0"
1228-
"@datadog/native-iast-rewriter" "1.1.2"
1229-
"@datadog/native-iast-taint-tracking" "1.1.0"
1222+
"@datadog/native-iast-rewriter" "2.0.1"
1223+
"@datadog/native-iast-taint-tracking" "1.1.1"
12301224
"@datadog/native-metrics" "^1.5.0"
1231-
"@datadog/pprof" "^1.1.1"
1225+
"@datadog/pprof" "^2.1.0"
12321226
"@datadog/sketches-js" "^2.1.0"
1233-
"@types/node" "<18.13"
12341227
crypto-randomuuid "^1.0.0"
12351228
diagnostics_channel "^1.1.0"
12361229
ignore "^5.2.0"
@@ -1463,11 +1456,6 @@ find-up@^4.0.0, find-up@^4.1.0:
14631456
locate-path "^5.0.0"
14641457
path-exists "^4.0.0"
14651458

1466-
findit2@^2.2.3:
1467-
version "2.2.3"
1468-
resolved "https://registry.yarnpkg.com/findit2/-/findit2-2.2.3.tgz#58a466697df8a6205cdfdbf395536b8bd777a5f6"
1469-
integrity sha512-lg/Moejf4qXovVutL0Lz4IsaPoNYMuxt4PA0nGqFxnJ1CTTGGlEO2wKgoDpwknhvZ8k4Q2F+eesgkLbG2Mxfog==
1470-
14711459
for-each@^0.3.3:
14721460
version "0.3.3"
14731461
resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
@@ -2686,6 +2674,11 @@ pkg-dir@^4.2.0:
26862674
dependencies:
26872675
find-up "^4.0.0"
26882676

2677+
pprof-format@^2.0.6:
2678+
version "2.0.7"
2679+
resolved "https://registry.yarnpkg.com/pprof-format/-/pprof-format-2.0.7.tgz#526e4361f8b37d16b2ec4bb0696b5292de5046a4"
2680+
integrity sha512-1qWaGAzwMpaXJP9opRa23nPnt2Egi7RMNoNBptEE/XwHbcn4fC2b/4U4bKc5arkGkIh2ZabpF2bEb+c5GNHEKA==
2681+
26892682
prelude-ls@~1.1.2:
26902683
version "1.1.2"
26912684
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -2736,7 +2729,7 @@ propagate@^2.0.0:
27362729
resolved "https://registry.yarnpkg.com/propagate/-/propagate-2.0.1.tgz#40cdedab18085c792334e64f0ac17256d38f9a45"
27372730
integrity sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==
27382731

2739-
protobufjs@^7.0.0, protobufjs@^7.1.2:
2732+
protobufjs@^7.1.2:
27402733
version "7.2.2"
27412734
resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.2.tgz#2af401d8c547b9476fb37ffc65782cf302342ca3"
27422735
integrity sha512-++PrQIjrom+bFDPpfmqXfAGSQs40116JRrqqyf53dymUMvvb5d/LMRyicRoF1AUKoXVS1/IgJXlEgcpr4gTF3Q==

0 commit comments

Comments
 (0)