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

MySQL databases - service naming #3057

Merged
merged 4 commits into from
Jun 14, 2023
Merged

Conversation

jbertran
Copy link
Contributor

What does this PR do?

This applies the service naming schema logic (see #2941) to mysql integrations - mysql, mysql2 and mariadb.

These are more complex than messaging integrations, as we need to take into account the default provided by DatabasePlugin into the naming functions, which version 0 must respect, but version 1 does not need.

This PR relies on #3056 for the split into different files according to general area (messaging, storage) and a few optimizations to the service naming computation.

Motivation

Keep trucking on naming schema adoption.

Plugin Checklist

  • Unit tests.

Additional Notes

@jbertran jbertran requested a review from a team as a code owner April 27, 2023 09:57
@github-actions
Copy link

github-actions bot commented Apr 27, 2023

Overall package size

Self size: 4.32 MB
Deduped: 60.67 MB
No deduping: 60.72 MB

Dependency sizes

name version self size total size
@datadog/pprof 2.2.1 14.24 MB 15.12 MB
@datadog/native-iast-taint-tracking 1.4.1 14.85 MB 14.86 MB
@datadog/native-appsec 3.2.0 13.38 MB 13.39 MB
protobufjs 7.1.2 2.76 MB 6.55 MB
@datadog/native-iast-rewriter 2.0.1 2.09 MB 2.1 MB
@opentelemetry/core 1.3.1 784.66 kB 1.37 MB
@datadog/native-metrics 2.0.0 898.77 kB 1.3 MB
@opentelemetry/api 1.4.1 780.32 kB 780.32 kB
opentracing 0.14.7 194.81 kB 194.81 kB
semver 7.3.8 88.2 kB 118.6 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.0.1 59.52 kB 59.52 kB
ignore 5.2.0 48.87 kB 48.87 kB
import-in-the-middle 1.3.5 34.34 kB 38.81 kB
istanbul-lib-coverage 3.2.0 29.34 kB 29.34 kB
retry 0.10.1 27.44 kB 27.44 kB
lodash.uniq 4.5.0 25.01 kB 25.01 kB
limiter 1.1.5 23.17 kB 23.17 kB
lodash.kebabcase 4.1.1 17.75 kB 17.75 kB
lodash.pick 4.4.0 16.33 kB 16.33 kB
node-abort-controller 3.0.1 14.33 kB 14.33 kB
crypto-randomuuid 1.0.0 11.18 kB 11.18 kB
diagnostics_channel 1.1.0 7.07 kB 7.07 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

@codecov
Copy link

codecov bot commented Apr 27, 2023

Codecov Report

Merging #3057 (86a2b54) into master (71a5288) will decrease coverage by 0.39%.
The diff coverage is 20.00%.

❗ Current head 86a2b54 differs from pull request most recent head 3a9b1c9. Consider uploading reports for the commit 3a9b1c9 to get more accurate results

@@            Coverage Diff             @@
##           master    #3057      +/-   ##
==========================================
- Coverage   86.05%   85.67%   -0.39%     
==========================================
  Files         191      182       -9     
  Lines        7459     7239     -220     
  Branches       33       33              
==========================================
- Hits         6419     6202     -217     
+ Misses       1040     1037       -3     
Impacted Files Coverage Δ
.../dd-trace/src/service-naming/schemas/v0/storage.js 17.64% <0.00%> (-9.63%) ⬇️
.../dd-trace/src/service-naming/schemas/v1/storage.js 50.00% <50.00%> (ø)

... and 24 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@pr-commenter
Copy link

pr-commenter bot commented Apr 27, 2023

Benchmarks

Comparing candidate commit 3a9b1c9 in PR branch jbertran/service-naming-mysql-db with baseline commit 5b7040f in branch master.

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

tlhunter
tlhunter previously approved these changes May 2, 2023
rochdev
rochdev previously requested changes May 2, 2023
packages/datadog-plugin-mariadb/test/naming.js Outdated Show resolved Hide resolved
packages/datadog-plugin-mysql2/test/naming.js Outdated Show resolved Hide resolved
@jbertran jbertran force-pushed the jbertran/service-naming-mysql-db branch from 10386ae to 7d63b43 Compare May 3, 2023 13:13
@jbertran jbertran requested a review from rochdev May 3, 2023 13:14
@jbertran jbertran force-pushed the jbertran/service-naming-cache branch 3 times, most recently from 3bde47b to ccada49 Compare May 22, 2023 09:52
@jbertran jbertran force-pushed the jbertran/service-naming-mysql-db branch from 7d63b43 to 3744c6a Compare May 23, 2023 15:34
@jbertran jbertran requested a review from a team as a code owner May 23, 2023 15:34
@jbertran jbertran changed the base branch from jbertran/service-naming-cache to master May 23, 2023 15:50
@jbertran jbertran dismissed tlhunter’s stale review May 23, 2023 15:50

The base branch was changed.

@jbertran jbertran force-pushed the jbertran/service-naming-mysql-db branch from 3744c6a to 1a79692 Compare May 24, 2023 08:52
@jbertran jbertran dismissed rochdev’s stale review May 30, 2023 09:02

Changes addressed

@jbertran jbertran requested review from Qard and tlhunter May 30, 2023 09:02
@jbertran jbertran force-pushed the jbertran/service-naming-mysql-db branch from 1a79692 to 33a4eb9 Compare May 30, 2023 09:06
@jbertran jbertran force-pushed the jbertran/service-naming-mysql-db branch from 33a4eb9 to 86a2b54 Compare June 8, 2023 16:32
tlhunter
tlhunter previously approved these changes Jun 14, 2023
@tlhunter tlhunter merged commit 6ec8008 into master Jun 14, 2023
@tlhunter tlhunter deleted the jbertran/service-naming-mysql-db branch June 14, 2023 16:34
nsavoire pushed a commit that referenced this pull request Jun 20, 2023
* add v0 naming to mysql integrations
* add v1 to mysql integrations
* add tests on v1 for mysql databases

---------

Co-authored-by: Thomas Hunter II <tlhunter@datadog.com>
nsavoire pushed a commit that referenced this pull request Jun 20, 2023
* add v0 naming to mysql integrations
* add v1 to mysql integrations
* add tests on v1 for mysql databases

---------

Co-authored-by: Thomas Hunter II <tlhunter@datadog.com>
nsavoire pushed a commit that referenced this pull request Jun 21, 2023
* add v0 naming to mysql integrations
* add v1 to mysql integrations
* add tests on v1 for mysql databases

---------

Co-authored-by: Thomas Hunter II <tlhunter@datadog.com>
This was referenced Jun 21, 2023
tlhunter added a commit that referenced this pull request Jun 23, 2023
* add v0 naming to mysql integrations
* add v1 to mysql integrations
* add tests on v1 for mysql databases

---------

Co-authored-by: Thomas Hunter II <tlhunter@datadog.com>
tlhunter added a commit that referenced this pull request Jun 23, 2023
* add v0 naming to mysql integrations
* add v1 to mysql integrations
* add tests on v1 for mysql databases

---------

Co-authored-by: Thomas Hunter II <tlhunter@datadog.com>
tlhunter added a commit that referenced this pull request Jun 23, 2023
* add v0 naming to mysql integrations
* add v1 to mysql integrations
* add tests on v1 for mysql databases

---------

Co-authored-by: Thomas Hunter II <tlhunter@datadog.com>
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.

4 participants