From d410af5e4d4d02f39867c1a98d35fec606ca27bd Mon Sep 17 00:00:00 2001 From: MTRNord Date: Sat, 2 Sep 2023 18:11:28 +0200 Subject: [PATCH] Update matrix-appservice fork --- package.json | 4 ++-- yarn.lock | 19 +++++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 3721cdf7..983f8667 100644 --- a/package.json +++ b/package.json @@ -73,11 +73,11 @@ }, "overrides": { "matrix-appservice-bridge": { - "matrix-appservice": "MTRNord/matrix-appservice-node#MTRNord\/draupnir4all" + "matrix-appservice": "MTRNord/matrix-appservice-node#13430a57da67ee708b050a42458b93fa9cd3b136" } }, "resolutions": { - "matrix-appservice": "https://github.com/MTRNord/matrix-appservice-node.git#MTRNord\/draupnir4all" + "matrix-appservice": "https://github.com/MTRNord/matrix-appservice-node.git#13430a57da67ee708b050a42458b93fa9cd3b136" }, "engines": { "node": ">=18.0.0" diff --git a/yarn.lock b/yarn.lock index 9da0e976..a7d0957c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -834,6 +834,15 @@ resolved "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.15.2.tgz" integrity sha512-CjbOKwk2s+3xPIMcd5UNYQzsf+v94RczbdNix9/kQh38WiQkM90sUOi3if8eyHFgiBjBjhwXrA7W3ydiSQP9mw== +"@opentelemetry/shim-opentracing@^1.15.2": + version "1.15.2" + resolved "https://registry.yarnpkg.com/@opentelemetry/shim-opentracing/-/shim-opentracing-1.15.2.tgz#c18895b7eb88745d96e9fefb4805688e46e3aeca" + integrity sha512-5Y1zJPfbf7hWS2Mp12voZyKyyeDvO7F7UGQqDb7VqxRKah1jinYSO89FxTF+GuhQmIJqocVcaVF6vKFSDzj4CQ== + dependencies: + "@opentelemetry/core" "1.15.2" + "@opentelemetry/semantic-conventions" "1.15.2" + opentracing "^0.14.4" + "@opentelemetry/sql-common@^0.40.0": version "0.40.0" resolved "https://registry.npmjs.org/@opentelemetry/sql-common/-/sql-common-0.40.0.tgz" @@ -3379,15 +3388,17 @@ matrix-appservice-bridge@8.1.2: winston "^3.3.3" winston-daily-rotate-file "^4.5.1" -matrix-appservice@^1.1.0, "matrix-appservice@https://github.com/MTRNord/matrix-appservice-node.git#MTRNord/draupnir4all": +matrix-appservice@^1.1.0, "matrix-appservice@https://github.com/MTRNord/matrix-appservice-node.git#13430a57da67ee708b050a42458b93fa9cd3b136": version "2.0.0" - resolved "https://github.com/MTRNord/matrix-appservice-node.git#e59ce9e6db75cc7f2ac49b674c86f2626478ce57" + resolved "https://github.com/MTRNord/matrix-appservice-node.git#13430a57da67ee708b050a42458b93fa9cd3b136" dependencies: "@opentelemetry/api" "^1.4.1" + "@opentelemetry/shim-opentracing" "^1.15.2" body-parser "^1.19.0" express "^4.18.1" js-yaml "^4.1.0" morgan "^1.10.0" + opentracing "^0.14.7" matrix-bot-sdk@^0.6.2: version "0.6.2" @@ -3689,9 +3700,9 @@ one-time@^1.0.0: dependencies: fn.name "1.x.x" -opentracing@^0.14.4: +opentracing@^0.14.4, opentracing@^0.14.7: version "0.14.7" - resolved "https://registry.npmjs.org/opentracing/-/opentracing-0.14.7.tgz" + resolved "https://registry.yarnpkg.com/opentracing/-/opentracing-0.14.7.tgz#25d472bd0296dc0b64d7b94cbc995219031428f5" integrity sha512-vz9iS7MJ5+Bp1URw8Khvdyw1H/hGvzHWlKQ7eRrQojSCDL1/SrWfrY9QebLw97n2deyRtzHRC3MkQfVNUCo91Q== optionator@^0.8.1: