diff --git a/.pnp.cjs b/.pnp.cjs index 0eafa87df..2446bbd62 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -1605,13 +1605,6 @@ const RAW_RUNTIME_STATE = ["@aws-sdk/service-error-classification", "npm:3.342.0"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:3.370.0", {\ - "packageLocation": "./.yarn/cache/@aws-sdk-service-error-classification-npm-3.370.0-0d5b615252-500f067ba1.zip/node_modules/@aws-sdk/service-error-classification/",\ - "packageDependencies": [\ - ["@aws-sdk/service-error-classification", "npm:3.370.0"]\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["@aws-sdk/shared-ini-file-loader", [\ @@ -1795,15 +1788,6 @@ const RAW_RUNTIME_STATE = ["tslib", "npm:2.5.2"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:3.418.0", {\ - "packageLocation": "./.yarn/cache/@aws-sdk-types-npm-3.418.0-451c0cadd0-627955c2c9.zip/node_modules/@aws-sdk/types/",\ - "packageDependencies": [\ - ["@aws-sdk/types", "npm:3.418.0"],\ - ["@smithy/types", "npm:2.3.4"],\ - ["tslib", "npm:2.5.2"]\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["@aws-sdk/url-parser", [\ @@ -5504,14 +5488,6 @@ const RAW_RUNTIME_STATE = ["tslib", "npm:2.5.2"]\ ],\ "linkType": "HARD"\ - }],\ - ["npm:2.3.4", {\ - "packageLocation": "./.yarn/cache/@smithy-types-npm-2.3.4-7d0b3a2a2f-8a5ad3b47e.zip/node_modules/@smithy/types/",\ - "packageDependencies": [\ - ["@smithy/types", "npm:2.3.4"],\ - ["tslib", "npm:2.5.2"]\ - ],\ - "linkType": "HARD"\ }]\ ]],\ ["@smithy/url-parser", [\ @@ -5740,7 +5716,6 @@ const RAW_RUNTIME_STATE = ["@types/node", "npm:20.5.7"],\ ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ ["@typescript-eslint/parser", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ - ["aws-xray-sdk", "npm:3.5.2"],\ ["dayjs", "npm:1.11.7"],\ ["dotenv", "npm:16.1.3"],\ ["eslint", "npm:8.41.0"],\ @@ -5798,7 +5773,6 @@ const RAW_RUNTIME_STATE = ["@types/prettyjson", "npm:0.0.30"],\ ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ ["@typescript-eslint/parser", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ - ["aws-xray-sdk", "npm:3.5.2"],\ ["axios", "npm:1.4.0"],\ ["cors", "npm:2.8.5"],\ ["dotenv", "npm:16.1.3"],\ @@ -5861,7 +5835,6 @@ const RAW_RUNTIME_STATE = ["@types/uuid", "npm:9.0.3"],\ ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ ["@typescript-eslint/parser", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ - ["aws-xray-sdk", "npm:3.5.2"],\ ["axios", "npm:1.4.0"],\ ["bcryptjs", "npm:2.4.3"],\ ["cors", "npm:2.8.5"],\ @@ -5965,7 +5938,6 @@ const RAW_RUNTIME_STATE = ["@types/newrelic", "npm:9.14.0"],\ ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ ["@typescript-eslint/parser", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ - ["aws-xray-sdk", "npm:3.5.2"],\ ["eslint", "npm:8.41.0"],\ ["eslint-plugin-prettier", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.0.0"],\ ["ioredis", "npm:5.3.2"],\ @@ -6055,7 +6027,6 @@ const RAW_RUNTIME_STATE = ["@types/uuid", "npm:9.0.3"],\ ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ ["@typescript-eslint/parser", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ - ["aws-xray-sdk", "npm:3.5.2"],\ ["connect-busboy", "npm:1.0.0"],\ ["cors", "npm:2.8.5"],\ ["dayjs", "npm:1.11.7"],\ @@ -6187,12 +6158,10 @@ const RAW_RUNTIME_STATE = ["@types/express", "npm:4.17.17"],\ ["@types/ioredis", "npm:5.0.0"],\ ["@types/jest", "npm:29.5.2"],\ - ["@types/mysql", "npm:2.15.22"],\ ["@types/newrelic", "npm:9.14.0"],\ ["@types/node", "npm:20.5.7"],\ ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ ["@typescript-eslint/parser", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ - ["aws-xray-sdk", "npm:3.5.2"],\ ["cors", "npm:2.8.5"],\ ["dotenv", "npm:16.1.3"],\ ["eslint", "npm:8.41.0"],\ @@ -6203,7 +6172,6 @@ const RAW_RUNTIME_STATE = ["ioredis", "npm:5.3.2"],\ ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.5.0"],\ ["mongodb", "virtual:365b8c88cdf194291829ee28b79556e2328175d26a621363e703848100bea0042e9500db2a1206c9bbc3a4a76a1d169639ef774b2ea3a1a98584a9936b58c6be#npm:6.0.0"],\ - ["mysql", "npm:2.18.1"],\ ["mysql2", "npm:3.3.3"],\ ["newrelic", "npm:11.0.0"],\ ["prettier", "npm:3.0.3"],\ @@ -6236,7 +6204,6 @@ const RAW_RUNTIME_STATE = ["@types/node", "npm:20.5.7"],\ ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ ["@typescript-eslint/parser", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ - ["aws-xray-sdk", "npm:3.5.2"],\ ["dayjs", "npm:1.11.7"],\ ["dotenv", "npm:16.1.3"],\ ["eslint", "npm:8.41.0"],\ @@ -6386,7 +6353,6 @@ const RAW_RUNTIME_STATE = ["@types/uuid", "npm:9.0.3"],\ ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ ["@typescript-eslint/parser", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ - ["aws-xray-sdk", "npm:3.5.2"],\ ["axios", "npm:1.4.0"],\ ["cors", "npm:2.8.5"],\ ["dotenv", "npm:16.1.3"],\ @@ -6474,7 +6440,6 @@ const RAW_RUNTIME_STATE = ["@types/newrelic", "npm:9.14.0"],\ ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ ["@typescript-eslint/parser", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:6.5.0"],\ - ["aws-xray-sdk", "npm:3.5.2"],\ ["axios", "npm:1.4.0"],\ ["cors", "npm:2.8.5"],\ ["dotenv", "npm:16.1.3"],\ @@ -6644,16 +6609,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["@types/cls-hooked", [\ - ["npm:4.3.6", {\ - "packageLocation": "./.yarn/cache/@types-cls-hooked-npm-4.3.6-8787b64e86-f5b9864348.zip/node_modules/@types/cls-hooked/",\ - "packageDependencies": [\ - ["@types/cls-hooked", "npm:4.3.6"],\ - ["@types/node", "npm:20.2.5"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["@types/concat-stream", [\ ["npm:1.6.1", {\ "packageLocation": "./.yarn/cache/@types-concat-stream-npm-1.6.1-42cd06b019-7d211e7433.zip/node_modules/@types/concat-stream/",\ @@ -6913,16 +6868,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["@types/mysql", [\ - ["npm:2.15.22", {\ - "packageLocation": "./.yarn/cache/@types-mysql-npm-2.15.22-d643eb999e-6be0aac58f.zip/node_modules/@types/mysql/",\ - "packageDependencies": [\ - ["@types/mysql", "npm:2.15.22"],\ - ["@types/node", "npm:20.2.5"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["@types/newrelic", [\ ["npm:9.14.0", {\ "packageLocation": "./.yarn/cache/@types-newrelic-npm-9.14.0-4668da51a1-3a54ea75a4.zip/node_modules/@types/newrelic/",\ @@ -6991,18 +6936,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["@types/pg", [\ - ["npm:8.10.3", {\ - "packageLocation": "./.yarn/cache/@types-pg-npm-8.10.3-3fc3365c7b-22d4836bd9.zip/node_modules/@types/pg/",\ - "packageDependencies": [\ - ["@types/pg", "npm:8.10.3"],\ - ["@types/node", "npm:20.2.5"],\ - ["pg-protocol", "npm:1.6.0"],\ - ["pg-types", "npm:4.0.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["@types/prettier", [\ ["npm:2.7.3", {\ "packageLocation": "./.yarn/cache/@types-prettier-npm-2.7.3-497316f37c-cda84c19ac.zip/node_modules/@types/prettier/",\ @@ -8013,16 +7946,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["async-hook-jl", [\ - ["npm:1.7.6", {\ - "packageLocation": "./.yarn/cache/async-hook-jl-npm-1.7.6-9999815029-f61a3bd4c3.zip/node_modules/async-hook-jl/",\ - "packageDependencies": [\ - ["async-hook-jl", "npm:1.7.6"],\ - ["stack-chain", "npm:1.3.7"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["asynckit", [\ ["npm:0.4.0", {\ "packageLocation": "./.yarn/cache/asynckit-npm-0.4.0-c718858525-3ce727cbc7.zip/node_modules/asynckit/",\ @@ -8032,112 +7955,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["atomic-batcher", [\ - ["npm:1.0.2", {\ - "packageLocation": "./.yarn/cache/atomic-batcher-npm-1.0.2-6fcd3a3097-025e334f1f.zip/node_modules/atomic-batcher/",\ - "packageDependencies": [\ - ["atomic-batcher", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["aws-xray-sdk", [\ - ["npm:3.5.2", {\ - "packageLocation": "./.yarn/cache/aws-xray-sdk-npm-3.5.2-15fc4e54ee-576d0d5ccb.zip/node_modules/aws-xray-sdk/",\ - "packageDependencies": [\ - ["aws-xray-sdk", "npm:3.5.2"],\ - ["aws-xray-sdk-core", "npm:3.5.2"],\ - ["aws-xray-sdk-express", "virtual:15fc4e54eec18d85ce3f22aa2405619072c35fbd500ad809cce2c9e4ead8a191fcc189cef6a5d76df3bea5576f09735fc4d32f086db561623afc56dd36794c8f#npm:3.5.2"],\ - ["aws-xray-sdk-mysql", "virtual:15fc4e54eec18d85ce3f22aa2405619072c35fbd500ad809cce2c9e4ead8a191fcc189cef6a5d76df3bea5576f09735fc4d32f086db561623afc56dd36794c8f#npm:3.5.2"],\ - ["aws-xray-sdk-postgres", "virtual:15fc4e54eec18d85ce3f22aa2405619072c35fbd500ad809cce2c9e4ead8a191fcc189cef6a5d76df3bea5576f09735fc4d32f086db561623afc56dd36794c8f#npm:3.5.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["aws-xray-sdk-core", [\ - ["npm:3.5.2", {\ - "packageLocation": "./.yarn/cache/aws-xray-sdk-core-npm-3.5.2-9083a0c00f-a643998187.zip/node_modules/aws-xray-sdk-core/",\ - "packageDependencies": [\ - ["aws-xray-sdk-core", "npm:3.5.2"],\ - ["@aws-sdk/service-error-classification", "npm:3.370.0"],\ - ["@aws-sdk/types", "npm:3.418.0"],\ - ["@types/cls-hooked", "npm:4.3.6"],\ - ["atomic-batcher", "npm:1.0.2"],\ - ["cls-hooked", "npm:4.2.2"],\ - ["semver", "npm:7.5.4"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["aws-xray-sdk-express", [\ - ["npm:3.5.2", {\ - "packageLocation": "./.yarn/cache/aws-xray-sdk-express-npm-3.5.2-c4574a664b-62a07d0f3b.zip/node_modules/aws-xray-sdk-express/",\ - "packageDependencies": [\ - ["aws-xray-sdk-express", "npm:3.5.2"]\ - ],\ - "linkType": "SOFT"\ - }],\ - ["virtual:15fc4e54eec18d85ce3f22aa2405619072c35fbd500ad809cce2c9e4ead8a191fcc189cef6a5d76df3bea5576f09735fc4d32f086db561623afc56dd36794c8f#npm:3.5.2", {\ - "packageLocation": "./.yarn/__virtual__/aws-xray-sdk-express-virtual-36027c3d91/0/cache/aws-xray-sdk-express-npm-3.5.2-c4574a664b-62a07d0f3b.zip/node_modules/aws-xray-sdk-express/",\ - "packageDependencies": [\ - ["aws-xray-sdk-express", "virtual:15fc4e54eec18d85ce3f22aa2405619072c35fbd500ad809cce2c9e4ead8a191fcc189cef6a5d76df3bea5576f09735fc4d32f086db561623afc56dd36794c8f#npm:3.5.2"],\ - ["@types/aws-xray-sdk-core", null],\ - ["@types/express", "npm:4.17.17"],\ - ["aws-xray-sdk-core", "npm:3.5.2"]\ - ],\ - "packagePeers": [\ - "@types/aws-xray-sdk-core",\ - "aws-xray-sdk-core"\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["aws-xray-sdk-mysql", [\ - ["npm:3.5.2", {\ - "packageLocation": "./.yarn/cache/aws-xray-sdk-mysql-npm-3.5.2-095483ab95-f910a96630.zip/node_modules/aws-xray-sdk-mysql/",\ - "packageDependencies": [\ - ["aws-xray-sdk-mysql", "npm:3.5.2"]\ - ],\ - "linkType": "SOFT"\ - }],\ - ["virtual:15fc4e54eec18d85ce3f22aa2405619072c35fbd500ad809cce2c9e4ead8a191fcc189cef6a5d76df3bea5576f09735fc4d32f086db561623afc56dd36794c8f#npm:3.5.2", {\ - "packageLocation": "./.yarn/__virtual__/aws-xray-sdk-mysql-virtual-d8a5f29b75/0/cache/aws-xray-sdk-mysql-npm-3.5.2-095483ab95-f910a96630.zip/node_modules/aws-xray-sdk-mysql/",\ - "packageDependencies": [\ - ["aws-xray-sdk-mysql", "virtual:15fc4e54eec18d85ce3f22aa2405619072c35fbd500ad809cce2c9e4ead8a191fcc189cef6a5d76df3bea5576f09735fc4d32f086db561623afc56dd36794c8f#npm:3.5.2"],\ - ["@types/aws-xray-sdk-core", null],\ - ["@types/mysql", "npm:2.15.22"],\ - ["aws-xray-sdk-core", "npm:3.5.2"]\ - ],\ - "packagePeers": [\ - "@types/aws-xray-sdk-core",\ - "aws-xray-sdk-core"\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["aws-xray-sdk-postgres", [\ - ["npm:3.5.2", {\ - "packageLocation": "./.yarn/cache/aws-xray-sdk-postgres-npm-3.5.2-3a7e7bcc42-f2d6da22c7.zip/node_modules/aws-xray-sdk-postgres/",\ - "packageDependencies": [\ - ["aws-xray-sdk-postgres", "npm:3.5.2"]\ - ],\ - "linkType": "SOFT"\ - }],\ - ["virtual:15fc4e54eec18d85ce3f22aa2405619072c35fbd500ad809cce2c9e4ead8a191fcc189cef6a5d76df3bea5576f09735fc4d32f086db561623afc56dd36794c8f#npm:3.5.2", {\ - "packageLocation": "./.yarn/__virtual__/aws-xray-sdk-postgres-virtual-c6edb063fc/0/cache/aws-xray-sdk-postgres-npm-3.5.2-3a7e7bcc42-f2d6da22c7.zip/node_modules/aws-xray-sdk-postgres/",\ - "packageDependencies": [\ - ["aws-xray-sdk-postgres", "virtual:15fc4e54eec18d85ce3f22aa2405619072c35fbd500ad809cce2c9e4ead8a191fcc189cef6a5d76df3bea5576f09735fc4d32f086db561623afc56dd36794c8f#npm:3.5.2"],\ - ["@types/aws-xray-sdk-core", null],\ - ["@types/pg", "npm:8.10.3"],\ - ["aws-xray-sdk-core", "npm:3.5.2"]\ - ],\ - "packagePeers": [\ - "@types/aws-xray-sdk-core",\ - "aws-xray-sdk-core"\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["axios", [\ ["npm:0.21.4", {\ "packageLocation": "./.yarn/cache/axios-npm-0.21.4-e278873748-da644592cb.zip/node_modules/axios/",\ @@ -8341,13 +8158,6 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["bignumber.js", [\ - ["npm:9.0.0", {\ - "packageLocation": "./.yarn/cache/bignumber.js-npm-9.0.0-ce190bcd7c-7406d0d11d.zip/node_modules/bignumber.js/",\ - "packageDependencies": [\ - ["bignumber.js", "npm:9.0.0"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:9.1.1", {\ "packageLocation": "./.yarn/cache/bignumber.js-npm-9.1.1-5929e8d8dc-1f771bfa88.zip/node_modules/bignumber.js/",\ "packageDependencies": [\ @@ -8935,18 +8745,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["cls-hooked", [\ - ["npm:4.2.2", {\ - "packageLocation": "./.yarn/cache/cls-hooked-npm-4.2.2-db33b9b95f-59081fcc0f.zip/node_modules/cls-hooked/",\ - "packageDependencies": [\ - ["cls-hooked", "npm:4.2.2"],\ - ["async-hook-jl", "npm:1.7.6"],\ - ["emitter-listener", "npm:1.1.2"],\ - ["semver", "npm:5.7.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["cluster-key-slot", [\ ["npm:1.1.2", {\ "packageLocation": "./.yarn/cache/cluster-key-slot-npm-1.1.2-0571a28825-516ed8b5e1.zip/node_modules/cluster-key-slot/",\ @@ -9837,16 +9635,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["emitter-listener", [\ - ["npm:1.1.2", {\ - "packageLocation": "./.yarn/cache/emitter-listener-npm-1.1.2-0fe118d0b3-697f53c308.zip/node_modules/emitter-listener/",\ - "packageDependencies": [\ - ["emitter-listener", "npm:1.1.2"],\ - ["shimmer", "npm:1.2.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["emittery", [\ ["npm:0.13.1", {\ "packageLocation": "./.yarn/cache/emittery-npm-0.13.1-cb6cd1bb03-fbe214171d.zip/node_modules/emittery/",\ @@ -13730,19 +13518,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["mysql", [\ - ["npm:2.18.1", {\ - "packageLocation": "./.yarn/cache/mysql-npm-2.18.1-8fdb56201f-87d80e3747.zip/node_modules/mysql/",\ - "packageDependencies": [\ - ["mysql", "npm:2.18.1"],\ - ["bignumber.js", "npm:9.0.0"],\ - ["readable-stream", "npm:2.3.7"],\ - ["safe-buffer", "npm:5.1.2"],\ - ["sqlstring", "npm:2.3.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["mysql2", [\ ["npm:3.3.3", {\ "packageLocation": "./.yarn/cache/mysql2-npm-3.3.3-d2fe8cf512-4bf7ace8f1.zip/node_modules/mysql2/",\ @@ -14232,15 +14007,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["obuf", [\ - ["npm:1.1.2", {\ - "packageLocation": "./.yarn/cache/obuf-npm-1.1.2-8db5fae8dd-53ff4ab3a1.zip/node_modules/obuf/",\ - "packageDependencies": [\ - ["obuf", "npm:1.1.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["on-finished", [\ ["npm:2.4.1", {\ "packageLocation": "./.yarn/cache/on-finished-npm-2.4.1-907af70f88-8e81472c50.zip/node_modules/on-finished/",\ @@ -14701,49 +14467,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["pg-int8", [\ - ["npm:1.0.1", {\ - "packageLocation": "./.yarn/cache/pg-int8-npm-1.0.1-5cd67f3e22-a1e3a05a69.zip/node_modules/pg-int8/",\ - "packageDependencies": [\ - ["pg-int8", "npm:1.0.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["pg-numeric", [\ - ["npm:1.0.2", {\ - "packageLocation": "./.yarn/cache/pg-numeric-npm-1.0.2-9026ec3427-8899f8200c.zip/node_modules/pg-numeric/",\ - "packageDependencies": [\ - ["pg-numeric", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["pg-protocol", [\ - ["npm:1.6.0", {\ - "packageLocation": "./.yarn/cache/pg-protocol-npm-1.6.0-089a4b1d3c-995864cc2a.zip/node_modules/pg-protocol/",\ - "packageDependencies": [\ - ["pg-protocol", "npm:1.6.0"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["pg-types", [\ - ["npm:4.0.1", {\ - "packageLocation": "./.yarn/cache/pg-types-npm-4.0.1-8f922557d3-2c686ef361.zip/node_modules/pg-types/",\ - "packageDependencies": [\ - ["pg-types", "npm:4.0.1"],\ - ["pg-int8", "npm:1.0.1"],\ - ["pg-numeric", "npm:1.0.2"],\ - ["postgres-array", "npm:3.0.2"],\ - ["postgres-bytea", "npm:3.0.0"],\ - ["postgres-date", "npm:2.0.1"],\ - ["postgres-interval", "npm:3.0.0"],\ - ["postgres-range", "npm:1.1.3"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["picocolors", [\ ["npm:1.0.0", {\ "packageLocation": "./.yarn/cache/picocolors-npm-1.0.0-d81e0b1927-a2e8092dd8.zip/node_modules/picocolors/",\ @@ -14815,52 +14538,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["postgres-array", [\ - ["npm:3.0.2", {\ - "packageLocation": "./.yarn/cache/postgres-array-npm-3.0.2-da6a3f1fed-0159517e4e.zip/node_modules/postgres-array/",\ - "packageDependencies": [\ - ["postgres-array", "npm:3.0.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["postgres-bytea", [\ - ["npm:3.0.0", {\ - "packageLocation": "./.yarn/cache/postgres-bytea-npm-3.0.0-5de4c664f6-f5c01758fd.zip/node_modules/postgres-bytea/",\ - "packageDependencies": [\ - ["postgres-bytea", "npm:3.0.0"],\ - ["obuf", "npm:1.1.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["postgres-date", [\ - ["npm:2.0.1", {\ - "packageLocation": "./.yarn/cache/postgres-date-npm-2.0.1-00e0e0bc9e-908eacec35.zip/node_modules/postgres-date/",\ - "packageDependencies": [\ - ["postgres-date", "npm:2.0.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["postgres-interval", [\ - ["npm:3.0.0", {\ - "packageLocation": "./.yarn/cache/postgres-interval-npm-3.0.0-936c769b98-c7a1cf006d.zip/node_modules/postgres-interval/",\ - "packageDependencies": [\ - ["postgres-interval", "npm:3.0.0"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["postgres-range", [\ - ["npm:1.1.3", {\ - "packageLocation": "./.yarn/cache/postgres-range-npm-1.1.3-46f68e1a9e-356a46d97e.zip/node_modules/postgres-range/",\ - "packageDependencies": [\ - ["postgres-range", "npm:1.1.3"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["prelude-ls", [\ ["npm:1.2.1", {\ "packageLocation": "./.yarn/cache/prelude-ls-npm-1.2.1-3e4d272a55-0b9d2c7680.zip/node_modules/prelude-ls/",\ @@ -15280,20 +14957,6 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["readable-stream", [\ - ["npm:2.3.7", {\ - "packageLocation": "./.yarn/cache/readable-stream-npm-2.3.7-77b22a9818-d04c677c17.zip/node_modules/readable-stream/",\ - "packageDependencies": [\ - ["readable-stream", "npm:2.3.7"],\ - ["core-util-is", "npm:1.0.3"],\ - ["inherits", "npm:2.0.4"],\ - ["isarray", "npm:1.0.0"],\ - ["process-nextick-args", "npm:2.0.1"],\ - ["safe-buffer", "npm:5.1.2"],\ - ["string_decoder", "npm:1.1.1"],\ - ["util-deprecate", "npm:1.0.2"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:2.3.8", {\ "packageLocation": "./.yarn/cache/readable-stream-npm-2.3.8-67a94c2cb1-8500dd3a90.zip/node_modules/readable-stream/",\ "packageDependencies": [\ @@ -15634,13 +15297,6 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "HARD"\ }],\ - ["npm:5.7.2", {\ - "packageLocation": "./.yarn/cache/semver-npm-5.7.2-938ee91eaa-fca14418a1.zip/node_modules/semver/",\ - "packageDependencies": [\ - ["semver", "npm:5.7.2"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:6.3.0", {\ "packageLocation": "./.yarn/cache/semver-npm-6.3.0-b3eace8bfd-8dd72e7c7c.zip/node_modules/semver/",\ "packageDependencies": [\ @@ -15785,15 +15441,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["shimmer", [\ - ["npm:1.2.1", {\ - "packageLocation": "./.yarn/cache/shimmer-npm-1.2.1-8b50bf3206-aa0d6252ad.zip/node_modules/shimmer/",\ - "packageDependencies": [\ - ["shimmer", "npm:1.2.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["side-channel", [\ ["npm:1.0.4", {\ "packageLocation": "./.yarn/cache/side-channel-npm-1.0.4-e1f38b9e06-c4998d9fc5.zip/node_modules/side-channel/",\ @@ -16061,13 +15708,6 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["sqlstring", [\ - ["npm:2.3.1", {\ - "packageLocation": "./.yarn/cache/sqlstring-npm-2.3.1-2d4ffafe98-bc09237002.zip/node_modules/sqlstring/",\ - "packageDependencies": [\ - ["sqlstring", "npm:2.3.1"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:2.3.3", {\ "packageLocation": "./.yarn/cache/sqlstring-npm-2.3.3-2db6939570-4e5a25af2d.zip/node_modules/sqlstring/",\ "packageDependencies": [\ @@ -16125,15 +15765,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["stack-chain", [\ - ["npm:1.3.7", {\ - "packageLocation": "./.yarn/cache/stack-chain-npm-1.3.7-c803ef2abb-6420637b76.zip/node_modules/stack-chain/",\ - "packageDependencies": [\ - ["stack-chain", "npm:1.3.7"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["stack-trace", [\ ["npm:0.0.10", {\ "packageLocation": "./.yarn/cache/stack-trace-npm-0.0.10-9460b173e1-7bd633f0e9.zip/node_modules/stack-trace/",\ diff --git a/.yarn/cache/@aws-sdk-service-error-classification-npm-3.370.0-0d5b615252-500f067ba1.zip b/.yarn/cache/@aws-sdk-service-error-classification-npm-3.370.0-0d5b615252-500f067ba1.zip deleted file mode 100644 index b573826ee..000000000 Binary files a/.yarn/cache/@aws-sdk-service-error-classification-npm-3.370.0-0d5b615252-500f067ba1.zip and /dev/null differ diff --git a/.yarn/cache/@aws-sdk-types-npm-3.418.0-451c0cadd0-627955c2c9.zip b/.yarn/cache/@aws-sdk-types-npm-3.418.0-451c0cadd0-627955c2c9.zip deleted file mode 100644 index f140d1070..000000000 Binary files a/.yarn/cache/@aws-sdk-types-npm-3.418.0-451c0cadd0-627955c2c9.zip and /dev/null differ diff --git a/.yarn/cache/@types-cls-hooked-npm-4.3.6-8787b64e86-f5b9864348.zip b/.yarn/cache/@types-cls-hooked-npm-4.3.6-8787b64e86-f5b9864348.zip deleted file mode 100644 index 077506671..000000000 Binary files a/.yarn/cache/@types-cls-hooked-npm-4.3.6-8787b64e86-f5b9864348.zip and /dev/null differ diff --git a/.yarn/cache/@types-mysql-npm-2.15.22-d643eb999e-6be0aac58f.zip b/.yarn/cache/@types-mysql-npm-2.15.22-d643eb999e-6be0aac58f.zip deleted file mode 100644 index 5432f6f27..000000000 Binary files a/.yarn/cache/@types-mysql-npm-2.15.22-d643eb999e-6be0aac58f.zip and /dev/null differ diff --git a/.yarn/cache/@types-pg-npm-8.10.3-3fc3365c7b-22d4836bd9.zip b/.yarn/cache/@types-pg-npm-8.10.3-3fc3365c7b-22d4836bd9.zip deleted file mode 100644 index 2c4602e33..000000000 Binary files a/.yarn/cache/@types-pg-npm-8.10.3-3fc3365c7b-22d4836bd9.zip and /dev/null differ diff --git a/.yarn/cache/async-hook-jl-npm-1.7.6-9999815029-f61a3bd4c3.zip b/.yarn/cache/async-hook-jl-npm-1.7.6-9999815029-f61a3bd4c3.zip deleted file mode 100644 index c46116bb8..000000000 Binary files a/.yarn/cache/async-hook-jl-npm-1.7.6-9999815029-f61a3bd4c3.zip and /dev/null differ diff --git a/.yarn/cache/atomic-batcher-npm-1.0.2-6fcd3a3097-025e334f1f.zip b/.yarn/cache/atomic-batcher-npm-1.0.2-6fcd3a3097-025e334f1f.zip deleted file mode 100644 index 4c2543144..000000000 Binary files a/.yarn/cache/atomic-batcher-npm-1.0.2-6fcd3a3097-025e334f1f.zip and /dev/null differ diff --git a/.yarn/cache/aws-xray-sdk-core-npm-3.5.2-9083a0c00f-a643998187.zip b/.yarn/cache/aws-xray-sdk-core-npm-3.5.2-9083a0c00f-a643998187.zip deleted file mode 100644 index 3f1c6041b..000000000 Binary files a/.yarn/cache/aws-xray-sdk-core-npm-3.5.2-9083a0c00f-a643998187.zip and /dev/null differ diff --git a/.yarn/cache/aws-xray-sdk-express-npm-3.5.2-c4574a664b-62a07d0f3b.zip b/.yarn/cache/aws-xray-sdk-express-npm-3.5.2-c4574a664b-62a07d0f3b.zip deleted file mode 100644 index b3fa0b098..000000000 Binary files a/.yarn/cache/aws-xray-sdk-express-npm-3.5.2-c4574a664b-62a07d0f3b.zip and /dev/null differ diff --git a/.yarn/cache/aws-xray-sdk-mysql-npm-3.5.2-095483ab95-f910a96630.zip b/.yarn/cache/aws-xray-sdk-mysql-npm-3.5.2-095483ab95-f910a96630.zip deleted file mode 100644 index 89e63994d..000000000 Binary files a/.yarn/cache/aws-xray-sdk-mysql-npm-3.5.2-095483ab95-f910a96630.zip and /dev/null differ diff --git a/.yarn/cache/aws-xray-sdk-npm-3.5.2-15fc4e54ee-576d0d5ccb.zip b/.yarn/cache/aws-xray-sdk-npm-3.5.2-15fc4e54ee-576d0d5ccb.zip deleted file mode 100644 index a446ecc81..000000000 Binary files a/.yarn/cache/aws-xray-sdk-npm-3.5.2-15fc4e54ee-576d0d5ccb.zip and /dev/null differ diff --git a/.yarn/cache/aws-xray-sdk-postgres-npm-3.5.2-3a7e7bcc42-f2d6da22c7.zip b/.yarn/cache/aws-xray-sdk-postgres-npm-3.5.2-3a7e7bcc42-f2d6da22c7.zip deleted file mode 100644 index b223f0e95..000000000 Binary files a/.yarn/cache/aws-xray-sdk-postgres-npm-3.5.2-3a7e7bcc42-f2d6da22c7.zip and /dev/null differ diff --git a/.yarn/cache/bignumber.js-npm-9.0.0-ce190bcd7c-7406d0d11d.zip b/.yarn/cache/bignumber.js-npm-9.0.0-ce190bcd7c-7406d0d11d.zip deleted file mode 100644 index b09e4b2fa..000000000 Binary files a/.yarn/cache/bignumber.js-npm-9.0.0-ce190bcd7c-7406d0d11d.zip and /dev/null differ diff --git a/.yarn/cache/cls-hooked-npm-4.2.2-db33b9b95f-59081fcc0f.zip b/.yarn/cache/cls-hooked-npm-4.2.2-db33b9b95f-59081fcc0f.zip deleted file mode 100644 index faaa733fb..000000000 Binary files a/.yarn/cache/cls-hooked-npm-4.2.2-db33b9b95f-59081fcc0f.zip and /dev/null differ diff --git a/.yarn/cache/emitter-listener-npm-1.1.2-0fe118d0b3-697f53c308.zip b/.yarn/cache/emitter-listener-npm-1.1.2-0fe118d0b3-697f53c308.zip deleted file mode 100644 index 29d60dbc0..000000000 Binary files a/.yarn/cache/emitter-listener-npm-1.1.2-0fe118d0b3-697f53c308.zip and /dev/null differ diff --git a/.yarn/cache/mysql-npm-2.18.1-8fdb56201f-87d80e3747.zip b/.yarn/cache/mysql-npm-2.18.1-8fdb56201f-87d80e3747.zip deleted file mode 100644 index 9467e5ad8..000000000 Binary files a/.yarn/cache/mysql-npm-2.18.1-8fdb56201f-87d80e3747.zip and /dev/null differ diff --git a/.yarn/cache/obuf-npm-1.1.2-8db5fae8dd-53ff4ab3a1.zip b/.yarn/cache/obuf-npm-1.1.2-8db5fae8dd-53ff4ab3a1.zip deleted file mode 100644 index 99fb56b5c..000000000 Binary files a/.yarn/cache/obuf-npm-1.1.2-8db5fae8dd-53ff4ab3a1.zip and /dev/null differ diff --git a/.yarn/cache/pg-int8-npm-1.0.1-5cd67f3e22-a1e3a05a69.zip b/.yarn/cache/pg-int8-npm-1.0.1-5cd67f3e22-a1e3a05a69.zip deleted file mode 100644 index 600179612..000000000 Binary files a/.yarn/cache/pg-int8-npm-1.0.1-5cd67f3e22-a1e3a05a69.zip and /dev/null differ diff --git a/.yarn/cache/pg-numeric-npm-1.0.2-9026ec3427-8899f8200c.zip b/.yarn/cache/pg-numeric-npm-1.0.2-9026ec3427-8899f8200c.zip deleted file mode 100644 index cd2b4b919..000000000 Binary files a/.yarn/cache/pg-numeric-npm-1.0.2-9026ec3427-8899f8200c.zip and /dev/null differ diff --git a/.yarn/cache/pg-protocol-npm-1.6.0-089a4b1d3c-995864cc2a.zip b/.yarn/cache/pg-protocol-npm-1.6.0-089a4b1d3c-995864cc2a.zip deleted file mode 100644 index 7303b8265..000000000 Binary files a/.yarn/cache/pg-protocol-npm-1.6.0-089a4b1d3c-995864cc2a.zip and /dev/null differ diff --git a/.yarn/cache/pg-types-npm-4.0.1-8f922557d3-2c686ef361.zip b/.yarn/cache/pg-types-npm-4.0.1-8f922557d3-2c686ef361.zip deleted file mode 100644 index 854370065..000000000 Binary files a/.yarn/cache/pg-types-npm-4.0.1-8f922557d3-2c686ef361.zip and /dev/null differ diff --git a/.yarn/cache/postgres-array-npm-3.0.2-da6a3f1fed-0159517e4e.zip b/.yarn/cache/postgres-array-npm-3.0.2-da6a3f1fed-0159517e4e.zip deleted file mode 100644 index 2c83f00df..000000000 Binary files a/.yarn/cache/postgres-array-npm-3.0.2-da6a3f1fed-0159517e4e.zip and /dev/null differ diff --git a/.yarn/cache/postgres-bytea-npm-3.0.0-5de4c664f6-f5c01758fd.zip b/.yarn/cache/postgres-bytea-npm-3.0.0-5de4c664f6-f5c01758fd.zip deleted file mode 100644 index d9b7589e7..000000000 Binary files a/.yarn/cache/postgres-bytea-npm-3.0.0-5de4c664f6-f5c01758fd.zip and /dev/null differ diff --git a/.yarn/cache/postgres-date-npm-2.0.1-00e0e0bc9e-908eacec35.zip b/.yarn/cache/postgres-date-npm-2.0.1-00e0e0bc9e-908eacec35.zip deleted file mode 100644 index 88dea56ae..000000000 Binary files a/.yarn/cache/postgres-date-npm-2.0.1-00e0e0bc9e-908eacec35.zip and /dev/null differ diff --git a/.yarn/cache/postgres-interval-npm-3.0.0-936c769b98-c7a1cf006d.zip b/.yarn/cache/postgres-interval-npm-3.0.0-936c769b98-c7a1cf006d.zip deleted file mode 100644 index 29ebcceb2..000000000 Binary files a/.yarn/cache/postgres-interval-npm-3.0.0-936c769b98-c7a1cf006d.zip and /dev/null differ diff --git a/.yarn/cache/postgres-range-npm-1.1.3-46f68e1a9e-356a46d97e.zip b/.yarn/cache/postgres-range-npm-1.1.3-46f68e1a9e-356a46d97e.zip deleted file mode 100644 index afcf6da44..000000000 Binary files a/.yarn/cache/postgres-range-npm-1.1.3-46f68e1a9e-356a46d97e.zip and /dev/null differ diff --git a/.yarn/cache/readable-stream-npm-2.3.7-77b22a9818-d04c677c17.zip b/.yarn/cache/readable-stream-npm-2.3.7-77b22a9818-d04c677c17.zip deleted file mode 100644 index 80ed5fbbe..000000000 Binary files a/.yarn/cache/readable-stream-npm-2.3.7-77b22a9818-d04c677c17.zip and /dev/null differ diff --git a/.yarn/cache/semver-npm-5.7.2-938ee91eaa-fca14418a1.zip b/.yarn/cache/semver-npm-5.7.2-938ee91eaa-fca14418a1.zip deleted file mode 100644 index 4f3e96aff..000000000 Binary files a/.yarn/cache/semver-npm-5.7.2-938ee91eaa-fca14418a1.zip and /dev/null differ diff --git a/.yarn/cache/shimmer-npm-1.2.1-8b50bf3206-aa0d6252ad.zip b/.yarn/cache/shimmer-npm-1.2.1-8b50bf3206-aa0d6252ad.zip deleted file mode 100644 index dbdf6d851..000000000 Binary files a/.yarn/cache/shimmer-npm-1.2.1-8b50bf3206-aa0d6252ad.zip and /dev/null differ diff --git a/.yarn/cache/sqlstring-npm-2.3.1-2d4ffafe98-bc09237002.zip b/.yarn/cache/sqlstring-npm-2.3.1-2d4ffafe98-bc09237002.zip deleted file mode 100644 index 740b9e166..000000000 Binary files a/.yarn/cache/sqlstring-npm-2.3.1-2d4ffafe98-bc09237002.zip and /dev/null differ diff --git a/.yarn/cache/stack-chain-npm-1.3.7-c803ef2abb-6420637b76.zip b/.yarn/cache/stack-chain-npm-1.3.7-c803ef2abb-6420637b76.zip deleted file mode 100644 index d1ce350e7..000000000 Binary files a/.yarn/cache/stack-chain-npm-1.3.7-c803ef2abb-6420637b76.zip and /dev/null differ diff --git a/packages/analytics/bin/report.ts b/packages/analytics/bin/report.ts index e09305c1d..db88d1f45 100644 --- a/packages/analytics/bin/report.ts +++ b/packages/analytics/bin/report.ts @@ -1,7 +1,6 @@ import 'reflect-metadata' import { Logger } from 'winston' -import * as AWSXRay from 'aws-xray-sdk' import { EmailLevel } from '@standardnotes/domain-core' import { DomainEventPublisherInterface } from '@standardnotes/domain-events' @@ -254,14 +253,6 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.enableManualMode() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const logger: Logger = container.get(TYPES.Logger) logger.info('Starting usage report generation...') diff --git a/packages/analytics/bin/worker.ts b/packages/analytics/bin/worker.ts index 1c0c3ac1b..05dd71deb 100644 --- a/packages/analytics/bin/worker.ts +++ b/packages/analytics/bin/worker.ts @@ -1,7 +1,6 @@ import 'reflect-metadata' import { Logger } from 'winston' -import * as AWSXRay from 'aws-xray-sdk' import { DomainEventSubscriberFactoryInterface } from '@standardnotes/domain-events' import * as dayjs from 'dayjs' import * as utc from 'dayjs/plugin/utc' @@ -17,14 +16,6 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.enableManualMode() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const logger: Logger = container.get(TYPES.Logger) logger.info('Starting worker...') diff --git a/packages/analytics/package.json b/packages/analytics/package.json index b5c2840cf..cdc5e98ca 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -46,7 +46,6 @@ "@standardnotes/domain-events": "workspace:*", "@standardnotes/domain-events-infra": "workspace:*", "@standardnotes/time": "workspace:*", - "aws-xray-sdk": "^3.5.2", "dayjs": "^1.11.6", "dotenv": "^16.0.1", "inversify": "^6.0.1", diff --git a/packages/analytics/src/Bootstrap/Container.ts b/packages/analytics/src/Bootstrap/Container.ts index 3670799c3..cc461ffa4 100644 --- a/packages/analytics/src/Bootstrap/Container.ts +++ b/packages/analytics/src/Bootstrap/Container.ts @@ -6,7 +6,7 @@ import { DomainEventMessageHandlerInterface, DomainEventSubscriberFactoryInterface, } from '@standardnotes/domain-events' -import { MapperInterface, ServiceIdentifier } from '@standardnotes/domain-core' +import { MapperInterface } from '@standardnotes/domain-core' // eslint-disable-next-line @typescript-eslint/no-var-requires const Mixpanel = require('mixpanel') @@ -18,7 +18,6 @@ import { SNSDomainEventPublisher, SQSDomainEventSubscriberFactory, SQSEventMessageHandler, - SQSXRayEventMessageHandler, } from '@standardnotes/domain-events-infra' import { Timer, TimerInterface } from '@standardnotes/time' import { PeriodKeyGeneratorInterface } from '../Domain/Time/PeriodKeyGeneratorInterface' @@ -57,7 +56,6 @@ import { SNSClient, SNSClientConfig } from '@aws-sdk/client-sns' import { SQSClient, SQSClientConfig } from '@aws-sdk/client-sqs' import { SessionCreatedEventHandler } from '../Domain/Handler/SessionCreatedEventHandler' import { SessionRefreshedEventHandler } from '../Domain/Handler/SessionRefreshedEventHandler' -import { captureAWSv3Client } from 'aws-xray-sdk' export class ContainerConfigLoader { async load(): Promise { @@ -108,7 +106,7 @@ export class ContainerConfigLoader { secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true), } } - container.bind(TYPES.SNS).toConstantValue(captureAWSv3Client(new SNSClient(snsConfig))) + container.bind(TYPES.SNS).toConstantValue(new SNSClient(snsConfig)) if (env.get('SQS_QUEUE_URL', true)) { const sqsConfig: SQSClientConfig = { @@ -123,7 +121,7 @@ export class ContainerConfigLoader { secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true), } } - container.bind(TYPES.SQS).toConstantValue(captureAWSv3Client(new SQSClient(sqsConfig))) + container.bind(TYPES.SQS).toConstantValue(new SQSClient(sqsConfig)) } // env vars @@ -245,15 +243,7 @@ export class ContainerConfigLoader { container .bind(TYPES.DomainEventMessageHandler) - .toConstantValue( - env.get('NEW_RELIC_ENABLED', true) === 'true' - ? new SQSXRayEventMessageHandler( - ServiceIdentifier.NAMES.AnalyticsWorker, - eventHandlers, - container.get(TYPES.Logger), - ) - : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)), - ) + .toConstantValue(new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger))) container .bind(TYPES.DomainEventSubscriberFactory) .toConstantValue( diff --git a/packages/api-gateway/bin/server.ts b/packages/api-gateway/bin/server.ts index 2e1e1f5c1..07e169f42 100644 --- a/packages/api-gateway/bin/server.ts +++ b/packages/api-gateway/bin/server.ts @@ -29,7 +29,6 @@ import helmet from 'helmet' import * as cors from 'cors' import { text, json, Request, Response, NextFunction } from 'express' import * as winston from 'winston' -import * as AWSXRay from 'aws-xray-sdk' // eslint-disable-next-line @typescript-eslint/no-var-requires const robots = require('express-robots-txt') @@ -37,27 +36,15 @@ import { InversifyExpressServer } from 'inversify-express-utils' import { ContainerConfigLoader } from '../src/Bootstrap/Container' import { TYPES } from '../src/Bootstrap/Types' import { Env } from '../src/Bootstrap/Env' -import { ServiceIdentifier } from '@standardnotes/domain-core' const container = new ContainerConfigLoader() void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const server = new InversifyExpressServer(container) server.setConfig((app) => { - if (isConfiguredForAWSProduction) { - app.use(AWSXRay.express.openSegment(ServiceIdentifier.NAMES.ApiGateway)) - } - app.use((_request: Request, response: Response, next: NextFunction) => { response.setHeader('X-API-Gateway-Version', container.get(TYPES.ApiGateway_VERSION)) next() @@ -117,10 +104,6 @@ void container.load().then((container) => { const serverInstance = server.build() - if (isConfiguredForAWSProduction) { - serverInstance.use(AWSXRay.express.closeSegment()) - } - serverInstance.listen(env.get('PORT')) logger.info(`Server started on port ${process.env.PORT}`) diff --git a/packages/api-gateway/package.json b/packages/api-gateway/package.json index 943dcfa1f..5959005f9 100644 --- a/packages/api-gateway/package.json +++ b/packages/api-gateway/package.json @@ -31,7 +31,6 @@ "@standardnotes/domain-events-infra": "workspace:*", "@standardnotes/security": "workspace:*", "@standardnotes/time": "workspace:*", - "aws-xray-sdk": "^3.5.2", "axios": "^1.1.3", "cors": "2.8.5", "dotenv": "^16.0.1", diff --git a/packages/api-gateway/src/Bootstrap/Container.ts b/packages/api-gateway/src/Bootstrap/Container.ts index 108110ab3..2609f50e9 100644 --- a/packages/api-gateway/src/Bootstrap/Container.ts +++ b/packages/api-gateway/src/Bootstrap/Container.ts @@ -35,8 +35,6 @@ export class ContainerConfigLoader { const container = new Container() const isConfiguredForHomeServer = env.get('MODE', true) === 'home-server' - const isConfiguredForSelfHosting = env.get('MODE', true) === 'self-hosted' - const isConfiguredForAWSProduction = !isConfiguredForHomeServer && !isConfiguredForSelfHosting const isConfiguredForInMemoryCache = env.get('CACHE_TYPE', true) === 'memory' const winstonFormatters = [winston.format.splat(), winston.format.json()] @@ -92,9 +90,6 @@ export class ContainerConfigLoader { .bind(TYPES.ApiGateway_CROSS_SERVICE_TOKEN_CACHE_TTL) .toConstantValue(+env.get('CROSS_SERVICE_TOKEN_CACHE_TTL', true)) container.bind(TYPES.ApiGateway_IS_CONFIGURED_FOR_HOME_SERVER).toConstantValue(isConfiguredForHomeServer) - container - .bind(TYPES.ApiGateway_IS_CONFIGURED_FOR_AWS_PRODUCTION) - .toConstantValue(isConfiguredForAWSProduction) // Middleware container diff --git a/packages/api-gateway/src/Bootstrap/Types.ts b/packages/api-gateway/src/Bootstrap/Types.ts index 4b0e8560c..134581d9b 100644 --- a/packages/api-gateway/src/Bootstrap/Types.ts +++ b/packages/api-gateway/src/Bootstrap/Types.ts @@ -15,7 +15,6 @@ export const TYPES = { ApiGateway_VERSION: Symbol.for('ApiGateway_VERSION'), ApiGateway_CROSS_SERVICE_TOKEN_CACHE_TTL: Symbol.for('ApiGateway_CROSS_SERVICE_TOKEN_CACHE_TTL'), ApiGateway_IS_CONFIGURED_FOR_HOME_SERVER: Symbol.for('ApiGateway_IS_CONFIGURED_FOR_HOME_SERVER'), - ApiGateway_IS_CONFIGURED_FOR_AWS_PRODUCTION: Symbol.for('ApiGateway_IS_CONFIGURED_FOR_AWS_PRODUCTION'), // Middleware ApiGateway_RequiredCrossServiceTokenMiddleware: Symbol.for('ApiGateway_RequiredCrossServiceTokenMiddleware'), ApiGateway_OptionalCrossServiceTokenMiddleware: Symbol.for('ApiGateway_OptionalCrossServiceTokenMiddleware'), diff --git a/packages/api-gateway/src/Controller/AuthMiddleware.ts b/packages/api-gateway/src/Controller/AuthMiddleware.ts index 006acbdf8..c2fe6316c 100644 --- a/packages/api-gateway/src/Controller/AuthMiddleware.ts +++ b/packages/api-gateway/src/Controller/AuthMiddleware.ts @@ -8,7 +8,6 @@ import { Logger } from 'winston' import { CrossServiceTokenCacheInterface } from '../Service/Cache/CrossServiceTokenCacheInterface' import { ServiceProxyInterface } from '../Service/Http/ServiceProxyInterface' -import { Segment, getSegment } from 'aws-xray-sdk' export abstract class AuthMiddleware extends BaseMiddleware { constructor( @@ -17,7 +16,6 @@ export abstract class AuthMiddleware extends BaseMiddleware { private crossServiceTokenCacheTTL: number, private crossServiceTokenCache: CrossServiceTokenCacheInterface, private timer: TimerInterface, - private isConfiguredForAWSProduction: boolean, protected logger: Logger, ) { super() @@ -75,13 +73,6 @@ export abstract class AuthMiddleware extends BaseMiddleware { response.locals.roles = decodedToken.roles response.locals.sharedVaultOwnerContext = decodedToken.shared_vault_owner_context response.locals.belongsToSharedVaults = decodedToken.belongs_to_shared_vaults ?? [] - - if (this.isConfiguredForAWSProduction) { - const segment = getSegment() - if (segment instanceof Segment) { - segment.setUser(decodedToken.user.uuid) - } - } } catch (error) { const errorMessage = (error as AxiosError).isAxiosError ? JSON.stringify((error as AxiosError).response?.data) diff --git a/packages/api-gateway/src/Controller/OptionalCrossServiceTokenMiddleware.ts b/packages/api-gateway/src/Controller/OptionalCrossServiceTokenMiddleware.ts index 1d29ea63a..6e1937db0 100644 --- a/packages/api-gateway/src/Controller/OptionalCrossServiceTokenMiddleware.ts +++ b/packages/api-gateway/src/Controller/OptionalCrossServiceTokenMiddleware.ts @@ -16,18 +16,9 @@ export class OptionalCrossServiceTokenMiddleware extends AuthMiddleware { @inject(TYPES.ApiGateway_CROSS_SERVICE_TOKEN_CACHE_TTL) crossServiceTokenCacheTTL: number, @inject(TYPES.ApiGateway_CrossServiceTokenCache) crossServiceTokenCache: CrossServiceTokenCacheInterface, @inject(TYPES.ApiGateway_Timer) timer: TimerInterface, - @inject(TYPES.ApiGateway_IS_CONFIGURED_FOR_AWS_PRODUCTION) isConfiguredForAWSProduction: boolean, @inject(TYPES.ApiGateway_Logger) logger: Logger, ) { - super( - serviceProxy, - jwtSecret, - crossServiceTokenCacheTTL, - crossServiceTokenCache, - timer, - isConfiguredForAWSProduction, - logger, - ) + super(serviceProxy, jwtSecret, crossServiceTokenCacheTTL, crossServiceTokenCache, timer, logger) } protected override handleSessionValidationResponse( diff --git a/packages/api-gateway/src/Controller/RequiredCrossServiceTokenMiddleware.ts b/packages/api-gateway/src/Controller/RequiredCrossServiceTokenMiddleware.ts index 9e36e9aa2..ecc93d867 100644 --- a/packages/api-gateway/src/Controller/RequiredCrossServiceTokenMiddleware.ts +++ b/packages/api-gateway/src/Controller/RequiredCrossServiceTokenMiddleware.ts @@ -16,18 +16,9 @@ export class RequiredCrossServiceTokenMiddleware extends AuthMiddleware { @inject(TYPES.ApiGateway_CROSS_SERVICE_TOKEN_CACHE_TTL) crossServiceTokenCacheTTL: number, @inject(TYPES.ApiGateway_CrossServiceTokenCache) crossServiceTokenCache: CrossServiceTokenCacheInterface, @inject(TYPES.ApiGateway_Timer) timer: TimerInterface, - @inject(TYPES.ApiGateway_IS_CONFIGURED_FOR_AWS_PRODUCTION) isConfiguredForAWSProduction: boolean, @inject(TYPES.ApiGateway_Logger) logger: Logger, ) { - super( - serviceProxy, - jwtSecret, - crossServiceTokenCacheTTL, - crossServiceTokenCache, - timer, - isConfiguredForAWSProduction, - logger, - ) + super(serviceProxy, jwtSecret, crossServiceTokenCacheTTL, crossServiceTokenCache, timer, logger) } protected override handleSessionValidationResponse( diff --git a/packages/auth/bin/backup.ts b/packages/auth/bin/backup.ts index fa76d6789..d02015119 100644 --- a/packages/auth/bin/backup.ts +++ b/packages/auth/bin/backup.ts @@ -5,7 +5,6 @@ import { Stream } from 'stream' import { Logger } from 'winston' import * as dayjs from 'dayjs' import * as utc from 'dayjs/plugin/utc' -import * as AWSXRay from 'aws-xray-sdk' import { ContainerConfigLoader } from '../src/Bootstrap/Container' import TYPES from '../src/Bootstrap/Types' @@ -83,14 +82,6 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.enableManualMode() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const logger: Logger = container.get(TYPES.Auth_Logger) logger.info(`Starting ${backupFrequency} ${backupProvider} backup requesting...`) diff --git a/packages/auth/bin/cleanup.ts b/packages/auth/bin/cleanup.ts index 0d4970212..daa1b35a3 100644 --- a/packages/auth/bin/cleanup.ts +++ b/packages/auth/bin/cleanup.ts @@ -1,7 +1,6 @@ import 'reflect-metadata' import { Logger } from 'winston' -import * as AWSXRay from 'aws-xray-sdk' import { ContainerConfigLoader } from '../src/Bootstrap/Container' import TYPES from '../src/Bootstrap/Types' @@ -24,14 +23,6 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.enableManualMode() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const logger: Logger = container.get(TYPES.Auth_Logger) logger.info('Starting sessions and session traces cleanup') diff --git a/packages/auth/bin/server.ts b/packages/auth/bin/server.ts index 4c2464a53..39d27a297 100644 --- a/packages/auth/bin/server.ts +++ b/packages/auth/bin/server.ts @@ -24,13 +24,11 @@ import { urlencoded, json, Request, Response, NextFunction } from 'express' import * as winston from 'winston' import * as dayjs from 'dayjs' import * as utc from 'dayjs/plugin/utc' -import * as AWSXRay from 'aws-xray-sdk' import { InversifyExpressServer } from 'inversify-express-utils' import { ContainerConfigLoader } from '../src/Bootstrap/Container' import TYPES from '../src/Bootstrap/Types' import { Env } from '../src/Bootstrap/Env' -import { ServiceIdentifier } from '@standardnotes/domain-core' const container = new ContainerConfigLoader() void container.load().then((container) => { @@ -39,20 +37,9 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const server = new InversifyExpressServer(container) server.setConfig((app) => { - if (isConfiguredForAWSProduction) { - app.use(AWSXRay.express.openSegment(ServiceIdentifier.NAMES.Auth)) - } - app.use((_request: Request, response: Response, next: NextFunction) => { response.setHeader('X-Auth-Version', container.get(TYPES.Auth_VERSION)) next() @@ -79,10 +66,6 @@ void container.load().then((container) => { const serverInstance = server.build() - if (isConfiguredForAWSProduction) { - serverInstance.use(AWSXRay.express.closeSegment()) - } - serverInstance.listen(env.get('PORT')) logger.info(`Server started on port ${process.env.PORT}`) diff --git a/packages/auth/bin/stats.ts b/packages/auth/bin/stats.ts index a258688fa..02b74d259 100644 --- a/packages/auth/bin/stats.ts +++ b/packages/auth/bin/stats.ts @@ -2,7 +2,6 @@ import 'reflect-metadata' import { Logger } from 'winston' import { TimerInterface } from '@standardnotes/time' -import * as AWSXRay from 'aws-xray-sdk' import { ContainerConfigLoader } from '../src/Bootstrap/Container' import TYPES from '../src/Bootstrap/Types' @@ -14,14 +13,6 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.enableManualMode() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const logger: Logger = container.get(TYPES.Auth_Logger) logger.info('Starting session traces cleanup') diff --git a/packages/auth/bin/transition.ts b/packages/auth/bin/transition.ts index 86c6af3fc..5ba570f7d 100644 --- a/packages/auth/bin/transition.ts +++ b/packages/auth/bin/transition.ts @@ -3,7 +3,6 @@ import 'reflect-metadata' import { Logger } from 'winston' import * as dayjs from 'dayjs' import * as utc from 'dayjs/plugin/utc' -import * as AWSXRay from 'aws-xray-sdk' import { ContainerConfigLoader } from '../src/Bootstrap/Container' import TYPES from '../src/Bootstrap/Types' @@ -103,14 +102,6 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.enableManualMode() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const logger: Logger = container.get(TYPES.Auth_Logger) logger.info(`Starting transition request for users created between ${startDateString} and ${endDateString}`) diff --git a/packages/auth/bin/user_email_backup.ts b/packages/auth/bin/user_email_backup.ts index 5820561ef..786dc270c 100644 --- a/packages/auth/bin/user_email_backup.ts +++ b/packages/auth/bin/user_email_backup.ts @@ -3,7 +3,6 @@ import 'reflect-metadata' import { Logger } from 'winston' import * as dayjs from 'dayjs' import * as utc from 'dayjs/plugin/utc' -import * as AWSXRay from 'aws-xray-sdk' import { ContainerConfigLoader } from '../src/Bootstrap/Container' import TYPES from '../src/Bootstrap/Types' @@ -71,14 +70,6 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.enableManualMode() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const logger: Logger = container.get(TYPES.Auth_Logger) logger.info(`Starting email backup requesting for ${backupEmail} ...`) diff --git a/packages/auth/bin/worker.ts b/packages/auth/bin/worker.ts index 6c1c4371f..d6d786228 100644 --- a/packages/auth/bin/worker.ts +++ b/packages/auth/bin/worker.ts @@ -8,7 +8,6 @@ import { Env } from '../src/Bootstrap/Env' import { DomainEventSubscriberFactoryInterface } from '@standardnotes/domain-events' import * as dayjs from 'dayjs' import * as utc from 'dayjs/plugin/utc' -import * as AWSXRay from 'aws-xray-sdk' const container = new ContainerConfigLoader('worker') void container.load().then((container) => { @@ -17,14 +16,6 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.enableManualMode() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const logger: Logger = container.get(TYPES.Auth_Logger) logger.info('Starting worker...') diff --git a/packages/auth/package.json b/packages/auth/package.json index 91bc3b27b..15279d89f 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -54,7 +54,6 @@ "@standardnotes/sncrypto-common": "^1.13.4", "@standardnotes/sncrypto-node": "workspace:*", "@standardnotes/time": "workspace:*", - "aws-xray-sdk": "^3.5.2", "axios": "^1.1.3", "bcryptjs": "2.4.3", "cors": "2.8.5", diff --git a/packages/auth/src/Bootstrap/Container.ts b/packages/auth/src/Bootstrap/Container.ts index bebd41b97..bf668e1b2 100644 --- a/packages/auth/src/Bootstrap/Container.ts +++ b/packages/auth/src/Bootstrap/Container.ts @@ -1,6 +1,5 @@ import * as winston from 'winston' import Redis from 'ioredis' -import { captureAWSv3Client } from 'aws-xray-sdk' import { SNSClient, SNSClientConfig } from '@aws-sdk/client-sns' import { SQSClient, SQSClientConfig } from '@aws-sdk/client-sqs' import { Container } from 'inversify' @@ -93,7 +92,6 @@ import { SNSDomainEventPublisher, SQSDomainEventSubscriberFactory, SQSEventMessageHandler, - SQSXRayEventMessageHandler, } from '@standardnotes/domain-events-infra' import { GetUserSubscription } from '../Domain/UseCase/GetUserSubscription/GetUserSubscription' import { ChangeCredentials } from '../Domain/UseCase/ChangeCredentials/ChangeCredentials' @@ -190,7 +188,6 @@ import { ControllerContainer, ControllerContainerInterface, MapperInterface, - ServiceIdentifier, SharedVaultUser, } from '@standardnotes/domain-core' import { SessionTracePersistenceMapper } from '../Mapping/SessionTracePersistenceMapper' @@ -322,8 +319,6 @@ export class ContainerConfigLoader { logger.debug('Database initialized') const isConfiguredForHomeServer = env.get('MODE', true) === 'home-server' - const isConfiguredForSelfHosting = env.get('MODE', true) === 'self-hosted' - const isConfiguredForAWSProduction = !isConfiguredForHomeServer && !isConfiguredForSelfHosting const isConfiguredForInMemoryCache = env.get('CACHE_TYPE', true) === 'memory' if (!isConfiguredForInMemoryCache) { @@ -354,10 +349,7 @@ export class ContainerConfigLoader { secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true), } } - let snsClient = new SNSClient(snsConfig) - if (isConfiguredForAWSProduction) { - snsClient = captureAWSv3Client(snsClient) - } + const snsClient = new SNSClient(snsConfig) container.bind(TYPES.Auth_SNS).toConstantValue(snsClient) const sqsConfig: SQSClientConfig = { @@ -372,10 +364,7 @@ export class ContainerConfigLoader { secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true), } } - let sqsClient = new SQSClient(sqsConfig) - if (isConfiguredForAWSProduction) { - sqsClient = captureAWSv3Client(sqsClient) - } + const sqsClient = new SQSClient(sqsConfig) container.bind(TYPES.Auth_SQS).toConstantValue(sqsClient) } @@ -1234,15 +1223,7 @@ export class ContainerConfigLoader { } else { container .bind(TYPES.Auth_DomainEventMessageHandler) - .toConstantValue( - isConfiguredForAWSProduction - ? new SQSXRayEventMessageHandler( - ServiceIdentifier.NAMES.AuthWorker, - eventHandlers, - container.get(TYPES.Auth_Logger), - ) - : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Auth_Logger)), - ) + .toConstantValue(new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Auth_Logger))) container .bind(TYPES.Auth_DomainEventSubscriberFactory) diff --git a/packages/domain-events-infra/package.json b/packages/domain-events-infra/package.json index fd3e9d982..4f86fcdf9 100644 --- a/packages/domain-events-infra/package.json +++ b/packages/domain-events-infra/package.json @@ -27,7 +27,6 @@ "@aws-sdk/client-sns": "^3.332.0", "@aws-sdk/client-sqs": "^3.332.0", "@standardnotes/domain-events": "workspace:*", - "aws-xray-sdk": "^3.5.2", "ioredis": "^5.2.4", "reflect-metadata": "^0.1.13", "sqs-consumer": "^7.3.0", diff --git a/packages/domain-events-infra/src/Infra/SQS/SQSXRayEventMessageHandler.ts b/packages/domain-events-infra/src/Infra/SQS/SQSXRayEventMessageHandler.ts deleted file mode 100644 index 50dcde19c..000000000 --- a/packages/domain-events-infra/src/Infra/SQS/SQSXRayEventMessageHandler.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { Logger } from 'winston' -import * as zlib from 'zlib' -import { Segment, Subsegment, captureAsyncFunc } from 'aws-xray-sdk' - -import { - DomainEventHandlerInterface, - DomainEventInterface, - DomainEventMessageHandlerInterface, -} from '@standardnotes/domain-events' - -export class SQSXRayEventMessageHandler implements DomainEventMessageHandlerInterface { - constructor( - private serviceName: string, - private handlers: Map, - private logger: Logger, - ) {} - - async handleMessage(message: string): Promise { - const messageParsed = JSON.parse(message) - - const domainEventJson = zlib.unzipSync(Buffer.from(messageParsed.Message, 'base64')).toString() - - const domainEvent: DomainEventInterface = JSON.parse(domainEventJson) - - domainEvent.createdAt = new Date(domainEvent.createdAt) - - const handler = this.handlers.get(domainEvent.type) - if (!handler) { - this.logger.debug(`Event handler for event type ${domainEvent.type} does not exist`) - - return - } - - this.logger.debug(`Received event: ${domainEvent.type}`) - - const xRaySegment = new Segment(this.serviceName) - - if (domainEvent.meta.correlation.userIdentifierType === 'uuid') { - xRaySegment.setUser(domainEvent.meta.correlation.userIdentifier) - } - - await captureAsyncFunc( - domainEvent.type, - async (subsegment?: Subsegment) => { - await handler.handle(domainEvent) - - if (subsegment) { - subsegment.close() - } - }, - xRaySegment, - ) - - xRaySegment.close() - } - - async handleError(error: Error): Promise { - this.logger.error('Error occured while handling SQS message: %O', error) - } -} diff --git a/packages/domain-events-infra/src/Infra/index.ts b/packages/domain-events-infra/src/Infra/index.ts index 6e3cd9a0c..328923383 100644 --- a/packages/domain-events-infra/src/Infra/index.ts +++ b/packages/domain-events-infra/src/Infra/index.ts @@ -12,4 +12,3 @@ export * from './SQS/SQSNewRelicBounceNotificiationHandler' export * from './SQS/SQSDomainEventSubscriberFactory' export * from './SQS/SQSEventMessageHandler' export * from './SQS/SQSNewRelicEventMessageHandler' -export * from './SQS/SQSXRayEventMessageHandler' diff --git a/packages/files/bin/server.ts b/packages/files/bin/server.ts index 68f8bf82e..447fae742 100644 --- a/packages/files/bin/server.ts +++ b/packages/files/bin/server.ts @@ -10,7 +10,6 @@ import helmet from 'helmet' import * as cors from 'cors' import { urlencoded, json, raw, Request, Response, NextFunction } from 'express' import * as winston from 'winston' -import * as AWSXRay from 'aws-xray-sdk' // eslint-disable-next-line @typescript-eslint/no-var-requires const robots = require('express-robots-txt') @@ -18,27 +17,15 @@ import { InversifyExpressServer } from 'inversify-express-utils' import { ContainerConfigLoader } from '../src/Bootstrap/Container' import TYPES from '../src/Bootstrap/Types' import { Env } from '../src/Bootstrap/Env' -import { ServiceIdentifier } from '@standardnotes/domain-core' const container = new ContainerConfigLoader() void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const server = new InversifyExpressServer(container) server.setConfig((app) => { - if (isConfiguredForAWSProduction) { - app.use(AWSXRay.express.openSegment(ServiceIdentifier.NAMES.Files)) - } - app.use((_request: Request, response: Response, next: NextFunction) => { response.setHeader('X-Files-Version', container.get(TYPES.Files_VERSION)) next() @@ -103,10 +90,6 @@ void container.load().then((container) => { const serverInstance = server.build() - if (isConfiguredForAWSProduction) { - serverInstance.use(AWSXRay.express.closeSegment()) - } - serverInstance.listen(env.get('PORT')) logger.info(`Server started on port ${process.env.PORT}`) diff --git a/packages/files/bin/worker.ts b/packages/files/bin/worker.ts index ebf2767a1..5fcea6222 100644 --- a/packages/files/bin/worker.ts +++ b/packages/files/bin/worker.ts @@ -8,7 +8,6 @@ import { Env } from '../src/Bootstrap/Env' import { DomainEventSubscriberFactoryInterface } from '@standardnotes/domain-events' import * as dayjs from 'dayjs' import * as utc from 'dayjs/plugin/utc' -import * as AWSXRay from 'aws-xray-sdk' const container = new ContainerConfigLoader() void container.load().then((container) => { @@ -17,14 +16,6 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.enableManualMode() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const logger: Logger = container.get(TYPES.Files_Logger) logger.info('Starting worker...') diff --git a/packages/files/package.json b/packages/files/package.json index 8c578fb32..77fcb4851 100644 --- a/packages/files/package.json +++ b/packages/files/package.json @@ -37,7 +37,6 @@ "@standardnotes/sncrypto-common": "^1.13.4", "@standardnotes/sncrypto-node": "workspace:*", "@standardnotes/time": "workspace:*", - "aws-xray-sdk": "^3.5.2", "connect-busboy": "^1.0.0", "cors": "^2.8.5", "dayjs": "^1.11.6", diff --git a/packages/files/src/Bootstrap/Container.ts b/packages/files/src/Bootstrap/Container.ts index 88dd270c5..d4315113d 100644 --- a/packages/files/src/Bootstrap/Container.ts +++ b/packages/files/src/Bootstrap/Container.ts @@ -1,6 +1,5 @@ import * as winston from 'winston' import Redis from 'ioredis' -import { captureAWSv3Client } from 'aws-xray-sdk' import { SNSClient, SNSClientConfig } from '@aws-sdk/client-sns' import { SQSClient, SQSClientConfig } from '@aws-sdk/client-sqs' import { S3Client, S3ClientConfig } from '@aws-sdk/client-s3' @@ -20,7 +19,6 @@ import { SNSDomainEventPublisher, SQSDomainEventSubscriberFactory, SQSEventMessageHandler, - SQSXRayEventMessageHandler, } from '@standardnotes/domain-events-infra' import { StreamDownloadFile } from '../Domain/UseCase/StreamDownloadFile/StreamDownloadFile' import { FileDownloaderInterface } from '../Domain/Services/FileDownloaderInterface' @@ -54,7 +52,6 @@ import { S3FileMover } from '../Infra/S3/S3FileMover' import { FSFileMover } from '../Infra/FS/FSFileMover' import { MoveFile } from '../Domain/UseCase/MoveFile/MoveFile' import { SharedVaultValetTokenAuthMiddleware } from '../Infra/InversifyExpress/Middleware/SharedVaultValetTokenAuthMiddleware' -import { ServiceIdentifier } from '@standardnotes/domain-core' export class ContainerConfigLoader { async load(configuration?: { @@ -85,9 +82,7 @@ export class ContainerConfigLoader { .toConstantValue(env.get('FILE_UPLOAD_PATH', true) ?? `${__dirname}/../../uploads`) const isConfiguredForHomeServer = env.get('MODE', true) === 'home-server' - const isConfiguredForSelfHosting = env.get('MODE', true) === 'self-hosted' const isConfiguredForInMemoryCache = env.get('CACHE_TYPE', true) === 'memory' - const isConfiguredForAWSProduction = !isConfiguredForHomeServer && !isConfiguredForSelfHosting let logger: winston.Logger if (configuration?.logger) { @@ -153,10 +148,7 @@ export class ContainerConfigLoader { secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true), } } - let snsClient = new SNSClient(snsConfig) - if (isConfiguredForAWSProduction) { - snsClient = captureAWSv3Client(snsClient) - } + const snsClient = new SNSClient(snsConfig) container.bind(TYPES.Files_SNS).toConstantValue(snsClient) } @@ -173,10 +165,7 @@ export class ContainerConfigLoader { secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true), } } - let sqsClient = new SQSClient(sqsConfig) - if (isConfiguredForAWSProduction) { - sqsClient = captureAWSv3Client(sqsClient) - } + const sqsClient = new SQSClient(sqsConfig) container.bind(TYPES.Files_SQS).toConstantValue(sqsClient) } @@ -197,10 +186,7 @@ export class ContainerConfigLoader { if (env.get('S3_ENDPOINT', true)) { s3Opts.endpoint = env.get('S3_ENDPOINT', true) } - let s3Client = new S3Client(s3Opts) - if (isConfiguredForAWSProduction) { - s3Client = captureAWSv3Client(s3Client) - } + const s3Client = new S3Client(s3Opts) container.bind(TYPES.Files_S3).toConstantValue(s3Client) container.bind(TYPES.Files_FileDownloader).to(S3FileDownloader) container.bind(TYPES.Files_FileUploader).to(S3FileUploader) @@ -305,15 +291,7 @@ export class ContainerConfigLoader { } else { container .bind(TYPES.Files_DomainEventMessageHandler) - .toConstantValue( - env.get('NEW_RELIC_ENABLED', true) === 'true' - ? new SQSXRayEventMessageHandler( - ServiceIdentifier.NAMES.FilesWorker, - eventHandlers, - container.get(TYPES.Files_Logger), - ) - : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Files_Logger)), - ) + .toConstantValue(new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Files_Logger))) container .bind(TYPES.Files_DomainEventSubscriberFactory) .toConstantValue( diff --git a/packages/revisions/bin/server.ts b/packages/revisions/bin/server.ts index 23a34025d..aae68df3f 100644 --- a/packages/revisions/bin/server.ts +++ b/packages/revisions/bin/server.ts @@ -3,7 +3,6 @@ import 'reflect-metadata' import * as cors from 'cors' import { urlencoded, json, Request, Response, NextFunction } from 'express' import * as winston from 'winston' -import * as AWSXRay from 'aws-xray-sdk' import { InversifyExpressServer } from 'inversify-express-utils' import TYPES from '../src/Bootstrap/Types' @@ -12,26 +11,14 @@ import { ContainerConfigLoader } from '../src/Bootstrap/Container' import '../src/Infra/InversifyExpress/AnnotatedRevisionsController' import '../src/Infra/InversifyExpress/AnnotatedHealthCheckController' -import { ServiceIdentifier } from '@standardnotes/domain-core' const container = new ContainerConfigLoader() void container.load().then((container) => { const env: Env = container.get(TYPES.Revisions_Env) - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const server = new InversifyExpressServer(container) server.setConfig((app) => { - if (isConfiguredForAWSProduction) { - app.use(AWSXRay.express.openSegment(ServiceIdentifier.NAMES.Revisions)) - } - app.use((_request: Request, response: Response, next: NextFunction) => { response.setHeader('X-Revisions-Version', container.get(TYPES.Revisions_VERSION)) next() @@ -58,10 +45,6 @@ void container.load().then((container) => { const serverInstance = server.build() - if (isConfiguredForAWSProduction) { - serverInstance.use(AWSXRay.express.closeSegment()) - } - serverInstance.listen(env.get('PORT')) logger.info(`Server started on port ${process.env.PORT}`) diff --git a/packages/revisions/bin/worker.ts b/packages/revisions/bin/worker.ts index 49609d1e9..a49d308ea 100644 --- a/packages/revisions/bin/worker.ts +++ b/packages/revisions/bin/worker.ts @@ -1,7 +1,6 @@ import 'reflect-metadata' import { Logger } from 'winston' -import * as AWSXRay from 'aws-xray-sdk' import TYPES from '../src/Bootstrap/Types' import { Env } from '../src/Bootstrap/Env' @@ -13,14 +12,6 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.enableManualMode() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const logger: Logger = container.get(TYPES.Revisions_Logger) logger.info('Starting worker...') diff --git a/packages/revisions/package.json b/packages/revisions/package.json index 5dcd727ec..c5259b98e 100644 --- a/packages/revisions/package.json +++ b/packages/revisions/package.json @@ -36,7 +36,6 @@ "@standardnotes/responses": "^1.13.27", "@standardnotes/security": "workspace:^", "@standardnotes/time": "workspace:^", - "aws-xray-sdk": "^3.5.2", "cors": "2.8.5", "dotenv": "^16.0.1", "express": "^4.18.2", @@ -44,7 +43,6 @@ "inversify-express-utils": "^6.4.3", "ioredis": "^5.3.2", "mongodb": "^6.0.0", - "mysql": "^2.18.1", "mysql2": "^3.0.1", "reflect-metadata": "0.1.13", "sqlite3": "^5.1.6", @@ -57,7 +55,6 @@ "@types/express": "^4.17.14", "@types/ioredis": "^5.0.0", "@types/jest": "^29.5.1", - "@types/mysql": "^2", "@types/node": "^20.5.7", "@typescript-eslint/eslint-plugin": "^6.5.0", "@typescript-eslint/parser": "^6.5.0", diff --git a/packages/revisions/src/Bootstrap/Container.ts b/packages/revisions/src/Bootstrap/Container.ts index d9dfbd8fb..cbb3f072f 100644 --- a/packages/revisions/src/Bootstrap/Container.ts +++ b/packages/revisions/src/Bootstrap/Container.ts @@ -1,14 +1,8 @@ -import { - ControllerContainer, - ControllerContainerInterface, - MapperInterface, - ServiceIdentifier, -} from '@standardnotes/domain-core' +import { ControllerContainer, ControllerContainerInterface, MapperInterface } from '@standardnotes/domain-core' import Redis from 'ioredis' import { Container, interfaces } from 'inversify' import { MongoRepository, Repository } from 'typeorm' import * as winston from 'winston' -import { captureAWSv3Client } from 'aws-xray-sdk' import { SNSClient, SNSClientConfig } from '@aws-sdk/client-sns' import { Revision } from '../Domain/Revision/Revision' @@ -41,7 +35,6 @@ import { DirectCallEventMessageHandler, DirectCallDomainEventPublisher, SNSDomainEventPublisher, - SQSXRayEventMessageHandler, } from '@standardnotes/domain-events-infra' import { DumpRepositoryInterface } from '../Domain/Dump/DumpRepositoryInterface' import { AccountDeletionRequestedEventHandler } from '../Domain/Handler/AccountDeletionRequestedEventHandler' @@ -96,7 +89,6 @@ export class ContainerConfigLoader { const isConfiguredForHomeServer = env.get('MODE', true) === 'home-server' const isConfiguredForSelfHosting = env.get('MODE', true) === 'self-hosted' - const isConfiguredForAWSProduction = !isConfiguredForHomeServer && !isConfiguredForSelfHosting const isConfiguredForHomeServerOrSelfHosting = isConfiguredForHomeServer || isConfiguredForSelfHosting const isSecondaryDatabaseEnabled = env.get('SECONDARY_DB_ENABLED', true) === 'true' const isConfiguredForInMemoryCache = env.get('CACHE_TYPE', true) === 'memory' @@ -180,10 +172,6 @@ export class ContainerConfigLoader { } } - if (isConfiguredForAWSProduction) { - return captureAWSv3Client(new SNSClient(snsConfig)) - } - return new SNSClient(snsConfig) }) @@ -212,10 +200,6 @@ export class ContainerConfigLoader { } } - if (isConfiguredForAWSProduction) { - return captureAWSv3Client(new SQSClient(sqsConfig)) - } - return new SQSClient(sqsConfig) }) @@ -228,10 +212,6 @@ export class ContainerConfigLoader { apiVersion: 'latest', region: env.get('S3_AWS_REGION', true), }) - - if (isConfiguredForAWSProduction) { - return captureAWSv3Client(s3Client) - } } return s3Client @@ -528,15 +508,7 @@ export class ContainerConfigLoader { } else { container .bind(TYPES.Revisions_DomainEventMessageHandler) - .toConstantValue( - env.get('NEW_RELIC_ENABLED', true) === 'true' - ? new SQSXRayEventMessageHandler( - ServiceIdentifier.NAMES.RevisionsWorker, - eventHandlers, - container.get(TYPES.Revisions_Logger), - ) - : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Revisions_Logger)), - ) + .toConstantValue(new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Revisions_Logger))) container .bind(TYPES.Revisions_DomainEventSubscriberFactory) diff --git a/packages/revisions/src/Bootstrap/DataSource.ts b/packages/revisions/src/Bootstrap/DataSource.ts index 14cbd4d13..0601a8d19 100644 --- a/packages/revisions/src/Bootstrap/DataSource.ts +++ b/packages/revisions/src/Bootstrap/DataSource.ts @@ -1,5 +1,3 @@ -import * as mysqlDriver from 'mysql' -import { captureMySQL } from 'aws-xray-sdk' import { DataSource, EntityTarget, LoggerOptions, MongoRepository, ObjectLiteral, Repository } from 'typeorm' import { MysqlConnectionOptions } from 'typeorm/driver/mysql/MysqlConnectionOptions' @@ -119,15 +117,9 @@ export class AppDataSource { restoreNodeTimeout: 5, } - let driver = undefined - if (!isConfiguredForHomeServerOrSelfHosting) { - driver = captureMySQL(mysqlDriver) - } - const mySQLDataSourceOptions: MysqlConnectionOptions = { ...commonDataSourceOptions, type: 'mysql', - driver, charset: 'utf8mb4', supportBigNumbers: true, bigNumberStrings: false, diff --git a/packages/scheduler/bin/verify.ts b/packages/scheduler/bin/verify.ts index a523081b5..fdf6825c4 100644 --- a/packages/scheduler/bin/verify.ts +++ b/packages/scheduler/bin/verify.ts @@ -3,7 +3,6 @@ import 'reflect-metadata' import { Logger } from 'winston' import * as dayjs from 'dayjs' import * as utc from 'dayjs/plugin/utc' -import * as AWSXRay from 'aws-xray-sdk' import { TimerInterface } from '@standardnotes/time' import { ContainerConfigLoader } from '../src/Bootstrap/Container' @@ -22,14 +21,6 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.enableManualMode() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const logger: Logger = container.get(TYPES.Logger) const timer: TimerInterface = container.get(TYPES.Timer) const now = timer.getTimestampInMicroseconds() diff --git a/packages/scheduler/bin/worker.ts b/packages/scheduler/bin/worker.ts index 1c0c3ac1b..05dd71deb 100644 --- a/packages/scheduler/bin/worker.ts +++ b/packages/scheduler/bin/worker.ts @@ -1,7 +1,6 @@ import 'reflect-metadata' import { Logger } from 'winston' -import * as AWSXRay from 'aws-xray-sdk' import { DomainEventSubscriberFactoryInterface } from '@standardnotes/domain-events' import * as dayjs from 'dayjs' import * as utc from 'dayjs/plugin/utc' @@ -17,14 +16,6 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.enableManualMode() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const logger: Logger = container.get(TYPES.Logger) logger.info('Starting worker...') diff --git a/packages/scheduler/package.json b/packages/scheduler/package.json index 7b6f50027..9bbd3427d 100644 --- a/packages/scheduler/package.json +++ b/packages/scheduler/package.json @@ -30,7 +30,6 @@ "@standardnotes/domain-events-infra": "workspace:*", "@standardnotes/predicates": "workspace:*", "@standardnotes/time": "workspace:*", - "aws-xray-sdk": "^3.5.2", "dayjs": "^1.11.6", "dotenv": "^16.0.1", "inversify": "^6.0.1", diff --git a/packages/scheduler/src/Bootstrap/Container.ts b/packages/scheduler/src/Bootstrap/Container.ts index 81e1fe5de..705c7132d 100644 --- a/packages/scheduler/src/Bootstrap/Container.ts +++ b/packages/scheduler/src/Bootstrap/Container.ts @@ -17,7 +17,6 @@ import { SNSDomainEventPublisher, SQSDomainEventSubscriberFactory, SQSEventMessageHandler, - SQSXRayEventMessageHandler, } from '@standardnotes/domain-events-infra' import { Timer, TimerInterface } from '@standardnotes/time' import { PredicateRepositoryInterface } from '../Domain/Predicate/PredicateRepositoryInterface' @@ -35,8 +34,6 @@ import { VerifyPredicates } from '../Domain/UseCase/VerifyPredicates/VerifyPredi import { UserRegisteredEventHandler } from '../Domain/Handler/UserRegisteredEventHandler' import { SubscriptionCancelledEventHandler } from '../Domain/Handler/SubscriptionCancelledEventHandler' import { ExitDiscountAppliedEventHandler } from '../Domain/Handler/ExitDiscountAppliedEventHandler' -import { ServiceIdentifier } from '@standardnotes/domain-core' -import { captureAWSv3Client } from 'aws-xray-sdk' export class ContainerConfigLoader { async load(): Promise { @@ -88,7 +85,7 @@ export class ContainerConfigLoader { secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true), } } - container.bind(TYPES.SNS).toConstantValue(captureAWSv3Client(new SNSClient(snsConfig))) + container.bind(TYPES.SNS).toConstantValue(new SNSClient(snsConfig)) } if (env.get('SQS_QUEUE_URL', true)) { @@ -104,7 +101,7 @@ export class ContainerConfigLoader { secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true), } } - container.bind(TYPES.SQS).toConstantValue(captureAWSv3Client(new SQSClient(sqsConfig))) + container.bind(TYPES.SQS).toConstantValue(new SQSClient(sqsConfig)) } // env vars @@ -156,15 +153,7 @@ export class ContainerConfigLoader { container .bind(TYPES.DomainEventMessageHandler) - .toConstantValue( - env.get('NEW_RELIC_ENABLED', true) === 'true' - ? new SQSXRayEventMessageHandler( - ServiceIdentifier.NAMES.SchedulerWorker, - eventHandlers, - container.get(TYPES.Logger), - ) - : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)), - ) + .toConstantValue(new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger))) container .bind(TYPES.DomainEventSubscriberFactory) .toConstantValue( diff --git a/packages/syncing-server/bin/server.ts b/packages/syncing-server/bin/server.ts index 81d6f243c..9ce9289bb 100644 --- a/packages/syncing-server/bin/server.ts +++ b/packages/syncing-server/bin/server.ts @@ -11,33 +11,20 @@ import helmet from 'helmet' import * as cors from 'cors' import { urlencoded, json, Request, Response, NextFunction } from 'express' import * as winston from 'winston' -import * as AWSXRay from 'aws-xray-sdk' import { InversifyExpressServer } from 'inversify-express-utils' import TYPES from '../src/Bootstrap/Types' import { Env } from '../src/Bootstrap/Env' import { ContainerConfigLoader } from '../src/Bootstrap/Container' -import { ServiceIdentifier } from '@standardnotes/domain-core' const container = new ContainerConfigLoader() void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const server = new InversifyExpressServer(container) server.setConfig((app) => { - if (isConfiguredForAWSProduction) { - app.use(AWSXRay.express.openSegment(ServiceIdentifier.NAMES.SyncingServer)) - } - app.use((_request: Request, response: Response, next: NextFunction) => { response.setHeader('X-SSJS-Version', container.get(TYPES.Sync_VERSION)) next() @@ -86,10 +73,6 @@ void container.load().then((container) => { const serverInstance = server.build() - if (isConfiguredForAWSProduction) { - serverInstance.use(AWSXRay.express.closeSegment()) - } - serverInstance.listen(env.get('PORT')) logger.info(`Server started on port ${process.env.PORT}`) diff --git a/packages/syncing-server/bin/worker.ts b/packages/syncing-server/bin/worker.ts index a2e1a4251..3334f5736 100644 --- a/packages/syncing-server/bin/worker.ts +++ b/packages/syncing-server/bin/worker.ts @@ -1,7 +1,6 @@ import 'reflect-metadata' import { Logger } from 'winston' -import * as AWSXRay from 'aws-xray-sdk' import TYPES from '../src/Bootstrap/Types' import { Env } from '../src/Bootstrap/Env' @@ -13,14 +12,6 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.enableManualMode() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const logger: Logger = container.get(TYPES.Sync_Logger) logger.info('Starting worker...') diff --git a/packages/syncing-server/package.json b/packages/syncing-server/package.json index b2dedeccb..21741305b 100644 --- a/packages/syncing-server/package.json +++ b/packages/syncing-server/package.json @@ -40,7 +40,6 @@ "@standardnotes/settings": "workspace:*", "@standardnotes/sncrypto-node": "workspace:*", "@standardnotes/time": "workspace:*", - "aws-xray-sdk": "^3.5.2", "axios": "^1.1.3", "cors": "2.8.5", "dotenv": "^16.0.1", diff --git a/packages/syncing-server/src/Bootstrap/Container.ts b/packages/syncing-server/src/Bootstrap/Container.ts index ff3603aae..c82cc0aa7 100644 --- a/packages/syncing-server/src/Bootstrap/Container.ts +++ b/packages/syncing-server/src/Bootstrap/Container.ts @@ -5,7 +5,6 @@ import { Container, interfaces } from 'inversify' import { Env } from './Env' import TYPES from './Types' import { AppDataSource } from './DataSource' -import { captureAWSv3Client } from 'aws-xray-sdk' import { SNSClient, SNSClientConfig } from '@aws-sdk/client-sns' import { ItemRepositoryInterface } from '../Domain/Item/ItemRepositoryInterface' import { SQLLegacyItemRepository } from '../Infra/TypeORM/SQLLegacyItemRepository' @@ -17,7 +16,6 @@ import { SNSDomainEventPublisher, SQSDomainEventSubscriberFactory, SQSEventMessageHandler, - SQSXRayEventMessageHandler, } from '@standardnotes/domain-events-infra' import { DomainEventFactoryInterface } from '../Domain/Event/DomainEventFactoryInterface' import { DomainEventFactory } from '../Domain/Event/DomainEventFactory' @@ -64,7 +62,6 @@ import { ControllerContainer, ControllerContainerInterface, MapperInterface, - ServiceIdentifier, SharedVaultUser, } from '@standardnotes/domain-core' import { BaseItemsController } from '../Infra/InversifyExpressUtils/Base/BaseItemsController' @@ -233,7 +230,6 @@ export class ContainerConfigLoader { const isConfiguredForHomeServer = env.get('MODE', true) === 'home-server' const isConfiguredForSelfHosting = env.get('MODE', true) === 'self-hosted' - const isConfiguredForAWSProduction = !isConfiguredForHomeServer && !isConfiguredForSelfHosting const isConfiguredForHomeServerOrSelfHosting = isConfiguredForHomeServer || isConfiguredForSelfHosting const isSecondaryDatabaseEnabled = env.get('SECONDARY_DB_ENABLED', true) === 'true' const isConfiguredForInMemoryCache = env.get('CACHE_TYPE', true) === 'memory' @@ -285,10 +281,6 @@ export class ContainerConfigLoader { } } - if (isConfiguredForAWSProduction) { - captureAWSv3Client(new SNSClient(snsConfig)) - } - return new SNSClient(snsConfig) }) @@ -317,10 +309,6 @@ export class ContainerConfigLoader { } } - if (isConfiguredForAWSProduction) { - captureAWSv3Client(new SQSClient(sqsConfig)) - } - return new SQSClient(sqsConfig) }) @@ -333,10 +321,6 @@ export class ContainerConfigLoader { apiVersion: 'latest', region: env.get('S3_AWS_REGION', true), }) - - if (isConfiguredForAWSProduction) { - captureAWSv3Client(s3Client) - } } return s3Client @@ -1171,15 +1155,7 @@ export class ContainerConfigLoader { } else { container .bind(TYPES.Sync_DomainEventMessageHandler) - .toConstantValue( - env.get('NEW_RELIC_ENABLED', true) === 'true' - ? new SQSXRayEventMessageHandler( - ServiceIdentifier.NAMES.SyncingServerWorker, - eventHandlers, - container.get(TYPES.Sync_Logger), - ) - : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Sync_Logger)), - ) + .toConstantValue(new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Sync_Logger))) } container diff --git a/packages/websockets/bin/server.ts b/packages/websockets/bin/server.ts index b2c7c1b17..7e6cb8c66 100644 --- a/packages/websockets/bin/server.ts +++ b/packages/websockets/bin/server.ts @@ -4,7 +4,6 @@ import '../src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController' import '../src/Infra/InversifyExpressUtils/AnnotatedWebSocketsController' import * as cors from 'cors' -import * as AWSXRay from 'aws-xray-sdk' import { urlencoded, json, Request, Response, NextFunction } from 'express' import * as winston from 'winston' @@ -12,20 +11,15 @@ import { InversifyExpressServer } from 'inversify-express-utils' import { ContainerConfigLoader } from '../src/Bootstrap/Container' import TYPES from '../src/Bootstrap/Types' import { Env } from '../src/Bootstrap/Env' -import { ServiceIdentifier } from '@standardnotes/domain-core' const container = new ContainerConfigLoader() void container.load().then((container) => { const env: Env = new Env() env.load() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - const server = new InversifyExpressServer(container) server.setConfig((app) => { - app.use(AWSXRay.express.openSegment(ServiceIdentifier.NAMES.Websockets)) - app.use((_request: Request, response: Response, next: NextFunction) => { response.setHeader('X-Websockets-Version', container.get(TYPES.VERSION)) next() @@ -52,8 +46,6 @@ void container.load().then((container) => { const serverInstance = server.build() - serverInstance.use(AWSXRay.express.closeSegment()) - serverInstance.listen(env.get('PORT')) logger.info(`Server started on port ${process.env.PORT}`) diff --git a/packages/websockets/bin/worker.ts b/packages/websockets/bin/worker.ts index 82bf331bf..ac53b23e6 100644 --- a/packages/websockets/bin/worker.ts +++ b/packages/websockets/bin/worker.ts @@ -1,7 +1,6 @@ import 'reflect-metadata' import { Logger } from 'winston' -import * as AWSXRay from 'aws-xray-sdk' import { ContainerConfigLoader } from '../src/Bootstrap/Container' import TYPES from '../src/Bootstrap/Types' @@ -13,14 +12,6 @@ void container.load().then((container) => { const env: Env = new Env() env.load() - const isConfiguredForAWSProduction = - env.get('MODE', true) !== 'home-server' && env.get('MODE', true) !== 'self-hosted' - - if (isConfiguredForAWSProduction) { - AWSXRay.enableManualMode() - AWSXRay.config([AWSXRay.plugins.ECSPlugin]) - } - const logger: Logger = container.get(TYPES.Logger) logger.info('Starting worker...') diff --git a/packages/websockets/package.json b/packages/websockets/package.json index 0722b351c..08b528f0a 100644 --- a/packages/websockets/package.json +++ b/packages/websockets/package.json @@ -31,7 +31,6 @@ "@standardnotes/domain-events-infra": "workspace:^", "@standardnotes/responses": "^1.13.27", "@standardnotes/security": "workspace:^", - "aws-xray-sdk": "^3.5.2", "axios": "^1.1.3", "cors": "2.8.5", "dotenv": "^16.0.1", diff --git a/packages/websockets/src/Bootstrap/Container.ts b/packages/websockets/src/Bootstrap/Container.ts index b680a91cb..f08af8ed0 100644 --- a/packages/websockets/src/Bootstrap/Container.ts +++ b/packages/websockets/src/Bootstrap/Container.ts @@ -18,11 +18,7 @@ import { RedisWebSocketsConnectionRepository } from '../Infra/Redis/RedisWebSock import { AddWebSocketsConnection } from '../Domain/UseCase/AddWebSocketsConnection/AddWebSocketsConnection' import { RemoveWebSocketsConnection } from '../Domain/UseCase/RemoveWebSocketsConnection/RemoveWebSocketsConnection' import { WebSocketsClientMessenger } from '../Infra/WebSockets/WebSocketsClientMessenger' -import { - SQSDomainEventSubscriberFactory, - SQSEventMessageHandler, - SQSXRayEventMessageHandler, -} from '@standardnotes/domain-events-infra' +import { SQSDomainEventSubscriberFactory, SQSEventMessageHandler } from '@standardnotes/domain-events-infra' import { ApiGatewayAuthMiddleware } from '../Controller/ApiGatewayAuthMiddleware' import { @@ -38,8 +34,6 @@ import { WebSocketsController } from '../Controller/WebSocketsController' import { WebSocketServerInterface } from '@standardnotes/api' import { ClientMessengerInterface } from '../Client/ClientMessengerInterface' import { WebSocketMessageRequestedEventHandler } from '../Domain/Handler/WebSocketMessageRequestedEventHandler' -import { ServiceIdentifier } from '@standardnotes/domain-core' -import { captureAWSv3Client } from 'aws-xray-sdk' export class ContainerConfigLoader { async load(): Promise { @@ -88,18 +82,16 @@ export class ContainerConfigLoader { secretAccessKey: env.get('SQS_SECRET_ACCESS_KEY', true), } } - container.bind(TYPES.SQS).toConstantValue(captureAWSv3Client(new SQSClient(sqsConfig))) + container.bind(TYPES.SQS).toConstantValue(new SQSClient(sqsConfig)) } container.bind(TYPES.WEBSOCKETS_API_URL).toConstantValue(env.get('WEBSOCKETS_API_URL', true)) container.bind(TYPES.WebSockets_ApiGatewayManagementApiClient).toConstantValue( - captureAWSv3Client( - new ApiGatewayManagementApiClient({ - endpoint: container.get(TYPES.WEBSOCKETS_API_URL), - region: env.get('API_GATEWAY_AWS_REGION', true) ?? 'us-east-1', - }), - ), + new ApiGatewayManagementApiClient({ + endpoint: container.get(TYPES.WEBSOCKETS_API_URL), + region: env.get('API_GATEWAY_AWS_REGION', true) ?? 'us-east-1', + }), ) // Controller @@ -156,15 +148,7 @@ export class ContainerConfigLoader { container .bind(TYPES.DomainEventMessageHandler) - .toConstantValue( - env.get('NEW_RELIC_ENABLED', true) === 'true' - ? new SQSXRayEventMessageHandler( - ServiceIdentifier.NAMES.WebsocketsWorker, - eventHandlers, - container.get(TYPES.Logger), - ) - : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)), - ) + .toConstantValue(new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger))) container .bind(TYPES.DomainEventSubscriberFactory) .toConstantValue( diff --git a/yarn.lock b/yarn.lock index 253a5f2df..4efdff8de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1752,13 +1752,6 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/service-error-classification@npm:^3.4.1": - version: 3.370.0 - resolution: "@aws-sdk/service-error-classification@npm:3.370.0" - checksum: 500f067ba170c8801437cb317078e6cbb3bc523e476cf773b9cdb21af76bc78d2daf37d63aa9ea3af720c24fac3fb387e073dd4865ee02ac356ae0fb9efd39cd - languageName: node - linkType: hard - "@aws-sdk/shared-ini-file-loader@npm:3.342.0": version: 3.342.0 resolution: "@aws-sdk/shared-ini-file-loader@npm:3.342.0" @@ -1984,16 +1977,6 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/types@npm:^3.4.1": - version: 3.418.0 - resolution: "@aws-sdk/types@npm:3.418.0" - dependencies: - "@smithy/types": "npm:^2.3.3" - tslib: "npm:^2.5.0" - checksum: 627955c2c92f7dd80ab5ac0fd23b6f5d5ff7a8cbc3dcc6f8b86b702f73b844219c3192990dc7048bbca9b36e2e46cdb48d21a8dc3eaf36861623348c1c1427a1 - languageName: node - linkType: hard - "@aws-sdk/url-parser@npm:3.342.0": version: 3.342.0 resolution: "@aws-sdk/url-parser@npm:3.342.0" @@ -5059,7 +5042,7 @@ __metadata: languageName: node linkType: hard -"@smithy/types@npm:^2.3.3, @smithy/types@npm:^2.3.4": +"@smithy/types@npm:^2.3.4": version: 2.3.4 resolution: "@smithy/types@npm:2.3.4" dependencies: @@ -5354,7 +5337,6 @@ __metadata: "@types/node": "npm:^20.5.7" "@typescript-eslint/eslint-plugin": "npm:^6.5.0" "@typescript-eslint/parser": "npm:^6.5.0" - aws-xray-sdk: "npm:^3.5.2" dayjs: "npm:^1.11.6" dotenv: "npm:^16.0.1" eslint: "npm:^8.39.0" @@ -5401,7 +5383,6 @@ __metadata: "@types/prettyjson": "npm:^0.0.30" "@typescript-eslint/eslint-plugin": "npm:^6.5.0" "@typescript-eslint/parser": "npm:^6.5.0" - aws-xray-sdk: "npm:^3.5.2" axios: "npm:^1.1.3" cors: "npm:2.8.5" dotenv: "npm:^16.0.1" @@ -5484,7 +5465,6 @@ __metadata: "@types/uuid": "npm:^9.0.3" "@typescript-eslint/eslint-plugin": "npm:^6.5.0" "@typescript-eslint/parser": "npm:^6.5.0" - aws-xray-sdk: "npm:^3.5.2" axios: "npm:^1.1.3" bcryptjs: "npm:2.4.3" cors: "npm:2.8.5" @@ -5569,7 +5549,6 @@ __metadata: "@types/newrelic": "npm:^9.14.0" "@typescript-eslint/eslint-plugin": "npm:^6.5.0" "@typescript-eslint/parser": "npm:^6.5.0" - aws-xray-sdk: "npm:^3.5.2" eslint: "npm:^8.39.0" eslint-plugin-prettier: "npm:^5.0.0" ioredis: "npm:^5.2.4" @@ -5682,7 +5661,6 @@ __metadata: "@types/uuid": "npm:^9.0.3" "@typescript-eslint/eslint-plugin": "npm:^6.5.0" "@typescript-eslint/parser": "npm:^6.5.0" - aws-xray-sdk: "npm:^3.5.2" connect-busboy: "npm:^1.0.0" cors: "npm:^2.8.5" dayjs: "npm:^1.11.6" @@ -5811,12 +5789,10 @@ __metadata: "@types/express": "npm:^4.17.14" "@types/ioredis": "npm:^5.0.0" "@types/jest": "npm:^29.5.1" - "@types/mysql": "npm:^2" "@types/newrelic": "npm:^9.14.0" "@types/node": "npm:^20.5.7" "@typescript-eslint/eslint-plugin": "npm:^6.5.0" "@typescript-eslint/parser": "npm:^6.5.0" - aws-xray-sdk: "npm:^3.5.2" cors: "npm:2.8.5" dotenv: "npm:^16.0.1" eslint: "npm:^8.39.0" @@ -5827,7 +5803,6 @@ __metadata: ioredis: "npm:^5.3.2" jest: "npm:^29.5.0" mongodb: "npm:^6.0.0" - mysql: "npm:^2.18.1" mysql2: "npm:^3.0.1" newrelic: "npm:^11.0.0" prettier: "npm:^3.0.3" @@ -5865,7 +5840,6 @@ __metadata: "@types/node": "npm:^20.5.7" "@typescript-eslint/eslint-plugin": "npm:^6.5.0" "@typescript-eslint/parser": "npm:^6.5.0" - aws-xray-sdk: "npm:^3.5.2" dayjs: "npm:^1.11.6" dotenv: "npm:^16.0.1" eslint: "npm:^8.39.0" @@ -6016,7 +5990,6 @@ __metadata: "@types/uuid": "npm:^9.0.3" "@typescript-eslint/eslint-plugin": "npm:^6.5.0" "@typescript-eslint/parser": "npm:^6.5.0" - aws-xray-sdk: "npm:^3.5.2" axios: "npm:^1.1.3" cors: "npm:2.8.5" dotenv: "npm:^16.0.1" @@ -6106,7 +6079,6 @@ __metadata: "@types/newrelic": "npm:^9.14.0" "@typescript-eslint/eslint-plugin": "npm:^6.5.0" "@typescript-eslint/parser": "npm:^6.5.0" - aws-xray-sdk: "npm:^3.5.2" axios: "npm:^1.1.3" cors: "npm:2.8.5" dotenv: "npm:^16.0.1" @@ -6261,15 +6233,6 @@ __metadata: languageName: node linkType: hard -"@types/cls-hooked@npm:^4.3.3": - version: 4.3.6 - resolution: "@types/cls-hooked@npm:4.3.6" - dependencies: - "@types/node": "npm:*" - checksum: f5b9864348c132fef6983b6b3aab233599ed3d93849c28e73d7498d664991e5675cf052899bb7a81991f7d9450b6c6c895b7464c4797a31ab3b6f52502f44e8c - languageName: node - linkType: hard - "@types/concat-stream@npm:^1.6.0": version: 1.6.1 resolution: "@types/concat-stream@npm:1.6.1" @@ -6495,15 +6458,6 @@ __metadata: languageName: node linkType: hard -"@types/mysql@npm:*, @types/mysql@npm:^2": - version: 2.15.22 - resolution: "@types/mysql@npm:2.15.22" - dependencies: - "@types/node": "npm:*" - checksum: 6be0aac58fe5c0f20ebf149d2ab228c620f751569a24fda33df457e0520b3c2f071bda06973ad54815ef54b0e0fa2176e56aba96b65b5990054930f4e2b7bb4e - languageName: node - linkType: hard - "@types/newrelic@npm:^9.14.0": version: 9.14.0 resolution: "@types/newrelic@npm:9.14.0" @@ -6564,17 +6518,6 @@ __metadata: languageName: node linkType: hard -"@types/pg@npm:*": - version: 8.10.3 - resolution: "@types/pg@npm:8.10.3" - dependencies: - "@types/node": "npm:*" - pg-protocol: "npm:*" - pg-types: "npm:^4.0.1" - checksum: 22d4836bd9a272e047e068b2bd9278287137ad191651952474fc13e3dd8e70df6b3fc1211bf1cd353cd7591fb6b9754a0755929e8a2a584a5f76921a91cff488 - languageName: node - linkType: hard - "@types/prettier@npm:^2.1.5": version: 2.7.3 resolution: "@types/prettier@npm:2.7.3" @@ -7351,15 +7294,6 @@ __metadata: languageName: node linkType: hard -"async-hook-jl@npm:^1.7.6": - version: 1.7.6 - resolution: "async-hook-jl@npm:1.7.6" - dependencies: - stack-chain: "npm:^1.3.7" - checksum: f61a3bd4c34c01dfdf7f571a22b5308b5c4cfc1574879bf57d86384e1944f50d4dc4873dbb31e718801dd1121604b22c316f88e5abd0f44b8ba15c97b4b73388 - languageName: node - linkType: hard - "async@npm:^3.2.3": version: 3.2.4 resolution: "async@npm:3.2.4" @@ -7374,72 +7308,6 @@ __metadata: languageName: node linkType: hard -"atomic-batcher@npm:^1.0.2": - version: 1.0.2 - resolution: "atomic-batcher@npm:1.0.2" - checksum: 025e334f1f2d0e47cb0703c6c4ae626457fc0d542f55cdf7ccb7dc9068198c743f05a96e0d6d5d2c08a58496acf536fb37751ed84d94aba1b2e76493b160d2b7 - languageName: node - linkType: hard - -"aws-xray-sdk-core@npm:3.5.2": - version: 3.5.2 - resolution: "aws-xray-sdk-core@npm:3.5.2" - dependencies: - "@aws-sdk/service-error-classification": "npm:^3.4.1" - "@aws-sdk/types": "npm:^3.4.1" - "@types/cls-hooked": "npm:^4.3.3" - atomic-batcher: "npm:^1.0.2" - cls-hooked: "npm:^4.2.2" - semver: "npm:^7.5.3" - checksum: a643998187ac38d49b2a79c3633223a261a8a6290e64ba450359c965bd4aed070ae48634f9d4c9a835f0b7cdc2da1498399b891a6c2aa5cbd2a5a8308a83940f - languageName: node - linkType: hard - -"aws-xray-sdk-express@npm:3.5.2": - version: 3.5.2 - resolution: "aws-xray-sdk-express@npm:3.5.2" - dependencies: - "@types/express": "npm:*" - peerDependencies: - aws-xray-sdk-core: ^3.5.2 - checksum: 62a07d0f3ba647d02d597ee749a56669dcd62b16c3eccd2ff661e2cfad3135b4af78fa4cf66fc6a32d636914713f89c399387c64575b9022b6d9e86002e6c61a - languageName: node - linkType: hard - -"aws-xray-sdk-mysql@npm:3.5.2": - version: 3.5.2 - resolution: "aws-xray-sdk-mysql@npm:3.5.2" - dependencies: - "@types/mysql": "npm:*" - peerDependencies: - aws-xray-sdk-core: ^3.5.2 - checksum: f910a96630169fa1591b68aaac591d24d116ea749dc49e66340bb70915d474d45ddeead3c46b49b1fec4516d5a586e10960b5ff1e5553e6fe2d287caff98e03e - languageName: node - linkType: hard - -"aws-xray-sdk-postgres@npm:3.5.2": - version: 3.5.2 - resolution: "aws-xray-sdk-postgres@npm:3.5.2" - dependencies: - "@types/pg": "npm:*" - peerDependencies: - aws-xray-sdk-core: ^3.5.2 - checksum: f2d6da22c74b65ba30d700776924ab7a5037e11f428545ba5b3bbdbacac095e958ceb829db2aa8445f1c718c8e375ab98d1dd9c7a2f5eb486c53b82ea414c768 - languageName: node - linkType: hard - -"aws-xray-sdk@npm:^3.5.2": - version: 3.5.2 - resolution: "aws-xray-sdk@npm:3.5.2" - dependencies: - aws-xray-sdk-core: "npm:3.5.2" - aws-xray-sdk-express: "npm:3.5.2" - aws-xray-sdk-mysql: "npm:3.5.2" - aws-xray-sdk-postgres: "npm:3.5.2" - checksum: 576d0d5ccb0f069e8da0afd041a47f1516ab5f8e637fa9595f711da136a49db57aff37b662b3c123234b4934a0c582c8deee677856b3c82884541e12b63df377 - languageName: node - linkType: hard - "axios@npm:0.21.4": version: 0.21.4 resolution: "axios@npm:0.21.4" @@ -7571,13 +7439,6 @@ __metadata: languageName: node linkType: hard -"bignumber.js@npm:9.0.0": - version: 9.0.0 - resolution: "bignumber.js@npm:9.0.0" - checksum: 7406d0d11dfdd2183e19be745f0d5913e3773ded5fbca2a310221e719f15fd8ec6b8d7991031a6081a6276a8e12e27d58ead60f73dcbb9d697ebe9e2dd0ad7e0 - languageName: node - linkType: hard - "bignumber.js@npm:^9.0.0": version: 9.1.1 resolution: "bignumber.js@npm:9.1.1" @@ -8127,17 +7988,6 @@ __metadata: languageName: node linkType: hard -"cls-hooked@npm:^4.2.2": - version: 4.2.2 - resolution: "cls-hooked@npm:4.2.2" - dependencies: - async-hook-jl: "npm:^1.7.6" - emitter-listener: "npm:^1.0.1" - semver: "npm:^5.4.1" - checksum: 59081fcc0f8b7ed929ac8eb0d16bd96946c82b3dd6a89213013e70874e5e7e202c09b07fc0ef0e2dd91b375c3f86d8d57b695e6a3e3bb9e6e25b20f144d712e8 - languageName: node - linkType: hard - "cluster-key-slot@npm:^1.1.0": version: 1.1.2 resolution: "cluster-key-slot@npm:1.1.2" @@ -8874,15 +8724,6 @@ __metadata: languageName: node linkType: hard -"emitter-listener@npm:^1.0.1": - version: 1.1.2 - resolution: "emitter-listener@npm:1.1.2" - dependencies: - shimmer: "npm:^1.2.0" - checksum: 697f53c30841eb380240b27b385f55596d66ff2d8c479ca3af2ad448cbbeb930d87f7c70105be5467a1424bdd0dfb161173238df413a2c79d8263b9140f917be - languageName: node - linkType: hard - "emittery@npm:^0.13.1": version: 0.13.1 resolution: "emittery@npm:0.13.1" @@ -12337,18 +12178,6 @@ __metadata: languageName: node linkType: hard -"mysql@npm:^2.18.1": - version: 2.18.1 - resolution: "mysql@npm:2.18.1" - dependencies: - bignumber.js: "npm:9.0.0" - readable-stream: "npm:2.3.7" - safe-buffer: "npm:5.1.2" - sqlstring: "npm:2.3.1" - checksum: 87d80e374717d7767d3e609f7f5e09987fa4dee208ba346ff269fffd2500719dcf2f65ac86c8e77649c3d52b86811a88e33cfd06e7e4a48cec53ecd4ac85c08d - languageName: node - linkType: hard - "mz@npm:^2.4.0": version: 2.7.0 resolution: "mz@npm:2.7.0" @@ -12801,13 +12630,6 @@ __metadata: languageName: node linkType: hard -"obuf@npm:~1.1.2": - version: 1.1.2 - resolution: "obuf@npm:1.1.2" - checksum: 53ff4ab3a13cc33ba6c856cf281f2965c0aec9720967af450e8fd06cfd50aceeefc791986a16bcefa14e7898b3ca9acdfcf15b9d9a1b9c7e1366581a8ad6e65e - languageName: node - linkType: hard - "on-finished@npm:2.4.1": version: 2.4.1 resolution: "on-finished@npm:2.4.1" @@ -13229,42 +13051,6 @@ __metadata: languageName: node linkType: hard -"pg-int8@npm:1.0.1": - version: 1.0.1 - resolution: "pg-int8@npm:1.0.1" - checksum: a1e3a05a69005ddb73e5f324b6b4e689868a447c5fa280b44cd4d04e6916a344ac289e0b8d2695d66e8e89a7fba023affb9e0e94778770ada5df43f003d664c9 - languageName: node - linkType: hard - -"pg-numeric@npm:1.0.2": - version: 1.0.2 - resolution: "pg-numeric@npm:1.0.2" - checksum: 8899f8200caa1744439a8778a9eb3ceefb599d893e40a09eef84ee0d4c151319fd416634a6c0fc7b7db4ac268710042da5be700b80ef0de716fe089b8652c84f - languageName: node - linkType: hard - -"pg-protocol@npm:*": - version: 1.6.0 - resolution: "pg-protocol@npm:1.6.0" - checksum: 995864cc2a8517368b84697c753caff769a4db292eda66f96d9eec46e3aa84737cd0b0fe171aca9d7d4b4a4c46bb25bd399713cb1027a5bf8f38adea0b4284f4 - languageName: node - linkType: hard - -"pg-types@npm:^4.0.1": - version: 4.0.1 - resolution: "pg-types@npm:4.0.1" - dependencies: - pg-int8: "npm:1.0.1" - pg-numeric: "npm:1.0.2" - postgres-array: "npm:~3.0.1" - postgres-bytea: "npm:~3.0.0" - postgres-date: "npm:~2.0.1" - postgres-interval: "npm:^3.0.0" - postgres-range: "npm:^1.1.1" - checksum: 2c686ef361856ff9695a40cf34d7bb59bcf2218bd1f121d7fc8b77a75cc4106c09519e9520a82aac8fce4540dec81f695458b8e43bfc420ba74eb9b5005b5619 - languageName: node - linkType: hard - "picocolors@npm:^1.0.0": version: 1.0.0 resolution: "picocolors@npm:1.0.0" @@ -13326,43 +13112,6 @@ __metadata: languageName: node linkType: hard -"postgres-array@npm:~3.0.1": - version: 3.0.2 - resolution: "postgres-array@npm:3.0.2" - checksum: 0159517e4e5f263bf9e324f0c4d3c10244a294021f2b5980abc8c23afdb965370a7fc0c82012fce4d28e83186ad089b6476b05fcef6c88f8e43e37a3a2fa0ad5 - languageName: node - linkType: hard - -"postgres-bytea@npm:~3.0.0": - version: 3.0.0 - resolution: "postgres-bytea@npm:3.0.0" - dependencies: - obuf: "npm:~1.1.2" - checksum: f5c01758fd2fa807afbd34e1ba2146f683818ebc2d23f4a62f0fd627c0b1126fc543cab1b63925f97ce6c7d8f5f316043218619c447445210ea82f10411efb1b - languageName: node - linkType: hard - -"postgres-date@npm:~2.0.1": - version: 2.0.1 - resolution: "postgres-date@npm:2.0.1" - checksum: 908eacec35faf9b6fa4248074e7c8db0fc4ac6a2e0a00eacef9fb9cf44a25fc6f100af7cda09f5d89d076c87923b59e940a309560d86aded4753985c97255be1 - languageName: node - linkType: hard - -"postgres-interval@npm:^3.0.0": - version: 3.0.0 - resolution: "postgres-interval@npm:3.0.0" - checksum: c7a1cf006de97de663b6b8c4d2b167aa9909a238c4866a94b15d303762f5ac884ff4796cd6e2111b7f0a91302b83c570453aa8506fd005b5a5d5dfa87441bebc - languageName: node - linkType: hard - -"postgres-range@npm:^1.1.1": - version: 1.1.3 - resolution: "postgres-range@npm:1.1.3" - checksum: 356a46d97eab301cca0dbf7a65be6f68c4a7e33d304909e5ca840038b1210390e1d33fcc3b566c42020f7b97e9de189bc5286d1ec8d7ba2445ed3377c576ce9e - languageName: node - linkType: hard - "prelude-ls@npm:^1.2.1": version: 1.2.1 resolution: "prelude-ls@npm:1.2.1" @@ -13717,21 +13466,6 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:2.3.7": - version: 2.3.7 - resolution: "readable-stream@npm:2.3.7" - dependencies: - core-util-is: "npm:~1.0.0" - inherits: "npm:~2.0.3" - isarray: "npm:~1.0.0" - process-nextick-args: "npm:~2.0.0" - safe-buffer: "npm:~5.1.1" - string_decoder: "npm:~1.1.1" - util-deprecate: "npm:~1.0.1" - checksum: d04c677c1705e3fc6283d45859a23f4c05243d0c0f1fc08cb8f995b4d69f0eb7f38ec0ec102f0ee20535c5d999ee27449f40aa2edf6bf30c24d0cc8f8efeb6d7 - languageName: node - linkType: hard - "readable-stream@npm:3, readable-stream@npm:^3.0.0, readable-stream@npm:^3.0.2, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0, readable-stream@npm:^3.6.1": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" @@ -14016,13 +13750,6 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1": - version: 5.1.2 - resolution: "safe-buffer@npm:5.1.2" - checksum: 7eb5b48f2ed9a594a4795677d5a150faa7eb54483b2318b568dc0c4fc94092a6cce5be02c7288a0500a156282f5276d5688bce7259299568d1053b2150ef374a - languageName: node - linkType: hard - "safe-buffer@npm:5.2.1, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" @@ -14030,6 +13757,13 @@ __metadata: languageName: node linkType: hard +"safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1": + version: 5.1.2 + resolution: "safe-buffer@npm:5.1.2" + checksum: 7eb5b48f2ed9a594a4795677d5a150faa7eb54483b2318b568dc0c4fc94092a6cce5be02c7288a0500a156282f5276d5688bce7259299568d1053b2150ef374a + languageName: node + linkType: hard + "safe-stable-stringify@npm:^2.3.1": version: 2.4.3 resolution: "safe-stable-stringify@npm:2.4.3" @@ -14086,15 +13820,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:^5.4.1": - version: 5.7.2 - resolution: "semver@npm:5.7.2" - bin: - semver: bin/semver - checksum: fca14418a174d4b4ef1fecb32c5941e3412d52a4d3d85165924ce3a47fbc7073372c26faf7484ceb4bbc2bde25880c6b97e492473dc7e9708fdfb1c6a02d546e - languageName: node - linkType: hard - "semver@npm:^6.0.0, semver@npm:^6.3.0": version: 6.3.0 resolution: "semver@npm:6.3.0" @@ -14104,7 +13829,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4": +"semver@npm:^7.5.2, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: @@ -14215,13 +13940,6 @@ __metadata: languageName: node linkType: hard -"shimmer@npm:^1.2.0": - version: 1.2.1 - resolution: "shimmer@npm:1.2.1" - checksum: aa0d6252ad1c682a4fdfda69e541be987f7a265ac7b00b1208e5e48cc68dc55f293955346ea4c71a169b7324b82c70f8400b3d3d2d60b2a7519f0a3522423250 - languageName: node - linkType: hard - "side-channel@npm:^1.0.4": version: 1.0.4 resolution: "side-channel@npm:1.0.4" @@ -14460,13 +14178,6 @@ __metadata: languageName: node linkType: hard -"sqlstring@npm:2.3.1": - version: 2.3.1 - resolution: "sqlstring@npm:2.3.1" - checksum: bc09237002da7e1172098e7d47401ea0ae45c1e4b224619f7ee2905dc921321f5ccc8c5e076994890df01b4a3363b2b5ea295b7a10d32a35181ef25bad158093 - languageName: node - linkType: hard - "sqlstring@npm:^2.3.2": version: 2.3.3 resolution: "sqlstring@npm:2.3.3" @@ -14513,13 +14224,6 @@ __metadata: languageName: node linkType: hard -"stack-chain@npm:^1.3.7": - version: 1.3.7 - resolution: "stack-chain@npm:1.3.7" - checksum: 6420637b7607566763f2452aa058af06ad31773333c4bb55ceb2a71338016fd82f55425bf2ea950bf148576b28d72a235ec46b8f01d117a194a2ec123e577d18 - languageName: node - linkType: hard - "stack-trace@npm:0.0.x": version: 0.0.10 resolution: "stack-trace@npm:0.0.10"