Skip to content

Commit ff109b7

Browse files
Flarnarenovate-bot
Flarna
and
renovate-bot
authored
fix(deps): update otel core experimental to ^0.35.1 (open-telemetry#1358)
* 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>
1 parent aae03f2 commit ff109b7

File tree

43 files changed

+63
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+63
-63
lines changed

‎archive/opentelemetry-browser-extension-autoinjection/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@
7070
"@opentelemetry/core": "^1.8.0",
7171
"@opentelemetry/exporter-trace-otlp-http": "^0.34.0",
7272
"@opentelemetry/exporter-zipkin": "^1.0.0",
73-
"@opentelemetry/instrumentation": "^0.34.0",
73+
"@opentelemetry/instrumentation": "^0.35.1",
7474
"@opentelemetry/instrumentation-document-load": "^0.29.0",
75-
"@opentelemetry/instrumentation-fetch": "^0.34.0",
76-
"@opentelemetry/instrumentation-xml-http-request": "^0.34.0",
75+
"@opentelemetry/instrumentation-fetch": "^0.35.1",
76+
"@opentelemetry/instrumentation-xml-http-request": "^0.35.1",
7777
"@opentelemetry/resources": "^1.8.0",
7878
"@opentelemetry/sdk-trace-base": "^1.8.0",
7979
"@opentelemetry/sdk-trace-web": "^1.8.0",

‎detectors/node/opentelemetry-resource-detector-instana/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"devDependencies": {
4242
"@opentelemetry/api": "^1.3.0",
4343
"@opentelemetry/contrib-test-utils": "^0.33.0",
44-
"@opentelemetry/sdk-node": "^0.34.0",
44+
"@opentelemetry/sdk-node": "^0.35.1",
4545
"@types/mocha": "8.2.3",
4646
"@types/node": "18.11.7",
4747
"@types/semver": "7.3.8",

‎metapackages/auto-instrumentations-node/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"typescript": "4.3.5"
4747
},
4848
"dependencies": {
49-
"@opentelemetry/instrumentation": "^0.34.0",
49+
"@opentelemetry/instrumentation": "^0.35.1",
5050
"@opentelemetry/instrumentation-amqplib": "^0.32.0",
5151
"@opentelemetry/instrumentation-aws-lambda": "^0.34.0",
5252
"@opentelemetry/instrumentation-aws-sdk": "^0.33.0",
@@ -60,9 +60,9 @@
6060
"@opentelemetry/instrumentation-fastify": "^0.31.0",
6161
"@opentelemetry/instrumentation-generic-pool": "^0.31.0",
6262
"@opentelemetry/instrumentation-graphql": "^0.33.0",
63-
"@opentelemetry/instrumentation-grpc": "^0.34.0",
63+
"@opentelemetry/instrumentation-grpc": "^0.35.1",
6464
"@opentelemetry/instrumentation-hapi": "^0.31.0",
65-
"@opentelemetry/instrumentation-http": "^0.34.0",
65+
"@opentelemetry/instrumentation-http": "^0.35.1",
6666
"@opentelemetry/instrumentation-ioredis": "^0.33.1",
6767
"@opentelemetry/instrumentation-knex": "^0.31.0",
6868
"@opentelemetry/instrumentation-koa": "^0.34.0",

‎metapackages/auto-instrumentations-web/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
"webpack-merge": "5.8.0"
6161
},
6262
"dependencies": {
63-
"@opentelemetry/instrumentation": "^0.34.0",
63+
"@opentelemetry/instrumentation": "^0.35.1",
6464
"@opentelemetry/instrumentation-document-load": "^0.31.0",
65-
"@opentelemetry/instrumentation-fetch": "^0.34.0",
65+
"@opentelemetry/instrumentation-fetch": "^0.35.1",
6666
"@opentelemetry/instrumentation-user-interaction": "^0.32.0",
67-
"@opentelemetry/instrumentation-xml-http-request": "^0.34.0"
67+
"@opentelemetry/instrumentation-xml-http-request": "^0.35.1"
6868
}
6969
}

‎packages/opentelemetry-test-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"dependencies": {
5050
"@opentelemetry/core": "^1.0.0",
5151
"@opentelemetry/exporter-jaeger": "^1.3.1",
52-
"@opentelemetry/instrumentation": "^0.34.0",
52+
"@opentelemetry/instrumentation": "^0.35.1",
5353
"@opentelemetry/sdk-trace-node": "^1.8.0",
5454
"@opentelemetry/resources": "^1.8.0",
5555
"@opentelemetry/sdk-trace-base": "^1.8.0",

‎plugins/node/instrumentation-amqplib/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
},
4848
"dependencies": {
4949
"@opentelemetry/core": "^1.8.0",
50-
"@opentelemetry/instrumentation": "^0.34.0",
50+
"@opentelemetry/instrumentation": "^0.35.1",
5151
"@opentelemetry/semantic-conventions": "^1.0.0",
5252
"@types/amqplib": "^0.5.17"
5353
},

‎plugins/node/instrumentation-dataloader/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"typescript": "4.3.5"
6363
},
6464
"dependencies": {
65-
"@opentelemetry/instrumentation": "^0.34.0"
65+
"@opentelemetry/instrumentation": "^0.35.1"
6666
},
6767
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme"
6868
}

‎plugins/node/instrumentation-fs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
},
6161
"dependencies": {
6262
"@opentelemetry/core": "^1.8.0",
63-
"@opentelemetry/instrumentation": "^0.34.0",
63+
"@opentelemetry/instrumentation": "^0.35.1",
6464
"@opentelemetry/semantic-conventions": "^1.0.0"
6565
},
6666
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme"

‎plugins/node/instrumentation-lru-memoizer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"typescript": "4.3.5"
5959
},
6060
"dependencies": {
61-
"@opentelemetry/instrumentation": "^0.34.0"
61+
"@opentelemetry/instrumentation": "^0.35.1"
6262
},
6363
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer#readme"
6464
}

‎plugins/node/instrumentation-mongoose/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
},
6363
"dependencies": {
6464
"@opentelemetry/core": "^1.8.0",
65-
"@opentelemetry/instrumentation": "^0.34.0",
65+
"@opentelemetry/instrumentation": "^0.35.1",
6666
"@opentelemetry/semantic-conventions": "^1.0.0"
6767
},
6868
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-mongoose#readme"

‎plugins/node/instrumentation-socket.io/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"typescript": "4.3.5"
6060
},
6161
"dependencies": {
62-
"@opentelemetry/instrumentation": "^0.34.0",
62+
"@opentelemetry/instrumentation": "^0.35.1",
6363
"@opentelemetry/semantic-conventions": "^1.0.0"
6464
},
6565
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io#readme"

‎plugins/node/instrumentation-tedious/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"typescript": "4.3.5"
6464
},
6565
"dependencies": {
66-
"@opentelemetry/instrumentation": "^0.34.0",
66+
"@opentelemetry/instrumentation": "^0.35.1",
6767
"@opentelemetry/semantic-conventions": "^1.0.0",
6868
"@types/tedious": "^4.0.6"
6969
},

‎plugins/node/opentelemetry-instrumentation-aws-lambda/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"typescript": "4.3.5"
6060
},
6161
"dependencies": {
62-
"@opentelemetry/instrumentation": "^0.32.0",
62+
"@opentelemetry/instrumentation": "^0.35.1",
6363
"@opentelemetry/propagator-aws-xray": "^1.1.1",
6464
"@opentelemetry/resources": "^1.8.0",
6565
"@opentelemetry/semantic-conventions": "^1.0.0",

‎plugins/node/opentelemetry-instrumentation-aws-sdk/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
},
4848
"dependencies": {
4949
"@opentelemetry/core": "^1.8.0",
50-
"@opentelemetry/instrumentation": "^0.34.0",
50+
"@opentelemetry/instrumentation": "^0.35.1",
5151
"@opentelemetry/semantic-conventions": "^1.0.0",
5252
"@opentelemetry/propagation-utils": "^0.29.1"
5353
},

‎plugins/node/opentelemetry-instrumentation-bunyan/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"typescript": "4.3.5"
6666
},
6767
"dependencies": {
68-
"@opentelemetry/instrumentation": "^0.34.0",
68+
"@opentelemetry/instrumentation": "^0.35.1",
6969
"@types/bunyan": "1.8.7"
7070
},
7171
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan#readme"

‎plugins/node/opentelemetry-instrumentation-cassandra/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"typescript": "4.3.5"
6666
},
6767
"dependencies": {
68-
"@opentelemetry/instrumentation": "^0.34.0",
68+
"@opentelemetry/instrumentation": "^0.35.1",
6969
"@opentelemetry/semantic-conventions": "^1.0.0"
7070
},
7171
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-cassandra#readme"

