Skip to content

Commit cff3a1c

Browse files
committed
Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-js-contrib into bedrock-metrics
2 parents 8fe002a + 41d0d4b commit cff3a1c

34 files changed

+980
-144
lines changed

.github/component-label-map.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,11 @@ pkg:instrumentation-ioredis:
131131
- plugins/node/opentelemetry-instrumentation-ioredis/**
132132
- packages/opentelemetry-test-utils/**
133133
- packages/opentelemetry-redis-common/**
134+
pkg:instrumentation-kafkajs:
135+
- changed-files:
136+
- any-glob-to-any-file:
137+
- plugins/node/instrumentation-kafkajs/**
138+
- packages/opentelemetry-test-utils/**
134139
pkg:instrumentation-knex:
135140
- changed-files:
136141
- any-glob-to-any-file:

.release-please-manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"detectors/node/opentelemetry-resource-detector-github": "0.31.0",
88
"detectors/node/opentelemetry-resource-detector-instana": "0.19.0",
99
"metapackages/auto-configuration-propagators": "0.4.0",
10-
"metapackages/auto-instrumentations-node": "0.57.1",
10+
"metapackages/auto-instrumentations-node": "0.58.0",
1111
"metapackages/auto-instrumentations-web": "0.46.0",
1212
"packages/baggage-span-processor": "0.4.0",
1313
"packages/baggage-log-record-processor": "0.1.0",
@@ -22,10 +22,10 @@
2222
"plugins/node/instrumentation-cucumber": "0.15.0",
2323
"plugins/node/instrumentation-dataloader": "0.17.0",
2424
"plugins/node/instrumentation-fs": "0.20.0",
25-
"plugins/node/instrumentation-kafkajs": "0.9.0",
25+
"plugins/node/instrumentation-kafkajs": "0.9.1",
2626
"plugins/node/instrumentation-lru-memoizer": "0.45.0",
2727
"plugins/node/instrumentation-mongoose": "0.47.0",
28-
"plugins/node/instrumentation-runtime-node": "0.13.0",
28+
"plugins/node/instrumentation-runtime-node": "0.14.0",
2929
"plugins/node/instrumentation-socket.io": "0.47.0",
3030
"plugins/node/instrumentation-tedious": "0.19.0",
3131
"plugins/node/instrumentation-undici": "0.11.0",
@@ -35,7 +35,7 @@
3535
"plugins/node/opentelemetry-instrumentation-cassandra": "0.46.0",
3636
"plugins/node/opentelemetry-instrumentation-connect": "0.44.0",
3737
"plugins/node/opentelemetry-instrumentation-dns": "0.44.0",
38-
"plugins/node/opentelemetry-instrumentation-express": "0.48.0",
38+
"plugins/node/opentelemetry-instrumentation-express": "0.48.1",
3939
"plugins/node/opentelemetry-instrumentation-fastify": "0.45.0",
4040
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.44.0",
4141
"plugins/node/opentelemetry-instrumentation-graphql": "0.48.0",

metapackages/auto-instrumentations-node/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Changelog
22

3+
## [0.58.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.57.1...auto-instrumentations-node-v0.58.0) (2025-04-16)
4+
5+
6+
### Features
7+
8+
* **auto-instrumentations-node:** enable runtime-node ([#2786](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2786)) ([f637c87](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/f637c8729ac6899f3a87aac93e555fd42d46ab71))
9+
10+
11+
### Dependencies
12+
13+
* The following workspace dependencies were updated
14+
* dependencies
15+
* @opentelemetry/instrumentation-express bumped from ^0.48.0 to ^0.48.1
16+
* @opentelemetry/instrumentation-kafkajs bumped from ^0.9.0 to ^0.9.1
17+
* @opentelemetry/instrumentation-runtime-node bumped from ^0.13.0 to ^0.14.0
18+
319
## [0.57.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.57.0...auto-instrumentations-node-v0.57.1) (2025-04-08)
420

521

metapackages/auto-instrumentations-node/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ registerInstrumentations({
197197
- [@opentelemetry/instrumentation-pino](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-pino)
198198
- [@opentelemetry/instrumentation-redis](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-redis)
199199
- [@opentelemetry/instrumentation-restify](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-restify)
200+
- [@opentelemetry/instrumentation-runtime-node](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-runtime-node)
200201
- [@opentelemetry/instrumentation-socket.io](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io)
201202
- [@opentelemetry/instrumentation-undici](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-undici)
202203
- [@opentelemetry/instrumentation-winston](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-winston)

metapackages/auto-instrumentations-node/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/auto-instrumentations-node",
3-
"version": "0.57.1",
3+
"version": "0.58.0",
44
"description": "Metapackage which bundles opentelemetry node core and contrib instrumentations",
55
"author": "OpenTelemetry Authors",
66
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-node#readme",
@@ -58,7 +58,7 @@
5858
"@opentelemetry/instrumentation-cucumber": "^0.15.0",
5959
"@opentelemetry/instrumentation-dataloader": "^0.17.0",
6060
"@opentelemetry/instrumentation-dns": "^0.44.0",
61-
"@opentelemetry/instrumentation-express": "^0.48.0",
61+
"@opentelemetry/instrumentation-express": "^0.48.1",
6262
"@opentelemetry/instrumentation-fastify": "^0.45.0",
6363
"@opentelemetry/instrumentation-fs": "^0.20.0",
6464
"@opentelemetry/instrumentation-generic-pool": "^0.44.0",
@@ -67,7 +67,7 @@
6767
"@opentelemetry/instrumentation-hapi": "^0.46.0",
6868
"@opentelemetry/instrumentation-http": "^0.200.0",
6969
"@opentelemetry/instrumentation-ioredis": "^0.48.0",
70-
"@opentelemetry/instrumentation-kafkajs": "^0.9.0",
70+
"@opentelemetry/instrumentation-kafkajs": "^0.9.1",
7171
"@opentelemetry/instrumentation-knex": "^0.45.0",
7272
"@opentelemetry/instrumentation-koa": "^0.48.0",
7373
"@opentelemetry/instrumentation-lru-memoizer": "^0.45.0",
@@ -84,6 +84,7 @@
8484
"@opentelemetry/instrumentation-redis-4": "^0.47.0",
8585
"@opentelemetry/instrumentation-restify": "^0.46.0",
8686
"@opentelemetry/instrumentation-router": "^0.45.0",
87+
"@opentelemetry/instrumentation-runtime-node": "^0.14.0",
8788
"@opentelemetry/instrumentation-socket.io": "^0.47.0",
8889
"@opentelemetry/instrumentation-tedious": "^0.19.0",
8990
"@opentelemetry/instrumentation-undici": "^0.11.0",

metapackages/auto-instrumentations-node/src/utils.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import { RedisInstrumentation as RedisInstrumentationV2 } from '@opentelemetry/i
5252
import { RedisInstrumentation as RedisInstrumentationV4 } from '@opentelemetry/instrumentation-redis-4';
5353
import { RestifyInstrumentation } from '@opentelemetry/instrumentation-restify';
5454
import { RouterInstrumentation } from '@opentelemetry/instrumentation-router';
55+
import { RuntimeNodeInstrumentation } from '@opentelemetry/instrumentation-runtime-node';
5556
import { SocketIoInstrumentation } from '@opentelemetry/instrumentation-socket.io';
5657
import { TediousInstrumentation } from '@opentelemetry/instrumentation-tedious';
5758
import { UndiciInstrumentation } from '@opentelemetry/instrumentation-undici';
@@ -129,6 +130,7 @@ const InstrumentationMap = {
129130
'@opentelemetry/instrumentation-redis-4': RedisInstrumentationV4,
130131
'@opentelemetry/instrumentation-restify': RestifyInstrumentation,
131132
'@opentelemetry/instrumentation-router': RouterInstrumentation,
133+
'@opentelemetry/instrumentation-runtime-node': RuntimeNodeInstrumentation,
132134
'@opentelemetry/instrumentation-socket.io': SocketIoInstrumentation,
133135
'@opentelemetry/instrumentation-tedious': TediousInstrumentation,
134136
'@opentelemetry/instrumentation-undici': UndiciInstrumentation,

nx.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
"^compile"
1919
],
2020
"inputs": [
21-
"{projectRoot}/src",
22-
"{projectRoot}/test"
21+
"{projectRoot}/src/**/*.ts",
22+
"{projectRoot}/test/**/*.ts"
2323
],
2424
"outputs": [
2525
"{projectRoot}/build"
2626
]
2727
},
2828
"lint": {
2929
"inputs": [
30-
"{projectRoot}/src",
31-
"{projectRoot}/test"
30+
"{projectRoot}/src/**/*.ts",
31+
"{projectRoot}/test/**/*.ts"
3232
]
3333
},
3434
"version:update": {

0 commit comments

Comments
 (0)