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

chore(deps): update deps matching "@opentelemetry/" #2408

Merged
merged 6 commits into from
Aug 30, 2024
Merged

chore(deps): update deps matching "@opentelemetry/" #2408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b9b495
chore(deps): update deps matching "@opentelemetry/"
pichlermarc Aug 28, 2024
f8cb2e7
fixup! chore(deps): update deps matching "@opentelemetry/"
pichlermarc Aug 28, 2024
b408671
fixup! chore(deps): update deps matching "@opentelemetry/"
pichlermarc Aug 28, 2024
594b939
test(express): fix up tests to match fixed http instrumentation, use …
pichlermarc Aug 29, 2024
3c598bb
fixup! test(express): fix up tests to match fixed http instrumentatio…
pichlermarc Aug 29, 2024
bd2a449
test(instrumentation-koa): assert for correct SpanKind, account for h…
pichlermarc Aug 29, 2024
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
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-instana/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/contrib-test-utils": "^0.40.0",
"@opentelemetry/sdk-node": "^0.52.0",
"@opentelemetry/sdk-node": "^0.53.0",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/semver": "7.5.8",
Expand Down
4 changes: 2 additions & 2 deletions metapackages/auto-configuration-propagators/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
},
"dependencies": {
"@opentelemetry/core": "^1.25.1",
"@opentelemetry/propagator-aws-xray": "^1.25.1",
"@opentelemetry/propagator-aws-xray-lambda": "^0.53.0",
"@opentelemetry/propagator-b3": "^1.25.1",
"@opentelemetry/propagator-jaeger": "^1.25.1",
"@opentelemetry/propagator-aws-xray": "^1.25.1",
"@opentelemetry/propagator-aws-xray-lambda": "^0.52.1",
"@opentelemetry/propagator-ot-trace": "^0.27.2"
},
"files": [
Expand Down
8 changes: 4 additions & 4 deletions metapackages/auto-instrumentations-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/instrumentation-amqplib": "^0.41.0",
"@opentelemetry/instrumentation-aws-lambda": "^0.43.0",
"@opentelemetry/instrumentation-aws-sdk": "^0.43.1",
Expand All @@ -64,9 +64,9 @@
"@opentelemetry/instrumentation-fs": "^0.14.0",
"@opentelemetry/instrumentation-generic-pool": "^0.38.1",
"@opentelemetry/instrumentation-graphql": "^0.42.0",
"@opentelemetry/instrumentation-grpc": "^0.52.0",
"@opentelemetry/instrumentation-grpc": "^0.53.0",
"@opentelemetry/instrumentation-hapi": "^0.40.0",
"@opentelemetry/instrumentation-http": "^0.52.0",
"@opentelemetry/instrumentation-http": "^0.53.0",
"@opentelemetry/instrumentation-ioredis": "^0.42.0",
"@opentelemetry/instrumentation-kafkajs": "^0.2.0",
"@opentelemetry/instrumentation-knex": "^0.39.0",
Expand Down Expand Up @@ -95,7 +95,7 @@
"@opentelemetry/resource-detector-container": "^0.4.0",
"@opentelemetry/resource-detector-gcp": "^0.29.10",
"@opentelemetry/resources": "^1.24.0",
"@opentelemetry/sdk-node": "^0.52.0"
"@opentelemetry/sdk-node": "^0.53.0"
},
"files": [
"build/src/**/*.js",
Expand Down
6 changes: 3 additions & 3 deletions metapackages/auto-instrumentations-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@
"webpack-merge": "5.10.0"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/instrumentation-document-load": "^0.39.0",
"@opentelemetry/instrumentation-fetch": "^0.52.0",
"@opentelemetry/instrumentation-fetch": "^0.53.0",
"@opentelemetry/instrumentation-user-interaction": "^0.39.0",
"@opentelemetry/instrumentation-xml-http-request": "^0.52.0"
"@opentelemetry/instrumentation-xml-http-request": "^0.53.0"
},
"files": [
"build/src/**/*.js",
Expand Down
1,087 changes: 602 additions & 485 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/opentelemetry-test-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^1.3.1",
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/resources": "^1.8.0",
"@opentelemetry/sdk-node": "^0.52.0",
"@opentelemetry/sdk-node": "^0.53.0",
"@opentelemetry/sdk-trace-base": "^1.8.0",
"@opentelemetry/sdk-trace-node": "^1.8.0",
"@opentelemetry/semantic-conventions": "^1.22.0"
Expand Down
9 changes: 9 additions & 0 deletions packages/opentelemetry-test-utils/src/test-fixtures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,15 @@ export function createTestNodeSdk(opts: {
return sdk;
}

export enum OtlpSpanKind {
UNSPECIFIED = 0,
INTERNAL = 1,
SERVER = 2,
CLIENT = 3,
PRODUCER = 4,
CONSUMER = 5,
}

Comment on lines +58 to +66
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reviewer note: some tests incorrectly used SpanKind instead of the OTLP representation of the same enum. The number values are different, but the tests that used it did look somewhat plausible.

INTERNAL spans were asserted to be SERVER spans, the first SERVER span was asserted as a CLIENT span as they shared the same value.

I opted to add this here as we'll change the exports from @opentelemetry/otlp-transformer soon-ish and that type we have there will not be exported anymore. Not using the type from there will help save use some work when we have to clean up the tests in this repo eventually.

// TestSpan is an OTLP span plus references to `resource` and
// `instrumentationScope` that are shared between multiple spans in the
// protocol.
Expand Down
2 changes: 1 addition & 1 deletion packages/winston-transport/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/api-logs": "^0.52.0",
"@opentelemetry/api-logs": "^0.53.0",
"winston-transport": "4.*"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/winston-transport#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-amqplib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/semantic-conventions": "^1.22.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-cucumber/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/semantic-conventions": "^1.22.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-cucumber#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-dataloader/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.52.0"
"@opentelemetry/instrumentation": "^0.53.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme"
}
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-fs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.52.0"
"@opentelemetry/instrumentation": "^0.53.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme"
}
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-kafkajs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/semantic-conventions": "^1.24.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-kafkajs#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-lru-memoizer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.52.0"
"@opentelemetry/instrumentation": "^0.53.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer#readme"
}
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-mongoose/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/semantic-conventions": "^1.22.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-mongoose#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-runtime-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"access": "public"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.52.0"
"@opentelemetry/instrumentation": "^0.53.0"
},
"devDependencies": {
"@opentelemetry/api": "^1.3.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-socket.io/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/semantic-conventions": "^1.22.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-tedious/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/semantic-conventions": "^1.22.0",
"@types/tedious": "^4.0.14"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-undici/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.52.0"
"@opentelemetry/instrumentation": "^0.53.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-undici",
"sideEffects": false
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/propagator-aws-xray": "^1.3.1",
"@opentelemetry/resources": "^1.8.0",
"@opentelemetry/semantic-conventions": "^1.22.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-aws-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/propagation-utils": "^0.30.10",
"@opentelemetry/semantic-conventions": "^1.22.0"
},
Expand Down
6 changes: 3 additions & 3 deletions plugins/node/opentelemetry-instrumentation-bunyan/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/resources": "^1.8.0",
"@opentelemetry/sdk-logs": "^0.52.0",
"@opentelemetry/sdk-logs": "^0.53.0",
"@opentelemetry/sdk-trace-base": "^1.8.0",
"@opentelemetry/sdk-trace-node": "^1.8.0",
"@opentelemetry/semantic-conventions": "^1.23.0",
Expand All @@ -63,8 +63,8 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/api-logs": "^0.52.0",
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/api-logs": "^0.53.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@types/bunyan": "1.8.9"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-bunyan/src/instrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export class BunyanInstrumentation extends InstrumentationBase<BunyanInstrumenta
}

override setConfig(config: BunyanInstrumentationConfig = {}) {
this._config = { ...DEFAULT_CONFIG, ...config };
Copy link
Member Author

@pichlermarc pichlermarc Aug 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reviewer note: this did override the enabled config and actually disabled the instrumentation, this went unnoticed until the change from open-telemetry/opentelemetry-js@0ee398d which now uses this method instead of setting it directly.

super.setConfig({ ...DEFAULT_CONFIG, ...config });
}

private _getPatchedEmit() {
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-cassandra/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/semantic-conventions": "^1.22.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-cassandra#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-connect/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/semantic-conventions": "^1.22.0",
"@types/connect": "3.4.36"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-dns/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"semver": "^7.5.4"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-dns#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.52.0",
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/semantic-conventions": "^1.22.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-express#readme"
Expand Down
Loading