diff --git a/.pnp.cjs b/.pnp.cjs index 4fddbb0a3..a332e050f 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -3788,6 +3788,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["fast-json-stringify", "npm:2.7.13"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:2.1.1", {\ + "packageLocation": "./.yarn/cache/@elastic-ecs-helpers-npm-2.1.1-fb74491ac7-80db727963.zip/node_modules/@elastic/ecs-helpers/",\ + "packageDependencies": [\ + ["@elastic/ecs-helpers", "npm:2.1.1"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@elastic/ecs-pino-format", [\ @@ -3798,6 +3805,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@elastic/ecs-helpers", "npm:1.1.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:1.5.0", {\ + "packageLocation": "./.yarn/cache/@elastic-ecs-pino-format-npm-1.5.0-6583091a19-e66a1801ec.zip/node_modules/@elastic/ecs-pino-format/",\ + "packageDependencies": [\ + ["@elastic/ecs-pino-format", "npm:1.5.0"],\ + ["@elastic/ecs-helpers", "npm:2.1.1"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["@elastic/elasticsearch", [\ @@ -6920,7 +6935,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["date-fns", "npm:2.24.0"],\ ["draft-js", "virtual:6d9c0fee0b376eb0bb6824eb7a3246834ef21d870b31f75eebe59bb4d027e50f2607ba168fd29d446567f4e9c2a5cad2442c4741fa92c92e0b7e9145c3a3e3a7#npm:0.11.7"],\ ["draft-js-export-html", "virtual:6d9c0fee0b376eb0bb6824eb7a3246834ef21d870b31f75eebe59bb4d027e50f2607ba168fd29d446567f4e9c2a5cad2442c4741fa92c92e0b7e9145c3a3e3a7#npm:1.4.1"],\ - ["elastic-apm-node", "npm:3.49.1"],\ + ["elastic-apm-node", "npm:4.3.0"],\ ["express", "npm:4.18.2"],\ ["graphql", "npm:16.8.1"],\ ["graphql-bigint", "virtual:6d9c0fee0b376eb0bb6824eb7a3246834ef21d870b31f75eebe59bb4d027e50f2607ba168fd29d446567f4e9c2a5cad2442c4741fa92c92e0b7e9145c3a3e3a7#npm:1.0.0"],\ @@ -6981,10 +6996,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["virtual:8104cbdaae52f059ce9f6832f149558074388f5b3819b29f67c9650bdba94a2b244f30aff892d8527487d0b0ee30e57a91dfc34133e0299139998a5c7325337d#npm:1.15.2", {\ - "packageLocation": "./.yarn/__virtual__/@opentelemetry-core-virtual-1a13da69be/0/cache/@opentelemetry-core-npm-1.15.2-3b4038450a-0040d1952b.zip/node_modules/@opentelemetry/core/",\ + ["virtual:65b27adc8a4c92b3c143edefe582301e7501ea7329134a1aca17084ad7e3a659e5b60b2c00a4eff80ede4ecfd0f9f99b1cc913f8d04e160b656f4347f70ec3d2#npm:1.15.2", {\ + "packageLocation": "./.yarn/__virtual__/@opentelemetry-core-virtual-fc4488a424/0/cache/@opentelemetry-core-npm-1.15.2-3b4038450a-0040d1952b.zip/node_modules/@opentelemetry/core/",\ "packageDependencies": [\ - ["@opentelemetry/core", "virtual:8104cbdaae52f059ce9f6832f149558074388f5b3819b29f67c9650bdba94a2b244f30aff892d8527487d0b0ee30e57a91dfc34133e0299139998a5c7325337d#npm:1.15.2"],\ + ["@opentelemetry/core", "virtual:65b27adc8a4c92b3c143edefe582301e7501ea7329134a1aca17084ad7e3a659e5b60b2c00a4eff80ede4ecfd0f9f99b1cc913f8d04e160b656f4347f70ec3d2#npm:1.15.2"],\ ["@opentelemetry/api", "npm:1.4.1"],\ ["@opentelemetry/semantic-conventions", "npm:1.15.2"],\ ["@types/opentelemetry__api", null]\ @@ -7004,12 +7019,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["virtual:f9e1c368674485390088ef6eb1b011ee730cfa112679b9d548feb7da54adb091a819660fba57f79c41123d8469e425c262db35573699425dd2211400947e81a5#npm:1.15.2", {\ - "packageLocation": "./.yarn/__virtual__/@opentelemetry-resources-virtual-fe327957ec/0/cache/@opentelemetry-resources-npm-1.15.2-7b6f6604fc-072d64bee2.zip/node_modules/@opentelemetry/resources/",\ + ["virtual:c08dde2b691c0ac469e888919bfb2be1cdf7ffa8b420c9e5f4b97cb2426ea262b966863e7f3951887a3218264d5c93dbca680e9459d9bc15ea6d3250a0f00802#npm:1.15.2", {\ + "packageLocation": "./.yarn/__virtual__/@opentelemetry-resources-virtual-f608f814a9/0/cache/@opentelemetry-resources-npm-1.15.2-7b6f6604fc-072d64bee2.zip/node_modules/@opentelemetry/resources/",\ "packageDependencies": [\ - ["@opentelemetry/resources", "virtual:f9e1c368674485390088ef6eb1b011ee730cfa112679b9d548feb7da54adb091a819660fba57f79c41123d8469e425c262db35573699425dd2211400947e81a5#npm:1.15.2"],\ + ["@opentelemetry/resources", "virtual:c08dde2b691c0ac469e888919bfb2be1cdf7ffa8b420c9e5f4b97cb2426ea262b966863e7f3951887a3218264d5c93dbca680e9459d9bc15ea6d3250a0f00802#npm:1.15.2"],\ ["@opentelemetry/api", "npm:1.4.1"],\ - ["@opentelemetry/core", "virtual:8104cbdaae52f059ce9f6832f149558074388f5b3819b29f67c9650bdba94a2b244f30aff892d8527487d0b0ee30e57a91dfc34133e0299139998a5c7325337d#npm:1.15.2"],\ + ["@opentelemetry/core", "virtual:65b27adc8a4c92b3c143edefe582301e7501ea7329134a1aca17084ad7e3a659e5b60b2c00a4eff80ede4ecfd0f9f99b1cc913f8d04e160b656f4347f70ec3d2#npm:1.15.2"],\ ["@opentelemetry/semantic-conventions", "npm:1.15.2"],\ ["@types/opentelemetry__api", null]\ ],\ @@ -7028,13 +7043,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["virtual:8104cbdaae52f059ce9f6832f149558074388f5b3819b29f67c9650bdba94a2b244f30aff892d8527487d0b0ee30e57a91dfc34133e0299139998a5c7325337d#npm:1.15.2", {\ - "packageLocation": "./.yarn/__virtual__/@opentelemetry-sdk-metrics-virtual-f9e1c36867/0/cache/@opentelemetry-sdk-metrics-npm-1.15.2-01e4d3baeb-15eb40b977.zip/node_modules/@opentelemetry/sdk-metrics/",\ + ["virtual:65b27adc8a4c92b3c143edefe582301e7501ea7329134a1aca17084ad7e3a659e5b60b2c00a4eff80ede4ecfd0f9f99b1cc913f8d04e160b656f4347f70ec3d2#npm:1.15.2", {\ + "packageLocation": "./.yarn/__virtual__/@opentelemetry-sdk-metrics-virtual-c08dde2b69/0/cache/@opentelemetry-sdk-metrics-npm-1.15.2-01e4d3baeb-15eb40b977.zip/node_modules/@opentelemetry/sdk-metrics/",\ "packageDependencies": [\ - ["@opentelemetry/sdk-metrics", "virtual:8104cbdaae52f059ce9f6832f149558074388f5b3819b29f67c9650bdba94a2b244f30aff892d8527487d0b0ee30e57a91dfc34133e0299139998a5c7325337d#npm:1.15.2"],\ + ["@opentelemetry/sdk-metrics", "virtual:65b27adc8a4c92b3c143edefe582301e7501ea7329134a1aca17084ad7e3a659e5b60b2c00a4eff80ede4ecfd0f9f99b1cc913f8d04e160b656f4347f70ec3d2#npm:1.15.2"],\ ["@opentelemetry/api", "npm:1.4.1"],\ - ["@opentelemetry/core", "virtual:8104cbdaae52f059ce9f6832f149558074388f5b3819b29f67c9650bdba94a2b244f30aff892d8527487d0b0ee30e57a91dfc34133e0299139998a5c7325337d#npm:1.15.2"],\ - ["@opentelemetry/resources", "virtual:f9e1c368674485390088ef6eb1b011ee730cfa112679b9d548feb7da54adb091a819660fba57f79c41123d8469e425c262db35573699425dd2211400947e81a5#npm:1.15.2"],\ + ["@opentelemetry/core", "virtual:65b27adc8a4c92b3c143edefe582301e7501ea7329134a1aca17084ad7e3a659e5b60b2c00a4eff80ede4ecfd0f9f99b1cc913f8d04e160b656f4347f70ec3d2#npm:1.15.2"],\ + ["@opentelemetry/resources", "virtual:c08dde2b691c0ac469e888919bfb2be1cdf7ffa8b420c9e5f4b97cb2426ea262b966863e7f3951887a3218264d5c93dbca680e9459d9bc15ea6d3250a0f00802#npm:1.15.2"],\ ["@types/opentelemetry__api", null],\ ["lodash.merge", "npm:4.6.2"]\ ],\ @@ -10063,6 +10078,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["abort-controller", [\ + ["npm:3.0.0", {\ + "packageLocation": "./.yarn/cache/abort-controller-npm-3.0.0-2f3a9a2bcb-170bdba9b4.zip/node_modules/abort-controller/",\ + "packageDependencies": [\ + ["abort-controller", "npm:3.0.0"],\ + ["event-target-shim", "npm:5.0.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["accepts", [\ ["npm:1.3.8", {\ "packageLocation": "./.yarn/cache/accepts-npm-1.3.8-9a812371c9-50c43d32e7.zip/node_modules/accepts/",\ @@ -10146,10 +10171,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "SOFT"\ }],\ - ["virtual:0d6260c99a008f5be9e4359f808b7c212ffb01364e5d58ad3ffaa6cd86111a6eebcd70235a8529093b0d0158115bda51bd421ad8029e342e4db4485408536ce2#npm:1.9.0", {\ - "packageLocation": "./.yarn/__virtual__/acorn-import-assertions-virtual-2f04282092/0/cache/acorn-import-assertions-npm-1.9.0-22f56507c7-944fb2659d.zip/node_modules/acorn-import-assertions/",\ + ["virtual:bfaeb36d0b28c68003504291231cace227e34ceee45de0aa5d508bb12f30d6040f2c10de2d4889fffc63c1abf782629f095899a7cd7044cfa2fd5476f93ca472#npm:1.9.0", {\ + "packageLocation": "./.yarn/__virtual__/acorn-import-assertions-virtual-1e466c1fa2/0/cache/acorn-import-assertions-npm-1.9.0-22f56507c7-944fb2659d.zip/node_modules/acorn-import-assertions/",\ "packageDependencies": [\ - ["acorn-import-assertions", "virtual:0d6260c99a008f5be9e4359f808b7c212ffb01364e5d58ad3ffaa6cd86111a6eebcd70235a8529093b0d0158115bda51bd421ad8029e342e4db4485408536ce2#npm:1.9.0"],\ + ["acorn-import-assertions", "virtual:bfaeb36d0b28c68003504291231cace227e34ceee45de0aa5d508bb12f30d6040f2c10de2d4889fffc63c1abf782629f095899a7cd7044cfa2fd5476f93ca472#npm:1.9.0"],\ ["@types/acorn", null],\ ["acorn", "npm:8.10.0"]\ ],\ @@ -12839,6 +12864,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["cookie", "npm:0.5.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:0.6.0", {\ + "packageLocation": "./.yarn/cache/cookie-npm-0.6.0-362d6a2e45-f56a7d32a0.zip/node_modules/cookie/",\ + "packageDependencies": [\ + ["cookie", "npm:0.6.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["cookie-parser", [\ @@ -14211,8 +14243,8 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["elastic-apm-node", "npm:3.49.1"],\ ["@elastic/ecs-pino-format", "npm:1.3.0"],\ ["@opentelemetry/api", "npm:1.4.1"],\ - ["@opentelemetry/core", "virtual:8104cbdaae52f059ce9f6832f149558074388f5b3819b29f67c9650bdba94a2b244f30aff892d8527487d0b0ee30e57a91dfc34133e0299139998a5c7325337d#npm:1.15.2"],\ - ["@opentelemetry/sdk-metrics", "virtual:8104cbdaae52f059ce9f6832f149558074388f5b3819b29f67c9650bdba94a2b244f30aff892d8527487d0b0ee30e57a91dfc34133e0299139998a5c7325337d#npm:1.15.2"],\ + ["@opentelemetry/core", "virtual:65b27adc8a4c92b3c143edefe582301e7501ea7329134a1aca17084ad7e3a659e5b60b2c00a4eff80ede4ecfd0f9f99b1cc913f8d04e160b656f4347f70ec3d2#npm:1.15.2"],\ + ["@opentelemetry/sdk-metrics", "virtual:65b27adc8a4c92b3c143edefe582301e7501ea7329134a1aca17084ad7e3a659e5b60b2c00a4eff80ede4ecfd0f9f99b1cc913f8d04e160b656f4347f70ec3d2#npm:1.15.2"],\ ["after-all-results", "npm:2.0.0"],\ ["agentkeepalive", "npm:4.2.1"],\ ["async-cache", "npm:1.1.0"],\ @@ -14249,6 +14281,50 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["unicode-byte-truncate", "npm:1.0.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:4.3.0", {\ + "packageLocation": "./.yarn/cache/elastic-apm-node-npm-4.3.0-65b27adc8a-b0a257800e.zip/node_modules/elastic-apm-node/",\ + "packageDependencies": [\ + ["elastic-apm-node", "npm:4.3.0"],\ + ["@elastic/ecs-pino-format", "npm:1.5.0"],\ + ["@opentelemetry/api", "npm:1.4.1"],\ + ["@opentelemetry/core", "virtual:65b27adc8a4c92b3c143edefe582301e7501ea7329134a1aca17084ad7e3a659e5b60b2c00a4eff80ede4ecfd0f9f99b1cc913f8d04e160b656f4347f70ec3d2#npm:1.15.2"],\ + ["@opentelemetry/sdk-metrics", "virtual:65b27adc8a4c92b3c143edefe582301e7501ea7329134a1aca17084ad7e3a659e5b60b2c00a4eff80ede4ecfd0f9f99b1cc913f8d04e160b656f4347f70ec3d2#npm:1.15.2"],\ + ["after-all-results", "npm:2.0.0"],\ + ["agentkeepalive", "npm:4.2.1"],\ + ["async-value-promise", "npm:1.1.1"],\ + ["basic-auth", "npm:2.0.1"],\ + ["breadth-filter", "npm:2.0.0"],\ + ["cookie", "npm:0.6.0"],\ + ["core-util-is", "npm:1.0.3"],\ + ["end-of-stream", "npm:1.4.4"],\ + ["error-callsites", "npm:2.0.4"],\ + ["error-stack-parser", "npm:2.0.6"],\ + ["escape-string-regexp", "npm:4.0.0"],\ + ["fast-safe-stringify", "npm:2.1.1"],\ + ["fast-stream-to-buffer", "npm:1.0.0"],\ + ["http-headers", "npm:3.0.2"],\ + ["import-in-the-middle", "npm:1.5.0"],\ + ["json-bigint", "npm:1.0.0"],\ + ["lru-cache", "npm:10.1.0"],\ + ["measured-reporting", "npm:1.51.1"],\ + ["module-details-from-path", "npm:1.0.3"],\ + ["monitor-event-loop-delay", "npm:1.0.0"],\ + ["object-filter-sequence", "npm:1.0.0"],\ + ["object-identity-map", "npm:1.0.2"],\ + ["original-url", "npm:1.2.3"],\ + ["pino", "npm:8.16.2"],\ + ["readable-stream", "npm:3.6.2"],\ + ["relative-microtime", "npm:2.0.0"],\ + ["require-in-the-middle", "npm:7.2.0"],\ + ["semver", "npm:7.5.4"],\ + ["shallow-clone-shim", "npm:2.0.0"],\ + ["source-map", "npm:0.8.0-beta.0"],\ + ["sql-summary", "npm:1.0.1"],\ + ["stream-chopper", "npm:3.0.1"],\ + ["unicode-byte-truncate", "npm:1.0.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["electron-to-chromium", [\ @@ -15038,6 +15114,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["event-target-shim", [\ + ["npm:5.0.1", {\ + "packageLocation": "./.yarn/cache/event-target-shim-npm-5.0.1-cb48709025-1ffe3bb22a.zip/node_modules/event-target-shim/",\ + "packageDependencies": [\ + ["event-target-shim", "npm:5.0.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["eventemitter3", [\ ["npm:3.1.2", {\ "packageLocation": "./.yarn/cache/eventemitter3-npm-3.1.2-a68b03e1ea-81e4e82b84.zip/node_modules/eventemitter3/",\ @@ -15424,6 +15509,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["fast-redact", "npm:3.1.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:3.3.0", {\ + "packageLocation": "./.yarn/cache/fast-redact-npm-3.3.0-2f2f249914-3f7becc70a.zip/node_modules/fast-redact/",\ + "packageDependencies": [\ + ["fast-redact", "npm:3.3.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["fast-safe-stringify", [\ @@ -17572,7 +17664,18 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "packageDependencies": [\ ["import-in-the-middle", "npm:1.4.2"],\ ["acorn", "npm:8.10.0"],\ - ["acorn-import-assertions", "virtual:0d6260c99a008f5be9e4359f808b7c212ffb01364e5d58ad3ffaa6cd86111a6eebcd70235a8529093b0d0158115bda51bd421ad8029e342e4db4485408536ce2#npm:1.9.0"],\ + ["acorn-import-assertions", "virtual:bfaeb36d0b28c68003504291231cace227e34ceee45de0aa5d508bb12f30d6040f2c10de2d4889fffc63c1abf782629f095899a7cd7044cfa2fd5476f93ca472#npm:1.9.0"],\ + ["cjs-module-lexer", "npm:1.2.3"],\ + ["module-details-from-path", "npm:1.0.3"]\ + ],\ + "linkType": "HARD"\ + }],\ + ["npm:1.5.0", {\ + "packageLocation": "./.yarn/cache/import-in-the-middle-npm-1.5.0-bfaeb36d0b-e58a105aef.zip/node_modules/import-in-the-middle/",\ + "packageDependencies": [\ + ["import-in-the-middle", "npm:1.5.0"],\ + ["acorn", "npm:8.10.0"],\ + ["acorn-import-assertions", "virtual:bfaeb36d0b28c68003504291231cace227e34ceee45de0aa5d508bb12f30d6040f2c10de2d4889fffc63c1abf782629f095899a7cd7044cfa2fd5476f93ca472#npm:1.9.0"],\ ["cjs-module-lexer", "npm:1.2.3"],\ ["module-details-from-path", "npm:1.0.3"]\ ],\ @@ -20524,6 +20627,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ],\ "linkType": "HARD"\ }],\ + ["npm:10.1.0", {\ + "packageLocation": "./.yarn/cache/lru-cache-npm-10.1.0-f3d3a0f0ab-58056d33e2.zip/node_modules/lru-cache/",\ + "packageDependencies": [\ + ["lru-cache", "npm:10.1.0"]\ + ],\ + "linkType": "HARD"\ + }],\ ["npm:4.1.5", {\ "packageLocation": "./.yarn/cache/lru-cache-npm-4.1.5-ede304cc43-4bb4b58a36.zip/node_modules/lru-cache/",\ "packageDependencies": [\ @@ -22726,6 +22836,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["on-exit-leak-free", [\ + ["npm:2.1.2", {\ + "packageLocation": "./.yarn/cache/on-exit-leak-free-npm-2.1.2-0d0c5ad67d-6ce7acdc7b.zip/node_modules/on-exit-leak-free/",\ + "packageDependencies": [\ + ["on-exit-leak-free", "npm:2.1.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["on-finished", [\ ["npm:2.3.0", {\ "packageLocation": "./.yarn/cache/on-finished-npm-2.3.0-4ce92f72c6-1db595bd96.zip/node_modules/on-finished/",\ @@ -23727,6 +23846,35 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["sonic-boom", "npm:1.4.1"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:8.16.2", {\ + "packageLocation": "./.yarn/cache/pino-npm-8.16.2-ab350f6df7-78d194112f.zip/node_modules/pino/",\ + "packageDependencies": [\ + ["pino", "npm:8.16.2"],\ + ["atomic-sleep", "npm:1.0.0"],\ + ["fast-redact", "npm:3.3.0"],\ + ["on-exit-leak-free", "npm:2.1.2"],\ + ["pino-abstract-transport", "npm:1.1.0"],\ + ["pino-std-serializers", "npm:6.2.2"],\ + ["process-warning", "npm:2.3.2"],\ + ["quick-format-unescaped", "npm:4.0.4"],\ + ["real-require", "npm:0.2.0"],\ + ["safe-stable-stringify", "npm:2.4.3"],\ + ["sonic-boom", "npm:3.7.0"],\ + ["thread-stream", "npm:2.4.1"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["pino-abstract-transport", [\ + ["npm:1.1.0", {\ + "packageLocation": "./.yarn/cache/pino-abstract-transport-npm-1.1.0-178ca571bf-cc84caabee.zip/node_modules/pino-abstract-transport/",\ + "packageDependencies": [\ + ["pino-abstract-transport", "npm:1.1.0"],\ + ["readable-stream", "npm:4.4.2"],\ + ["split2", "npm:4.2.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["pino-std-serializers", [\ @@ -23736,6 +23884,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["pino-std-serializers", "npm:3.2.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:6.2.2", {\ + "packageLocation": "./.yarn/cache/pino-std-serializers-npm-6.2.2-0e907a1130-aeb0662edc.zip/node_modules/pino-std-serializers/",\ + "packageDependencies": [\ + ["pino-std-serializers", "npm:6.2.2"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["pinst", [\ @@ -24011,6 +24166,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["process-warning", "npm:1.0.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:2.3.2", {\ + "packageLocation": "./.yarn/cache/process-warning-npm-2.3.2-3da45c38b9-cbeddc85d3.zip/node_modules/process-warning/",\ + "packageDependencies": [\ + ["process-warning", "npm:2.3.2"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["progress", [\ @@ -25152,6 +25314,28 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["util-deprecate", "npm:1.0.2"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:3.6.2", {\ + "packageLocation": "./.yarn/cache/readable-stream-npm-3.6.2-d2a6069158-bdcbe6c22e.zip/node_modules/readable-stream/",\ + "packageDependencies": [\ + ["readable-stream", "npm:3.6.2"],\ + ["inherits", "npm:2.0.4"],\ + ["string_decoder", "npm:1.3.0"],\ + ["util-deprecate", "npm:1.0.2"]\ + ],\ + "linkType": "HARD"\ + }],\ + ["npm:4.4.2", {\ + "packageLocation": "./.yarn/cache/readable-stream-npm-4.4.2-ac0d67d9ca-6f4063763d.zip/node_modules/readable-stream/",\ + "packageDependencies": [\ + ["readable-stream", "npm:4.4.2"],\ + ["abort-controller", "npm:3.0.0"],\ + ["buffer", "npm:6.0.3"],\ + ["events", "npm:3.3.0"],\ + ["process", "npm:0.11.10"],\ + ["string_decoder", "npm:1.3.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["readdir-scoped-modules", [\ @@ -25186,6 +25370,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["real-require", [\ + ["npm:0.2.0", {\ + "packageLocation": "./.yarn/cache/real-require-npm-0.2.0-7f69dbc7b6-fa060f19f2.zip/node_modules/real-require/",\ + "packageDependencies": [\ + ["real-require", "npm:0.2.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["redent", [\ ["npm:1.0.0", {\ "packageLocation": "./.yarn/cache/redent-npm-1.0.0-b4da60611f-2bb8f76fda.zip/node_modules/redent/",\ @@ -25921,6 +26114,15 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["safe-stable-stringify", [\ + ["npm:2.4.3", {\ + "packageLocation": "./.yarn/cache/safe-stable-stringify-npm-2.4.3-d895741b40-3aeb644497.zip/node_modules/safe-stable-stringify/",\ + "packageDependencies": [\ + ["safe-stable-stringify", "npm:2.4.3"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["safer-buffer", [\ ["npm:2.1.2", {\ "packageLocation": "./.yarn/cache/safer-buffer-npm-2.1.2-8d5c0b705e-cab8f25ae6.zip/node_modules/safer-buffer/",\ @@ -26453,6 +26655,14 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["flatstr", "npm:1.0.12"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:3.7.0", {\ + "packageLocation": "./.yarn/cache/sonic-boom-npm-3.7.0-c220d2f290-528f0f7f7e.zip/node_modules/sonic-boom/",\ + "packageDependencies": [\ + ["sonic-boom", "npm:3.7.0"],\ + ["atomic-sleep", "npm:1.0.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["sort-keys", [\ @@ -26644,6 +26854,13 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["readable-stream", "npm:3.6.0"]\ ],\ "linkType": "HARD"\ + }],\ + ["npm:4.2.0", {\ + "packageLocation": "./.yarn/cache/split2-npm-4.2.0-16aa3883ba-05d5410254.zip/node_modules/split2/",\ + "packageDependencies": [\ + ["split2", "npm:4.2.0"]\ + ],\ + "linkType": "HARD"\ }]\ ]],\ ["sprintf-js", [\ @@ -27691,6 +27908,16 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ + ["thread-stream", [\ + ["npm:2.4.1", {\ + "packageLocation": "./.yarn/cache/thread-stream-npm-2.4.1-3f89bca0b7-8b28e11eab.zip/node_modules/thread-stream/",\ + "packageDependencies": [\ + ["thread-stream", "npm:2.4.1"],\ + ["real-require", "npm:0.2.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["through", [\ ["npm:2.3.8", {\ "packageLocation": "./.yarn/cache/through-npm-2.3.8-df5f72a16e-a38c3e0598.zip/node_modules/through/",\ diff --git a/packages/openneuro-server/package.json b/packages/openneuro-server/package.json index 7652646b2..020210960 100644 --- a/packages/openneuro-server/package.json +++ b/packages/openneuro-server/package.json @@ -30,7 +30,7 @@ "date-fns": "^2.16.1", "draft-js": "^0.11.7", "draft-js-export-html": "^1.4.1", - "elastic-apm-node": "3.49.1", + "elastic-apm-node": "^4.3.0", "express": "4.18.2", "graphql": "16.8.1", "graphql-bigint": "^1.0.0", diff --git a/packages/openneuro-server/src/config.ts b/packages/openneuro-server/src/config.ts index 3226ba0ca..fa41d24a6 100644 --- a/packages/openneuro-server/src/config.ts +++ b/packages/openneuro-server/src/config.ts @@ -63,6 +63,8 @@ const config = { }, elasticsearch: { connection: process.env.ELASTICSEARCH_CONNECTION, + apmServerUrl: process.env.ELASTIC_APM_SERVER_URL, + apmApiKey: process.env.ELASTIC_APM_API_KEY, }, github: { token: process.env.DATALAD_GITHUB_TOKEN, diff --git a/packages/openneuro-server/src/server.ts b/packages/openneuro-server/src/server.ts index ce940dfd7..596b992e9 100644 --- a/packages/openneuro-server/src/server.ts +++ b/packages/openneuro-server/src/server.ts @@ -1,14 +1,17 @@ -/** Needs to run before the other imports in Node */ import apm from "elastic-apm-node" -apm.start({ - serviceName: "openneuro-server", - cloudProvider: "none", -}) - +import config from "./config" +/** Needs to run before the other imports in Node */ +if (config.elasticsearch.apmServerUrl) { + apm.start({ + serverUrl: config.elasticsearch.apmServerUrl, + apiKey: config.elasticsearch.apmApiKey, + serviceName: "openneuro-server", + cloudProvider: "none", + }) +} import { createServer } from "http" import mongoose from "mongoose" import { connect as redisConnect } from "./libs/redis" -import config from "./config" import { expressApolloSetup } from "./app" const redisConnectionSetup = async () => { diff --git a/yarn.lock b/yarn.lock index f2af19200..8fa297d83 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2917,6 +2917,13 @@ __metadata: languageName: node linkType: hard +"@elastic/ecs-helpers@npm:^2.1.1": + version: 2.1.1 + resolution: "@elastic/ecs-helpers@npm:2.1.1" + checksum: 80db727963e26a28312c67e47cbc40bfe5441ff8937dc27157a7f968fcd20475345a19a6588cc1c6b97b2eeaf5990f2285eaf2f03e206f3c2cd9965160d3fdaa + languageName: node + linkType: hard + "@elastic/ecs-pino-format@npm:^1.2.0": version: 1.3.0 resolution: "@elastic/ecs-pino-format@npm:1.3.0" @@ -2926,6 +2933,15 @@ __metadata: languageName: node linkType: hard +"@elastic/ecs-pino-format@npm:^1.5.0": + version: 1.5.0 + resolution: "@elastic/ecs-pino-format@npm:1.5.0" + dependencies: + "@elastic/ecs-helpers": ^2.1.1 + checksum: e66a1801ecafa5d1f56037df8dafa9da9c302440c8254c636374e489a5a50e85166b77c951c1f8d3edd99cb77f43b5967c3f31a68cac23b2a4b95a87ce72b066 + languageName: node + linkType: hard + "@elastic/elasticsearch@npm:7.15.0": version: 7.15.0 resolution: "@elastic/elasticsearch@npm:7.15.0" @@ -5582,7 +5598,7 @@ __metadata: date-fns: ^2.16.1 draft-js: ^0.11.7 draft-js-export-html: ^1.4.1 - elastic-apm-node: 3.49.1 + elastic-apm-node: ^4.3.0 express: 4.18.2 graphql: 16.8.1 graphql-bigint: ^1.0.0 @@ -8284,6 +8300,15 @@ __metadata: languageName: node linkType: hard +"abort-controller@npm:^3.0.0": + version: 3.0.0 + resolution: "abort-controller@npm:3.0.0" + dependencies: + event-target-shim: ^5.0.0 + checksum: 170bdba9b47b7e65906a28c8ce4f38a7a369d78e2271706f020849c1bfe0ee2067d4261df8bbb66eb84f79208fd5b710df759d64191db58cfba7ce8ef9c54b75 + languageName: node + linkType: hard + "accepts@npm:~1.3.8": version: 1.3.8 resolution: "accepts@npm:1.3.8" @@ -10788,6 +10813,13 @@ __metadata: languageName: node linkType: hard +"cookie@npm:^0.6.0": + version: 0.6.0 + resolution: "cookie@npm:0.6.0" + checksum: f56a7d32a07db5458e79c726b77e3c2eff655c36792f2b6c58d351fb5f61531e5b1ab7f46987150136e366c65213cbe31729e02a3eaed630c3bf7334635fb410 + languageName: node + linkType: hard + "cookiejar@npm:^2.1.0, cookiejar@npm:^2.1.2": version: 2.1.4 resolution: "cookiejar@npm:2.1.4" @@ -11844,7 +11876,7 @@ __metadata: languageName: node linkType: hard -"elastic-apm-node@npm:3.49.1, elastic-apm-node@npm:^3.49.1": +"elastic-apm-node@npm:^3.49.1": version: 3.49.1 resolution: "elastic-apm-node@npm:3.49.1" dependencies: @@ -11890,6 +11922,51 @@ __metadata: languageName: node linkType: hard +"elastic-apm-node@npm:^4.3.0": + version: 4.3.0 + resolution: "elastic-apm-node@npm:4.3.0" + dependencies: + "@elastic/ecs-pino-format": ^1.5.0 + "@opentelemetry/api": ^1.4.1 + "@opentelemetry/core": ^1.11.0 + "@opentelemetry/sdk-metrics": ^1.12.0 + after-all-results: ^2.0.0 + agentkeepalive: ^4.2.1 + async-value-promise: ^1.1.1 + basic-auth: ^2.0.1 + breadth-filter: ^2.0.0 + cookie: ^0.6.0 + core-util-is: ^1.0.2 + end-of-stream: ^1.4.4 + error-callsites: ^2.0.4 + error-stack-parser: ^2.0.6 + escape-string-regexp: ^4.0.0 + fast-safe-stringify: ^2.0.7 + fast-stream-to-buffer: ^1.0.0 + http-headers: ^3.0.2 + import-in-the-middle: 1.5.0 + json-bigint: ^1.0.0 + lru-cache: ^10.0.1 + measured-reporting: ^1.51.1 + module-details-from-path: ^1.0.3 + monitor-event-loop-delay: ^1.0.0 + object-filter-sequence: ^1.0.0 + object-identity-map: ^1.0.2 + original-url: ^1.2.3 + pino: ^8.15.0 + readable-stream: ^3.6.2 + relative-microtime: ^2.0.0 + require-in-the-middle: ^7.1.1 + semver: ^7.5.4 + shallow-clone-shim: ^2.0.0 + source-map: ^0.8.0-beta.0 + sql-summary: ^1.0.1 + stream-chopper: ^3.0.1 + unicode-byte-truncate: ^1.0.0 + checksum: b0a257800e0fa436775ba4118d502a67985a54f5fcecd02944e31b938f44bd107176628864f9818ed2a13738e606df0baec8865844bb00f021240841a00e7cff + languageName: node + linkType: hard + "electron-to-chromium@npm:^1.4.477": version: 1.4.520 resolution: "electron-to-chromium@npm:1.4.520" @@ -12577,6 +12654,13 @@ __metadata: languageName: node linkType: hard +"event-target-shim@npm:^5.0.0": + version: 5.0.1 + resolution: "event-target-shim@npm:5.0.1" + checksum: 1ffe3bb22a6d51bdeb6bf6f7cf97d2ff4a74b017ad12284cc9e6a279e727dc30a5de6bb613e5596ff4dc3e517841339ad09a7eec44266eccb1aa201a30448166 + languageName: node + linkType: hard + "eventemitter3@npm:^3.1.0": version: 3.1.2 resolution: "eventemitter3@npm:3.1.2" @@ -12942,6 +13026,13 @@ __metadata: languageName: node linkType: hard +"fast-redact@npm:^3.1.1": + version: 3.3.0 + resolution: "fast-redact@npm:3.3.0" + checksum: 3f7becc70a5a2662a9cbfdc52a4291594f62ae998806ee00315af307f32d9559dbf512146259a22739ee34401950ef47598c1f4777d33b0ed5027203d67f549c + languageName: node + linkType: hard + "fast-safe-stringify@npm:^2.0.7, fast-safe-stringify@npm:^2.0.8": version: 2.1.1 resolution: "fast-safe-stringify@npm:2.1.1" @@ -14897,6 +14988,18 @@ fsevents@~2.3.2: languageName: node linkType: hard +"import-in-the-middle@npm:1.5.0": + version: 1.5.0 + resolution: "import-in-the-middle@npm:1.5.0" + dependencies: + acorn: ^8.8.2 + acorn-import-assertions: ^1.9.0 + cjs-module-lexer: ^1.2.2 + module-details-from-path: ^1.0.3 + checksum: e58a105aef1b8098b418768c1bd108e09c07ab6b34d7458f50ce710e045dedd7e7dc440e6de2c89fde167604801b26c4625f3c7e19cd2d389a7744d46bc24c22 + languageName: node + linkType: hard + "import-lazy@npm:^2.1.0": version: 2.1.0 resolution: "import-lazy@npm:2.1.0" @@ -17508,6 +17611,13 @@ fsevents@~2.3.2: languageName: node linkType: hard +"lru-cache@npm:^10.0.1": + version: 10.1.0 + resolution: "lru-cache@npm:10.1.0" + checksum: 58056d33e2500fbedce92f8c542e7c11b50d7d086578f14b7074d8c241422004af0718e08a6eaae8705cee09c77e39a61c1c79e9370ba689b7010c152e6a76ab + languageName: node + linkType: hard + "lru-cache@npm:^4.0.0": version: 4.1.5 resolution: "lru-cache@npm:4.1.5" @@ -19592,6 +19702,13 @@ fsevents@~2.3.2: languageName: node linkType: hard +"on-exit-leak-free@npm:^2.1.0": + version: 2.1.2 + resolution: "on-exit-leak-free@npm:2.1.2" + checksum: 6ce7acdc7b9ceb51cf029b5239cbf41937ee4c8dcd9d4e475e1777b41702564d46caa1150a744e00da0ac6d923ab83471646a39a4470f97481cf6e2d8d253c3f + languageName: node + linkType: hard + "on-finished@npm:2.4.1": version: 2.4.1 resolution: "on-finished@npm:2.4.1" @@ -20496,6 +20613,16 @@ fsevents@~2.3.2: languageName: node linkType: hard +"pino-abstract-transport@npm:v1.1.0": + version: 1.1.0 + resolution: "pino-abstract-transport@npm:1.1.0" + dependencies: + readable-stream: ^4.0.0 + split2: ^4.0.0 + checksum: cc84caabee5647b5753ae484d5f63a1bca0f6e1791845e2db2b6d830a561c2b5dd1177720f68d78994c8a93aecc69f2729e6ac2bc871a1bf5bb4b0ec17210668 + languageName: node + linkType: hard + "pino-std-serializers@npm:^3.1.0": version: 3.2.0 resolution: "pino-std-serializers@npm:3.2.0" @@ -20503,6 +20630,13 @@ fsevents@~2.3.2: languageName: node linkType: hard +"pino-std-serializers@npm:^6.0.0": + version: 6.2.2 + resolution: "pino-std-serializers@npm:6.2.2" + checksum: aeb0662edc46ec926de9961ed4780a4f0586bb7c37d212cd469c069639e7816887a62c5093bc93f260a4e0900322f44fc8ab1343b5a9fa2864a888acccdb22a4 + languageName: node + linkType: hard + "pino@npm:^6.11.2": version: 6.13.4 resolution: "pino@npm:6.13.4" @@ -20520,6 +20654,27 @@ fsevents@~2.3.2: languageName: node linkType: hard +"pino@npm:^8.15.0": + version: 8.16.2 + resolution: "pino@npm:8.16.2" + dependencies: + atomic-sleep: ^1.0.0 + fast-redact: ^3.1.1 + on-exit-leak-free: ^2.1.0 + pino-abstract-transport: v1.1.0 + pino-std-serializers: ^6.0.0 + process-warning: ^2.0.0 + quick-format-unescaped: ^4.0.3 + real-require: ^0.2.0 + safe-stable-stringify: ^2.3.1 + sonic-boom: ^3.7.0 + thread-stream: ^2.0.0 + bin: + pino: bin.js + checksum: 78d194112f09f82471ec7e0022bc114ddb833375d60236be40ac55bf8a8ae26b88c8780d54912687c7cd6d0321ba5b1a78ffa89c5e9d5855ef849c3b9273c7ab + languageName: node + linkType: hard + "pinst@npm:^2.1.6": version: 2.1.6 resolution: "pinst@npm:2.1.6" @@ -20767,7 +20922,14 @@ fsevents@~2.3.2: languageName: node linkType: hard -"process@npm:^0.11.1": +"process-warning@npm:^2.0.0": + version: 2.3.2 + resolution: "process-warning@npm:2.3.2" + checksum: cbeddc85d3963eccd6578b1eea5ba981383d1ec688d6e4ba5bf0ca6662d094c024b44dfcb1c530662c7694b68fe09fd95fa0269a1309090d793008f4553e7784 + languageName: node + linkType: hard + +"process@npm:^0.11.1, process@npm:^0.11.10": version: 0.11.10 resolution: "process@npm:0.11.10" checksum: bfcce49814f7d172a6e6a14d5fa3ac92cc3d0c3b9feb1279774708a719e19acd673995226351a082a9ae99978254e320ccda4240ddc474ba31a76c79491ca7c3 @@ -21604,6 +21766,30 @@ fsevents@~2.3.2: languageName: node linkType: hard +"readable-stream@npm:^3.6.2": + version: 3.6.2 + resolution: "readable-stream@npm:3.6.2" + dependencies: + inherits: ^2.0.3 + string_decoder: ^1.1.1 + util-deprecate: ^1.0.1 + checksum: bdcbe6c22e846b6af075e32cf8f4751c2576238c5043169a1c221c92ee2878458a816a4ea33f4c67623c0b6827c8a400409bfb3cf0bf3381392d0b1dfb52ac8d + languageName: node + linkType: hard + +"readable-stream@npm:^4.0.0": + version: 4.4.2 + resolution: "readable-stream@npm:4.4.2" + dependencies: + abort-controller: ^3.0.0 + buffer: ^6.0.3 + events: ^3.3.0 + process: ^0.11.10 + string_decoder: ^1.3.0 + checksum: 6f4063763dbdb52658d22d3f49ca976420e1fbe16bbd241f744383715845350b196a2f08b8d6330f8e219153dff34b140aeefd6296da828e1041a7eab1f20d5e + languageName: node + linkType: hard + "readdir-scoped-modules@npm:^1.0.0": version: 1.1.0 resolution: "readdir-scoped-modules@npm:1.1.0" @@ -21632,6 +21818,13 @@ fsevents@~2.3.2: languageName: node linkType: hard +"real-require@npm:^0.2.0": + version: 0.2.0 + resolution: "real-require@npm:0.2.0" + checksum: fa060f19f2f447adf678d1376928c76379dce5f72bd334da301685ca6cdcb7b11356813332cc243c88470796bc2e2b1e2917fc10df9143dd93c2ea608694971d + languageName: node + linkType: hard + "redent@npm:^1.0.0": version: 1.0.0 resolution: "redent@npm:1.0.0" @@ -22355,6 +22548,13 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"safe-stable-stringify@npm:^2.3.1": + version: 2.4.3 + resolution: "safe-stable-stringify@npm:2.4.3" + checksum: 3aeb64449706ee1f5ad2459fc99648b131d48e7a1fbb608d7c628020177512dc9d94108a5cb61bbc953985d313d0afea6566d243237743e02870490afef04b43 + languageName: node + linkType: hard + "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:~2.1.0": version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" @@ -22858,6 +23058,15 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"sonic-boom@npm:^3.7.0": + version: 3.7.0 + resolution: "sonic-boom@npm:3.7.0" + dependencies: + atomic-sleep: ^1.0.0 + checksum: 528f0f7f7e09dcdb02ad5985039f66554266cbd8813f9920781607c9248e01f468598c1334eab2cc740c016a63c8b2a20e15c3f618cddb08ea1cfb4a390a796e + languageName: node + linkType: hard + "sort-keys@npm:^2.0.0": version: 2.0.0 resolution: "sort-keys@npm:2.0.0" @@ -23014,6 +23223,13 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"split2@npm:^4.0.0": + version: 4.2.0 + resolution: "split2@npm:4.2.0" + checksum: 05d54102546549fe4d2455900699056580cca006c0275c334611420f854da30ac999230857a85fdd9914dc2109ae50f80fda43d2a445f2aa86eccdc1dfce779d + languageName: node + linkType: hard + "split@npm:0.3": version: 0.3.3 resolution: "split@npm:0.3.3" @@ -23425,7 +23641,7 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"string_decoder@npm:^1.1.1": +"string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0": version: 1.3.0 resolution: "string_decoder@npm:1.3.0" dependencies: @@ -23980,6 +24196,15 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"thread-stream@npm:^2.0.0": + version: 2.4.1 + resolution: "thread-stream@npm:2.4.1" + dependencies: + real-require: ^0.2.0 + checksum: 8b28e11eab2f805f963e6b6b23afab5523079575c4fc79c16eb29aa1c13d7931289762ebbc1268b3373d3f35ce795bd291df8e2d51eb45779ecaaecd06873459 + languageName: node + linkType: hard + "through2@npm:^2.0.0, through2@npm:^2.0.2": version: 2.0.5 resolution: "through2@npm:2.0.5"