‎plugins/node/opentelemetry-instrumentation-connect/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
},
6161
"dependencies": {
6262
"@opentelemetry/core": "^1.8.0",
63-
"@opentelemetry/instrumentation": "^0.34.0",
63+
"@opentelemetry/instrumentation": "^0.35.1",
6464
"@opentelemetry/semantic-conventions": "^1.0.0",
6565
"@types/connect": "3.4.35"
6666
},

‎plugins/node/opentelemetry-instrumentation-dns/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"typescript": "4.3.5"
6464
},
6565
"dependencies": {
66-
"@opentelemetry/instrumentation": "^0.34.0",
66+
"@opentelemetry/instrumentation": "^0.35.1",
6767
"@opentelemetry/semantic-conventions": "^1.0.0",
6868
"semver": "^7.3.2"
6969
},

‎plugins/node/opentelemetry-instrumentation-express/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
},
6868
"dependencies": {
6969
"@opentelemetry/core": "^1.8.0",
70-
"@opentelemetry/instrumentation": "^0.34.0",
70+
"@opentelemetry/instrumentation": "^0.35.1",
7171
"@opentelemetry/semantic-conventions": "^1.0.0",
7272
"@types/express": "4.17.13"
7373
},

‎plugins/node/opentelemetry-instrumentation-fastify/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@fastify/express": "^2.0.2",
4949
"@opentelemetry/api": "^1.3.0",
5050
"@opentelemetry/context-async-hooks": "^1.8.0",
51-
"@opentelemetry/instrumentation-http": "0.34.0",
51+
"@opentelemetry/instrumentation-http": "0.35.1",
5252
"@opentelemetry/sdk-trace-base": "^1.8.0",
5353
"@opentelemetry/sdk-trace-node": "^1.8.0",
5454
"@types/express": "4.17.13",
@@ -64,7 +64,7 @@
6464
},
6565
"dependencies": {
6666
"@opentelemetry/core": "^1.8.0",
67-
"@opentelemetry/instrumentation": "^0.34.0",
67+
"@opentelemetry/instrumentation": "^0.35.1",
6868
"@opentelemetry/semantic-conventions": "^1.0.0"
6969
},
7070
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify#readme"

‎plugins/node/opentelemetry-instrumentation-fastify/test/instrumentation.test.ts

