From 78f39c53fc789f56ad5aa8ad01ba7357c44de2df Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Thu, 19 Oct 2023 15:29:24 +0200 Subject: [PATCH 1/2] update deps --- service-blue/app.js | 16 +- service-blue/package-lock.json | 837 -------------------------- service-blue/package.json | 10 - service-gateway/app.js | 15 +- service-gateway/package-lock.json | 943 ------------------------------ service-gateway/package.json | 10 - service-green/app.js | 16 +- service-green/package-lock.json | 943 ------------------------------ service-green/package.json | 10 - 9 files changed, 19 insertions(+), 2781 deletions(-) diff --git a/service-blue/app.js b/service-blue/app.js index 500307e..852c124 100644 --- a/service-blue/app.js +++ b/service-blue/app.js @@ -1,17 +1,11 @@ const path = require('path'); require('dotenv').config({ path: path.resolve(__dirname, '../.env') }); - const Sentry = require('@sentry/node-experimental'); -if(process.env.SENTRY) { - Sentry.init({ - dsn: process.env.SENTRY_SERVICE_BLUE_DSN, - tracesSampleRate: 1.0, - }); -} else { - const sdk = require("../otel/tracing")('service-blue'); -} - +Sentry.init({ + dsn: process.env.SENTRY_SERVICE_BLUE_DSN, + tracesSampleRate: 1.0, +}); const createError = require("http-errors"); const express = require("express"); @@ -33,6 +27,8 @@ app.use(express.static(path.join(__dirname, "public"))); app.use("/", indexRouter); +app.use(Sentry.Handlers.errorHandler()); + // catch 404 and forward to error handler app.use((req, res, next) => { next(createError(404)); diff --git a/service-blue/package-lock.json b/service-blue/package-lock.json index a986613..45f33af 100644 --- a/service-blue/package-lock.json +++ b/service-blue/package-lock.json @@ -8,16 +8,6 @@ "name": "service-blue", "version": "0.0.0", "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/exporter-jaeger": "^0.16.0", - "@opentelemetry/node": "^0.16.0", - "@opentelemetry/plugin-dns": "^0.13.1", - "@opentelemetry/plugin-express": "^0.13.1", - "@opentelemetry/plugin-http": "^0.16.0", - "@opentelemetry/plugin-mongodb": "^0.13.1", - "@opentelemetry/plugins-node-core-and-contrib": "^0.13.1", - "@opentelemetry/tracing": "^0.16.0", - "@sentry/node": "^7.21.1", "@sentry/node-experimental": "^7.74.1", "cookie-parser": "^1.4.6", "dd-trace": "^0.12.1", @@ -51,681 +41,6 @@ "semver": "bin/semver" } }, - "node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/context-async-hooks": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-0.16.0.tgz", - "integrity": "sha512-8R77Kc84jBKOsXrsz0Q7bKaHZ4eOEznRKSOwbVKMKVJJYTjXTEkhCZAT+NfUganr787ipErwRk1uOAQmgEmGuw==", - "dependencies": { - "@opentelemetry/context-base": "^0.16.0" - }, - "engines": { - "node": ">=8.1.0" - } - }, - "node_modules/@opentelemetry/context-async-hooks/node_modules/@opentelemetry/context-base": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.16.0.tgz", - "integrity": "sha512-2h2s+3P40wIu8ZaJiqBF6E0rEJPeSVOErFlkx2MfRGPs9Vs9Th+i5YSpgvCW4s5LeYTFAf2BRwut39JivEyH9w==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/core": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.16.0.tgz", - "integrity": "sha512-NFZwEW5TeFIAUlNty9al0KU9AQzpEiBowem/33d3ftxYHZ7dG1JklFnyKLTVb+pAZFm/peTziVddfHoTsIY4Rg==", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/context-base": "^0.16.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/core/node_modules/@opentelemetry/api": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.16.0.tgz", - "integrity": "sha512-y5mNFAiktm7Zyf0GrQ6kjsRqace/WCXk9gMo/sOOna4TtMW8NaZgJceKrsQZl3qiPY9Upu8O9VvdlETXDx4U5A==", - "dependencies": { - "@opentelemetry/context-base": "^0.16.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/core/node_modules/@opentelemetry/context-base": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.16.0.tgz", - "integrity": "sha512-2h2s+3P40wIu8ZaJiqBF6E0rEJPeSVOErFlkx2MfRGPs9Vs9Th+i5YSpgvCW4s5LeYTFAf2BRwut39JivEyH9w==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/exporter-jaeger": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-jaeger/-/exporter-jaeger-0.16.0.tgz", - "integrity": "sha512-r57HG/KWp2zKIU+wZX9dkSvAROnJm5u53q8DKPjVcmfg9ySVD6MbtQFUkDtGyZq4pv7d+XCitKOYzbw1kWAp2w==", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/core": "^0.16.0", - "@opentelemetry/tracing": "^0.16.0", - "jaeger-client": "^3.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/exporter-jaeger/node_modules/@opentelemetry/api": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.16.0.tgz", - "integrity": "sha512-y5mNFAiktm7Zyf0GrQ6kjsRqace/WCXk9gMo/sOOna4TtMW8NaZgJceKrsQZl3qiPY9Upu8O9VvdlETXDx4U5A==", - "dependencies": { - "@opentelemetry/context-base": "^0.16.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/exporter-jaeger/node_modules/@opentelemetry/context-base": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.16.0.tgz", - "integrity": "sha512-2h2s+3P40wIu8ZaJiqBF6E0rEJPeSVOErFlkx2MfRGPs9Vs9Th+i5YSpgvCW4s5LeYTFAf2BRwut39JivEyH9w==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/node": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/node/-/node-0.16.0.tgz", - "integrity": "sha512-hDIMsAZk1D+dFOW7FJH155nQrYKeuSBaiHvHm3F9VfZul+v9UNlNjPXqzAahW3l5au05nJ+e7EIKKq6cgMbw8Q==", - "deprecated": "Package renamed to @opentelemetry/sdk-trace-node", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/context-async-hooks": "^0.16.0", - "@opentelemetry/core": "^0.16.0", - "@opentelemetry/tracing": "^0.16.0", - "require-in-the-middle": "^5.0.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/node/node_modules/@opentelemetry/api": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.16.0.tgz", - "integrity": "sha512-y5mNFAiktm7Zyf0GrQ6kjsRqace/WCXk9gMo/sOOna4TtMW8NaZgJceKrsQZl3qiPY9Upu8O9VvdlETXDx4U5A==", - "dependencies": { - "@opentelemetry/context-base": "^0.16.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/node/node_modules/@opentelemetry/context-base": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.16.0.tgz", - "integrity": "sha512-2h2s+3P40wIu8ZaJiqBF6E0rEJPeSVOErFlkx2MfRGPs9Vs9Th+i5YSpgvCW4s5LeYTFAf2BRwut39JivEyH9w==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-dns": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-dns/-/plugin-dns-0.13.1.tgz", - "integrity": "sha512-txqBMqJkFj2tjVN5oHNJ40+JCXp8TL4ur0LN0W1s0eP1uxd5Cqpk6PRuH78D9qBLOjatc5ByNdZC3l73ctCkzQ==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-dns", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "semver": "^7.3.2", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-dns/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-express": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-express/-/plugin-express-0.13.1.tgz", - "integrity": "sha512-klgLutbDzIhEtipBx+Foh7jZmbjK8cgM7Uf9c63ipw1Ogv73WoBGqKmEnOh5AIGN8ZkchoDyWbKRTVydvGbPlQ==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-express", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-express/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-grpc/-/plugin-grpc-0.15.0.tgz", - "integrity": "sha512-blQwyl6BsT56Z3ehxEFNrS383tjdqcK1CXrvM6MDBPEsMC08H8b3BYAHiTL87w7teBBj1BtPEGXragqQ32einw==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-grpc", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc-js": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-grpc-js/-/plugin-grpc-js-0.15.0.tgz", - "integrity": "sha512-NulLW20E/Y1fmoyJnZbwvUMacFx6QUwFbeo9UBjIc7cf1hx71OfTbby8VAEKxDCTW6QPFnLlPi5frS98QUUgFw==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-grpc", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "shimmer": "1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc-js/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc-js/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-http": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-http/-/plugin-http-0.16.0.tgz", - "integrity": "sha512-0jpFhsMOt/eEosD8XI4VIzgUbiTln7CF9ALQJhgNjjxHJhsIjlhysnI6em5ylQj7PkW/df0iwPG+KXvhZnNlVg==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-http", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/core": "^0.16.0", - "@opentelemetry/semantic-conventions": "^0.16.0", - "semver": "^7.1.3", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-http/node_modules/@opentelemetry/api": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.16.0.tgz", - "integrity": "sha512-y5mNFAiktm7Zyf0GrQ6kjsRqace/WCXk9gMo/sOOna4TtMW8NaZgJceKrsQZl3qiPY9Upu8O9VvdlETXDx4U5A==", - "dependencies": { - "@opentelemetry/context-base": "^0.16.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-http/node_modules/@opentelemetry/context-base": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.16.0.tgz", - "integrity": "sha512-2h2s+3P40wIu8ZaJiqBF6E0rEJPeSVOErFlkx2MfRGPs9Vs9Th+i5YSpgvCW4s5LeYTFAf2BRwut39JivEyH9w==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-https": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-https/-/plugin-https-0.15.0.tgz", - "integrity": "sha512-wvpvKf8piM7QOUUjBUo2ft0WICysFRdkhCazDCF9n4o9w6FPq/tCjfm5JRppVGS9YQ27V839ULBmWJw3D6rN2w==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-http", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/plugin-http": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "semver": "^7.1.3", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-https/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-https/node_modules/@opentelemetry/plugin-http": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-http/-/plugin-http-0.15.0.tgz", - "integrity": "sha512-DIldMPLtjU1o7wXCSN9YQD97vpE7a6KbsDnjQitlwMNKPNX1wIJ94zCBWuYcSrPcyPTymxH7vYUiObJzQI+f8A==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-http", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "semver": "^7.1.3", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-https/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-ioredis": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-ioredis/-/plugin-ioredis-0.13.1.tgz", - "integrity": "sha512-pP56uuEIQZpY1QIVHQ+GNIb5JpJZN0N+eEDwYXt2Nn1pbuoyxMxBkDwIo4olMbp8QSbA4vmXr1nnCVNCPvGXQA==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-ioredis", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-ioredis/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-ioredis/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mongodb": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-mongodb/-/plugin-mongodb-0.13.1.tgz", - "integrity": "sha512-xeo8VqlGXWq4k+VVqEm8eKkwdWPKMWvLjfhiluGygwJUYZfcNJE4ch1Cyd0WY0OeHs9M8MhZGDmOWm5P9tOiWw==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-mongodb", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mongodb/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-mongodb/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mysql": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-mysql/-/plugin-mysql-0.13.1.tgz", - "integrity": "sha512-sQajgaPvyu4LCvsB8gjUKeI/tfviVNCeRRTS2zqxUZ7RSLAPWeKbjh6o+Kii6ewwby2x5tgwnQuncW3wTJ1GRA==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-mysql", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mysql/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-pg": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-pg/-/plugin-pg-0.13.1.tgz", - "integrity": "sha512-hXaYtjhOjTYfEwPmZg2aHMWeEWoLH+b+t2M6h2J1lYkvMJdR1ToE/RswGf9/VBU0uGG+1SLCNWW8Dd0U6L+/Rg==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-pg", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-pg-pool": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-pg-pool/-/plugin-pg-pool-0.13.1.tgz", - "integrity": "sha512-NU5HsRKdPBWbcV/KHOG7kx05aiiorC9n+oRhIYkNDppajMEmKRp/YW7sNvUd3pe53Epo3uLE5WVn40W/Ye6ooA==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-pg", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-pg-pool/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-pg/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-redis": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-redis/-/plugin-redis-0.13.1.tgz", - "integrity": "sha512-+10QgxgwhnjDvj+VvoAZsP3buAgYj5UNBgZV5Lu3B+W0fVbZ+CoYvWcJL+Nulywg7zstomkV/cY8lxnAGmoBdw==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-redis", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-redis/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugins-node-core/-/plugins-node-core-0.15.0.tgz", - "integrity": "sha512-fLuHftNBRsHzftMa2MAbpSzGfBtQKX2/raqKzcIh9U5CJXJQEM2kH24E9sSyO+GLJuYsMuiRi7ngBGLq8L0OMA==", - "deprecated": "Deprecated in favor of @opentelemetry/auto-instrumentations-node and @opentelemetry/auto-instrumentations-web", - "dependencies": { - "@opentelemetry/plugin-grpc": "^0.15.0", - "@opentelemetry/plugin-grpc-js": "^0.15.0", - "@opentelemetry/plugin-http": "^0.15.0", - "@opentelemetry/plugin-https": "^0.15.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core-and-contrib": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugins-node-core-and-contrib/-/plugins-node-core-and-contrib-0.13.1.tgz", - "integrity": "sha512-htmM83U/DzceoVirodF0qEHs14uIgHlgdlPOcKTmP2G686cy2txYPFttAgLghg4R4eM2IwgNBwUYJfo20M3iaw==", - "deprecated": "Deprecated in favor of @opentelemetry/auto-instrumentations-node and @opentelemetry/auto-instrumentations-web", - "dependencies": { - "@opentelemetry/plugin-express": "^0.13.1", - "@opentelemetry/plugin-ioredis": "^0.13.1", - "@opentelemetry/plugin-mongodb": "^0.13.1", - "@opentelemetry/plugin-mysql": "^0.13.1", - "@opentelemetry/plugin-pg": "^0.13.1", - "@opentelemetry/plugin-pg-pool": "^0.13.1", - "@opentelemetry/plugin-redis": "^0.13.1", - "@opentelemetry/plugins-node-core": "0.15.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core/node_modules/@opentelemetry/plugin-http": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-http/-/plugin-http-0.15.0.tgz", - "integrity": "sha512-DIldMPLtjU1o7wXCSN9YQD97vpE7a6KbsDnjQitlwMNKPNX1wIJ94zCBWuYcSrPcyPTymxH7vYUiObJzQI+f8A==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-http", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "semver": "^7.1.3", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/resources": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.16.0.tgz", - "integrity": "sha512-HOAmcRnZGbEhcddsjqvz3Q/mEg75PyEoH/CZZ3YGqYmwTPimTiusm8iz5nXMxp1UpT8rkzlEGei/E21SQ/Zh9g==", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/core": "^0.16.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/resources/node_modules/@opentelemetry/api": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.16.0.tgz", - "integrity": "sha512-y5mNFAiktm7Zyf0GrQ6kjsRqace/WCXk9gMo/sOOna4TtMW8NaZgJceKrsQZl3qiPY9Upu8O9VvdlETXDx4U5A==", - "dependencies": { - "@opentelemetry/context-base": "^0.16.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/resources/node_modules/@opentelemetry/context-base": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.16.0.tgz", - "integrity": "sha512-2h2s+3P40wIu8ZaJiqBF6E0rEJPeSVOErFlkx2MfRGPs9Vs9Th+i5YSpgvCW4s5LeYTFAf2BRwut39JivEyH9w==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/semantic-conventions": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.16.0.tgz", - "integrity": "sha512-RDYLf6lUtikIDTr6yVDehsUAlNb1U680eOV1QuDN0w6FDGubTnjbADlgpF41ByOow1Jp/WGmynFfOh19Ix4NWw==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/tracing": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.16.0.tgz", - "integrity": "sha512-8UrNbzO56m8fe9ge+XR0Lruwld+W6SM6aWFQT32YCU8lS+Hzz2P6TbevmgT4DzeKszJxnHqzNnqx8HziNeUjTA==", - "deprecated": "Package renamed to @opentelemetry/sdk-trace-base", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/context-base": "^0.16.0", - "@opentelemetry/core": "^0.16.0", - "@opentelemetry/resources": "^0.16.0", - "@opentelemetry/semantic-conventions": "^0.16.0", - "lodash.merge": "^4.6.2" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/tracing/node_modules/@opentelemetry/api": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.16.0.tgz", - "integrity": "sha512-y5mNFAiktm7Zyf0GrQ6kjsRqace/WCXk9gMo/sOOna4TtMW8NaZgJceKrsQZl3qiPY9Upu8O9VvdlETXDx4U5A==", - "dependencies": { - "@opentelemetry/context-base": "^0.16.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/tracing/node_modules/@opentelemetry/context-base": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.16.0.tgz", - "integrity": "sha512-2h2s+3P40wIu8ZaJiqBF6E0rEJPeSVOErFlkx2MfRGPs9Vs9Th+i5YSpgvCW4s5LeYTFAf2BRwut39JivEyH9w==", - "engines": { - "node": ">=8.0.0" - } - }, "node_modules/@prisma/instrumentation": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-5.3.1.tgz", @@ -1697,14 +1012,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node_modules/ansi-color": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz", - "integrity": "sha512-bF6xLaZBLpOQzgYUtYEhJx090nPSZk1BQ/q2oyBK9aMMcJHzx9uXGCjI2Y+LebsN4Jwoykr0V9whbPiogdyHoQ==", - "engines": { - "node": "*" - } - }, "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -1810,20 +1117,6 @@ "node": ">=0.6.19" } }, - "node_modules/bufrw": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/bufrw/-/bufrw-1.3.0.tgz", - "integrity": "sha512-jzQnSbdJqhIltU9O5KUiTtljP9ccw2u5ix59McQy4pV2xGhVLhRZIndY8GIrgh5HjXa6+QJ9AQhOd2QWQizJFQ==", - "dependencies": { - "ansi-color": "^0.2.1", - "error": "^7.0.0", - "hexer": "^1.5.0", - "xtend": "^4.0.0" - }, - "engines": { - "node": ">= 0.10.x" - } - }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -2053,15 +1346,6 @@ "node": ">= 0.8" } }, - "node_modules/error": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/error/-/error-7.0.2.tgz", - "integrity": "sha512-UtVv4l5MhijsYUxPJo4390gzfZvAnTHreNnDjnTZaKIiZ/SemXxAhBkYSKtWa5RtBXbLP8tMgn/n0RUa/H7jXw==", - "dependencies": { - "string-template": "~0.2.1", - "xtend": "~4.0.0" - } - }, "node_modules/error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -2266,23 +1550,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/hexer": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/hexer/-/hexer-1.5.0.tgz", - "integrity": "sha512-dyrPC8KzBzUJ19QTIo1gXNqIISRXQ0NwteW6OeQHRN4ZuZeHkdODfj0zHBdOlHbRY8GqbqK57C9oWSvQZizFsg==", - "dependencies": { - "ansi-color": "^0.2.1", - "minimist": "^1.1.0", - "process": "^0.10.0", - "xtend": "^4.0.0" - }, - "bin": { - "hexer": "cli.js" - }, - "engines": { - "node": ">= 0.10.x" - } - }, "node_modules/hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", @@ -2457,21 +1724,6 @@ "jade": "bin/jade" } }, - "node_modules/jaeger-client": { - "version": "3.19.0", - "resolved": "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.19.0.tgz", - "integrity": "sha512-M0c7cKHmdyEUtjemnJyx/y9uX16XHocL46yQvyqDlPdvAcwPDbHrIbKjQdBqtiE4apQ/9dmr+ZLJYYPGnurgpw==", - "dependencies": { - "node-int64": "^0.4.0", - "opentracing": "^0.14.4", - "thriftrw": "^3.5.0", - "uuid": "^8.3.2", - "xorshift": "^1.1.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -2546,14 +1798,6 @@ "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==" }, - "node_modules/long": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/long/-/long-2.4.0.tgz", - "integrity": "sha512-ijUtjmO/n2A5PaosNG9ZGDsQ3vxJg7ZW8vsY8Kp0f2yIZWhSJvjmegV7t+9RPQKxKrvj8yKGehhS+po14hPLGQ==", - "engines": { - "node": ">=0.6" - } - }, "node_modules/lru_map": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz", @@ -2804,11 +2048,6 @@ "node-gyp-build-test": "build-test.js" } }, - "node_modules/node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==" - }, "node_modules/normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -3121,14 +2360,6 @@ "node": ">=0.10.0" } }, - "node_modules/process": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/process/-/process-0.10.1.tgz", - "integrity": "sha512-dyIett8dgGIZ/TXKUzeYExt7WA6ldDzys9vTDU/cCA9L17Ypme+KzS+NjQCjpn9xsvi/shbMC+yP/BcFMBz0NA==", - "engines": { - "node": ">= 0.6.0" - } - }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -3291,40 +2522,6 @@ "node": ">=4" } }, - "node_modules/require-in-the-middle": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.2.0.tgz", - "integrity": "sha512-efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg==", - "dependencies": { - "debug": "^4.1.1", - "module-details-from-path": "^1.0.3", - "resolve": "^1.22.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/require-in-the-middle/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/require-in-the-middle/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -3544,11 +2741,6 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, - "node_modules/string-template": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz", - "integrity": "sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==" - }, "node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -3601,22 +2793,6 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, - "node_modules/thriftrw": { - "version": "3.11.4", - "resolved": "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.4.tgz", - "integrity": "sha512-UcuBd3eanB3T10nXWRRMwfwoaC6VMk7qe3/5YIWP2Jtw+EbHqJ0p1/K3x8ixiR5dozKSSfcg1W+0e33G1Di3XA==", - "dependencies": { - "bufrw": "^1.2.1", - "error": "7.0.2", - "long": "^2.4.0" - }, - "bin": { - "thrift2json": "thrift2json.js" - }, - "engines": { - "node": ">= 0.10.x" - } - }, "node_modules/toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", @@ -3681,14 +2857,6 @@ "node": ">= 0.4.0" } }, - "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "bin": { - "uuid": "dist/bin/uuid" - } - }, "node_modules/validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -3706,11 +2874,6 @@ "node": ">= 0.8" } }, - "node_modules/xorshift": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/xorshift/-/xorshift-1.2.0.tgz", - "integrity": "sha512-iYgNnGyeeJ4t6U11NpA/QiKy+PXn5Aa3Azg5qkwIFz1tBLllQrjjsk9yzD7IAK0naNU4JxdeDgqW9ov4u/hc4g==" - }, "node_modules/xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", diff --git a/service-blue/package.json b/service-blue/package.json index 8836ff1..b6602b9 100644 --- a/service-blue/package.json +++ b/service-blue/package.json @@ -6,16 +6,6 @@ "start": "node ./bin/www" }, "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/exporter-jaeger": "^0.16.0", - "@opentelemetry/node": "^0.16.0", - "@opentelemetry/plugin-dns": "^0.13.1", - "@opentelemetry/plugin-express": "^0.13.1", - "@opentelemetry/plugin-http": "^0.16.0", - "@opentelemetry/plugin-mongodb": "^0.13.1", - "@opentelemetry/plugins-node-core-and-contrib": "^0.13.1", - "@opentelemetry/tracing": "^0.16.0", - "@sentry/node": "^7.21.1", "@sentry/node-experimental": "^7.74.1", "cookie-parser": "^1.4.6", "dd-trace": "^0.12.1", diff --git a/service-gateway/app.js b/service-gateway/app.js index 7dc5c8f..f9f648b 100644 --- a/service-gateway/app.js +++ b/service-gateway/app.js @@ -2,15 +2,10 @@ const path = require('path'); require('dotenv').config({ path: path.resolve(__dirname, '../.env') }); const Sentry = require('@sentry/node-experimental'); -if(process.env.SENTRY) { - Sentry.init({ - dsn: process.env.SENTRY_GATEWAY_DSN, - tracesSampleRate: 1.0, - }); -} else { - const sdk = require("../otel/tracing")('service-gateway'); -} - +Sentry.init({ + dsn: process.env.SENTRY_GATEWAY_DSN, + tracesSampleRate: 1.0, +}); const createError = require("http-errors"); const express = require("express"); @@ -32,6 +27,8 @@ app.use(cookieParser()); app.use(express.static(path.join(__dirname, "public"))); app.use("/", indexRouter()); +app.use(Sentry.Handlers.errorHandler()); + // catch 404 and forward to error handler app.use((req, res, next) => { next(createError(404)); diff --git a/service-gateway/package-lock.json b/service-gateway/package-lock.json index 62116cd..4579fc1 100644 --- a/service-gateway/package-lock.json +++ b/service-gateway/package-lock.json @@ -8,16 +8,6 @@ "name": "service-gateway", "version": "0.0.0", "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/exporter-jaeger": "^0.16.0", - "@opentelemetry/node": "^0.16.0", - "@opentelemetry/plugin-dns": "^0.13.1", - "@opentelemetry/plugin-express": "^0.13.1", - "@opentelemetry/plugin-http": "^0.16.0", - "@opentelemetry/plugin-mongodb": "^0.13.1", - "@opentelemetry/plugins-node-core-and-contrib": "^0.13.1", - "@opentelemetry/tracing": "^0.16.0", - "@sentry/node": "^7.21.1", "@sentry/node-experimental": "^7.74.1", "axios": "^0.21.4", "cookie-parser": "^1.4.6", @@ -52,787 +42,6 @@ "semver": "bin/semver" } }, - "node_modules/@opentelemetry/api": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.16.0.tgz", - "integrity": "sha512-y5mNFAiktm7Zyf0GrQ6kjsRqace/WCXk9gMo/sOOna4TtMW8NaZgJceKrsQZl3qiPY9Upu8O9VvdlETXDx4U5A==", - "dependencies": { - "@opentelemetry/context-base": "^0.16.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/context-async-hooks": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-0.16.0.tgz", - "integrity": "sha512-8R77Kc84jBKOsXrsz0Q7bKaHZ4eOEznRKSOwbVKMKVJJYTjXTEkhCZAT+NfUganr787ipErwRk1uOAQmgEmGuw==", - "dependencies": { - "@opentelemetry/context-base": "^0.16.0" - }, - "engines": { - "node": ">=8.1.0" - } - }, - "node_modules/@opentelemetry/context-base": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.16.0.tgz", - "integrity": "sha512-2h2s+3P40wIu8ZaJiqBF6E0rEJPeSVOErFlkx2MfRGPs9Vs9Th+i5YSpgvCW4s5LeYTFAf2BRwut39JivEyH9w==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/core": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.16.0.tgz", - "integrity": "sha512-NFZwEW5TeFIAUlNty9al0KU9AQzpEiBowem/33d3ftxYHZ7dG1JklFnyKLTVb+pAZFm/peTziVddfHoTsIY4Rg==", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/context-base": "^0.16.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/exporter-jaeger": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-jaeger/-/exporter-jaeger-0.16.0.tgz", - "integrity": "sha512-r57HG/KWp2zKIU+wZX9dkSvAROnJm5u53q8DKPjVcmfg9ySVD6MbtQFUkDtGyZq4pv7d+XCitKOYzbw1kWAp2w==", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/core": "^0.16.0", - "@opentelemetry/tracing": "^0.16.0", - "jaeger-client": "^3.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/node": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/node/-/node-0.16.0.tgz", - "integrity": "sha512-hDIMsAZk1D+dFOW7FJH155nQrYKeuSBaiHvHm3F9VfZul+v9UNlNjPXqzAahW3l5au05nJ+e7EIKKq6cgMbw8Q==", - "deprecated": "Package renamed to @opentelemetry/sdk-trace-node", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/context-async-hooks": "^0.16.0", - "@opentelemetry/core": "^0.16.0", - "@opentelemetry/tracing": "^0.16.0", - "require-in-the-middle": "^5.0.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-dns": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-dns/-/plugin-dns-0.13.1.tgz", - "integrity": "sha512-txqBMqJkFj2tjVN5oHNJ40+JCXp8TL4ur0LN0W1s0eP1uxd5Cqpk6PRuH78D9qBLOjatc5ByNdZC3l73ctCkzQ==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-dns", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "semver": "^7.3.2", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-dns/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-dns/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-dns/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-express": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-express/-/plugin-express-0.13.1.tgz", - "integrity": "sha512-klgLutbDzIhEtipBx+Foh7jZmbjK8cgM7Uf9c63ipw1Ogv73WoBGqKmEnOh5AIGN8ZkchoDyWbKRTVydvGbPlQ==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-express", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-express/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-express/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-express/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-grpc/-/plugin-grpc-0.15.0.tgz", - "integrity": "sha512-blQwyl6BsT56Z3ehxEFNrS383tjdqcK1CXrvM6MDBPEsMC08H8b3BYAHiTL87w7teBBj1BtPEGXragqQ32einw==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-grpc", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc-js": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-grpc-js/-/plugin-grpc-js-0.15.0.tgz", - "integrity": "sha512-NulLW20E/Y1fmoyJnZbwvUMacFx6QUwFbeo9UBjIc7cf1hx71OfTbby8VAEKxDCTW6QPFnLlPi5frS98QUUgFw==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-grpc", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "shimmer": "1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc-js/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc-js/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc-js/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc-js/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-http": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-http/-/plugin-http-0.16.0.tgz", - "integrity": "sha512-0jpFhsMOt/eEosD8XI4VIzgUbiTln7CF9ALQJhgNjjxHJhsIjlhysnI6em5ylQj7PkW/df0iwPG+KXvhZnNlVg==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-http", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/core": "^0.16.0", - "@opentelemetry/semantic-conventions": "^0.16.0", - "semver": "^7.1.3", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-https": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-https/-/plugin-https-0.15.0.tgz", - "integrity": "sha512-wvpvKf8piM7QOUUjBUo2ft0WICysFRdkhCazDCF9n4o9w6FPq/tCjfm5JRppVGS9YQ27V839ULBmWJw3D6rN2w==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-http", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/plugin-http": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "semver": "^7.1.3", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-https/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-https/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-https/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-https/node_modules/@opentelemetry/plugin-http": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-http/-/plugin-http-0.15.0.tgz", - "integrity": "sha512-DIldMPLtjU1o7wXCSN9YQD97vpE7a6KbsDnjQitlwMNKPNX1wIJ94zCBWuYcSrPcyPTymxH7vYUiObJzQI+f8A==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-http", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "semver": "^7.1.3", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-https/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-ioredis": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-ioredis/-/plugin-ioredis-0.13.1.tgz", - "integrity": "sha512-pP56uuEIQZpY1QIVHQ+GNIb5JpJZN0N+eEDwYXt2Nn1pbuoyxMxBkDwIo4olMbp8QSbA4vmXr1nnCVNCPvGXQA==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-ioredis", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-ioredis/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-ioredis/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-ioredis/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-ioredis/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mongodb": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-mongodb/-/plugin-mongodb-0.13.1.tgz", - "integrity": "sha512-xeo8VqlGXWq4k+VVqEm8eKkwdWPKMWvLjfhiluGygwJUYZfcNJE4ch1Cyd0WY0OeHs9M8MhZGDmOWm5P9tOiWw==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-mongodb", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mongodb/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mongodb/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mongodb/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-mongodb/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mysql": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-mysql/-/plugin-mysql-0.13.1.tgz", - "integrity": "sha512-sQajgaPvyu4LCvsB8gjUKeI/tfviVNCeRRTS2zqxUZ7RSLAPWeKbjh6o+Kii6ewwby2x5tgwnQuncW3wTJ1GRA==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-mysql", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mysql/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mysql/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mysql/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-pg": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-pg/-/plugin-pg-0.13.1.tgz", - "integrity": "sha512-hXaYtjhOjTYfEwPmZg2aHMWeEWoLH+b+t2M6h2J1lYkvMJdR1ToE/RswGf9/VBU0uGG+1SLCNWW8Dd0U6L+/Rg==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-pg", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-pg-pool": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-pg-pool/-/plugin-pg-pool-0.13.1.tgz", - "integrity": "sha512-NU5HsRKdPBWbcV/KHOG7kx05aiiorC9n+oRhIYkNDppajMEmKRp/YW7sNvUd3pe53Epo3uLE5WVn40W/Ye6ooA==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-pg", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-pg-pool/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-pg-pool/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-pg-pool/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-pg/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-pg/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-pg/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-redis": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-redis/-/plugin-redis-0.13.1.tgz", - "integrity": "sha512-+10QgxgwhnjDvj+VvoAZsP3buAgYj5UNBgZV5Lu3B+W0fVbZ+CoYvWcJL+Nulywg7zstomkV/cY8lxnAGmoBdw==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-redis", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-redis/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-redis/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-redis/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugins-node-core/-/plugins-node-core-0.15.0.tgz", - "integrity": "sha512-fLuHftNBRsHzftMa2MAbpSzGfBtQKX2/raqKzcIh9U5CJXJQEM2kH24E9sSyO+GLJuYsMuiRi7ngBGLq8L0OMA==", - "deprecated": "Deprecated in favor of @opentelemetry/auto-instrumentations-node and @opentelemetry/auto-instrumentations-web", - "dependencies": { - "@opentelemetry/plugin-grpc": "^0.15.0", - "@opentelemetry/plugin-grpc-js": "^0.15.0", - "@opentelemetry/plugin-http": "^0.15.0", - "@opentelemetry/plugin-https": "^0.15.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core-and-contrib": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugins-node-core-and-contrib/-/plugins-node-core-and-contrib-0.13.1.tgz", - "integrity": "sha512-htmM83U/DzceoVirodF0qEHs14uIgHlgdlPOcKTmP2G686cy2txYPFttAgLghg4R4eM2IwgNBwUYJfo20M3iaw==", - "deprecated": "Deprecated in favor of @opentelemetry/auto-instrumentations-node and @opentelemetry/auto-instrumentations-web", - "dependencies": { - "@opentelemetry/plugin-express": "^0.13.1", - "@opentelemetry/plugin-ioredis": "^0.13.1", - "@opentelemetry/plugin-mongodb": "^0.13.1", - "@opentelemetry/plugin-mysql": "^0.13.1", - "@opentelemetry/plugin-pg": "^0.13.1", - "@opentelemetry/plugin-pg-pool": "^0.13.1", - "@opentelemetry/plugin-redis": "^0.13.1", - "@opentelemetry/plugins-node-core": "0.15.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core/node_modules/@opentelemetry/plugin-http": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-http/-/plugin-http-0.15.0.tgz", - "integrity": "sha512-DIldMPLtjU1o7wXCSN9YQD97vpE7a6KbsDnjQitlwMNKPNX1wIJ94zCBWuYcSrPcyPTymxH7vYUiObJzQI+f8A==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-http", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "semver": "^7.1.3", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/resources": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.16.0.tgz", - "integrity": "sha512-HOAmcRnZGbEhcddsjqvz3Q/mEg75PyEoH/CZZ3YGqYmwTPimTiusm8iz5nXMxp1UpT8rkzlEGei/E21SQ/Zh9g==", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/core": "^0.16.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/semantic-conventions": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.16.0.tgz", - "integrity": "sha512-RDYLf6lUtikIDTr6yVDehsUAlNb1U680eOV1QuDN0w6FDGubTnjbADlgpF41ByOow1Jp/WGmynFfOh19Ix4NWw==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/tracing": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.16.0.tgz", - "integrity": "sha512-8UrNbzO56m8fe9ge+XR0Lruwld+W6SM6aWFQT32YCU8lS+Hzz2P6TbevmgT4DzeKszJxnHqzNnqx8HziNeUjTA==", - "deprecated": "Package renamed to @opentelemetry/sdk-trace-base", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/context-base": "^0.16.0", - "@opentelemetry/core": "^0.16.0", - "@opentelemetry/resources": "^0.16.0", - "@opentelemetry/semantic-conventions": "^0.16.0", - "lodash.merge": "^4.6.2" - }, - "engines": { - "node": ">=8.0.0" - } - }, "node_modules/@prisma/instrumentation": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-5.3.1.tgz", @@ -1766,14 +975,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/ansi-color": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz", - "integrity": "sha512-bF6xLaZBLpOQzgYUtYEhJx090nPSZk1BQ/q2oyBK9aMMcJHzx9uXGCjI2Y+LebsN4Jwoykr0V9whbPiogdyHoQ==", - "engines": { - "node": "*" - } - }, "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -1912,20 +1113,6 @@ "balanced-match": "^1.0.0" } }, - "node_modules/bufrw": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/bufrw/-/bufrw-1.3.0.tgz", - "integrity": "sha512-jzQnSbdJqhIltU9O5KUiTtljP9ccw2u5ix59McQy4pV2xGhVLhRZIndY8GIrgh5HjXa6+QJ9AQhOd2QWQizJFQ==", - "dependencies": { - "ansi-color": "^0.2.1", - "error": "^7.0.0", - "hexer": "^1.5.0", - "xtend": "^4.0.0" - }, - "engines": { - "node": ">= 0.10.x" - } - }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -2193,15 +1380,6 @@ "node": ">= 0.8" } }, - "node_modules/error": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/error/-/error-7.0.2.tgz", - "integrity": "sha512-UtVv4l5MhijsYUxPJo4390gzfZvAnTHreNnDjnTZaKIiZ/SemXxAhBkYSKtWa5RtBXbLP8tMgn/n0RUa/H7jXw==", - "dependencies": { - "string-template": "~0.2.1", - "xtend": "~4.0.0" - } - }, "node_modules/error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -2499,23 +1677,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/hexer": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/hexer/-/hexer-1.5.0.tgz", - "integrity": "sha512-dyrPC8KzBzUJ19QTIo1gXNqIISRXQ0NwteW6OeQHRN4ZuZeHkdODfj0zHBdOlHbRY8GqbqK57C9oWSvQZizFsg==", - "dependencies": { - "ansi-color": "^0.2.1", - "minimist": "^1.1.0", - "process": "^0.10.0", - "xtend": "^4.0.0" - }, - "bin": { - "hexer": "cli.js" - }, - "engines": { - "node": ">= 0.10.x" - } - }, "node_modules/hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", @@ -2714,21 +1875,6 @@ "jade": "bin/jade" } }, - "node_modules/jaeger-client": { - "version": "3.19.0", - "resolved": "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.19.0.tgz", - "integrity": "sha512-M0c7cKHmdyEUtjemnJyx/y9uX16XHocL46yQvyqDlPdvAcwPDbHrIbKjQdBqtiE4apQ/9dmr+ZLJYYPGnurgpw==", - "dependencies": { - "node-int64": "^0.4.0", - "opentracing": "^0.14.4", - "thriftrw": "^3.5.0", - "uuid": "^8.3.2", - "xorshift": "^1.1.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", @@ -2837,14 +1983,6 @@ "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==" }, - "node_modules/long": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/long/-/long-2.4.0.tgz", - "integrity": "sha512-ijUtjmO/n2A5PaosNG9ZGDsQ3vxJg7ZW8vsY8Kp0f2yIZWhSJvjmegV7t+9RPQKxKrvj8yKGehhS+po14hPLGQ==", - "engines": { - "node": ">=0.6" - } - }, "node_modules/lru_map": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz", @@ -3051,11 +2189,6 @@ "node-gyp-build-test": "build-test.js" } }, - "node_modules/node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==" - }, "node_modules/normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -3365,14 +2498,6 @@ "node": ">=0.10.0" } }, - "node_modules/process": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/process/-/process-0.10.1.tgz", - "integrity": "sha512-dyIett8dgGIZ/TXKUzeYExt7WA6ldDzys9vTDU/cCA9L17Ypme+KzS+NjQCjpn9xsvi/shbMC+yP/BcFMBz0NA==", - "engines": { - "node": ">= 0.6.0" - } - }, "node_modules/promise": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz", @@ -3564,40 +2689,6 @@ "uuid": "bin/uuid" } }, - "node_modules/require-in-the-middle": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.2.0.tgz", - "integrity": "sha512-efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg==", - "dependencies": { - "debug": "^4.1.1", - "module-details-from-path": "^1.0.3", - "resolve": "^1.22.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/require-in-the-middle/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/require-in-the-middle/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -3815,11 +2906,6 @@ "safe-buffer": "~5.2.0" } }, - "node_modules/string-template": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz", - "integrity": "sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==" - }, "node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -3924,22 +3010,6 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, - "node_modules/thriftrw": { - "version": "3.11.4", - "resolved": "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.4.tgz", - "integrity": "sha512-UcuBd3eanB3T10nXWRRMwfwoaC6VMk7qe3/5YIWP2Jtw+EbHqJ0p1/K3x8ixiR5dozKSSfcg1W+0e33G1Di3XA==", - "dependencies": { - "bufrw": "^1.2.1", - "error": "7.0.2", - "long": "^2.4.0" - }, - "bin": { - "thrift2json": "thrift2json.js" - }, - "engines": { - "node": ">= 0.10.x" - } - }, "node_modules/toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", @@ -4040,14 +3110,6 @@ "node": ">= 0.4.0" } }, - "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "bin": { - "uuid": "dist/bin/uuid" - } - }, "node_modules/validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -4078,11 +3140,6 @@ "extsprintf": "^1.2.0" } }, - "node_modules/xorshift": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/xorshift/-/xorshift-1.2.0.tgz", - "integrity": "sha512-iYgNnGyeeJ4t6U11NpA/QiKy+PXn5Aa3Azg5qkwIFz1tBLllQrjjsk9yzD7IAK0naNU4JxdeDgqW9ov4u/hc4g==" - }, "node_modules/xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", diff --git a/service-gateway/package.json b/service-gateway/package.json index 81a0372..0aa3b99 100644 --- a/service-gateway/package.json +++ b/service-gateway/package.json @@ -6,16 +6,6 @@ "start": "node ./bin/www" }, "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/exporter-jaeger": "^0.16.0", - "@opentelemetry/node": "^0.16.0", - "@opentelemetry/plugin-dns": "^0.13.1", - "@opentelemetry/plugin-express": "^0.13.1", - "@opentelemetry/plugin-http": "^0.16.0", - "@opentelemetry/plugin-mongodb": "^0.13.1", - "@opentelemetry/plugins-node-core-and-contrib": "^0.13.1", - "@opentelemetry/tracing": "^0.16.0", - "@sentry/node": "^7.21.1", "@sentry/node-experimental": "^7.74.1", "axios": "^0.21.4", "cookie-parser": "^1.4.6", diff --git a/service-green/app.js b/service-green/app.js index f609f39..0d85c4c 100644 --- a/service-green/app.js +++ b/service-green/app.js @@ -1,16 +1,12 @@ const path = require('path'); require('dotenv').config({ path: path.resolve(__dirname, '../.env') }); - const Sentry = require('@sentry/node-experimental'); -if(process.env.SENTRY) { - Sentry.init({ - dsn: process.env.SENTRY_SERVICE_GREEN_DSN, - tracesSampleRate: 1.0, - }); -} else { - const sdk = require("../otel/tracing")('service-green'); -} +Sentry.init({ + dsn: process.env.SENTRY_SERVICE_GREEN_DSN, + tracesSampleRate: 1.0, +}); + const createError = require("http-errors"); const express = require("express"); @@ -31,6 +27,8 @@ app.use(express.static(path.join(__dirname, "public"))); app.use("/", indexRouter); +app.use(Sentry.Handlers.errorHandler()); + // catch 404 and forward to error handler app.use((req, res, next) => { next(createError(404)); diff --git a/service-green/package-lock.json b/service-green/package-lock.json index 49cb78d..03bfe4a 100644 --- a/service-green/package-lock.json +++ b/service-green/package-lock.json @@ -8,16 +8,6 @@ "name": "service-green", "version": "0.0.0", "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/exporter-jaeger": "^0.16.0", - "@opentelemetry/node": "^0.16.0", - "@opentelemetry/plugin-dns": "^0.13.1", - "@opentelemetry/plugin-express": "^0.13.1", - "@opentelemetry/plugin-http": "^0.16.0", - "@opentelemetry/plugin-mongodb": "^0.13.1", - "@opentelemetry/plugins-node-core-and-contrib": "^0.13.1", - "@opentelemetry/tracing": "^0.16.0", - "@sentry/node": "^7.21.1", "@sentry/node-experimental": "^7.74.1", "cookie-parser": "^1.4.6", "dd-trace": "^0.12.1", @@ -51,787 +41,6 @@ "semver": "bin/semver" } }, - "node_modules/@opentelemetry/api": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.16.0.tgz", - "integrity": "sha512-y5mNFAiktm7Zyf0GrQ6kjsRqace/WCXk9gMo/sOOna4TtMW8NaZgJceKrsQZl3qiPY9Upu8O9VvdlETXDx4U5A==", - "dependencies": { - "@opentelemetry/context-base": "^0.16.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/context-async-hooks": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-0.16.0.tgz", - "integrity": "sha512-8R77Kc84jBKOsXrsz0Q7bKaHZ4eOEznRKSOwbVKMKVJJYTjXTEkhCZAT+NfUganr787ipErwRk1uOAQmgEmGuw==", - "dependencies": { - "@opentelemetry/context-base": "^0.16.0" - }, - "engines": { - "node": ">=8.1.0" - } - }, - "node_modules/@opentelemetry/context-base": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.16.0.tgz", - "integrity": "sha512-2h2s+3P40wIu8ZaJiqBF6E0rEJPeSVOErFlkx2MfRGPs9Vs9Th+i5YSpgvCW4s5LeYTFAf2BRwut39JivEyH9w==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/core": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.16.0.tgz", - "integrity": "sha512-NFZwEW5TeFIAUlNty9al0KU9AQzpEiBowem/33d3ftxYHZ7dG1JklFnyKLTVb+pAZFm/peTziVddfHoTsIY4Rg==", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/context-base": "^0.16.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/exporter-jaeger": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-jaeger/-/exporter-jaeger-0.16.0.tgz", - "integrity": "sha512-r57HG/KWp2zKIU+wZX9dkSvAROnJm5u53q8DKPjVcmfg9ySVD6MbtQFUkDtGyZq4pv7d+XCitKOYzbw1kWAp2w==", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/core": "^0.16.0", - "@opentelemetry/tracing": "^0.16.0", - "jaeger-client": "^3.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/node": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/node/-/node-0.16.0.tgz", - "integrity": "sha512-hDIMsAZk1D+dFOW7FJH155nQrYKeuSBaiHvHm3F9VfZul+v9UNlNjPXqzAahW3l5au05nJ+e7EIKKq6cgMbw8Q==", - "deprecated": "Package renamed to @opentelemetry/sdk-trace-node", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/context-async-hooks": "^0.16.0", - "@opentelemetry/core": "^0.16.0", - "@opentelemetry/tracing": "^0.16.0", - "require-in-the-middle": "^5.0.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-dns": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-dns/-/plugin-dns-0.13.1.tgz", - "integrity": "sha512-txqBMqJkFj2tjVN5oHNJ40+JCXp8TL4ur0LN0W1s0eP1uxd5Cqpk6PRuH78D9qBLOjatc5ByNdZC3l73ctCkzQ==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-dns", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "semver": "^7.3.2", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-dns/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-dns/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-dns/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-express": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-express/-/plugin-express-0.13.1.tgz", - "integrity": "sha512-klgLutbDzIhEtipBx+Foh7jZmbjK8cgM7Uf9c63ipw1Ogv73WoBGqKmEnOh5AIGN8ZkchoDyWbKRTVydvGbPlQ==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-express", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-express/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-express/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-express/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-grpc/-/plugin-grpc-0.15.0.tgz", - "integrity": "sha512-blQwyl6BsT56Z3ehxEFNrS383tjdqcK1CXrvM6MDBPEsMC08H8b3BYAHiTL87w7teBBj1BtPEGXragqQ32einw==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-grpc", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc-js": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-grpc-js/-/plugin-grpc-js-0.15.0.tgz", - "integrity": "sha512-NulLW20E/Y1fmoyJnZbwvUMacFx6QUwFbeo9UBjIc7cf1hx71OfTbby8VAEKxDCTW6QPFnLlPi5frS98QUUgFw==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-grpc", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "shimmer": "1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc-js/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc-js/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc-js/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc-js/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-grpc/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-http": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-http/-/plugin-http-0.16.0.tgz", - "integrity": "sha512-0jpFhsMOt/eEosD8XI4VIzgUbiTln7CF9ALQJhgNjjxHJhsIjlhysnI6em5ylQj7PkW/df0iwPG+KXvhZnNlVg==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-http", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/core": "^0.16.0", - "@opentelemetry/semantic-conventions": "^0.16.0", - "semver": "^7.1.3", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-https": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-https/-/plugin-https-0.15.0.tgz", - "integrity": "sha512-wvpvKf8piM7QOUUjBUo2ft0WICysFRdkhCazDCF9n4o9w6FPq/tCjfm5JRppVGS9YQ27V839ULBmWJw3D6rN2w==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-http", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/plugin-http": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "semver": "^7.1.3", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-https/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-https/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-https/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-https/node_modules/@opentelemetry/plugin-http": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-http/-/plugin-http-0.15.0.tgz", - "integrity": "sha512-DIldMPLtjU1o7wXCSN9YQD97vpE7a6KbsDnjQitlwMNKPNX1wIJ94zCBWuYcSrPcyPTymxH7vYUiObJzQI+f8A==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-http", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "semver": "^7.1.3", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-https/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-ioredis": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-ioredis/-/plugin-ioredis-0.13.1.tgz", - "integrity": "sha512-pP56uuEIQZpY1QIVHQ+GNIb5JpJZN0N+eEDwYXt2Nn1pbuoyxMxBkDwIo4olMbp8QSbA4vmXr1nnCVNCPvGXQA==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-ioredis", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-ioredis/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-ioredis/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-ioredis/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-ioredis/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mongodb": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-mongodb/-/plugin-mongodb-0.13.1.tgz", - "integrity": "sha512-xeo8VqlGXWq4k+VVqEm8eKkwdWPKMWvLjfhiluGygwJUYZfcNJE4ch1Cyd0WY0OeHs9M8MhZGDmOWm5P9tOiWw==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-mongodb", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mongodb/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mongodb/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mongodb/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-mongodb/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mysql": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-mysql/-/plugin-mysql-0.13.1.tgz", - "integrity": "sha512-sQajgaPvyu4LCvsB8gjUKeI/tfviVNCeRRTS2zqxUZ7RSLAPWeKbjh6o+Kii6ewwby2x5tgwnQuncW3wTJ1GRA==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-mysql", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mysql/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mysql/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-mysql/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-pg": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-pg/-/plugin-pg-0.13.1.tgz", - "integrity": "sha512-hXaYtjhOjTYfEwPmZg2aHMWeEWoLH+b+t2M6h2J1lYkvMJdR1ToE/RswGf9/VBU0uGG+1SLCNWW8Dd0U6L+/Rg==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-pg", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-pg-pool": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-pg-pool/-/plugin-pg-pool-0.13.1.tgz", - "integrity": "sha512-NU5HsRKdPBWbcV/KHOG7kx05aiiorC9n+oRhIYkNDppajMEmKRp/YW7sNvUd3pe53Epo3uLE5WVn40W/Ye6ooA==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-pg", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-pg-pool/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-pg-pool/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-pg-pool/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-pg/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-pg/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-pg/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugin-redis": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-redis/-/plugin-redis-0.13.1.tgz", - "integrity": "sha512-+10QgxgwhnjDvj+VvoAZsP3buAgYj5UNBgZV5Lu3B+W0fVbZ+CoYvWcJL+Nulywg7zstomkV/cY8lxnAGmoBdw==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-redis", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-redis/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-redis/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugin-redis/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugins-node-core/-/plugins-node-core-0.15.0.tgz", - "integrity": "sha512-fLuHftNBRsHzftMa2MAbpSzGfBtQKX2/raqKzcIh9U5CJXJQEM2kH24E9sSyO+GLJuYsMuiRi7ngBGLq8L0OMA==", - "deprecated": "Deprecated in favor of @opentelemetry/auto-instrumentations-node and @opentelemetry/auto-instrumentations-web", - "dependencies": { - "@opentelemetry/plugin-grpc": "^0.15.0", - "@opentelemetry/plugin-grpc-js": "^0.15.0", - "@opentelemetry/plugin-http": "^0.15.0", - "@opentelemetry/plugin-https": "^0.15.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core-and-contrib": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugins-node-core-and-contrib/-/plugins-node-core-and-contrib-0.13.1.tgz", - "integrity": "sha512-htmM83U/DzceoVirodF0qEHs14uIgHlgdlPOcKTmP2G686cy2txYPFttAgLghg4R4eM2IwgNBwUYJfo20M3iaw==", - "deprecated": "Deprecated in favor of @opentelemetry/auto-instrumentations-node and @opentelemetry/auto-instrumentations-web", - "dependencies": { - "@opentelemetry/plugin-express": "^0.13.1", - "@opentelemetry/plugin-ioredis": "^0.13.1", - "@opentelemetry/plugin-mongodb": "^0.13.1", - "@opentelemetry/plugin-mysql": "^0.13.1", - "@opentelemetry/plugin-pg": "^0.13.1", - "@opentelemetry/plugin-pg-pool": "^0.13.1", - "@opentelemetry/plugin-redis": "^0.13.1", - "@opentelemetry/plugins-node-core": "0.15.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core/node_modules/@opentelemetry/api": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.15.0.tgz", - "integrity": "sha512-tPyzyO8P33wWUlUdo8+NawX2qnn8HyVUAilANWLxrT9C6g4JbN6eatSQrx3G0NzohnobT3fiwrbVFNeacWS9gg==", - "dependencies": { - "@opentelemetry/context-base": "^0.15.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core/node_modules/@opentelemetry/context-base": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-base/-/context-base-0.15.0.tgz", - "integrity": "sha512-J8AKI035Mf84bcD+0Ok69Oo3nKoa+HLCj54/ZKcTPJPfx3MywZOEildDPej2fV3tA0d0G9BID8b6o+BGpbwmig==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core/node_modules/@opentelemetry/core": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.15.0.tgz", - "integrity": "sha512-4LLBoayeT0L+BpO+RYzoDsLByn1FMDqpQLto7M8P2DXOtxI//TWSo13KCMbv+pprOyweMWcsxL8jj+qv9ktSAg==", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/context-base": "^0.15.0", - "semver": "^7.1.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core/node_modules/@opentelemetry/plugin-http": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/plugin-http/-/plugin-http-0.15.0.tgz", - "integrity": "sha512-DIldMPLtjU1o7wXCSN9YQD97vpE7a6KbsDnjQitlwMNKPNX1wIJ94zCBWuYcSrPcyPTymxH7vYUiObJzQI+f8A==", - "deprecated": "Deprecated in favor of @opentelemetry/instrumentation-http", - "dependencies": { - "@opentelemetry/api": "^0.15.0", - "@opentelemetry/core": "^0.15.0", - "@opentelemetry/semantic-conventions": "^0.15.0", - "semver": "^7.1.3", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/plugins-node-core/node_modules/@opentelemetry/semantic-conventions": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.15.0.tgz", - "integrity": "sha512-JYHR5zZv2+1bg//mx6YE6b/gQPs0zGqjD0/4dDwa9x1Jpo9T18h480izqMJIlu3JZbXwlGm9a7PQhMKsLis63Q==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/resources": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.16.0.tgz", - "integrity": "sha512-HOAmcRnZGbEhcddsjqvz3Q/mEg75PyEoH/CZZ3YGqYmwTPimTiusm8iz5nXMxp1UpT8rkzlEGei/E21SQ/Zh9g==", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/core": "^0.16.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/semantic-conventions": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.16.0.tgz", - "integrity": "sha512-RDYLf6lUtikIDTr6yVDehsUAlNb1U680eOV1QuDN0w6FDGubTnjbADlgpF41ByOow1Jp/WGmynFfOh19Ix4NWw==", - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@opentelemetry/tracing": { - "version": "0.16.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/tracing/-/tracing-0.16.0.tgz", - "integrity": "sha512-8UrNbzO56m8fe9ge+XR0Lruwld+W6SM6aWFQT32YCU8lS+Hzz2P6TbevmgT4DzeKszJxnHqzNnqx8HziNeUjTA==", - "deprecated": "Package renamed to @opentelemetry/sdk-trace-base", - "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/context-base": "^0.16.0", - "@opentelemetry/core": "^0.16.0", - "@opentelemetry/resources": "^0.16.0", - "@opentelemetry/semantic-conventions": "^0.16.0", - "lodash.merge": "^4.6.2" - }, - "engines": { - "node": ">=8.0.0" - } - }, "node_modules/@prisma/instrumentation": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-5.3.1.tgz", @@ -1803,14 +1012,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node_modules/ansi-color": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz", - "integrity": "sha512-bF6xLaZBLpOQzgYUtYEhJx090nPSZk1BQ/q2oyBK9aMMcJHzx9uXGCjI2Y+LebsN4Jwoykr0V9whbPiogdyHoQ==", - "engines": { - "node": "*" - } - }, "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -1916,20 +1117,6 @@ "node": ">=0.6.19" } }, - "node_modules/bufrw": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/bufrw/-/bufrw-1.3.0.tgz", - "integrity": "sha512-jzQnSbdJqhIltU9O5KUiTtljP9ccw2u5ix59McQy4pV2xGhVLhRZIndY8GIrgh5HjXa6+QJ9AQhOd2QWQizJFQ==", - "dependencies": { - "ansi-color": "^0.2.1", - "error": "^7.0.0", - "hexer": "^1.5.0", - "xtend": "^4.0.0" - }, - "engines": { - "node": ">= 0.10.x" - } - }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -2159,15 +1346,6 @@ "node": ">= 0.8" } }, - "node_modules/error": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/error/-/error-7.0.2.tgz", - "integrity": "sha512-UtVv4l5MhijsYUxPJo4390gzfZvAnTHreNnDjnTZaKIiZ/SemXxAhBkYSKtWa5RtBXbLP8tMgn/n0RUa/H7jXw==", - "dependencies": { - "string-template": "~0.2.1", - "xtend": "~4.0.0" - } - }, "node_modules/error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -2372,23 +1550,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/hexer": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/hexer/-/hexer-1.5.0.tgz", - "integrity": "sha512-dyrPC8KzBzUJ19QTIo1gXNqIISRXQ0NwteW6OeQHRN4ZuZeHkdODfj0zHBdOlHbRY8GqbqK57C9oWSvQZizFsg==", - "dependencies": { - "ansi-color": "^0.2.1", - "minimist": "^1.1.0", - "process": "^0.10.0", - "xtend": "^4.0.0" - }, - "bin": { - "hexer": "cli.js" - }, - "engines": { - "node": ">= 0.10.x" - } - }, "node_modules/hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", @@ -2563,21 +1724,6 @@ "jade": "bin/jade" } }, - "node_modules/jaeger-client": { - "version": "3.19.0", - "resolved": "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.19.0.tgz", - "integrity": "sha512-M0c7cKHmdyEUtjemnJyx/y9uX16XHocL46yQvyqDlPdvAcwPDbHrIbKjQdBqtiE4apQ/9dmr+ZLJYYPGnurgpw==", - "dependencies": { - "node-int64": "^0.4.0", - "opentracing": "^0.14.4", - "thriftrw": "^3.5.0", - "uuid": "^8.3.2", - "xorshift": "^1.1.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -2652,14 +1798,6 @@ "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==" }, - "node_modules/long": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/long/-/long-2.4.0.tgz", - "integrity": "sha512-ijUtjmO/n2A5PaosNG9ZGDsQ3vxJg7ZW8vsY8Kp0f2yIZWhSJvjmegV7t+9RPQKxKrvj8yKGehhS+po14hPLGQ==", - "engines": { - "node": ">=0.6" - } - }, "node_modules/lru_map": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz", @@ -2910,11 +2048,6 @@ "node-gyp-build-test": "build-test.js" } }, - "node_modules/node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==" - }, "node_modules/normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -3227,14 +2360,6 @@ "node": ">=0.10.0" } }, - "node_modules/process": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/process/-/process-0.10.1.tgz", - "integrity": "sha512-dyIett8dgGIZ/TXKUzeYExt7WA6ldDzys9vTDU/cCA9L17Ypme+KzS+NjQCjpn9xsvi/shbMC+yP/BcFMBz0NA==", - "engines": { - "node": ">= 0.6.0" - } - }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -3397,40 +2522,6 @@ "node": ">=4" } }, - "node_modules/require-in-the-middle": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-5.2.0.tgz", - "integrity": "sha512-efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg==", - "dependencies": { - "debug": "^4.1.1", - "module-details-from-path": "^1.0.3", - "resolve": "^1.22.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/require-in-the-middle/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/require-in-the-middle/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -3650,11 +2741,6 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, - "node_modules/string-template": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz", - "integrity": "sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw==" - }, "node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -3707,22 +2793,6 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" }, - "node_modules/thriftrw": { - "version": "3.11.4", - "resolved": "https://registry.npmjs.org/thriftrw/-/thriftrw-3.11.4.tgz", - "integrity": "sha512-UcuBd3eanB3T10nXWRRMwfwoaC6VMk7qe3/5YIWP2Jtw+EbHqJ0p1/K3x8ixiR5dozKSSfcg1W+0e33G1Di3XA==", - "dependencies": { - "bufrw": "^1.2.1", - "error": "7.0.2", - "long": "^2.4.0" - }, - "bin": { - "thrift2json": "thrift2json.js" - }, - "engines": { - "node": ">= 0.10.x" - } - }, "node_modules/toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", @@ -3787,14 +2857,6 @@ "node": ">= 0.4.0" } }, - "node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "bin": { - "uuid": "dist/bin/uuid" - } - }, "node_modules/validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -3812,11 +2874,6 @@ "node": ">= 0.8" } }, - "node_modules/xorshift": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/xorshift/-/xorshift-1.2.0.tgz", - "integrity": "sha512-iYgNnGyeeJ4t6U11NpA/QiKy+PXn5Aa3Azg5qkwIFz1tBLllQrjjsk9yzD7IAK0naNU4JxdeDgqW9ov4u/hc4g==" - }, "node_modules/xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", diff --git a/service-green/package.json b/service-green/package.json index 37676b3..37214c9 100644 --- a/service-green/package.json +++ b/service-green/package.json @@ -6,16 +6,6 @@ "start": "node ./bin/www" }, "dependencies": { - "@opentelemetry/api": "^0.16.0", - "@opentelemetry/exporter-jaeger": "^0.16.0", - "@opentelemetry/node": "^0.16.0", - "@opentelemetry/plugin-dns": "^0.13.1", - "@opentelemetry/plugin-express": "^0.13.1", - "@opentelemetry/plugin-http": "^0.16.0", - "@opentelemetry/plugin-mongodb": "^0.13.1", - "@opentelemetry/plugins-node-core-and-contrib": "^0.13.1", - "@opentelemetry/tracing": "^0.16.0", - "@sentry/node": "^7.21.1", "@sentry/node-experimental": "^7.74.1", "cookie-parser": "^1.4.6", "dd-trace": "^0.12.1", From 707aff1016e97ca46440a99e20205e02b97086c4 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Fri, 20 Oct 2023 09:29:08 +0200 Subject: [PATCH 2/2] fix tracer --- frontend/app.js | 14 ++++----- frontend/package-lock.json | 1 - frontend/package.json | 4 ++- package.json | 6 ++++ service-blue/bin/www | 2 +- service-blue/package.json | 3 ++ service-gateway/bin/www | 2 +- service-gateway/package.json | 3 ++ service-green/bin/www | 2 +- service-green/package-lock.json | 25 ++++++----------- service-green/package.json | 4 +++ service-green/routes/index.js | 50 +++++++++++++++------------------ 12 files changed, 59 insertions(+), 57 deletions(-) create mode 100644 package.json diff --git a/frontend/app.js b/frontend/app.js index 7032c0c..8c4487f 100644 --- a/frontend/app.js +++ b/frontend/app.js @@ -3,14 +3,10 @@ require('dotenv').config({ path: path.resolve(__dirname, '../.env') }); const Sentry = require('@sentry/node-experimental'); -if(process.env.SENTRY) { - Sentry.init({ - dsn: process.env.SENTRY_FRONTEND_DSN, - tracesSampleRate: 1.0, - }); -} else { - const sdk = require("../otel/tracing")('frontend'); -} +Sentry.init({ + dsn: process.env.SENTRY_FRONTEND_DSN, + tracesSampleRate: 1.0, +}); const createError = require("http-errors"); const express = require("express"); @@ -35,6 +31,8 @@ app.use(express.static(path.join(__dirname, "public"))); app.use("/", indexRouter()); +app.use(Sentry.Handlers.errorHandler()); + // catch 404 and forward to error handler app.use((req, res, next) => { next(createError(404)); diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 8527a5f..72f2dc8 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -8,7 +8,6 @@ "name": "frontend", "version": "0.0.0", "dependencies": { - "@sentry/node": "^7.21.1", "@sentry/node-experimental": "^7.74.1", "axios": "^0.21.4", "cookie-parser": "^1.4.6", diff --git a/frontend/package.json b/frontend/package.json index eafe930..3f5ec35 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,7 +6,6 @@ "start": "node ./bin/www" }, "dependencies": { - "@sentry/node": "^7.21.1", "@sentry/node-experimental": "^7.74.1", "axios": "^0.21.4", "cookie-parser": "^1.4.6", @@ -19,5 +18,8 @@ "morgan": "~1.9.0", "pug": "^3.0.2", "request": "^2.88.2" + }, + "volta": { + "node": "18.18.2" } } diff --git a/package.json b/package.json new file mode 100644 index 0000000..67a80cd --- /dev/null +++ b/package.json @@ -0,0 +1,6 @@ +{ + "private": true, + "volta": { + "node": "18.18.2" + } +} \ No newline at end of file diff --git a/service-blue/bin/www b/service-blue/bin/www index 1ce5e8f..59b30e3 100755 --- a/service-blue/bin/www +++ b/service-blue/bin/www @@ -1,5 +1,5 @@ #!/usr/bin/env node -const sdk = require("../../otel/tracing")('service-blue'); +// const sdk = require("../../otel/tracing")('service-blue'); /** * Module dependencies. diff --git a/service-blue/package.json b/service-blue/package.json index b6602b9..c91be18 100644 --- a/service-blue/package.json +++ b/service-blue/package.json @@ -17,5 +17,8 @@ "mongodb": "^3.7.3", "morgan": "~1.9.0", "redis": "^4.5.1" + }, + "volta": { + "node": "18.18.2" } } diff --git a/service-gateway/bin/www b/service-gateway/bin/www index b632075..8530f6d 100755 --- a/service-gateway/bin/www +++ b/service-gateway/bin/www @@ -1,5 +1,5 @@ #!/usr/bin/env node -const sdk = require("../../otel/tracing")('service-gateway'); +// const sdk = require("../../otel/tracing")('service-gateway'); const app = require("../app"); const debug = require("debug")("service-1:server"); diff --git a/service-gateway/package.json b/service-gateway/package.json index 0aa3b99..79062cf 100644 --- a/service-gateway/package.json +++ b/service-gateway/package.json @@ -18,5 +18,8 @@ "morgan": "~1.9.0", "request": "^2.88.2", "superagent": "^4.1.0" + }, + "volta": { + "node": "18.18.2" } } diff --git a/service-green/bin/www b/service-green/bin/www index 3daf7cd..4b18b1d 100755 --- a/service-green/bin/www +++ b/service-green/bin/www @@ -1,5 +1,5 @@ #!/usr/bin/env node -const sdk = require("../../otel/tracing")('service-green'); +// const sdk = require("../../otel/tracing")('service-green'); /** diff --git a/service-green/package-lock.json b/service-green/package-lock.json index 03bfe4a..2751c9a 100644 --- a/service-green/package-lock.json +++ b/service-green/package-lock.json @@ -8,6 +8,7 @@ "name": "service-green", "version": "0.0.0", "dependencies": { + "@opentelemetry/api": "^1.6.0", "@sentry/node-experimental": "^7.74.1", "cookie-parser": "^1.4.6", "dd-trace": "^0.12.1", @@ -41,6 +42,14 @@ "semver": "bin/semver" } }, + "node_modules/@opentelemetry/api": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.6.0.tgz", + "integrity": "sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g==", + "engines": { + "node": ">=8.0.0" + } + }, "node_modules/@prisma/instrumentation": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/@prisma/instrumentation/-/instrumentation-5.3.1.tgz", @@ -296,14 +305,6 @@ "node": ">=14" } }, - "node_modules/@sentry/node-experimental/node_modules/@opentelemetry/api": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.6.0.tgz", - "integrity": "sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g==", - "engines": { - "node": ">=8.0.0" - } - }, "node_modules/@sentry/node-experimental/node_modules/@opentelemetry/context-async-hooks": { "version": "1.17.1", "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-1.17.1.tgz", @@ -2107,14 +2108,6 @@ "node": ">18.0.0" } }, - "node_modules/opentelemetry-instrumentation-fetch-node/node_modules/@opentelemetry/api": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.6.0.tgz", - "integrity": "sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g==", - "engines": { - "node": ">=8.0.0" - } - }, "node_modules/opentelemetry-instrumentation-fetch-node/node_modules/@opentelemetry/instrumentation": { "version": "0.43.0", "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.43.0.tgz", diff --git a/service-green/package.json b/service-green/package.json index 37214c9..dab1cde 100644 --- a/service-green/package.json +++ b/service-green/package.json @@ -7,6 +7,7 @@ }, "dependencies": { "@sentry/node-experimental": "^7.74.1", + "@opentelemetry/api": "^1.6.0", "cookie-parser": "^1.4.6", "dd-trace": "^0.12.1", "debug": "~2.6.9", @@ -17,5 +18,8 @@ "mongodb": "^3.7.3", "morgan": "~1.9.0", "redis": "^4.5.1" + }, + "volta": { + "node": "18.18.2" } } diff --git a/service-green/routes/index.js b/service-green/routes/index.js index 0d7a8af..fcbdf3b 100644 --- a/service-green/routes/index.js +++ b/service-green/routes/index.js @@ -8,36 +8,30 @@ const tracer = opentelemetry.trace.getTracer("details"); /* GET home page. */ router.get("/", async (req, res, next) => { - const parentSpan = tracer.startSpan("main"); - const ctx = opentelemetry.setSpan(opentelemetry.context.active(), parentSpan); + await tracer.startActiveSpan("main", async (parentSpan) => { + try { + const connectSpan = tracer.startSpan("mongo-connect"); + await client.connect({ useNewUrlParser: true }); + connectSpan.end(); + const database = client.db("voting"); + const votes = database.collection("votes"); - try { - const ctx = opentelemetry.setSpan( - opentelemetry.context.active(), - parentSpan - ); - const connectSpan = tracer.startSpan("mongo-connect", undefined, ctx); - await client.connect({ useNewUrlParser: true }); - connectSpan.end(); - const database = client.db("voting"); - const votes = database.collection("votes"); - - if (req.query.choice) { - const insertSpan = tracer.startSpan("mongo-insert", undefined, ctx); - - await votes.insertOne({ choice: req.query.choice }); - insertSpan.end(); + if (req.query.choice) { + const insertSpan = tracer.startSpan("mongo-insert"); + await votes.insertOne({ choice: req.query.choice }); + insertSpan.end(); + } + const countSpan = tracer.startSpan("mongo-count"); + const spaces = await votes.countDocuments({ choice: "spaces" }); + const tabs = await votes.countDocuments({ choice: "tabs" }); + countSpan.end(); + parentSpan.end(); + return res.json({ spaces, tabs }); + } catch (err) { + console.log(err); + return next(err); } - const countSpan = tracer.startSpan("mongo-count", undefined, ctx); - const spaces = await votes.countDocuments({ choice: "spaces" }); - const tabs = await votes.countDocuments({ choice: "tabs" }); - countSpan.end(); - parentSpan.end(); - return res.json({ spaces, tabs }); - } catch (err) { - console.log(err); - return next(err); - } + }); }); module.exports = router;