Skip to content

Commit

Permalink
fix(deps): update otel core experimental to ^0.35.1 (#1358)
Browse files Browse the repository at this point in the history 
* fix(deps): update otel core experimental to ^0.35.1

* chore: adapt fastify tests to fit http instrumentation

http instrumentation ends server spans later which results in exporting them later.
Adapt the tests to fit the new sequence.

---------

Co-authored-by: Renovate Bot <bot@renovateapp.com>
  • Loading branch information
@Flarna @renovate-bot
Flarna and renovate-bot authored Jan 31, 2023
1 parent aae03f2 commit ff109b7
Show file tree
Hide file tree
Showing 43 changed files with 63 additions and 63 deletions.
6 changes: 3 additions & 3 deletions archive/opentelemetry-browser-extension-autoinjection/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.34.0",
"@opentelemetry/exporter-zipkin": "^1.0.0",
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/instrumentation-document-load": "^0.29.0",
"@opentelemetry/instrumentation-fetch": "^0.34.0",
"@opentelemetry/instrumentation-xml-http-request": "^0.34.0",
"@opentelemetry/instrumentation-fetch": "^0.35.1",
"@opentelemetry/instrumentation-xml-http-request": "^0.35.1",
"@opentelemetry/resources": "^1.8.0",
"@opentelemetry/sdk-trace-base": "^1.8.0",
"@opentelemetry/sdk-trace-web": "^1.8.0",
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-instana/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/contrib-test-utils": "^0.33.0",
"@opentelemetry/sdk-node": "^0.34.0",
"@opentelemetry/sdk-node": "^0.35.1",
"@types/mocha": "8.2.3",
"@types/node": "18.11.7",
"@types/semver": "7.3.8",
Expand Down
6 changes: 3 additions & 3 deletions metapackages/auto-instrumentations-node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/instrumentation-amqplib": "^0.32.0",
"@opentelemetry/instrumentation-aws-lambda": "^0.34.0",
"@opentelemetry/instrumentation-aws-sdk": "^0.33.0",
Expand All @@ -60,9 +60,9 @@
"@opentelemetry/instrumentation-fastify": "^0.31.0",
"@opentelemetry/instrumentation-generic-pool": "^0.31.0",
"@opentelemetry/instrumentation-graphql": "^0.33.0",
"@opentelemetry/instrumentation-grpc": "^0.34.0",
"@opentelemetry/instrumentation-grpc": "^0.35.1",
"@opentelemetry/instrumentation-hapi": "^0.31.0",
"@opentelemetry/instrumentation-http": "^0.34.0",
"@opentelemetry/instrumentation-http": "^0.35.1",
"@opentelemetry/instrumentation-ioredis": "^0.33.1",
"@opentelemetry/instrumentation-knex": "^0.31.0",
"@opentelemetry/instrumentation-koa": "^0.34.0",
Expand Down
6 changes: 3 additions & 3 deletions metapackages/auto-instrumentations-web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@
"webpack-merge": "5.8.0"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/instrumentation-document-load": "^0.31.0",
"@opentelemetry/instrumentation-fetch": "^0.34.0",
"@opentelemetry/instrumentation-fetch": "^0.35.1",
"@opentelemetry/instrumentation-user-interaction": "^0.32.0",
"@opentelemetry/instrumentation-xml-http-request": "^0.34.0"
"@opentelemetry/instrumentation-xml-http-request": "^0.35.1"
}
}
2 changes: 1 addition & 1 deletion packages/opentelemetry-test-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^1.3.1",
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/sdk-trace-node": "^1.8.0",
"@opentelemetry/resources": "^1.8.0",
"@opentelemetry/sdk-trace-base": "^1.8.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-amqplib/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/amqplib": "^0.5.17"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-dataloader/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0"
"@opentelemetry/instrumentation": "^0.35.1"
},
"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
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.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-lru-memoizer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0"
"@opentelemetry/instrumentation": "^0.35.1"
},
"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
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.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-socket.io/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.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
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/tedious": "^4.0.6"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.32.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/propagator-aws-xray": "^1.1.1",
"@opentelemetry/resources": "^1.8.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-aws-sdk/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@opentelemetry/propagation-utils": "^0.29.1"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-bunyan/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@types/bunyan": "1.8.7"
},
"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-cassandra/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.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
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.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/connect": "3.4.35"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-dns/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"semver": "^7.3.2"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-express/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/express": "4.17.13"
},
Expand Down
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-instrumentation-fastify/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@fastify/express": "^2.0.2",
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/context-async-hooks": "^1.8.0",
"@opentelemetry/instrumentation-http": "0.34.0",
"@opentelemetry/instrumentation-http": "0.35.1",
"@opentelemetry/sdk-trace-base": "^1.8.0",
"@opentelemetry/sdk-trace-node": "^1.8.0",
"@types/express": "4.17.13",
Expand All @@ -64,7 +64,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify#readme"
Expand Down
26 changes: 13 additions & 13 deletions plugins/node/opentelemetry-instrumentation-fastify/test/instrumentation.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ describe('fastify', () => {

const spans = memoryExporter.getFinishedSpans();
assert.strictEqual(spans.length, 5);
const span = spans[3];
const span = spans[2];
assert.deepStrictEqual(span.attributes, {
'fastify.type': 'request_handler',
'plugin.name': 'fastify -> @fastify/express',
Expand All @@ -168,7 +168,7 @@ describe('fastify', () => {

const spans = memoryExporter.getFinishedSpans();
assert.strictEqual(spans.length, 5);
const span = spans[3];
const span = spans[2];
assert.deepStrictEqual(span.attributes, {
'fastify.type': 'request_handler',
'fastify.name': 'namedHandler',
Expand Down Expand Up @@ -220,11 +220,11 @@ describe('fastify', () => {
const spans = memoryExporter.getFinishedSpans();

assert.strictEqual(spans.length, 6);
const changedRootSpan = spans[2];
const span = spans[4];
const changedRootSpan = spans[4];
const span = spans[3];
assert.strictEqual(changedRootSpan.name, 'GET /test/:id');
assert.strictEqual(span.name, 'request handler - foo');
assert.strictEqual(span.parentSpanId, spans[3].spanContext().spanId);
assert.strictEqual(span.parentSpanId, spans[2].spanContext().spanId);
});

it('should create span for fastify express runConnect', async () => {
Expand All @@ -247,7 +247,7 @@ describe('fastify', () => {
const spans = memoryExporter.getFinishedSpans();

assert.strictEqual(spans.length, 6);
const baseSpan = spans[2];
const baseSpan = spans[4];
const span = spans[0];
assert.strictEqual(span.name, 'middleware - enhanceRequest');
assert.deepStrictEqual(span.attributes, {
Expand All @@ -263,8 +263,8 @@ describe('fastify', () => {
const spans = memoryExporter.getFinishedSpans();

assert.strictEqual(spans.length, 6);
const baseSpan = spans[3];
const span = spans[4];
const baseSpan = spans[2];
const span = spans[3];
assert.strictEqual(span.name, 'request handler - foo');
assert.deepStrictEqual(span.attributes, {
'plugin.name': 'subsystem',
Expand All @@ -280,7 +280,7 @@ describe('fastify', () => {
const spans = memoryExporter.getFinishedSpans();

assert.strictEqual(spans.length, 6);
const span = spans[2];
const span = spans[4];
assert.strictEqual(span.attributes['http.route'], '/test/:id');
});

Expand All @@ -289,7 +289,7 @@ describe('fastify', () => {

assert.strictEqual(spans.length, 6);
const baseSpan = spans[1];
const span = spans[3];
const span = spans[2];
assert.strictEqual(span.name, `middleware - ${ANONYMOUS_NAME}`);
assert.deepStrictEqual(span.attributes, {
'fastify.type': 'middleware',
Expand All @@ -306,7 +306,7 @@ describe('fastify', () => {
const spans = memoryExporter.getFinishedSpans();

assert.strictEqual(spans.length, 6);
const span = spans[4];
const span = spans[3];
assert.strictEqual(span.name, 'request handler - anonymous');
assert.deepStrictEqual(span.status, {
code: SpanStatusCode.ERROR,
Expand Down Expand Up @@ -454,7 +454,7 @@ describe('fastify', () => {

const spans = memoryExporter.getFinishedSpans();
assert.strictEqual(spans.length, 5);
const span = spans[3];
const span = spans[2];
assert.deepStrictEqual(span.attributes, {
'fastify.type': 'request_handler',
'plugin.name': 'fastify -> @fastify/express',
Expand Down Expand Up @@ -487,7 +487,7 @@ describe('fastify', () => {

const spans = memoryExporter.getFinishedSpans();
assert.strictEqual(spans.length, 5);
const span = spans[3];
const span = spans[2];
assert.deepStrictEqual(span.attributes, {
'fastify.type': 'request_handler',
'plugin.name': 'fastify -> @fastify/express',
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-generic-pool/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/generic-pool": "^3.1.9"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-graphql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0"
"@opentelemetry/instrumentation": "^0.35.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql#readme"
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-hapi/package.json
View file
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.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/hapi__hapi": "20.0.9"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-ioredis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/redis-common": "^0.34.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/ioredis": "4.26.6"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-knex/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-knex#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-koa/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/koa": "2.13.4",
"@types/koa__router": "8.0.7"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-memcached/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/memcached": "^2.2.6"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mongodb/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mongodb#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mysql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"mysql": "2.18.1",
"@types/mysql": "2.15.19"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mysql2/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"typescript": "4.3.5"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.34.0",
"@opentelemetry/instrumentation": "^0.35.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql2#readme"
Expand Down
Loading

0 comments on commit ff109b7

Please sign in to comment.