Skip to content

Commit bdb324b

Browse files
hectorhdzghectorhdzg
authored
Merge branch 'main' into hectorhdzg/reviewpr
2 parents e468a6c + 55cc256 commit bdb324b

File tree

199 files changed

+11533
-5505
lines changed

Some content is hidden

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

199 files changed

+11533
-5505
lines changed

‎.github/component-label-map.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,11 @@ pkg:instrumentation-net:
188188
- changed-files:
189189
- any-glob-to-any-file:
190190
- plugins/node/opentelemetry-instrumentation-net/**
191+
pkg:instrumentation-oracledb:
192+
- changed-files:
193+
- any-glob-to-any-file:
194+
- plugins/node/opentelemetry-instrumentation-oracledb/**
195+
- packages/opentelemetry-test-utils/**
191196
pkg:instrumentation-pg:
192197
- changed-files:
193198
- any-glob-to-any-file:

‎.github/component_owners.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ components:
123123
# Unmaintained
124124
plugins/node/opentelemetry-instrumentation-net:
125125
- seemk
126+
plugins/node/opentelemetry-instrumentation-oracledb:
127+
- sudarshan12s
128+
- sharadraju
126129
plugins/node/instrumentation-runtime-node:
127130
- d4nyll
128131
plugins/node/opentelemetry-instrumentation-pg:

‎.github/workflows/test-all-versions.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,19 @@ jobs:
8080
--health-interval 10s
8181
--health-timeout 5s
8282
--health-retries 5
83+
oracledb:
84+
image: gvenzl/oracle-free:slim
85+
env:
86+
APP_USER: otel
87+
APP_USER_PASSWORD: secret
88+
ORACLE_PASSWORD: oracle
89+
ports:
90+
- 1521:1521
91+
options: >-
92+
--health-cmd "sqlplus system/oracle@//localhost/FREEPDB1"
93+
--health-interval 10s
94+
--health-timeout 5s
95+
--health-retries 5
8396
postgres:
8497
image: postgres:16-alpine
8598
env:
@@ -122,6 +135,12 @@ jobs:
122135
MYSQL_USER: otel
123136
OPENTELEMETRY_REDIS_HOST: localhost
124137
OPENTELEMETRY_REDIS_PORT: 6379
138+
ORACLE_HOSTNAME: localhost
139+
ORACLE_PORT: 1521
140+
ORACLE_CONNECTSTRING: localhost:1521/freepdb1
141+
ORACLE_USER: otel
142+
ORACLE_PASSWORD: secret
143+
ORACLE_SERVICENAME: FREEPDB1
125144
POSTGRES_DB: otel_pg_database
126145
POSTGRES_HOST: localhost
127146
POSTGRES_PORT: 5432
@@ -130,6 +149,7 @@ jobs:
130149
RUN_MONGODB_TESTS: 1
131150
RUN_MSSQL_TESTS: 1
132151
RUN_MYSQL_TESTS: 1
152+
RUN_ORACLEDB_TESTS: 1
133153
RUN_POSTGRES_TESTS: 1
134154
RUN_REDIS_TESTS: 1
135155
NPM_CONFIG_UNSAFE_PERM: true

‎.github/workflows/unit-test.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,19 @@ jobs:
8383
--health-interval 10s
8484
--health-timeout 5s
8585
--health-retries 5
86+
oracledb:
87+
image: gvenzl/oracle-free:slim
88+
env:
89+
APP_USER: otel
90+
APP_USER_PASSWORD: secret
91+
ORACLE_PASSWORD: oracle
92+
ports:
93+
- 1521:1521
94+
options: >-
95+
--health-cmd "sqlplus system/oracle@//localhost/FREEPDB1"
96+
--health-interval 10s
97+
--health-timeout 5s
98+
--health-retries 5
8699
postgres:
87100
image: postgres:16-alpine
88101
env:
@@ -122,6 +135,7 @@ jobs:
122135
RUN_MONGODB_TESTS: 1
123136
RUN_MYSQL_TESTS: 1
124137
RUN_MSSQL_TESTS: 1
138+
RUN_ORACLEDB_TESTS: 1
125139
RUN_POSTGRES_TESTS: 1
126140
RUN_REDIS_TESTS: 1
127141
RUN_RABBIT_TESTS: 1
@@ -140,6 +154,12 @@ jobs:
140154
OPENTELEMETRY_MEMCACHED_PORT: 11211
141155
OPENTELEMETRY_REDIS_HOST: localhost
142156
OPENTELEMETRY_REDIS_PORT: 6379
157+
ORACLE_HOSTNAME: localhost
158+
ORACLE_PORT: 1521
159+
ORACLE_CONNECTSTRING: localhost:1521/freepdb1
160+
ORACLE_USER: otel
161+
ORACLE_PASSWORD: secret
162+
ORACLE_SERVICENAME: FREEPDB1
143163
POSTGRES_DB: otel_pg_database
144164
POSTGRES_HOST: localhost
145165
POSTGRES_PORT: 5432

‎.release-please-manifest.json‎

Lines changed: 59 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,69 @@
11
{
2-
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.31.0",
3-
"detectors/node/opentelemetry-resource-detector-aws": "2.0.0",
4-
"detectors/node/opentelemetry-resource-detector-azure": "0.7.0",
5-
"detectors/node/opentelemetry-resource-detector-container": "0.7.0",
6-
"detectors/node/opentelemetry-resource-detector-gcp": "0.34.0",
2+
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.31.1",
3+
"detectors/node/opentelemetry-resource-detector-aws": "2.1.0",
4+
"detectors/node/opentelemetry-resource-detector-azure": "0.8.0",
5+
"detectors/node/opentelemetry-resource-detector-container": "0.7.1",
6+
"detectors/node/opentelemetry-resource-detector-gcp": "0.35.0",
77
"detectors/node/opentelemetry-resource-detector-github": "0.31.0",
8-
"detectors/node/opentelemetry-resource-detector-instana": "0.19.0",
9-
"metapackages/auto-configuration-propagators": "0.4.0",
10-
"metapackages/auto-instrumentations-node": "0.58.0",
11-
"metapackages/auto-instrumentations-web": "0.46.0",
8+
"detectors/node/opentelemetry-resource-detector-instana": "0.20.0",
9+
"metapackages/auto-configuration-propagators": "0.4.1",
10+
"metapackages/auto-instrumentations-node": "0.59.0",
11+
"metapackages/auto-instrumentations-web": "0.47.0",
1212
"packages/baggage-span-processor": "0.4.0",
13-
"packages/baggage-log-record-processor": "0.1.0",
13+
"packages/baggage-log-record-processor": "0.2.0",
1414
"packages/opentelemetry-host-metrics": "0.36.0",
1515
"packages/opentelemetry-id-generator-aws-xray": "2.0.0",
16-
"packages/opentelemetry-propagation-utils": "0.31.0",
16+
"packages/opentelemetry-propagation-utils": "0.31.1",
1717
"packages/opentelemetry-redis-common": "0.37.0",
1818
"packages/opentelemetry-sql-common": "0.41.0",
19-
"packages/opentelemetry-test-utils": "0.46.0",
20-
"packages/winston-transport": "0.11.0",
21-
"plugins/node/instrumentation-amqplib": "0.47.0",
22-
"plugins/node/instrumentation-cucumber": "0.15.0",
23-
"plugins/node/instrumentation-dataloader": "0.17.0",
24-
"plugins/node/instrumentation-fs": "0.20.0",
25-
"plugins/node/instrumentation-kafkajs": "0.9.1",
26-
"plugins/node/instrumentation-lru-memoizer": "0.45.0",
27-
"plugins/node/instrumentation-mongoose": "0.47.0",
28-
"plugins/node/instrumentation-runtime-node": "0.14.0",
29-
"plugins/node/instrumentation-socket.io": "0.47.0",
30-
"plugins/node/instrumentation-tedious": "0.19.0",
31-
"plugins/node/instrumentation-typeorm": "0.0.1",
32-
"plugins/node/instrumentation-undici": "0.11.0",
33-
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.51.0",
34-
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.51.0",
35-
"plugins/node/opentelemetry-instrumentation-bunyan": "0.46.0",
36-
"plugins/node/opentelemetry-instrumentation-cassandra": "0.46.0",
37-
"plugins/node/opentelemetry-instrumentation-connect": "0.44.0",
38-
"plugins/node/opentelemetry-instrumentation-dns": "0.44.0",
39-
"plugins/node/opentelemetry-instrumentation-express": "0.48.1",
40-
"plugins/node/opentelemetry-instrumentation-fastify": "0.45.0",
41-
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.44.0",
42-
"plugins/node/opentelemetry-instrumentation-graphql": "0.48.0",
43-
"plugins/node/opentelemetry-instrumentation-hapi": "0.46.0",
44-
"plugins/node/opentelemetry-instrumentation-ioredis": "0.48.0",
45-
"plugins/node/opentelemetry-instrumentation-knex": "0.45.0",
46-
"plugins/node/opentelemetry-instrumentation-koa": "0.48.0",
47-
"plugins/node/opentelemetry-instrumentation-memcached": "0.44.0",
48-
"plugins/node/opentelemetry-instrumentation-mongodb": "0.53.0",
49-
"plugins/node/opentelemetry-instrumentation-mysql": "0.46.0",
50-
"plugins/node/opentelemetry-instrumentation-mysql2": "0.46.0",
51-
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.46.0",
52-
"plugins/node/opentelemetry-instrumentation-net": "0.44.0",
53-
"plugins/node/opentelemetry-instrumentation-pg": "0.52.0",
54-
"plugins/node/opentelemetry-instrumentation-pino": "0.47.0",
55-
"plugins/node/opentelemetry-instrumentation-redis": "0.47.0",
56-
"plugins/node/opentelemetry-instrumentation-redis-4": "0.47.0",
57-
"plugins/node/opentelemetry-instrumentation-restify": "0.46.0",
58-
"plugins/node/opentelemetry-instrumentation-router": "0.45.0",
59-
"plugins/node/opentelemetry-instrumentation-winston": "0.45.0",
60-
"plugins/web/opentelemetry-instrumentation-document-load": "0.45.0",
61-
"plugins/web/opentelemetry-instrumentation-long-task": "0.45.0",
62-
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.45.0",
63-
"plugins/web/opentelemetry-plugin-react-load": "0.32.0",
19+
"packages/opentelemetry-test-utils": "0.47.0",
20+
"packages/winston-transport": "0.12.0",
21+
"plugins/node/instrumentation-amqplib": "0.48.0",
22+
"plugins/node/instrumentation-cucumber": "0.16.0",
23+
"plugins/node/instrumentation-dataloader": "0.18.0",
24+
"plugins/node/instrumentation-fs": "0.21.0",
25+
"plugins/node/instrumentation-kafkajs": "0.10.0",
26+
"plugins/node/instrumentation-lru-memoizer": "0.46.0",
27+
"plugins/node/instrumentation-mongoose": "0.48.0",
28+
"plugins/node/instrumentation-runtime-node": "0.15.0",
29+
"plugins/node/instrumentation-socket.io": "0.48.0",
30+
"plugins/node/instrumentation-tedious": "0.20.0",
31+
"plugins/node/instrumentation-typeorm": "0.2.0",
32+
"plugins/node/instrumentation-undici": "0.12.0",
33+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.52.0",
34+
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.53.0",
35+
"plugins/node/opentelemetry-instrumentation-bunyan": "0.47.0",
36+
"plugins/node/opentelemetry-instrumentation-cassandra": "0.47.0",
37+
"plugins/node/opentelemetry-instrumentation-connect": "0.45.0",
38+
"plugins/node/opentelemetry-instrumentation-dns": "0.45.0",
39+
"plugins/node/opentelemetry-instrumentation-express": "0.50.0",
40+
"plugins/node/opentelemetry-instrumentation-fastify": "0.46.0",
41+
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.45.0",
42+
"plugins/node/opentelemetry-instrumentation-graphql": "0.49.0",
43+
"plugins/node/opentelemetry-instrumentation-hapi": "0.47.0",
44+
"plugins/node/opentelemetry-instrumentation-ioredis": "0.49.0",
45+
"plugins/node/opentelemetry-instrumentation-knex": "0.46.0",
46+
"plugins/node/opentelemetry-instrumentation-koa": "0.49.0",
47+
"plugins/node/opentelemetry-instrumentation-memcached": "0.45.0",
48+
"plugins/node/opentelemetry-instrumentation-mongodb": "0.54.0",
49+
"plugins/node/opentelemetry-instrumentation-mysql": "0.47.0",
50+
"plugins/node/opentelemetry-instrumentation-mysql2": "0.47.0",
51+
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.47.0",
52+
"plugins/node/opentelemetry-instrumentation-net": "0.45.0",
53+
"plugins/node/opentelemetry-instrumentation-oracledb": "0.27.0",
54+
"plugins/node/opentelemetry-instrumentation-pg": "0.53.0",
55+
"plugins/node/opentelemetry-instrumentation-pino": "0.48.0",
56+
"plugins/node/opentelemetry-instrumentation-redis": "0.48.0",
57+
"plugins/node/opentelemetry-instrumentation-redis-4": "0.48.0",
58+
"plugins/node/opentelemetry-instrumentation-restify": "0.47.0",
59+
"plugins/node/opentelemetry-instrumentation-router": "0.46.0",
60+
"plugins/node/opentelemetry-instrumentation-winston": "0.46.0",
61+
"plugins/web/opentelemetry-instrumentation-document-load": "0.46.0",
62+
"plugins/web/opentelemetry-instrumentation-long-task": "0.46.0",
63+
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.46.0",
64+
"plugins/web/opentelemetry-plugin-react-load": "0.33.0",
6465
"propagators/opentelemetry-propagator-instana": "0.4.0",
6566
"propagators/opentelemetry-propagator-ot-trace": "0.28.0",
66-
"propagators/propagator-aws-xray": "2.0.0",
67-
"propagators/propagator-aws-xray-lambda": "0.54.0"
67+
"propagators/propagator-aws-xray": "2.1.0",
68+
"propagators/propagator-aws-xray-lambda": "0.55.0"
6869
}

‎README.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# OpenTelemetry JavaScript Contrib
4040

41-
A repository for OpenTelemetry JavaScript contributions that are not part of the [core repository](https://github.com/open-telemetry/opentelemetry-js) and core distribution of the API and the SDK.
41+
A repository for community-maintained OpenTelemetry JavaScript contributions that are not part of the [core repository](https://github.com/open-telemetry/opentelemetry-js) and core distribution of the API and the SDK.
4242

4343
This project includes:
4444

@@ -52,6 +52,19 @@ Please read the [contributing guidelines on adding new instrumentation](CONTRIBU
5252

5353
**Resource Detectors**: OpenTelemetry can collect resource attributes of the entity that producing telemetry. For example, a process producing telemetry that is running in a container on Kubernetes has a Pod name, it is in a namespace and possibly is part of a Deployment which also has a name. All three of these attributes can be included in the `Resource`.
5454

55+
## Component Ownership
56+
57+
This repository includes various components, each maintained by one or more designated component owners. Unless
58+
necessary to resolve disagreements, [@open-telemetry/javascript-maintainers](https://github.com/orgs/open-telemetry/teams/javascript-maintainers)
59+
take a more passive role when it comes to Maintaining these components.
60+
61+
Component owners have the authority to make decisions on implementation and feature requests, following the best practices
62+
and the [mission, vision and values](https://github.com/open-telemetry/community/blob/main/mission-vision-values.md) of the OpenTelemetry Project. They are also assigned the Triager role to manage issues
63+
related to their components, and are the primary contact for conducting PR reviews for their components.
64+
65+
Component owners are automatically assigned to pull requests as reviewers. The source of truth for component ownership
66+
is [.github/component_owners.yml](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml).
67+
5568
## Stability levels
5669

5770
Stability level for components in this repository follow the definitions in [CONTRIBUTING.md](./CONTRIBUTING.md).

‎detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md‎

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

3+
## [0.31.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.31.0...resource-detector-alibaba-cloud-v0.31.1) (2025-05-15)
4+
5+
6+
### Dependencies
7+
8+
* The following workspace dependencies were updated
9+
* devDependencies
10+
* @opentelemetry/contrib-test-utils bumped from ^0.46.0 to ^0.47.0
11+
312
## [0.31.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.30.1...resource-detector-alibaba-cloud-v0.31.0) (2025-03-18)
413

514

‎detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-alibaba-cloud",
3-
"version": "0.31.0",
3+
"version": "0.31.1",
44
"description": "OpenTelemetry resource detector for Alibaba Cloud",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
@@ -43,7 +43,7 @@
4343
},
4444
"devDependencies": {
4545
"@opentelemetry/api": "^1.0.0",
46-
"@opentelemetry/contrib-test-utils": "^0.46.0",
46+
"@opentelemetry/contrib-test-utils": "^0.47.0",
4747
"@opentelemetry/sdk-trace-base": "^2.0.0",
4848
"@types/mocha": "10.0.10",
4949
"@types/node": "18.18.14",

‎detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md‎

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

3+
## [2.1.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v2.0.0...resource-detector-aws-v2.1.0) (2025-05-15)
4+
5+
6+
### Features
7+
8+
* **deps:** update deps matching '@opentelemetry/*' ([#2828](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2828)) ([59c2a4c](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/59c2a4c002992518da2d91b4ceb24f8479ad2346))
9+
10+
11+
### Dependencies
12+
13+
* The following workspace dependencies were updated
14+
* devDependencies
15+
* @opentelemetry/contrib-test-utils bumped from ^0.46.0 to ^0.47.0
16+
* @opentelemetry/instrumentation-fs bumped from ^0.20.0 to ^0.21.0
17+
318
## [2.0.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.12.0...resource-detector-aws-v2.0.0) (2025-03-18)
419

520

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-aws",
3-
"version": "2.0.0",
3+
"version": "2.1.0",
44
"description": "OpenTelemetry SDK resource detector for AWS",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
@@ -42,9 +42,9 @@
4242
},
4343
"devDependencies": {
4444
"@opentelemetry/api": "^1.0.0",
45-
"@opentelemetry/contrib-test-utils": "^0.46.0",
46-
"@opentelemetry/instrumentation-fs": "^0.20.0",
47-
"@opentelemetry/instrumentation-http": "^0.200.0",
45+
"@opentelemetry/contrib-test-utils": "^0.47.0",
46+
"@opentelemetry/instrumentation-fs": "^0.21.0",
47+
"@opentelemetry/instrumentation-http": "^0.201.0",
4848
"@opentelemetry/sdk-trace-base": "^2.0.0",
4949
"@types/mocha": "10.0.10",
5050
"@types/node": "18.18.14",

0 commit comments

Comments
 (0)