fixes for account, admin

This commit is contained in:
Luke Berndt
2024-09-14 09:54:19 -04:00
parent aa9f142d86
commit a1c3929fb9
7 changed files with 645 additions and 41 deletions

View File

@@ -1,11 +1,19 @@
/** Important **/
/** You should not be committing this file to GitHub **/
/** Repeat: DO! NOT! COMMIT! THIS! FILE! TO! YOUR! REPO! **/
var host = process.env['MONGO_NODE_DRIVER_HOST'] != null ? process.env['MONGO_NODE_DRIVER_HOST'] : 'localhost';
var port = process.env['MONGO_NODE_DRIVER_PORT'] != null ? process.env['MONGO_NODE_DRIVER_PORT'] : 27017;
var mongoUrl = 'mongodb://' + host + ':' + port + '/scanner';
const mongo_host = typeof process.env['MONGO_HOST'] !== 'undefined' ? process.env['MONGO_HOST'] : 'mongo';
const mongo_port = typeof process.env['MONGO_PORT'] !== 'undefined' ? process.env['MONGO_PORT'] : 27017;
const mongo_user = process.env['MONGO_USER'];
const mongo_password = process.env['MONGO_PASSWORD'];
let mongoUrl;
if ((typeof mongo_user !== 'undefined') && (typeof mongo_password !== 'undefined')) {
console.log("Using authentication for MongoDB - user: " + mongo_user);
mongoUrl = 'mongodb://' + mongo_user + ':' + mongo_password + '@' + mongo_host + ':' + mongo_port + '/scanner';
} else {
mongoUrl = 'mongodb://' + mongo_host + ':' + mongo_port + '/scanner';
}
const secrets = {
db: mongoUrl,

View File

@@ -1,11 +1,19 @@
/** Important **/
/** You should not be committing this file to GitHub **/
/** Repeat: DO! NOT! COMMIT! THIS! FILE! TO! YOUR! REPO! **/
var host = process.env['MONGO_NODE_DRIVER_HOST'] != null ? process.env['MONGO_NODE_DRIVER_HOST'] : 'localhost';
var port = process.env['MONGO_NODE_DRIVER_PORT'] != null ? process.env['MONGO_NODE_DRIVER_PORT'] : 27017;
var mongoUrl = 'mongodb://' + host + ':' + port + '/scanner';
const mongo_host = typeof process.env['MONGO_HOST'] !== 'undefined' ? process.env['MONGO_HOST'] : 'mongo';
const mongo_port = typeof process.env['MONGO_PORT'] !== 'undefined' ? process.env['MONGO_PORT'] : 27017;
const mongo_user = process.env['MONGO_USER'];
const mongo_password = process.env['MONGO_PASSWORD'];
let mongoUrl;
if ((typeof mongo_user !== 'undefined') && (typeof mongo_password !== 'undefined')) {
console.log("Using authentication for MongoDB - user: " + mongo_user);
mongoUrl = 'mongodb://' + mongo_user + ':' + mongo_password + '@' + mongo_host + ':' + mongo_port + '/scanner';
} else {
mongoUrl = 'mongodb://' + mongo_host + ':' + mongo_port + '/scanner';
}
module.exports = secrets = {
db: mongoUrl,

View File

@@ -2,8 +2,6 @@
const opentelemetry = require('@opentelemetry/sdk-node');
const { MongoDBInstrumentation } = require('@opentelemetry/instrumentation-mongodb');
const {SocketIoInstrumentation} = require("@opentelemetry/instrumentation-socket.io");
const { MongooseInstrumentation } = require('@opentelemetry/instrumentation-mongoose');
const { TraceIdRatioBasedSampler } = require('@opentelemetry/sdk-trace-node');
const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-http');
const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node');
@@ -27,8 +25,6 @@ const sdk = new opentelemetry.NodeSDK({
traceExporter: new OTLPTraceExporter(),
sampler: new TraceIdRatioBasedSampler(samplePercentage),
instrumentations: [
new SocketIoInstrumentation(),
new MongooseInstrumentation(),
new MongoDBInstrumentation({
// see under for available configuration
}),

View File

@@ -43,8 +43,8 @@ configureExpress(app)
// -------------------------------------------
const mongo_host = process.env['MONGO_HOST'] != null ? process.env['MONGO_HOST'] : 'mongo';
const mongo_port = process.env['MONGO_PORT'] != null ? process.env['MONGO_PORT'] : 27017;
const mongo_host = typeof process.env['MONGO_HOST'] !== 'undefined' ? process.env['MONGO_HOST'] : 'mongo';
const mongo_port = typeof process.env['MONGO_PORT'] !== 'undefined' ? process.env['MONGO_PORT'] : 27017;
const mongo_user = process.env['MONGO_USER'];
const mongo_password = process.env['MONGO_PASSWORD'];

View File

@@ -15,10 +15,14 @@
"@honeycombio/opentelemetry-node": "^0.7.2",
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/auto-instrumentations-node": "^0.41.1",
"@opentelemetry/exporter-collector": "^0.25.0",
"@opentelemetry/instrumentation-mongodb": "^0.46.0",
"@opentelemetry/instrumentation-mongoose": "^0.42.0",
"@opentelemetry/instrumentation-socket.io": "^0.42.0",
"@opentelemetry/resource-detector-docker": "^0.1.2",
"@opentelemetry/resources": "^1.26.0",
"@opentelemetry/sdk-trace-base": "^1.26.0",
"@opentelemetry/semantic-conventions": "^1.27.0",
"@smithy/node-http-handler": "^3.1.4",
"adm-zip": "^0.5.10",
"axios": "1.3.5",
@@ -1571,6 +1575,45 @@
"node": ">=8.0.0"
}
},
"node_modules/@honeycombio/opentelemetry-node/node_modules/@opentelemetry/resources": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.22.0.tgz",
"integrity": "sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@honeycombio/opentelemetry-node/node_modules/@opentelemetry/sdk-trace-base": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.22.0.tgz",
"integrity": "sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/resources": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@honeycombio/opentelemetry-node/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz",
"integrity": "sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/api": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.7.0.tgz",
@@ -1590,6 +1633,18 @@
"node": ">=14"
}
},
"node_modules/@opentelemetry/api-metrics": {
"version": "0.25.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/api-metrics/-/api-metrics-0.25.0.tgz",
"integrity": "sha512-9T0c9NQAEGRujUC7HzPa2/qZ5px/UvB2sfSU5CAKFRrAlDl2gn25B0oUbDqSRHW/IG1X2rnQ3z2bBQkJyJvE4g==",
"deprecated": "Please use @opentelemetry/api >= 1.3.0",
"engines": {
"node": ">=8.0.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
}
},
"node_modules/@opentelemetry/auto-instrumentations-node": {
"version": "0.41.1",
"resolved": "https://registry.npmjs.org/@opentelemetry/auto-instrumentations-node/-/auto-instrumentations-node-0.41.1.tgz",
@@ -2027,6 +2082,88 @@
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/core/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz",
"integrity": "sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/exporter-collector": {
"version": "0.25.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/exporter-collector/-/exporter-collector-0.25.0.tgz",
"integrity": "sha512-xZYstLt4hz1aTloJaepWdjMMf9305MqwqbUWjcU/X9pOxvgFWRlchO6x/HQTw7ow0i/S+ShzC+greKnb+1WvLA==",
"deprecated": "Please use trace and metric specific exporters @opentelemetry/exporter-trace-otlp-http and @opentelemetry/exporter-metrics-otlp-http",
"dependencies": {
"@opentelemetry/api-metrics": "0.25.0",
"@opentelemetry/core": "0.25.0",
"@opentelemetry/resources": "0.25.0",
"@opentelemetry/sdk-metrics-base": "0.25.0",
"@opentelemetry/sdk-trace-base": "0.25.0"
},
"engines": {
"node": ">=8.0.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
}
},
"node_modules/@opentelemetry/exporter-collector/node_modules/@opentelemetry/core": {
"version": "0.25.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.25.0.tgz",
"integrity": "sha512-8OTWF4vfCENU112XB5ElLqf0eq/FhsY0SBvvY65vB3+fbZ2Oi+CPsRASrUZWGtC9MJ5rK2lBlY+/jI4a/NPPBg==",
"dependencies": {
"@opentelemetry/semantic-conventions": "0.25.0",
"semver": "^7.3.5"
},
"engines": {
"node": ">=8.5.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
}
},
"node_modules/@opentelemetry/exporter-collector/node_modules/@opentelemetry/resources": {
"version": "0.25.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.25.0.tgz",
"integrity": "sha512-O46u53vDBlxCML8O9dIjsRcCC2VT5ri1upwhp02ITobgJ16aVD/iScCo1lPl/x2E7yq9uwzMINENiiYZRFb6XA==",
"dependencies": {
"@opentelemetry/core": "0.25.0",
"@opentelemetry/semantic-conventions": "0.25.0"
},
"engines": {
"node": ">=8.0.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
}
},
"node_modules/@opentelemetry/exporter-collector/node_modules/@opentelemetry/sdk-trace-base": {
"version": "0.25.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-0.25.0.tgz",
"integrity": "sha512-TInkLSF/ThM3GNVM+9tgnCVjyNLnRxvAkG585Fhu0HNwaEtCTUwI0r7AvMRIREOreeRWttBG6kvT0LOKdo8yjw==",
"dependencies": {
"@opentelemetry/core": "0.25.0",
"@opentelemetry/resources": "0.25.0",
"@opentelemetry/semantic-conventions": "0.25.0",
"lodash.merge": "^4.6.2"
},
"engines": {
"node": ">=8.0.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
}
},
"node_modules/@opentelemetry/exporter-collector/node_modules/@opentelemetry/semantic-conventions": {
"version": "0.25.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.25.0.tgz",
"integrity": "sha512-V3N+MDBiv0TUlorbgiSqk6CvcP876CYUk/41Tg6s8OIyvniTwprE6vPvFQayuABiVkGlHOxv1Mlvp0w4qNdnVg==",
"engines": {
"node": ">=8.0.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-grpc": {
"version": "0.49.1",
"resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-grpc/-/exporter-metrics-otlp-grpc-0.49.1.tgz",
@@ -2047,6 +2184,29 @@
"@opentelemetry/api": "^1.3.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/resources": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.22.0.tgz",
"integrity": "sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-grpc/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz",
"integrity": "sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-http": {
"version": "0.49.1",
"resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-http/-/exporter-metrics-otlp-http-0.49.1.tgz",
@@ -2065,6 +2225,29 @@
"@opentelemetry/api": "^1.3.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/resources": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.22.0.tgz",
"integrity": "sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-http/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz",
"integrity": "sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-proto": {
"version": "0.49.1",
"resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-proto/-/exporter-metrics-otlp-proto-0.49.1.tgz",
@@ -2085,6 +2268,29 @@
"@opentelemetry/api": "^1.3.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-proto/node_modules/@opentelemetry/resources": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.22.0.tgz",
"integrity": "sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/exporter-metrics-otlp-proto/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz",
"integrity": "sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/exporter-trace-otlp-grpc": {
"version": "0.49.1",
"resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-grpc/-/exporter-trace-otlp-grpc-0.49.1.tgz",
@@ -2104,6 +2310,45 @@
"@opentelemetry/api": "^1.0.0"
}
},
"node_modules/@opentelemetry/exporter-trace-otlp-grpc/node_modules/@opentelemetry/resources": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.22.0.tgz",
"integrity": "sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/exporter-trace-otlp-grpc/node_modules/@opentelemetry/sdk-trace-base": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.22.0.tgz",
"integrity": "sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/resources": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/exporter-trace-otlp-grpc/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz",
"integrity": "sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/exporter-trace-otlp-http": {
"version": "0.49.1",
"resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.49.1.tgz",
@@ -2122,6 +2367,45 @@
"@opentelemetry/api": "^1.0.0"
}
},
"node_modules/@opentelemetry/exporter-trace-otlp-http/node_modules/@opentelemetry/resources": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.22.0.tgz",
"integrity": "sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/exporter-trace-otlp-http/node_modules/@opentelemetry/sdk-trace-base": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.22.0.tgz",
"integrity": "sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/resources": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/exporter-trace-otlp-http/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz",
"integrity": "sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/exporter-trace-otlp-proto": {
"version": "0.49.1",
"resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-proto/-/exporter-trace-otlp-proto-0.49.1.tgz",
@@ -2141,6 +2425,45 @@
"@opentelemetry/api": "^1.0.0"
}
},
"node_modules/@opentelemetry/exporter-trace-otlp-proto/node_modules/@opentelemetry/resources": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.22.0.tgz",
"integrity": "sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/exporter-trace-otlp-proto/node_modules/@opentelemetry/sdk-trace-base": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.22.0.tgz",
"integrity": "sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/resources": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/exporter-trace-otlp-proto/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz",
"integrity": "sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/exporter-zipkin": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/exporter-zipkin/-/exporter-zipkin-1.22.0.tgz",
@@ -2158,6 +2481,45 @@
"@opentelemetry/api": "^1.0.0"
}
},
"node_modules/@opentelemetry/exporter-zipkin/node_modules/@opentelemetry/resources": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.22.0.tgz",
"integrity": "sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/exporter-zipkin/node_modules/@opentelemetry/sdk-trace-base": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.22.0.tgz",
"integrity": "sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/resources": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/exporter-zipkin/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz",
"integrity": "sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/instrumentation": {
"version": "0.48.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.48.0.tgz",
@@ -2659,14 +3021,6 @@
"@opentelemetry/api": "^1.3.0"
}
},
"node_modules/@opentelemetry/instrumentation-mongoose/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.27.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz",
"integrity": "sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/instrumentation-mongoose/node_modules/import-in-the-middle": {
"version": "1.11.0",
"resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.11.0.tgz",
@@ -2880,14 +3234,6 @@
"@opentelemetry/api": "^1.3.0"
}
},
"node_modules/@opentelemetry/instrumentation-socket.io/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.27.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz",
"integrity": "sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/instrumentation-socket.io/node_modules/import-in-the-middle": {
"version": "1.11.0",
"resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.11.0.tgz",
@@ -3006,6 +3352,45 @@
"node": ">=14"
}
},
"node_modules/@opentelemetry/otlp-transformer/node_modules/@opentelemetry/resources": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.22.0.tgz",
"integrity": "sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/otlp-transformer/node_modules/@opentelemetry/sdk-trace-base": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.22.0.tgz",
"integrity": "sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/resources": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/otlp-transformer/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz",
"integrity": "sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/propagation-utils": {
"version": "0.30.10",
"resolved": "https://registry.npmjs.org/@opentelemetry/propagation-utils/-/propagation-utils-0.30.10.tgz",
@@ -3146,18 +3531,32 @@
}
},
"node_modules/@opentelemetry/resources": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.22.0.tgz",
"integrity": "sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==",
"version": "1.26.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.26.0.tgz",
"integrity": "sha512-CPNYchBE7MBecCSVy0HKpUISEeJOniWqcHaAHpmasZ3j9o6V3AyBzhRc90jdmemq0HOxDr6ylhUbDhBqqPpeNw==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
"@opentelemetry/core": "1.26.0",
"@opentelemetry/semantic-conventions": "1.27.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
"@opentelemetry/api": ">=1.0.0 <1.10.0"
}
},
"node_modules/@opentelemetry/resources/node_modules/@opentelemetry/core": {
"version": "1.26.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.26.0.tgz",
"integrity": "sha512-1iKxXXE8415Cdv0yjG3G6hQnB5eVEsJce3QaawX8SjDn0mAS0ZM8fAbZZJD4ajvhC15cePvosSCut404KrIIvQ==",
"dependencies": {
"@opentelemetry/semantic-conventions": "1.27.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.10.0"
}
},
"node_modules/@opentelemetry/sdk-logs": {
@@ -3176,6 +3575,29 @@
"@opentelemetry/api-logs": ">=0.39.1"
}
},
"node_modules/@opentelemetry/sdk-logs/node_modules/@opentelemetry/resources": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.22.0.tgz",
"integrity": "sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/sdk-logs/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz",
"integrity": "sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/sdk-metrics": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.22.0.tgz",
@@ -3192,6 +3614,85 @@
"@opentelemetry/api": ">=1.3.0 <1.9.0"
}
},
"node_modules/@opentelemetry/sdk-metrics-base": {
"version": "0.25.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics-base/-/sdk-metrics-base-0.25.0.tgz",
"integrity": "sha512-7fwPlAFB5Xw8mnVQfq0wqKNw3RXiAMad9T1bk5Sza9LK/L6hz8RTuHWCsFMsj+1OOSAaiPFuUMYrK1J75+2IAg==",
"deprecated": "Please use @opentelemetry/sdk-metrics",
"dependencies": {
"@opentelemetry/api-metrics": "0.25.0",
"@opentelemetry/core": "0.25.0",
"@opentelemetry/resources": "0.25.0",
"lodash.merge": "^4.6.2"
},
"engines": {
"node": ">=8.0.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
}
},
"node_modules/@opentelemetry/sdk-metrics-base/node_modules/@opentelemetry/core": {
"version": "0.25.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-0.25.0.tgz",
"integrity": "sha512-8OTWF4vfCENU112XB5ElLqf0eq/FhsY0SBvvY65vB3+fbZ2Oi+CPsRASrUZWGtC9MJ5rK2lBlY+/jI4a/NPPBg==",
"dependencies": {
"@opentelemetry/semantic-conventions": "0.25.0",
"semver": "^7.3.5"
},
"engines": {
"node": ">=8.5.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
}
},
"node_modules/@opentelemetry/sdk-metrics-base/node_modules/@opentelemetry/resources": {
"version": "0.25.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-0.25.0.tgz",
"integrity": "sha512-O46u53vDBlxCML8O9dIjsRcCC2VT5ri1upwhp02ITobgJ16aVD/iScCo1lPl/x2E7yq9uwzMINENiiYZRFb6XA==",
"dependencies": {
"@opentelemetry/core": "0.25.0",
"@opentelemetry/semantic-conventions": "0.25.0"
},
"engines": {
"node": ">=8.0.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.2"
}
},
"node_modules/@opentelemetry/sdk-metrics-base/node_modules/@opentelemetry/semantic-conventions": {
"version": "0.25.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.25.0.tgz",
"integrity": "sha512-V3N+MDBiv0TUlorbgiSqk6CvcP876CYUk/41Tg6s8OIyvniTwprE6vPvFQayuABiVkGlHOxv1Mlvp0w4qNdnVg==",
"engines": {
"node": ">=8.0.0"
}
},
"node_modules/@opentelemetry/sdk-metrics/node_modules/@opentelemetry/resources": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.22.0.tgz",
"integrity": "sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/sdk-metrics/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz",
"integrity": "sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/sdk-node": {
"version": "0.49.1",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-node/-/sdk-node-0.49.1.tgz",
@@ -3248,7 +3749,22 @@
"@opentelemetry/api": "^1.3.0"
}
},
"node_modules/@opentelemetry/sdk-trace-base": {
"node_modules/@opentelemetry/sdk-node/node_modules/@opentelemetry/resources": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.22.0.tgz",
"integrity": "sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/sdk-node/node_modules/@opentelemetry/sdk-trace-base": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.22.0.tgz",
"integrity": "sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==",
@@ -3264,6 +3780,44 @@
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/sdk-node/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz",
"integrity": "sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/sdk-trace-base": {
"version": "1.26.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.26.0.tgz",
"integrity": "sha512-olWQldtvbK4v22ymrKLbIcBi9L2SpMO84sCPY54IVsJhP9fRsxJT194C/AVaAuJzLE30EdhhM1VmvVYR7az+cw==",
"dependencies": {
"@opentelemetry/core": "1.26.0",
"@opentelemetry/resources": "1.26.0",
"@opentelemetry/semantic-conventions": "1.27.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.10.0"
}
},
"node_modules/@opentelemetry/sdk-trace-base/node_modules/@opentelemetry/core": {
"version": "1.26.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.26.0.tgz",
"integrity": "sha512-1iKxXXE8415Cdv0yjG3G6hQnB5eVEsJce3QaawX8SjDn0mAS0ZM8fAbZZJD4ajvhC15cePvosSCut404KrIIvQ==",
"dependencies": {
"@opentelemetry/semantic-conventions": "1.27.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.10.0"
}
},
"node_modules/@opentelemetry/sdk-trace-node": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-node/-/sdk-trace-node-1.22.0.tgz",
@@ -3283,7 +3837,38 @@
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/semantic-conventions": {
"node_modules/@opentelemetry/sdk-trace-node/node_modules/@opentelemetry/resources": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.22.0.tgz",
"integrity": "sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/sdk-trace-node/node_modules/@opentelemetry/sdk-trace-base": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.22.0.tgz",
"integrity": "sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==",
"dependencies": {
"@opentelemetry/core": "1.22.0",
"@opentelemetry/resources": "1.22.0",
"@opentelemetry/semantic-conventions": "1.22.0"
},
"engines": {
"node": ">=14"
},
"peerDependencies": {
"@opentelemetry/api": ">=1.0.0 <1.9.0"
}
},
"node_modules/@opentelemetry/sdk-trace-node/node_modules/@opentelemetry/semantic-conventions": {
"version": "1.22.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.22.0.tgz",
"integrity": "sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==",
@@ -3291,6 +3876,14 @@
"node": ">=14"
}
},
"node_modules/@opentelemetry/semantic-conventions": {
"version": "1.27.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.27.0.tgz",
"integrity": "sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==",
"engines": {
"node": ">=14"
}
},
"node_modules/@opentelemetry/sql-common": {
"version": "0.40.0",
"resolved": "https://registry.npmjs.org/@opentelemetry/sql-common/-/sql-common-0.40.0.tgz",

View File

@@ -9,10 +9,10 @@
"@honeycombio/opentelemetry-node": "^0.7.2",
"@opentelemetry/api": "^1.7.0",
"@opentelemetry/auto-instrumentations-node": "^0.41.1",
"@opentelemetry/instrumentation-mongodb": "^0.46.0",
"@opentelemetry/instrumentation-mongoose": "^0.42.0",
"@opentelemetry/instrumentation-socket.io": "^0.42.0",
"@opentelemetry/resource-detector-docker": "^0.1.2",
"@opentelemetry/exporter-collector": "^0.25.0",
"@opentelemetry/resources": "^1.26.0",
"@opentelemetry/sdk-trace-base": "^1.26.0",
"@opentelemetry/semantic-conventions": "^1.27.0",
"@smithy/node-http-handler": "^3.1.4",
"adm-zip": "^0.5.10",
"axios": "1.3.5",

View File

@@ -67,7 +67,6 @@ services:
- OTEL_EXPORTER_OTLP_ENDPOINT
- OTEL_EXPORTER_OTLP_HEADERS
- OTEL_SERVICE_NAME
- MONGO_NODE_DRIVER_HOST=mongo
- MONGO_HOST
- MONGO_PORT
- MONGO_USER