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

Update OpenTelemetry dependencies #964

Merged
merged 10 commits into from
Dec 7, 2023
Merged

Update OpenTelemetry dependencies #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1789cf6
Add script to update test app dependencies
unflxw Nov 28, 2023
32c499f
Force usage of `@opentelemetry/api` version 1.6
unflxw Nov 30, 2023
8c859e1
Relax integration test app dependency bounds
unflxw Nov 30, 2023
f3c5c4b
Update integration test app locks
unflxw Nov 30, 2023
5307379
Update `@opentelemetry/sdk-node` dependency
unflxw Nov 30, 2023
8128b05
Remove `@opentelemetry/sdk-trace-base` dependency
unflxw Nov 30, 2023
6d3f4b1
Re-add test app `@opentelemetry/api` dependency
unflxw Nov 30, 2023
ec9c4fb
Add changeset for OpenTelemetry updates
tombruijn Dec 7, 2023
02dda5b
Merge branch 'main' into update-opentelemetry-dependencies
tombruijn Dec 7, 2023
403d657
Rerun npm install to rebuild package-lock.json
tombruijn Dec 7, 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
6 changes: 6 additions & 0 deletions .changesets/update-opentelemetry-dependencies.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
bump: "patch"
type: "change"
---

Update OpenTelemetry dependencies. This fixes a known issue with Next.js and webpack compatibility and includes other fixes.
13,056 changes: 2,838 additions & 10,218 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

39 changes: 19 additions & 20 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,25 @@
"appsignal-diagnose": "./bin/diagnose"
},
"dependencies": {
"@opentelemetry/api": "^1.6.0",
"@opentelemetry/instrumentation-express": "^0.33.1",
"@opentelemetry/instrumentation-fastify": "^0.32.3",
"@opentelemetry/instrumentation-graphql": "^0.35.1",
"@opentelemetry/instrumentation-http": "^0.43.0",
"@opentelemetry/instrumentation-ioredis": "^0.35.1",
"@opentelemetry/instrumentation-knex": "^0.32.1",
"@opentelemetry/instrumentation-koa": "^0.36.0",
"@opentelemetry/instrumentation-mongodb": "0.37.0",
"@opentelemetry/instrumentation-mongoose": "^0.33.1",
"@opentelemetry/instrumentation-mysql": "^0.34.1",
"@opentelemetry/instrumentation-mysql2": "^0.34.1",
"@opentelemetry/instrumentation-nestjs-core": "^0.33.1",
"@opentelemetry/instrumentation-pg": "^0.36.1",
"@opentelemetry/instrumentation-redis": "^0.35.1",
"@opentelemetry/instrumentation-redis-4": "^0.35.1",
"@opentelemetry/instrumentation-restify": "^0.34.0",
"@opentelemetry/sdk-node": "^0.43.0",
"@opentelemetry/sdk-trace-base": "^1.17.0",
"@prisma/instrumentation": "^5.3.1",
"@opentelemetry/api": ">= 1.6.0 < 1.7",
"@opentelemetry/instrumentation-express": ">= 0.33.3 < 0.34",
"@opentelemetry/instrumentation-fastify": ">= 0.32.4 < 0.33",
"@opentelemetry/instrumentation-graphql": ">= 0.35.2 < 0.36",
"@opentelemetry/instrumentation-http": ">= 0.43.0 < 0.44",
"@opentelemetry/instrumentation-ioredis": ">= 0.35.3 < 0.36",
"@opentelemetry/instrumentation-knex": ">= 0.32.3 < 0.33",
"@opentelemetry/instrumentation-koa": ">= 0.36.2 < 0.37",
"@opentelemetry/instrumentation-mongodb": ">= 0.37.0 < 0.38",
"@opentelemetry/instrumentation-mongoose": ">= 0.33.4 < 0.34",
"@opentelemetry/instrumentation-mysql": ">= 0.34.4 < 0.35",
"@opentelemetry/instrumentation-mysql2": ">= 0.34.4 < 0.35",
"@opentelemetry/instrumentation-nestjs-core": ">= 0.33.3 < 0.34",
"@opentelemetry/instrumentation-pg": ">= 0.36.2 < 0.37",
"@opentelemetry/instrumentation-redis": ">= 0.35.4 < 0.36",
"@opentelemetry/instrumentation-redis-4": ">= 0.35.5 < 0.36",
"@opentelemetry/instrumentation-restify": ">= 0.34.2 < 0.35",
"@opentelemetry/sdk-node": ">= 0.45.0 < 0.46",
"@prisma/instrumentation": ">= 5.4.0 < 5.6.0",
"node-addon-api": "^3.1.0",
"node-gyp": "^10.0.0",
"tslib": "^2.0.3",
Expand Down
13 changes: 13 additions & 0 deletions script/update_test_app_dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash

set -eu

for app in test/*; do
# Check that it is a test app
if test -f "$app/app/package-lock.json"; then
echo "Updating dependencies for $app..."
pushd "$app/app" > /dev/null
npm update
popd > /dev/null
fi
done
2 changes: 1 addition & 1 deletion src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export type DefaultInstrumentationName = keyof typeof DefaultInstrumentations
type ConfigArg<T> = T extends new (...args: infer U) => unknown ? U[0] : never
type DefaultInstrumentationsConfigMap = {
[Name in DefaultInstrumentationName]?: ConfigArg<
typeof DefaultInstrumentations[Name]
(typeof DefaultInstrumentations)[Name]
>
}

Expand Down
Loading