diff --git a/package-lock.json b/package-lock.json index 70e9e172c7..63901e9215 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5713,6 +5713,7 @@ "resolved": "https://registry.npmjs.org/@koa/router/-/router-12.0.0.tgz", "integrity": "sha512-cnnxeKHXlt7XARJptflGURdJaO+ITpNkOHmQu7NHmCoRinPbyvFzce/EG/E8Zy81yQ1W9MoSdtklc3nyaDReUw==", "deprecated": "**IMPORTANT 10x+ PERFORMANCE UPGRADE**: Please upgrade to v12.0.1+ as we have fixed an issue with debuglog causing 10x slower router benchmark performance, see https://github.com/koajs/router/pull/173", + "dev": true, "dependencies": { "http-errors": "^2.0.0", "koa-compose": "^4.1.0", @@ -10457,21 +10458,6 @@ "@types/node": "*" } }, - "node_modules/@types/mysql2": { - "version": "1.0.0", - "resolved": "git+ssh://git@github.com/types/mysql2.git#89378b2cb3974ea8cdd1d633b8f056e54e5d2384", - "dev": true, - "license": "ISC", - "dependencies": { - "@types/mysql": "types/mysql" - } - }, - "node_modules/@types/mysql2/node_modules/@types/mysql": { - "version": "2.0.0", - "resolved": "git+ssh://git@github.com/types/mysql.git#c26b1bc2bac17010081455e3127a90fb2eafcec9", - "dev": true, - "license": "ISC" - }, "node_modules/@types/node": { "version": "18.6.5", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz", @@ -30613,9 +30599,9 @@ } }, "node_modules/systeminformation": { - "version": "5.21.15", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.15.tgz", - "integrity": "sha512-vMLwsGgJZW6GvoBXVWNZuRQG0MPxlfQnIIIY9ZxoogWftUpJ9C33qD+32e1meFlXuWpN0moNApPFLpbsSi4OaQ==", + "version": "5.21.17", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.17.tgz", + "integrity": "sha512-JZYRCbIjk3WuBV59A9/rTla2rROX+aAJ9uo2Z1dI+bjieORcukClN8rlM1zE9NYKpULSbaGc+KKct/870lO0DA==", "os": [ "darwin", "linux", @@ -34449,6 +34435,15 @@ "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==", "dev": true }, + "packages/opentelemetry-propagation-utils/node_modules/@types/sinon": { + "version": "10.0.20", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.20.tgz", + "integrity": "sha512-2APKKruFNCAZgx3daAyACGzWuJ028VVCUDk6o2rw/Z4PXT0ogwdV4KUegW0MwVs0Zu59auPXbbuBJHF12Sx1Eg==", + "dev": true, + "dependencies": { + "@types/sinonjs__fake-timers": "*" + } + }, "packages/opentelemetry-redis-common": { "name": "@opentelemetry/redis-common", "version": "0.36.1", @@ -34717,6 +34712,15 @@ "integrity": "sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==", "dev": true }, + "plugins/node/instrumentation-fs/node_modules/@types/sinon": { + "version": "10.0.20", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.20.tgz", + "integrity": "sha512-2APKKruFNCAZgx3daAyACGzWuJ028VVCUDk6o2rw/Z4PXT0ogwdV4KUegW0MwVs0Zu59auPXbbuBJHF12Sx1Eg==", + "dev": true, + "dependencies": { + "@types/sinonjs__fake-timers": "*" + } + }, "plugins/node/instrumentation-lru-memoizer": { "name": "@opentelemetry/instrumentation-lru-memoizer", "version": "0.33.3", @@ -35918,6 +35922,37 @@ "node": ">=8" } }, + "plugins/node/opentelemetry-instrumentation-koa/examples/node_modules/@koa/router": { + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/@koa/router/-/router-12.0.1.tgz", + "integrity": "sha512-ribfPYfHb+Uw3b27Eiw6NPqjhIhTpVFzEWLwyc/1Xp+DCdwRRyIlAUODX+9bPARF6aQtUu1+/PHzdNvRzcs/+Q==", + "dependencies": { + "debug": "^4.3.4", + "http-errors": "^2.0.0", + "koa-compose": "^4.1.0", + "methods": "^1.1.2", + "path-to-regexp": "^6.2.1" + }, + "engines": { + "node": ">= 12" + } + }, + "plugins/node/opentelemetry-instrumentation-koa/examples/node_modules/@types/koa": { + "version": "2.13.11", + "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.13.11.tgz", + "integrity": "sha512-0HZSGNdmLlLRvSxv0ngLSp09Hw98c+2XL3ZRYmkE6y8grqTweKEyyaj7LgxkyPUv0gQ5pNS/a7kHXo2Iwha1rA==", + "dev": true, + "dependencies": { + "@types/accepts": "*", + "@types/content-disposition": "*", + "@types/cookies": "*", + "@types/http-assert": "*", + "@types/http-errors": "*", + "@types/keygrip": "*", + "@types/koa-compose": "*", + "@types/node": "*" + } + }, "plugins/node/opentelemetry-instrumentation-koa/node_modules/@opentelemetry/api-metrics": { "version": "0.29.2", "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.29.2.tgz", @@ -36222,6 +36257,15 @@ "node": ">=8" } }, + "plugins/node/opentelemetry-instrumentation-mysql/examples/node_modules/@types/mysql": { + "version": "2.15.24", + "resolved": "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.24.tgz", + "integrity": "sha512-I0qULi8JBEg0oso69Fe4H4QPR+IdE0yRhZLu3uRhGwQ92m2Epz1cSD5jnXY0nMeZQKd61U8EvnOVMbNE74o3Kw==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, "plugins/node/opentelemetry-instrumentation-mysql/node_modules/@opentelemetry/api-metrics": { "version": "0.32.0", "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.32.0.tgz", @@ -36309,7 +36353,6 @@ "@opentelemetry/contrib-test-utils": "^0.34.3", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", - "@types/mysql2": "github:types/mysql2", "@types/node": "18.6.5", "@types/semver": "7.5.3", "mocha": "7.2.0", @@ -36666,6 +36709,18 @@ "@types/node": "*" } }, + "plugins/node/opentelemetry-instrumentation-redis/node_modules/@types/express": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", + "dev": true, + "dependencies": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^4.17.33", + "@types/qs": "*", + "@types/serve-static": "*" + } + }, "plugins/node/opentelemetry-instrumentation-redis/node_modules/@types/mocha": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz", @@ -41822,6 +41877,7 @@ "version": "12.0.0", "resolved": "https://registry.npmjs.org/@koa/router/-/router-12.0.0.tgz", "integrity": "sha512-cnnxeKHXlt7XARJptflGURdJaO+ITpNkOHmQu7NHmCoRinPbyvFzce/EG/E8Zy81yQ1W9MoSdtklc3nyaDReUw==", + "dev": true, "requires": { "http-errors": "^2.0.0", "koa-compose": "^4.1.0", @@ -44545,6 +44601,15 @@ "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz", "integrity": "sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==", "dev": true + }, + "@types/sinon": { + "version": "10.0.20", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.20.tgz", + "integrity": "sha512-2APKKruFNCAZgx3daAyACGzWuJ028VVCUDk6o2rw/Z4PXT0ogwdV4KUegW0MwVs0Zu59auPXbbuBJHF12Sx1Eg==", + "dev": true, + "requires": { + "@types/sinonjs__fake-timers": "*" + } } } }, @@ -45084,7 +45149,6 @@ "@opentelemetry/semantic-conventions": "^1.0.0", "@opentelemetry/sql-common": "^0.40.0", "@types/mocha": "7.0.2", - "@types/mysql2": "github:types/mysql2", "@types/node": "18.6.5", "@types/semver": "7.5.3", "mocha": "7.2.0", @@ -45303,6 +45367,18 @@ } } }, + "@types/express": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", + "dev": true, + "requires": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^4.17.33", + "@types/qs": "*", + "@types/serve-static": "*" + } + }, "@types/mocha": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz", @@ -45842,6 +45918,15 @@ "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz", "integrity": "sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw==", "dev": true + }, + "@types/sinon": { + "version": "10.0.20", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.20.tgz", + "integrity": "sha512-2APKKruFNCAZgx3daAyACGzWuJ028VVCUDk6o2rw/Z4PXT0ogwdV4KUegW0MwVs0Zu59auPXbbuBJHF12Sx1Eg==", + "dev": true, + "requires": { + "@types/sinonjs__fake-timers": "*" + } } } }, @@ -47676,21 +47761,6 @@ "@types/node": "*" } }, - "@types/mysql2": { - "version": "git+ssh://git@github.com/types/mysql2.git#89378b2cb3974ea8cdd1d633b8f056e54e5d2384", - "dev": true, - "from": "@types/mysql2@github:types/mysql2", - "requires": { - "@types/mysql": "types/mysql" - }, - "dependencies": { - "@types/mysql": { - "version": "git+ssh://git@github.com/types/mysql.git#c26b1bc2bac17010081455e3127a90fb2eafcec9", - "dev": true, - "from": "@types/mysql@types/mysql" - } - } - }, "@types/node": { "version": "18.6.5", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz", @@ -55735,6 +55805,36 @@ "koa": "^2.13.0", "ts-node": "^10.6.0", "typescript": "4.4.4" + }, + "dependencies": { + "@koa/router": { + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/@koa/router/-/router-12.0.1.tgz", + "integrity": "sha512-ribfPYfHb+Uw3b27Eiw6NPqjhIhTpVFzEWLwyc/1Xp+DCdwRRyIlAUODX+9bPARF6aQtUu1+/PHzdNvRzcs/+Q==", + "requires": { + "debug": "^4.3.4", + "http-errors": "^2.0.0", + "koa-compose": "^4.1.0", + "methods": "^1.1.2", + "path-to-regexp": "^6.2.1" + } + }, + "@types/koa": { + "version": "2.13.11", + "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.13.11.tgz", + "integrity": "sha512-0HZSGNdmLlLRvSxv0ngLSp09Hw98c+2XL3ZRYmkE6y8grqTweKEyyaj7LgxkyPUv0gQ5pNS/a7kHXo2Iwha1rA==", + "dev": true, + "requires": { + "@types/accepts": "*", + "@types/content-disposition": "*", + "@types/cookies": "*", + "@types/http-assert": "*", + "@types/http-errors": "*", + "@types/keygrip": "*", + "@types/koa-compose": "*", + "@types/node": "*" + } + } } }, "kuler": { @@ -58556,6 +58656,17 @@ "mysql": "^2.18.1", "ts-node": "^10.6.0", "typescript": "4.4.4" + }, + "dependencies": { + "@types/mysql": { + "version": "2.15.24", + "resolved": "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.24.tgz", + "integrity": "sha512-I0qULi8JBEg0oso69Fe4H4QPR+IdE0yRhZLu3uRhGwQ92m2Epz1cSD5jnXY0nMeZQKd61U8EvnOVMbNE74o3Kw==", + "dev": true, + "requires": { + "@types/node": "*" + } + } } }, "mysql2": { @@ -63834,9 +63945,9 @@ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" }, "systeminformation": { - "version": "5.21.15", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.15.tgz", - "integrity": "sha512-vMLwsGgJZW6GvoBXVWNZuRQG0MPxlfQnIIIY9ZxoogWftUpJ9C33qD+32e1meFlXuWpN0moNApPFLpbsSi4OaQ==" + "version": "5.21.17", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.17.tgz", + "integrity": "sha512-JZYRCbIjk3WuBV59A9/rTla2rROX+aAJ9uo2Z1dI+bjieORcukClN8rlM1zE9NYKpULSbaGc+KKct/870lO0DA==" }, "tapable": { "version": "1.1.3", diff --git a/plugins/node/opentelemetry-instrumentation-mysql2/package.json b/plugins/node/opentelemetry-instrumentation-mysql2/package.json index c3140a7b25..92fa96323a 100644 --- a/plugins/node/opentelemetry-instrumentation-mysql2/package.json +++ b/plugins/node/opentelemetry-instrumentation-mysql2/package.json @@ -49,7 +49,6 @@ "@opentelemetry/contrib-test-utils": "^0.34.3", "@opentelemetry/sdk-trace-base": "^1.8.0", "@types/mocha": "7.0.2", - "@types/mysql2": "github:types/mysql2", "@types/node": "18.6.5", "@types/semver": "7.5.3", "mocha": "7.2.0",