Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support for node specifiers #3893

Merged
merged 3 commits into from
Dec 27, 2023

Conversation

khanayan123
Copy link
Collaborator

What does this PR do?

adds support for fastify versions >= 4.23.0 by adding support for node:* specifiers. Also updates addHook and register functionality to make sure that double patching doesn't occur when instrumenting node:* specifiers. For example instrumenting both dns and node:dns causes double patching

Motivation

fastify instrumentation breaking on versions >= 4.23.0

Notes

this PR is a continuation of this #3676

Copy link

github-actions bot commented Dec 19, 2023

Overall package size

Self size: 5.82 MB
Deduped: 61.24 MB
No deduping: 61.99 MB

Dependency sizes

name version self size total size
@datadog/native-iast-taint-tracking 1.6.4 16.43 MB 16.44 MB
@datadog/native-appsec 6.0.0 14.48 MB 14.48 MB
@datadog/pprof 4.1.0 9.36 MB 10.21 MB
protobufjs 7.2.5 2.77 MB 6.56 MB
@datadog/native-iast-rewriter 2.2.2 2.29 MB 2.37 MB
@opentelemetry/core 1.14.0 872.87 kB 1.47 MB
@datadog/native-metrics 2.0.0 898.77 kB 1.3 MB
@opentelemetry/api 1.4.1 780.32 kB 780.32 kB
import-in-the-middle 1.4.2 41.4 kB 704.79 kB
pprof-format 2.0.7 588.12 kB 588.12 kB
msgpack-lite 0.1.26 201.16 kB 281.59 kB
opentracing 0.14.7 194.81 kB 194.81 kB
semver 7.5.4 93.4 kB 123.8 kB
@datadog/sketches-js 2.1.0 109.9 kB 109.9 kB
lodash.sortby 4.7.0 75.76 kB 75.76 kB
lru-cache 7.14.0 74.95 kB 74.95 kB
ipaddr.js 2.1.0 60.23 kB 60.23 kB
ignore 5.2.4 51.22 kB 51.22 kB
int64-buffer 0.1.10 49.18 kB 49.18 kB
istanbul-lib-coverage 3.2.0 29.34 kB 29.34 kB
lodash.uniq 4.5.0 25.01 kB 25.01 kB
tlhunter-sorted-set 0.1.0 24.94 kB 24.94 kB
limiter 1.1.5 23.17 kB 23.17 kB
dc-polyfill 0.1.2 22.77 kB 22.77 kB
retry 0.13.1 18.85 kB 18.85 kB
lodash.kebabcase 4.1.1 17.75 kB 17.75 kB
node-abort-controller 3.1.1 16.89 kB 16.89 kB
lodash.pick 4.4.0 16.33 kB 16.33 kB
jest-docblock 29.7.0 8.99 kB 12.76 kB
crypto-randomuuid 1.0.0 11.18 kB 11.18 kB
path-to-regexp 0.1.7 6.78 kB 6.78 kB
koalas 1.0.2 6.47 kB 6.47 kB
methods 1.1.2 5.29 kB 5.29 kB
module-details-from-path 1.0.3 4.47 kB 4.47 kB

🤖 This report was automatically generated by heaviest-objects-in-the-universe

@khanayan123 khanayan123 marked this pull request as ready for review December 19, 2023 16:36
@khanayan123 khanayan123 requested review from a team as code owners December 19, 2023 16:36
@khanayan123 khanayan123 requested a review from jbertran December 19, 2023 16:36
Copy link

codecov bot commented Dec 19, 2023

Codecov Report

Attention: 5 lines in your changes are missing coverage. Please review.

Comparison is base (a9c1020) 84.58% compared to head (0b029fd) 84.54%.

Files Patch % Lines
packages/dd-trace/src/plugins/index.js 0.00% 5 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3893      +/-   ##
==========================================
- Coverage   84.58%   84.54%   -0.05%     
==========================================
  Files         235      235              
  Lines        9957     9962       +5     
  Branches       33       33              
==========================================
  Hits         8422     8422              
- Misses       1535     1540       +5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@pr-commenter
Copy link

pr-commenter bot commented Dec 19, 2023

Benchmarks

Benchmark execution time: 2023-12-27 19:50:55

Comparing candidate commit 0b029fd in PR branch khanayan123/add-support-for-node-specifiers with baseline commit a9c1020 in branch master.

Found 0 performance improvements and 0 performance regressions! Performance is the same for 524 metrics, 8 unstable metrics.

Qard
Qard previously approved these changes Dec 20, 2023
Copy link
Contributor

@Qard Qard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some minor nits but otherwise LGTM.

Comment on lines 28 to 34
name.forEach(val => {
if (!instrumentations[val]) {
instrumentations[val] = []
}

instrumentations[val].push({ name: val, versions, file, hook })
})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would generally recommend for-of over forEach.

Suggested change
name.forEach(val => {
if (!instrumentations[val]) {
instrumentations[val] = []
}
instrumentations[val].push({ name: val, versions, file, hook })
})
for (const val of name) {
if (!instrumentations[val]) {
instrumentations[val] = []
}
instrumentations[val].push({ name: val, versions, file, hook })
}

Comment on lines +23 to +29
if (name === 'net') {
require('dns')
} else {
require('node:dns')
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we loading the dns module here again? Maybe we could use a comment to remember?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it's because otherwise net gets an uninstrumented instance & thus we miss the dns calls

@khanayan123 khanayan123 force-pushed the khanayan123/add-support-for-node-specifiers branch from 88fe31f to 0b029fd Compare December 27, 2023 19:42
@khanayan123 khanayan123 merged commit f2586b0 into master Dec 27, 2023
106 of 109 checks passed
@khanayan123 khanayan123 deleted the khanayan123/add-support-for-node-specifiers branch December 27, 2023 20:00
khanayan123 added a commit that referenced this pull request Jan 2, 2024
* add support for node specifiers
khanayan123 added a commit that referenced this pull request Jan 2, 2024
* add support for node specifiers
khanayan123 added a commit that referenced this pull request Jan 2, 2024
* add support for node specifiers
khanayan123 added a commit that referenced this pull request Jan 2, 2024
* add support for node specifiers
khanayan123 added a commit that referenced this pull request Jan 2, 2024
* add support for node specifiers
khanayan123 added a commit that referenced this pull request Jan 2, 2024
* add support for node specifiers
This was referenced Jan 2, 2024
khanayan123 added a commit that referenced this pull request Jan 4, 2024
* add support for node specifiers
khanayan123 added a commit that referenced this pull request Jan 4, 2024
* add support for node specifiers
khanayan123 added a commit that referenced this pull request Jan 4, 2024
* add support for node specifiers
khanayan123 added a commit that referenced this pull request Jan 4, 2024
* add support for node specifiers
This was referenced Jan 4, 2024
khanayan123 added a commit that referenced this pull request Jan 4, 2024
* add support for node specifiers
khanayan123 added a commit that referenced this pull request Jan 4, 2024
* add support for node specifiers
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants