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

feat: mysql2 instrumentation #521

Merged
merged 11 commits into from
Jun 14, 2021
Merged

feat: mysql2 instrumentation #521

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
53fd174
feat: initial implementation of mysql2 instrumentation
rauno56 Jun 4, 2021
f061b54
fix: rename config type
rauno56 Jun 4, 2021
1308e10
feat: update package versions
rauno56 Jun 4, 2021
2a66655
style: lint everything
rauno56 Jun 4, 2021
1913815
docs: fix docs to reflect that it's for mysql2 package
rauno56 Jun 4, 2021
eb3e78b
Merge branch 'main' into feat/mysql2-instrumentation
rauno56 Jun 7, 2021
31c123f
feat: move api to peer deps
rauno56 Jun 7, 2021
8016759
Merge branch 'main' into feat/mysql2-instrumentation
rauno56 Jun 8, 2021
b6519dd
Merge branch 'main' into feat/mysql2-instrumentation
vmarchaud Jun 9, 2021
6179ab1
Merge branch 'main' into feat/mysql2-instrumentation
rauno56 Jun 11, 2021
15a555c
Merge branch 'main' into feat/mysql2-instrumentation
rauno56 Jun 14, 2021
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
Prev Previous commit
Next Next commit
feat: update package versions
  • Loading branch information
@rauno56
rauno56 committed Jun 4, 2021
commit 1308e10c4c718a56478f942b5952cffd674cabf4
14 changes: 7 additions & 7 deletions plugins/node/opentelemetry-instrumentation-mysql2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/instrumentation-mysql2",
"version": "0.16.0",
"version": "0.20.0",
"description": "OpenTelemetry mysql automatic instrumentation package.",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -41,9 +41,9 @@
"access": "public"
},
"devDependencies": {
"@opentelemetry/context-async-hooks": "0.19.0",
"@opentelemetry/test-utils": "file:../../../packages/opentelemetry-test-utils",
"@opentelemetry/tracing": "0.19.0",
"@opentelemetry/context-async-hooks": "0.20.0",
"@opentelemetry/test-utils": "0.20.0",
"@opentelemetry/tracing": "0.20.0",
"@types/mocha": "7.0.2",
"@types/node": "14.17.0",
"codecov": "3.8.2",
Expand All @@ -56,8 +56,8 @@
"typescript": "4.2.4"
},
"dependencies": {
"@opentelemetry/api": "^1.0.0-rc.0",
"@opentelemetry/instrumentation": "^0.19.0",
"@opentelemetry/semantic-conventions": "^0.19.0"
"@opentelemetry/api": "^0.20.0",
"@opentelemetry/instrumentation": "^0.20.0",
"@opentelemetry/semantic-conventions": "^0.20.0"
}
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mysql2/src/version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
*/

// this is autogenerated file, see scripts/version-update.js
export const VERSION = '0.16.0';
export const VERSION = '0.20.0';
54 changes: 27 additions & 27 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 @@ -14,7 +14,7 @@
* limitations under the License.
*/

