diff --git a/package-lock.json b/package-lock.json index 0e36377c..fbf97bed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,10 +14,10 @@ "@bugsnag/js": "^7.6.0", "@myrotvorets/envalidators": "^2.0.0", "@myrotvorets/opentelemetry-configurator": "^2.0.1", - "@myrotvorets/opentelemetry-plugin-knex": "^0.24.0", + "@myrotvorets/opentelemetry-plugin-knex": "^0.27.0", "@opentelemetry/api": "^1.0.1", "@opentelemetry/core": "^1.0.0", - "@opentelemetry/instrumentation": "^0.33.0", + "@opentelemetry/instrumentation": "^0.41.0", "debug": "^4.3.1", "envalid": "^7.0.0", "knex": "^2.0.0", @@ -31,7 +31,7 @@ "@types/better-sqlite3": "^7.5.0", "@types/debug": "^4.1.5", "@types/jest": "^29.0.0", - "@types/node": "^18.17.4", + "@types/node": "^18.11.3", "better-sqlite3": "^8.0.0", "eslint-formatter-gha": "^1.2.0", "husky": "^8.0.0", @@ -1365,53 +1365,27 @@ "@opentelemetry/api": "^1.3.0" } }, - "node_modules/@myrotvorets/opentelemetry-configurator/node_modules/require-in-the-middle": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-6.0.0.tgz", - "integrity": "sha512-+dtWQ7l2lqQDxheaG3jjyN1QI37gEwvzACSgjYi4/C2y+ZTUMeRW8BIOm+9NBKvwaMBUSZfPXVOt1skB0vBkRw==", - "dependencies": { - "debug": "^4.1.1", - "module-details-from-path": "^1.0.3", - "resolve": "^1.22.1" - }, - "engines": { - "node": ">=8.6.0" - } - }, "node_modules/@myrotvorets/opentelemetry-plugin-knex": { - "version": "0.24.0", - "resolved": "https://npm.pkg.github.com/download/@myrotvorets/opentelemetry-plugin-knex/0.24.0/89589f40ab32a10915a687ab09ec6aa1b6ef6fe7", - "integrity": "sha512-w93ruJXHEC1dfD+/4RnNurJ1zZhvkWT/9STvoG3r7JMyZxO3ocTaX8bF6ExtfsxaeiQaTO8jmaqo9nRNYWLaNw==", + "version": "0.27.0", + "resolved": "https://npm.pkg.github.com/download/@myrotvorets/opentelemetry-plugin-knex/0.27.0/820fbba013ad7cdd1bee988717430bac9ee9aef8", + "integrity": "sha512-+0QtIcmvL8laNvNYk6bJfzvArVHP3Cya8r6ormBzsPbGfj+w2txRpdwKc3H/dZeanUbZEjiiwq2hAEAyGSyOQg==", "license": "MIT", "dependencies": { "@opentelemetry/api": "^1.0.1", "@opentelemetry/core": "^1.0.0", - "@opentelemetry/instrumentation": "^0.31.0", + "@opentelemetry/instrumentation": "^0.36.0", "@opentelemetry/semantic-conventions": "^1.0.0" }, "peerDependencies": { - "knex": "^0.95.0 || ^1.0.0 || ^2.0.0" - } - }, - "node_modules/@myrotvorets/opentelemetry-plugin-knex/node_modules/@opentelemetry/api-metrics": { - "version": "0.31.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.31.0.tgz", - "integrity": "sha512-PcL1x0kZtMie7NsNy67OyMvzLEXqf3xd0TZJKHHPMGTe89oMpNVrD1zJB1kZcwXOxLlHHb6tz21G3vvXPdXyZg==", - "deprecated": "Please use @opentelemetry/api >= 1.3.0", - "dependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "engines": { - "node": ">=14" + "knex": "^1.0.0 || ^2.0.0" } }, "node_modules/@myrotvorets/opentelemetry-plugin-knex/node_modules/@opentelemetry/instrumentation": { - "version": "0.31.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.31.0.tgz", - "integrity": "sha512-b2hFebXPtBcut4d81b8Kg6GiCoAS8nxb8kYSronQYAXxwNSetqHwIJ2nKLo1slFH1UWUXn0zi3eDez2Sn/9uMQ==", + "version": "0.36.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.36.1.tgz", + "integrity": "sha512-gtYErugMEF5NXVacmuE+tHFBiyB82YIiO5l8iZX9/4R4TDV8uCWdrLW5QZMqgTzPhiyOG9AITFdqhwIZMw/5lA==", "dependencies": { - "@opentelemetry/api-metrics": "0.31.0", - "require-in-the-middle": "^5.0.3", + "require-in-the-middle": "^6.0.0", "semver": "^7.3.2", "shimmer": "^1.2.1" }, @@ -1419,7 +1393,7 @@ "node": ">=14" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.0" + "@opentelemetry/api": "^1.3.0" } }, "node_modules/@nodelib/fs.scandir": { @@ -1465,18 +1439,6 @@ "node": ">=8.0.0" } }, - "node_modules/@opentelemetry/api-metrics": { - "version": "0.33.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.33.0.tgz", - "integrity": "sha512-78evfPRRRnJA6uZ3xuBuS3VZlXTO/LRs+Ff1iv3O/7DgibCtq9k27T6Zlj8yRdJDFmcjcbQrvC0/CpDpWHaZYA==", - "deprecated": "Please use @opentelemetry/api >= 1.3.0", - "dependencies": { - "@opentelemetry/api": "^1.0.0" - }, - "engines": { - "node": ">=14" - } - }, "node_modules/@opentelemetry/context-async-hooks": { "version": "1.15.1", "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-1.15.1.tgz", @@ -1489,11 +1451,11 @@ } }, "node_modules/@opentelemetry/core": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.1.tgz", - "integrity": "sha512-V6GoRTY6aANMDDOQ9CiHOiLWEK2b2b3OGZK+zk05Li5merb9jadFeV5ooTSGtjxfxVNMpQUaQERO1cdbdbeEGg==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.2.tgz", + "integrity": "sha512-+gBv15ta96WqkHZaPpcDHiaz0utiiHZVfm2YOYSqFGrUaJpPkMoSuLBB58YFQGi6Rsb9EHos84X6X5+9JspmLw==", "dependencies": { - "@opentelemetry/semantic-conventions": "1.15.1" + "@opentelemetry/semantic-conventions": "1.15.2" }, "engines": { "node": ">=14" @@ -1502,6 +1464,14 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" } }, + "node_modules/@opentelemetry/core/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.15.2.tgz", + "integrity": "sha512-CjbOKwk2s+3xPIMcd5UNYQzsf+v94RczbdNix9/kQh38WiQkM90sUOi3if8eyHFgiBjBjhwXrA7W3ydiSQP9mw==", + "engines": { + "node": ">=14" + } + }, "node_modules/@opentelemetry/exporter-jaeger": { "version": "1.15.1", "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-jaeger/-/exporter-jaeger-1.15.1.tgz", @@ -1519,6 +1489,20 @@ "@opentelemetry/api": "^1.0.0" } }, + "node_modules/@opentelemetry/exporter-jaeger/node_modules/@opentelemetry/core": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.1.tgz", + "integrity": "sha512-V6GoRTY6aANMDDOQ9CiHOiLWEK2b2b3OGZK+zk05Li5merb9jadFeV5ooTSGtjxfxVNMpQUaQERO1cdbdbeEGg==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.15.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, "node_modules/@opentelemetry/exporter-zipkin": { "version": "1.15.1", "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-zipkin/-/exporter-zipkin-1.15.1.tgz", @@ -1536,21 +1520,36 @@ "@opentelemetry/api": "^1.0.0" } }, - "node_modules/@opentelemetry/instrumentation": { - "version": "0.33.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.33.0.tgz", - "integrity": "sha512-8joPjKJ6TznNt04JbnzZG+m1j/4wm1OIrX7DEw/V5lyZ9/2fahIqG72jeZ26VKOZnLOpVzUUnU/dweURqBzT3Q==", + "node_modules/@opentelemetry/exporter-zipkin/node_modules/@opentelemetry/core": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.1.tgz", + "integrity": "sha512-V6GoRTY6aANMDDOQ9CiHOiLWEK2b2b3OGZK+zk05Li5merb9jadFeV5ooTSGtjxfxVNMpQUaQERO1cdbdbeEGg==", "dependencies": { - "@opentelemetry/api-metrics": "0.33.0", - "require-in-the-middle": "^5.0.3", - "semver": "^7.3.2", + "@opentelemetry/semantic-conventions": "1.15.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/instrumentation": { + "version": "0.41.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.41.2.tgz", + "integrity": "sha512-rxU72E0pKNH6ae2w5+xgVYZLzc5mlxAbGzF4shxMVK8YC2QQsfN38B2GPbj0jvrKWWNUElfclQ+YTykkNg/grw==", + "dependencies": { + "@types/shimmer": "^1.0.2", + "import-in-the-middle": "1.4.2", + "require-in-the-middle": "^7.1.1", + "semver": "^7.5.1", "shimmer": "^1.2.1" }, "engines": { "node": ">=14" }, "peerDependencies": { - "@opentelemetry/api": "^1.0.0" + "@opentelemetry/api": "^1.3.0" } }, "node_modules/@opentelemetry/instrumentation-http": { @@ -1608,10 +1607,10 @@ "node": ">=14" } }, - "node_modules/@opentelemetry/instrumentation-http/node_modules/require-in-the-middle": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-6.0.0.tgz", - "integrity": "sha512-+dtWQ7l2lqQDxheaG3jjyN1QI37gEwvzACSgjYi4/C2y+ZTUMeRW8BIOm+9NBKvwaMBUSZfPXVOt1skB0vBkRw==", + "node_modules/@opentelemetry/instrumentation/node_modules/require-in-the-middle": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.2.0.tgz", + "integrity": "sha512-3TLx5TGyAY6AOqLBoXmHkNql0HIf2RGbuMgCDT2WO/uGVAPJs6h7Kl+bN6TIZGd9bWhWPwnDnTHGtW8Iu77sdw==", "dependencies": { "debug": "^4.1.1", "module-details-from-path": "^1.0.3", @@ -1635,6 +1634,20 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" } }, + "node_modules/@opentelemetry/propagator-b3/node_modules/@opentelemetry/core": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.1.tgz", + "integrity": "sha512-V6GoRTY6aANMDDOQ9CiHOiLWEK2b2b3OGZK+zk05Li5merb9jadFeV5ooTSGtjxfxVNMpQUaQERO1cdbdbeEGg==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.15.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, "node_modules/@opentelemetry/propagator-jaeger": { "version": "1.15.1", "resolved": "https://registry.npmjs.org/@opentelemetry/propagator-jaeger/-/propagator-jaeger-1.15.1.tgz", @@ -1649,6 +1662,20 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" } }, + "node_modules/@opentelemetry/propagator-jaeger/node_modules/@opentelemetry/core": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.1.tgz", + "integrity": "sha512-V6GoRTY6aANMDDOQ9CiHOiLWEK2b2b3OGZK+zk05Li5merb9jadFeV5ooTSGtjxfxVNMpQUaQERO1cdbdbeEGg==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.15.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, "node_modules/@opentelemetry/resources": { "version": "1.15.1", "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.15.1.tgz", @@ -1664,6 +1691,20 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" } }, + "node_modules/@opentelemetry/resources/node_modules/@opentelemetry/core": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.1.tgz", + "integrity": "sha512-V6GoRTY6aANMDDOQ9CiHOiLWEK2b2b3OGZK+zk05Li5merb9jadFeV5ooTSGtjxfxVNMpQUaQERO1cdbdbeEGg==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.15.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, "node_modules/@opentelemetry/sdk-trace-base": { "version": "1.15.1", "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.15.1.tgz", @@ -1680,6 +1721,20 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" } }, + "node_modules/@opentelemetry/sdk-trace-base/node_modules/@opentelemetry/core": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.1.tgz", + "integrity": "sha512-V6GoRTY6aANMDDOQ9CiHOiLWEK2b2b3OGZK+zk05Li5merb9jadFeV5ooTSGtjxfxVNMpQUaQERO1cdbdbeEGg==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.15.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, "node_modules/@opentelemetry/sdk-trace-node": { "version": "1.15.1", "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-node/-/sdk-trace-node-1.15.1.tgz", @@ -1699,6 +1754,20 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" } }, + "node_modules/@opentelemetry/sdk-trace-node/node_modules/@opentelemetry/core": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.1.tgz", + "integrity": "sha512-V6GoRTY6aANMDDOQ9CiHOiLWEK2b2b3OGZK+zk05Li5merb9jadFeV5ooTSGtjxfxVNMpQUaQERO1cdbdbeEGg==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.15.1" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, "node_modules/@opentelemetry/semantic-conventions": { "version": "1.15.1", "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.15.1.tgz", @@ -1923,6 +1992,11 @@ "dev": true, "peer": true }, + "node_modules/@types/shimmer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.0.2.tgz", + "integrity": "sha512-dKkr1bTxbEsFlh2ARpKzcaAmsYixqt9UyCdoEZk8rHyE4iQYcDCyvSjDSf7JUWJHlJiTtbIoQjxKh6ViywqDAg==" + }, "node_modules/@types/stack-utils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", @@ -2158,7 +2232,6 @@ "version": "8.10.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", - "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -2166,6 +2239,14 @@ "node": ">=0.4.0" } }, + "node_modules/acorn-import-assertions": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "peerDependencies": { + "acorn": "^8" + } + }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -2926,8 +3007,7 @@ "node_modules/cjs-module-lexer": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz", - "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==", - "dev": true + "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==" }, "node_modules/clean-stack": { "version": "2.2.0", @@ -4472,9 +4552,9 @@ } }, "node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.21.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", + "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", "dev": true, "peer": true, "dependencies": { @@ -4749,6 +4829,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/import-in-the-middle": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.4.2.tgz", + "integrity": "sha512-9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw==", + "dependencies": { + "acorn": "^8.8.2", + "acorn-import-assertions": "^1.9.0", + "cjs-module-lexer": "^1.2.2", + "module-details-from-path": "^1.0.3" + } + }, "node_modules/import-local": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", @@ -7383,16 +7474,16 @@ } }, "node_modules/require-in-the-middle": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.2.0.tgz", - "integrity": "sha512-efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-6.0.0.tgz", + "integrity": "sha512-+dtWQ7l2lqQDxheaG3jjyN1QI37gEwvzACSgjYi4/C2y+ZTUMeRW8BIOm+9NBKvwaMBUSZfPXVOt1skB0vBkRw==", "dependencies": { "debug": "^4.1.1", "module-details-from-path": "^1.0.3", "resolve": "^1.22.1" }, "engines": { - "node": ">=6" + "node": ">=8.6.0" } }, "node_modules/resolve": { diff --git a/package.json b/package.json index 52d1f988..05630488 100644 --- a/package.json +++ b/package.json @@ -24,10 +24,10 @@ "@bugsnag/js": "^7.6.0", "@myrotvorets/envalidators": "^2.0.0", "@myrotvorets/opentelemetry-configurator": "^2.0.1", - "@myrotvorets/opentelemetry-plugin-knex": "^0.24.0", + "@myrotvorets/opentelemetry-plugin-knex": "^0.27.0", "@opentelemetry/api": "^1.0.1", "@opentelemetry/core": "^1.0.0", - "@opentelemetry/instrumentation": "^0.33.0", + "@opentelemetry/instrumentation": "^0.41.0", "debug": "^4.3.1", "envalid": "^7.0.0", "knex": "^2.0.0",