Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to the next newrelic semver major and some other dependencies #74

Merged
merged 2 commits into from
Sep 4, 2023
Merged

Update to the next newrelic semver major and some other dependencies #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac70a16
Update to the next newrelic semver
kibertoad Sep 4, 2023
06d494d
Fix build
kibertoad Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/plugins/metricsPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ function plugin(app: FastifyInstance, opts: MetricsPluginOptions) {
promServer.log.error(logObject)
throw new Error('Critical error when trying to launch metrics server')
})
.then(() => {
// this is to consume string which plugin does not expect
})
}

export const metricsPlugin = fp(plugin, {
Expand Down
4 changes: 2 additions & 2 deletions lib/plugins/requestContextProviderPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ function plugin(fastify: FastifyInstance, opts: unknown, done: () => void) {
(req: FastifyRequest, res: FastifyReply, next: HookHandlerDoneFunction) => {
req.reqContext = {
logger: req.log,
reqId: req.id as string,
reqId: req.id,
}

// Store request_id in AsyncLocalStorage to be picked up by instrumentation tooling, such as OpenTelemetry
requestContext.set(REQUEST_ID_STORE_KEY, req.id as string)
requestContext.set(REQUEST_ID_STORE_KEY, req.id)

next()
},
Expand Down
26 changes: 13 additions & 13 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,30 +43,30 @@
"version": "auto-changelog -p && git add CHANGELOG.md"
},
"dependencies": {
"@bugsnag/js": "^7.20.2",
"@bugsnag/js": "^7.21.0",
"@opentelemetry/api": "^1.4.1",
"@opentelemetry/exporter-trace-otlp-grpc": "^0.41.0",
"@opentelemetry/instrumentation": "^0.41.0",
"@opentelemetry/resources": "^1.14.0",
"@opentelemetry/sdk-trace-base": "^1.14.0",
"@opentelemetry/sdk-trace-node": "^1.14.0",
"@opentelemetry/semantic-conventions": "^1.14.0",
"@prisma/instrumentation": "^5.0.0",
"@prisma/instrumentation": "^5.2.0",
"@splitsoftware/splitio": "^10.22.6",
"@amplitude/analytics-node": "^1.3.1",
"fastify-metrics": "^10.3.0",
"fastify-plugin": "^4.5.0",
"tslib": "^2.6.0"
"fastify-plugin": "^4.5.1",
"tslib": "^2.6.2"
},
"peerDependencies": {
"@fastify/request-context": "^5.0.0",
"fastify": "^4.18.0",
"newrelic": "^10.1.1",
"pino": "^8.14.1"
"fastify": "^4.22.2",
"newrelic": "^11.0.0",
"pino": "^8.15.0"
},
"devDependencies": {
"@fastify/request-context": "^5.0.0",
"@lokalise/node-core": "^5.10.0",
"@lokalise/node-core": "^6.2.0",
"@types/jest": "^29.5.3",
"@types/newrelic": "^9.14.0",
"@types/node": "^18.16.19",
Expand All @@ -79,15 +79,15 @@
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jest": "^27.2.2",
"eslint-plugin-prettier": "^5.0.0",
"fastify": "^4.19.2",
"jest": "^29.6.1",
"newrelic": "10.4.2",
"pino": "^8.14.1",
"fastify": "^4.22.2",
"jest": "^29.6.4",
"newrelic": "11.0.0",
"pino": "^8.15.0",
"prettier": "^3.0.0",
"shx": "^0.3.4",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"engines": {
"node": ">=18"
Expand Down
Loading