import { context, setSpan, SpanStatusCode } from '@opentelemetry/api';
import { context, trace, SpanStatusCode } from '@opentelemetry/api';
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
import * as testUtils from '@opentelemetry/test-utils';
Expand Down Expand Up @@ -129,7 +129,7 @@ describe('mysql@2.x', () => {
describe('when the query is a string', () => {
it('should name the span accordingly ', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+1 as solution';
const query = connection.query(sql);

Expand All @@ -145,7 +145,7 @@ describe('mysql@2.x', () => {
describe('when the query is an object', () => {
it('should name the span accordingly ', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+? as solution';
const query = connection.query({ sql, values: [1] });

Expand All @@ -161,7 +161,7 @@ describe('mysql@2.x', () => {
describe('#Connection', () => {
it('should intercept connection.query(text: string)', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+1 as solution';
const query = connection.query<Result[]>(sql);
let rows = 0;
Expand All @@ -183,7 +183,7 @@ describe('mysql@2.x', () => {

it('should intercept connection.query(text: string, callback)', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+1 as solution';
connection.query(sql, (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -199,7 +199,7 @@ describe('mysql@2.x', () => {

it('should intercept connection.query(text: options, callback)', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+? as solution';
connection.query({ sql, values: [1] }, (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -215,7 +215,7 @@ describe('mysql@2.x', () => {

it('should intercept connection.query(text: options, values: [], callback)', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+? as solution';
connection.query({ sql }, [1], (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -231,7 +231,7 @@ describe('mysql@2.x', () => {

it('should intercept connection.query(text: string, values: [], callback)', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT ? as solution';
connection.query(sql, [1], (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -247,7 +247,7 @@ describe('mysql@2.x', () => {

it('should intercept connection.query(text: string, value: any, callback)', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT ? as solution';
connection.query(sql, 1, (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -263,7 +263,7 @@ describe('mysql@2.x', () => {

it('should attach error messages to spans', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT ? as solution';
connection.query(sql, (err, res) => {
assert.ok(err);
Expand All @@ -279,7 +279,7 @@ describe('mysql@2.x', () => {
describe('#Pool', () => {
it('should intercept pool.query(text: string)', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+1 as solution';
const query = pool.query(sql);
let rows = 0;
Expand All @@ -301,7 +301,7 @@ describe('mysql@2.x', () => {

it('should intercept pool.getConnection().query(text: string)', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+1 as solution';
pool.getConnection((err, conn) => {
const query = conn.query(sql);
Expand All @@ -325,7 +325,7 @@ describe('mysql@2.x', () => {

it('should intercept pool.query(text: string, callback)', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+1 as solution';
pool.query(sql, (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -341,7 +341,7 @@ describe('mysql@2.x', () => {

it('should intercept pool.getConnection().query(text: string, callback)', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+1 as solution';
pool.getConnection((err, conn) => {
conn.query(sql, (err, res: mysqlTypes.RowDataPacket[]) => {
Expand All @@ -359,7 +359,7 @@ describe('mysql@2.x', () => {

it('should intercept pool.query(text: options, callback)', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+? as solution';
pool.query({ sql, values: [1] }, (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -375,7 +375,7 @@ describe('mysql@2.x', () => {

it('should intercept pool.query(text: options, values: [], callback)', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+? as solution';
pool.query({ sql }, [1], (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -391,7 +391,7 @@ describe('mysql@2.x', () => {

it('should intercept pool.query(text: string, values: [], callback)', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT ? as solution';
pool.query(sql, [1], (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -407,7 +407,7 @@ describe('mysql@2.x', () => {

it('should intercept pool.query(text: string, value: any, callback)', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT ? as solution';
pool.query(sql, 1, (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -423,7 +423,7 @@ describe('mysql@2.x', () => {

it('should attach error messages to spans', done => {
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT ? as solution';
pool.query(sql, (err, res) => {
assert.ok(err);
Expand All @@ -441,7 +441,7 @@ describe('mysql@2.x', () => {
poolCluster.getConnection((err, poolClusterConnection) => {
assert.ifError(err);
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+1 as solution';
const query = poolClusterConnection.query(sql);
let rows = 0;
Expand All @@ -466,7 +466,7 @@ describe('mysql@2.x', () => {
poolCluster.getConnection((err, poolClusterConnection) => {
assert.ifError(err);
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+1 as solution';
poolClusterConnection.query(sql, (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -485,7 +485,7 @@ describe('mysql@2.x', () => {
poolCluster.getConnection((err, poolClusterConnection) => {
assert.ifError(err);
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+? as solution';
poolClusterConnection.query({ sql, values: [1] }, (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -504,7 +504,7 @@ describe('mysql@2.x', () => {
poolCluster.getConnection((err, poolClusterConnection) => {
assert.ifError(err);
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1+? as solution';
poolClusterConnection.query({ sql }, [1], (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -523,7 +523,7 @@ describe('mysql@2.x', () => {
poolCluster.getConnection((err, poolClusterConnection) => {
assert.ifError(err);
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT ? as solution';
poolClusterConnection.query(sql, [1], (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -542,7 +542,7 @@ describe('mysql@2.x', () => {
poolCluster.getConnection((err, poolClusterConnection) => {
assert.ifError(err);
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT ? as solution';
poolClusterConnection.query(sql, 1, (err, res: mysqlTypes.RowDataPacket[]) => {
assert.ifError(err);
Expand All @@ -561,7 +561,7 @@ describe('mysql@2.x', () => {
poolCluster.getConnection((err, poolClusterConnection) => {
assert.ifError(err);
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT ? as solution';
poolClusterConnection.query(sql, (err, res) => {
assert.ok(err);
Expand All @@ -578,7 +578,7 @@ describe('mysql@2.x', () => {
poolCluster.getConnection('name', (err, poolClusterConnection) => {
assert.ifError(err);
const span = provider.getTracer('default').startSpan('test span');
context.with(setSpan(context.active(), span), () => {
context.with(trace.setSpan(context.active(), span), () => {
const sql = 'SELECT 1 as solution';
poolClusterConnection.query(sql, (err, res) => {
assert.ifError(err);
Expand Down