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.

Sign up for GitHub

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

fix(instrumentation-mysql): fix test for mysql2 v3 (#2168) #2451

Merged
merged 7 commits into from
Nov 1, 2024
Merged

fix(instrumentation-mysql): fix test for mysql2 v3 (#2168) #2451

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11f6a52
fix(instrumentation-mysql): fix test for mysql2 v3 (#2168)
tpraxl Sep 24, 2024
43da503
Merge branch 'main' into fix-mysql2-migrate-to-v3-in-tests
tpraxl Sep 26, 2024
91adced
Merge branch 'main' into fix-mysql2-migrate-to-v3-in-tests
tpraxl Oct 11, 2024
96ad247
Merge branch 'main' into fix-mysql2-migrate-to-v3-in-tests
tpraxl Oct 12, 2024
10c0288
Merge branch 'main' into fix-mysql2-migrate-to-v3-in-tests
pichlermarc Oct 17, 2024
342410c
Merge branch 'main' into fix-mysql2-migrate-to-v3-in-tests
tpraxl Oct 30, 2024
d8daccc
Merge branch 'main' into fix-mysql2-migrate-to-v3-in-tests
blumamir Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 57 additions & 61 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mysql2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@types/node": "18.18.14",
"@types/semver": "7.5.8",
"mocha": "7.2.0",
"mysql2": "2.3.3",
"mysql2": "3.11.3",
"nyc": "15.1.0",
"rimraf": "5.0.10",
"semver": "7.6.3",
Expand Down
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-instrumentation-mysql2/test/mysql.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ interface Result extends mysqlTypes.RowDataPacket {
solution: number;
}

describe('mysql2@2.x', () => {
describe('mysql2', () => {
let contextManager: AsyncHooksContextManager;
let connection: mysqlTypes.Connection;
let rootConnection: mysqlTypes.Connection;
Expand Down Expand Up @@ -148,7 +148,7 @@ describe('[email protected]', () => {
host,
password,
database,
} as mysqlTypes.PoolClusterOptions);
});
});

afterEach(done => {
Expand Down