+13-13
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ describe('fastify', () => {
146146

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

169169
const spans = memoryExporter.getFinishedSpans();
170170
assert.strictEqual(spans.length, 5);
171-
const span = spans[3];
171+
const span = spans[2];
172172
assert.deepStrictEqual(span.attributes, {
173173
'fastify.type': 'request_handler',
174174
'fastify.name': 'namedHandler',
@@ -220,11 +220,11 @@ describe('fastify', () => {
220220
const spans = memoryExporter.getFinishedSpans();
221221

222222
assert.strictEqual(spans.length, 6);
223-
const changedRootSpan = spans[2];
224-
const span = spans[4];
223+
const changedRootSpan = spans[4];
224+
const span = spans[3];
225225
assert.strictEqual(changedRootSpan.name, 'GET /test/:id');
226226
assert.strictEqual(span.name, 'request handler - foo');
227-
assert.strictEqual(span.parentSpanId, spans[3].spanContext().spanId);
227+
assert.strictEqual(span.parentSpanId, spans[2].spanContext().spanId);
228228
});
229229

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

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

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

282282
assert.strictEqual(spans.length, 6);
283-
const span = spans[2];
283+
const span = spans[4];
284284
assert.strictEqual(span.attributes['http.route'], '/test/:id');
285285
});
286286

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

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

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

455455
const spans = memoryExporter.getFinishedSpans();
456456
assert.strictEqual(spans.length, 5);
457-
const span = spans[3];
457+
const span = spans[2];
458458
assert.deepStrictEqual(span.attributes, {
459459
'fastify.type': 'request_handler',
460460
'plugin.name': 'fastify -> @fastify/express',
@@ -487,7 +487,7 @@ describe('fastify', () => {
487487

488488
const spans = memoryExporter.getFinishedSpans();
489489
assert.strictEqual(spans.length, 5);
490-
const span = spans[3];
490+
const span = spans[2];
491491
assert.deepStrictEqual(span.attributes, {
492492
'fastify.type': 'request_handler',
493493
'plugin.name': 'fastify -> @fastify/express',

‎plugins/node/opentelemetry-instrumentation-generic-pool/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"typescript": "4.3.5"
6363
},
6464
"dependencies": {
65-
"@opentelemetry/instrumentation": "^0.34.0",
65+
"@opentelemetry/instrumentation": "^0.35.1",
6666
"@opentelemetry/semantic-conventions": "^1.0.0",
6767
"@types/generic-pool": "^3.1.9"
6868
},

‎plugins/node/opentelemetry-instrumentation-graphql/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"typescript": "4.3.5"
6363
},
6464
"dependencies": {
65-
"@opentelemetry/instrumentation": "^0.34.0"
65+
"@opentelemetry/instrumentation": "^0.35.1"
6666
},
6767
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql#readme"
6868
}

‎plugins/node/opentelemetry-instrumentation-hapi/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
},
6262
"dependencies": {
6363
"@opentelemetry/core": "^1.8.0",
64-
"@opentelemetry/instrumentation": "^0.34.0",
64+
"@opentelemetry/instrumentation": "^0.35.1",
6565
"@opentelemetry/semantic-conventions": "^1.0.0",
6666
"@types/hapi__hapi": "20.0.9"
6767
},

‎plugins/node/opentelemetry-instrumentation-ioredis/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"typescript": "4.3.5"
7171
},
7272
"dependencies": {
73-
"@opentelemetry/instrumentation": "^0.34.0",
73+
"@opentelemetry/instrumentation": "^0.35.1",
7474
"@opentelemetry/redis-common": "^0.34.0",
7575
"@opentelemetry/semantic-conventions": "^1.0.0",
7676
"@types/ioredis": "4.26.6"

‎plugins/node/opentelemetry-instrumentation-knex/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"typescript": "4.3.5"
6262
},
6363
"dependencies": {
64-
"@opentelemetry/instrumentation": "^0.34.0",
64+
"@opentelemetry/instrumentation": "^0.35.1",
6565
"@opentelemetry/semantic-conventions": "^1.0.0"
6666
},
6767
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-knex#readme"

‎plugins/node/opentelemetry-instrumentation-koa/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
},
7070
"dependencies": {
7171
"@opentelemetry/core": "^1.8.0",
72-
"@opentelemetry/instrumentation": "^0.34.0",
72+
"@opentelemetry/instrumentation": "^0.35.1",
7373
"@opentelemetry/semantic-conventions": "^1.0.0",
7474
"@types/koa": "2.13.4",
7575
"@types/koa__router": "8.0.7"

‎plugins/node/opentelemetry-instrumentation-memcached/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"typescript": "4.3.5"
6565
},
6666
"dependencies": {
67-
"@opentelemetry/instrumentation": "^0.34.0",
67+
"@opentelemetry/instrumentation": "^0.35.1",
6868
"@opentelemetry/semantic-conventions": "^1.0.0",
6969
"@types/memcached": "^2.2.6"
7070
},

‎plugins/node/opentelemetry-instrumentation-mongodb/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"typescript": "4.3.5"
6969
},
7070
"dependencies": {
71-
"@opentelemetry/instrumentation": "^0.34.0",
71+
"@opentelemetry/instrumentation": "^0.35.1",
7272
"@opentelemetry/semantic-conventions": "^1.0.0"
7373
},
7474
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mongodb#readme"

‎plugins/node/opentelemetry-instrumentation-mysql/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"typescript": "4.3.5"
6464
},
6565
"dependencies": {
66-
"@opentelemetry/instrumentation": "^0.34.0",
66+
"@opentelemetry/instrumentation": "^0.35.1",
6767
"@opentelemetry/semantic-conventions": "^1.0.0",
6868
"mysql": "2.18.1",
6969
"@types/mysql": "2.15.19"

‎plugins/node/opentelemetry-instrumentation-mysql2/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"typescript": "4.3.5"
6767
},
6868
"dependencies": {
69-
"@opentelemetry/instrumentation": "^0.34.0",
69+
"@opentelemetry/instrumentation": "^0.35.1",
7070
"@opentelemetry/semantic-conventions": "^1.0.0"
7171
},
7272
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mysql2#readme"

0 commit comments

Comments
 (0)