Skip to content

Commit 1fad172

Browse files
astuyveastuyve
authored
feat: bump ddtrace to 3.41.0 (#439)
* feat: bump ddtrace to 3.4.1 * feat: add dc-polyfill * feat: Use dc-polyfill instead of dc because of node14 * fix: comment to deprecate * feat: update snapshots
1 parent f05c600 commit 1fad172

13 files changed

+61
-31
lines changed

‎integration_tests/snapshots/logs/process-input-traced_node14.log

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ START
3535
"resource": "GET /{proxy+}",
3636
"error": 0,
3737
"meta": {
38+
"_dd.p.tid": "XXXX",
3839
"_dd.p.dm": "-0",
3940
"service": "remappedApiGatewayServiceName",
4041
"runtime-id":"XXXX",
@@ -204,6 +205,7 @@ START
204205
"resource": "sns-lambda",
205206
"error": 0,
206207
"meta": {
208+
"_dd.p.tid": "XXXX",
207209
"_dd.p.dm": "-0",
208210
"service": "remappedSnsServiceName",
209211
"runtime-id":"XXXX",
@@ -328,6 +330,7 @@ START
328330
"resource": "my-queue",
329331
"error": 0,
330332
"meta": {
333+
"_dd.p.tid": "XXXX",
331334
"_dd.p.dm": "-0",
332335
"service": "remappedSqsServiceName",
333336
"runtime-id":"XXXX",

‎integration_tests/snapshots/logs/process-input-traced_node16.log

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ START
3535
"resource": "GET /{proxy+}",
3636
"error": 0,
3737
"meta": {
38+
"_dd.p.tid": "XXXX",
3839
"_dd.p.dm": "-0",
3940
"service": "remappedApiGatewayServiceName",
4041
"version": "1.0.0",
@@ -209,6 +210,7 @@ START
209210
"resource": "sns-lambda",
210211
"error": 0,
211212
"meta": {
213+
"_dd.p.tid": "XXXX",
212214
"_dd.p.dm": "-0",
213215
"service": "remappedSnsServiceName",
214216
"version": "1.0.0",
@@ -336,6 +338,7 @@ START
336338
"resource": "my-queue",
337339
"error": 0,
338340
"meta": {
341+
"_dd.p.tid": "XXXX",
339342
"_dd.p.dm": "-0",
340343
"service": "remappedSqsServiceName",
341344
"version": "1.0.0",

‎integration_tests/snapshots/logs/process-input-traced_node18.log

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ START
3535
"resource": "GET /{proxy+}",
3636
"error": 0,
3737
"meta": {
38+
"_dd.p.tid": "XXXX",
3839
"_dd.p.dm": "-0",
3940
"service": "remappedApiGatewayServiceName",
4041
"version": "1.0.0",
@@ -209,6 +210,7 @@ START
209210
"resource": "sns-lambda",
210211
"error": 0,
211212
"meta": {
213+
"_dd.p.tid": "XXXX",
212214
"_dd.p.dm": "-0",
213215
"service": "remappedSnsServiceName",
214216
"version": "1.0.0",
@@ -336,6 +338,7 @@ START
336338
"resource": "my-queue",
337339
"error": 0,
338340
"meta": {
341+
"_dd.p.tid": "XXXX",
339342
"_dd.p.dm": "-0",
340343
"service": "remappedSqsServiceName",
341344
"version": "1.0.0",

‎integration_tests/snapshots/logs/process-input-traced_node20.log

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ START
3535
"resource": "GET /{proxy+}",
3636
"error": 0,
3737
"meta": {
38+
"_dd.p.tid": "XXXX",
3839
"_dd.p.dm": "-0",
3940
"service": "remappedApiGatewayServiceName",
4041
"version": "1.0.0",
@@ -209,6 +210,7 @@ START
209210
"resource": "sns-lambda",
210211
"error": 0,
211212
"meta": {
213+
"_dd.p.tid": "XXXX",
212214
"_dd.p.dm": "-0",
213215
"service": "remappedSnsServiceName",
214216
"version": "1.0.0",
@@ -336,6 +338,7 @@ START
336338
"resource": "my-queue",
337339
"error": 0,
338340
"meta": {
341+
"_dd.p.tid": "XXXX",
339342
"_dd.p.dm": "-0",
340343
"service": "remappedSqsServiceName",
341344
"version": "1.0.0",

‎integration_tests/snapshots/logs/status-code-500s_node14.log

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ START
4141
"resource": "GET /{proxy+}",
4242
"error": 0,
4343
"meta": {
44+
"_dd.p.tid": "XXXX",
4445
"_dd.p.dm": "-0",
4546
"service": "remappedApiGatewayServiceName",
4647
"runtime-id":"XXXX",
@@ -155,6 +156,7 @@ START
155156
"resource": "sns-lambda",
156157
"error": 0,
157158
"meta": {
159+
"_dd.p.tid": "XXXX",
158160
"_dd.p.dm": "-0",
159161
"service": "remappedSnsServiceName",
160162
"runtime-id":"XXXX",
@@ -246,6 +248,7 @@ START
246248
"resource": "my-queue",
247249
"error": 0,
248250
"meta": {
251+
"_dd.p.tid": "XXXX",
249252
"_dd.p.dm": "-0",
250253
"service": "remappedSqsServiceName",
251254
"runtime-id":"XXXX",

‎integration_tests/snapshots/logs/status-code-500s_node16.log

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ START
4141
"resource": "GET /{proxy+}",
4242
"error": 0,
4343
"meta": {
44+
"_dd.p.tid": "XXXX",
4445
"_dd.p.dm": "-0",
4546
"service": "remappedApiGatewayServiceName",
4647
"version": "1.0.0",
@@ -158,6 +159,7 @@ START
158159
"resource": "sns-lambda",
159160
"error": 0,
160161
"meta": {
162+
"_dd.p.tid": "XXXX",
161163
"_dd.p.dm": "-0",
162164
"service": "remappedSnsServiceName",
163165
"version": "1.0.0",
@@ -251,6 +253,7 @@ START
251253
"resource": "my-queue",
252254
"error": 0,
253255
"meta": {
256+
"_dd.p.tid": "XXXX",
254257
"_dd.p.dm": "-0",
255258
"service": "remappedSqsServiceName",
256259
"version": "1.0.0",

‎integration_tests/snapshots/logs/status-code-500s_node18.log

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ START
4141
"resource": "GET /{proxy+}",
4242
"error": 0,
4343
"meta": {
44+
"_dd.p.tid": "XXXX",
4445
"_dd.p.dm": "-0",
4546
"service": "remappedApiGatewayServiceName",
4647
"version": "1.0.0",
@@ -158,6 +159,7 @@ START
158159
"resource": "sns-lambda",
159160
"error": 0,
160161
"meta": {
162+
"_dd.p.tid": "XXXX",
161163
"_dd.p.dm": "-0",
162164
"service": "remappedSnsServiceName",
163165
"version": "1.0.0",
@@ -251,6 +253,7 @@ START
251253
"resource": "my-queue",
252254
"error": 0,
253255
"meta": {
256+
"_dd.p.tid": "XXXX",
254257
"_dd.p.dm": "-0",
255258
"service": "remappedSqsServiceName",
256259
"version": "1.0.0",

‎integration_tests/snapshots/logs/status-code-500s_node20.log

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ START
4141
"resource": "GET /{proxy+}",
4242
"error": 0,
4343
"meta": {
44+
"_dd.p.tid": "XXXX",
4445
"_dd.p.dm": "-0",
4546
"service": "remappedApiGatewayServiceName",
4647
"version": "1.0.0",
@@ -158,6 +159,7 @@ START
158159
"resource": "sns-lambda",
159160
"error": 0,
160161
"meta": {
162+
"_dd.p.tid": "XXXX",
161163
"_dd.p.dm": "-0",
162164
"service": "remappedSnsServiceName",
163165
"version": "1.0.0",
@@ -251,6 +253,7 @@ START
251253
"resource": "my-queue",
252254
"error": 0,
253255
"meta": {
256+
"_dd.p.tid": "XXXX",
254257
"_dd.p.dm": "-0",
255258
"service": "remappedSqsServiceName",
256259
"version": "1.0.0",

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@types/node": "^15.6.1",
2727
"@types/promise-retry": "^1.1.3",
2828
"@types/shimmer": "^1.0.1",
29-
"dd-trace": "^3.38.1",
29+
"dd-trace": "^3.41.0",
3030
"jest": "^27.0.1",
3131
"mock-fs": "4.14.0",
3232
"nock": "13.0.11",
@@ -37,6 +37,7 @@
3737
},
3838
"dependencies": {
3939
"bignumber.js": "^9.0.1",
40+
"dc-polyfill": "^0.1.3",
4041
"hot-shots": "8.5.0",
4142
"promise-retry": "^2.0.1",
4243
"serialize-error": "^8.1.0",

‎scripts/run_integration_tests.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,10 @@ for handler_name in "${LAMBDA_HANDLERS[@]}"; do
221221
# Normalize Axios version
222222
perl -p -e "s/User-Agent:axios\/\d+\.\d+\.\d+/User-Agent:axios\/X\.X\.X/g" |
223223
# Remove init start line
224-
perl -p -e "s/INIT_START.*//g"
224+
perl -p -e "s/INIT_START.*//g" |
225+
sed -E "s/(tracestate\:)([A-Za-z0-9\-\=\:\;].+)/\1XXX/g" |
226+
sed -E "s/(\"_dd.p.tid\"\: \")[a-z0-9\.\-]+/\1XXXX/g" |
227+
sed -E "s/(_dd.p.tid=)[a-z0-9\.\-]+/\1XXXX/g"
225228
)
226229

227230
if [ ! -f $function_snapshot_path ]; then

‎src/runtime/require-tracer.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { subscribeToDC, getTraceTree, RequireNode } from "./require-tracer";
2-
const dc = require('diagnostics_channel')
2+
const dc = require('dc-polyfill')
33

44
describe('require-tracer', () => {
55
it('generates a trace tree', () => {

‎src/runtime/require-tracer.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const dc = require('diagnostics_channel')
1+
// TODO NEXT MAJOR (AJ): Remove this when we drop node14
2+
const dc = require('dc-polyfill')
23

34
export class RequireNode {
45
public id: string

‎yarn.lock

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -760,25 +760,25 @@
760760
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
761761
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
762762

763-
"@datadog/native-appsec@^4.0.0":
763+
"@datadog/[email protected]":
764764
version "4.0.0"
765765
resolved "https://registry.yarnpkg.com/@datadog/native-appsec/-/native-appsec-4.0.0.tgz#ee08138b987dec557eac3650a43a972dac85b6a6"
766766
integrity sha512-myTguXJ3VQHS2E1ylNsSF1avNpDmq5t+K4Q47wdzeakGc3sDIDDyEbvuFTujl9c9wBIkup94O1mZj5DR37ajzA==
767767
dependencies:
768768
node-gyp-build "^3.9.0"
769769

770-
"@datadog/native-iast-rewriter@2.1.3":
771-
version "2.1.3"
772-
resolved "https://registry.yarnpkg.com/@datadog/native-iast-rewriter/-/native-iast-rewriter-2.1.3.tgz#1964cd856655b9c4d0e144048af59a2e90910901"
773-
integrity sha512-4oxMFz5ZEpOK3pRc9KjquMgkRP6D+oPQVIzOk4dgG8fl2iepHtCa3gna/fQBfdWIiX5a2j65O3R1zNp2ckk8JA==
770+
"@datadog/native-iast-rewriter@2.2.1":
771+
version "2.2.1"
772+
resolved "https://registry.yarnpkg.com/@datadog/native-iast-rewriter/-/native-iast-rewriter-2.2.1.tgz#3c74c5a8caa0b876e091e9c5a95256add0d73e1c"
773+
integrity sha512-DyZlE8gNa5AoOFNKGRJU4RYF/Y/tJzv4bIAMuVBbEnMA0xhiIYqpYQG8T3OKkALl3VSEeBMjYwuOR2fCrJ6gzA==
774774
dependencies:
775775
lru-cache "^7.14.0"
776776
node-gyp-build "^4.5.0"
777777

778-
"@datadog/[email protected].1":
779-
version "1.6.1"
780-
resolved "https://registry.yarnpkg.com/@datadog/native-iast-taint-tracking/-/native-iast-taint-tracking-1.6.1.tgz#fcf2f376797dbfc368d6cb3636b922372d2be50e"
781-
integrity sha512-V1X0UbEROcEkqP4IIovqK9uu8jPXq80m8xOW1Vb6xJ9otO3eBphvDFDSa/OJ4pEYhajjjmGlraLlV6rXjaSGlQ==
778+
"@datadog/[email protected].4":
779+
version "1.6.4"
780+
resolved "https://registry.yarnpkg.com/@datadog/native-iast-taint-tracking/-/native-iast-taint-tracking-1.6.4.tgz#16c21ad7c36a53420c0d3c5a3720731809cc7e98"
781+
integrity sha512-Owxk7hQ4Dxwv4zJAoMjRga0IvE6lhvxnNc8pJCHsemCWBXchjr/9bqg05Zy5JnMbKUWn4XuZeJD6RFZpRa8bfw==
782782
dependencies:
783783
node-gyp-build "^3.9.0"
784784

@@ -790,10 +790,10 @@
790790
node-addon-api "^6.1.0"
791791
node-gyp-build "^3.9.0"
792792

793-
"@datadog/[email protected].0":
794-
version "4.0.0"
795-
resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-4.0.0.tgz#2ef48977292496f7b300ff97605f0853f7340586"
796-
integrity sha512-1rQV6arh5fp7BWshjHgKmhNzXELAIod1Y4ydkI7XRcRim35uBoxQgPy1VgMCuLjfzco7112Vt8bkfQxo9bIdoA==
793+
"@datadog/[email protected].1":
794+
version "4.0.1"
795+
resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-4.0.1.tgz#f8629ecb62646d90ed49b6252dd0583d8d5001d3"
796+
integrity sha512-TavqyiyQZOaUM9eQB07r8+K/T1CqKyOdsUGxpN79+BF+eOQBpTj/Cte6KdlhcUSKL3h5hSjC+vlgA7uW2qtVhA==
797797
dependencies:
798798
delay "^5.0.0"
799799
node-gyp-build "<4.0"
@@ -2040,21 +2040,26 @@ data-urls@^2.0.0:
20402040
whatwg-mimetype "^2.3.0"
20412041
whatwg-url "^8.0.0"
20422042

2043-
dd-trace@^3.38.1:
2044-
version "3.38.1"
2045-
resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-3.38.1.tgz#a10ff12973870fab74b476909538ef280af5a3d0"
2046-
integrity sha512-VsWsb5rY+AqS/HPZf+Lq7bH7mm9iQrLkkCUqF6vU4BGjPn2Pv77ntW0XiLIUhJl64feXd+x61zRZLbnHZLFy2w==
2043+
dc-polyfill@^0.1.2, dc-polyfill@^0.1.3:
2044+
version "0.1.3"
2045+
resolved "https://registry.yarnpkg.com/dc-polyfill/-/dc-polyfill-0.1.3.tgz#fe9eefc86813439dd46d6f9ad9582ec079c39720"
2046+
integrity sha512-Wyk5n/5KUj3GfVKV2jtDbtChC/Ff9fjKsBcg4ZtYW1yQe3DXNHcGURvmoxhqQdfOQ9TwyMjnfyv1lyYcOkFkFA==
2047+
2048+
dd-trace@^3.41.0:
2049+
version "3.41.0"
2050+
resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-3.41.0.tgz#ea9f9321cbd58eb958448f84b4defdeef6fb8b93"
2051+
integrity sha512-6o+Pmc3HRyCcvePezHWJsA4LfYH1catCVfveGt7BnAA2POAQlRjMUYWo1KqVSV+s04BjSbBlUycR2uyFVupoew==
20472052
dependencies:
2048-
"@datadog/native-appsec" "^4.0.0"
2049-
"@datadog/native-iast-rewriter" "2.1.3"
2050-
"@datadog/native-iast-taint-tracking" "1.6.1"
2053+
"@datadog/native-appsec" "4.0.0"
2054+
"@datadog/native-iast-rewriter" "2.2.1"
2055+
"@datadog/native-iast-taint-tracking" "1.6.4"
20512056
"@datadog/native-metrics" "^2.0.0"
2052-
"@datadog/pprof" "4.0.0"
2057+
"@datadog/pprof" "4.0.1"
20532058
"@datadog/sketches-js" "^2.1.0"
20542059
"@opentelemetry/api" "^1.0.0"
20552060
"@opentelemetry/core" "^1.14.0"
20562061
crypto-randomuuid "^1.0.0"
2057-
diagnostics_channel "^1.1.0"
2062+
dc-polyfill "^0.1.2"
20582063
ignore "^5.2.4"
20592064
import-in-the-middle "^1.4.2"
20602065
int64-buffer "^0.1.9"
@@ -2074,6 +2079,7 @@ dd-trace@^3.38.1:
20742079
node-abort-controller "^3.1.1"
20752080
opentracing ">=0.12.1"
20762081
path-to-regexp "^0.1.2"
2082+
pprof-format "^2.0.7"
20772083
protobufjs "^7.2.4"
20782084
retry "^0.13.1"
20792085
semver "^7.5.4"
@@ -2115,11 +2121,6 @@ detect-newline@^3.0.0:
21152121
resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
21162122
integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
21172123

2118-
diagnostics_channel@^1.1.0:
2119-
version "1.1.0"
2120-
resolved "https://registry.yarnpkg.com/diagnostics_channel/-/diagnostics_channel-1.1.0.tgz#bd66c49124ce3bac697dff57466464487f57cea5"
2121-
integrity sha512-OE1ngLDjSBPG6Tx0YATELzYzy3RKHC+7veQ8gLa8yS7AAgw65mFbVdcsu3501abqOZCEZqZyAIemB0zXlqDSuw==
2122-
21232124
diff-sequences@^26.6.2:
21242125
version "26.6.2"
21252126
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1"

0 commit comments

Comments
 (0)