Skip to content

Commit 53585cb

Browse files
deejay1deejay1
authored
Merge branch 'main' into knex-semantic-conventions
2 parents aef24d6 + f6bc4cc commit 53585cb

File tree

145 files changed

+14938
-10299
lines changed

Some content is hidden

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

145 files changed

+14938
-10299
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: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ components:
7272
- mottibec
7373
plugins/node/instrumentation-tedious: []
7474
# Unmaintained
75+
plugins/node/instrumentation-typeorm:
76+
- seemk
77+
- weyert
78+
- t2t2
79+
- mhennoch
7580
plugins/node/opentelemetry-instrumentation-aws-lambda:
7681
- jj22ee
7782
plugins/node/opentelemetry-instrumentation-aws-sdk:
@@ -118,6 +123,9 @@ components:
118123
# Unmaintained
119124
plugins/node/opentelemetry-instrumentation-net:
120125
- seemk
126+
plugins/node/opentelemetry-instrumentation-oracledb:
127+
- sudarshan12s
128+
- sharadraju
121129
plugins/node/instrumentation-runtime-node:
122130
- d4nyll
123131
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: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"detectors/node/opentelemetry-resource-detector-gcp": "0.34.0",
77
"detectors/node/opentelemetry-resource-detector-github": "0.31.0",
88
"detectors/node/opentelemetry-resource-detector-instana": "0.19.0",
9-
"metapackages/auto-configuration-propagators": "0.4.0",
10-
"metapackages/auto-instrumentations-node": "0.57.1",
9+
"metapackages/auto-configuration-propagators": "0.4.1",
10+
"metapackages/auto-instrumentations-node": "0.58.1",
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,20 +22,21 @@
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.2",
2626
"plugins/node/instrumentation-lru-memoizer": "0.45.0",
27-
"plugins/node/instrumentation-mongoose": "0.47.0",
28-
"plugins/node/instrumentation-runtime-node": "0.13.0",
27+
"plugins/node/instrumentation-mongoose": "0.47.1",
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",
31+
"plugins/node/instrumentation-typeorm": "0.1.0",
3132
"plugins/node/instrumentation-undici": "0.11.0",
32-
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.51.0",
33-
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.51.0",
33+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.51.1",
34+
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.52.0",
3435
"plugins/node/opentelemetry-instrumentation-bunyan": "0.46.0",
3536
"plugins/node/opentelemetry-instrumentation-cassandra": "0.46.0",
3637
"plugins/node/opentelemetry-instrumentation-connect": "0.44.0",
3738
"plugins/node/opentelemetry-instrumentation-dns": "0.44.0",
38-
"plugins/node/opentelemetry-instrumentation-express": "0.48.0",
39+
"plugins/node/opentelemetry-instrumentation-express": "0.49.0",
3940
"plugins/node/opentelemetry-instrumentation-fastify": "0.45.0",
4041
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.44.0",
4142
"plugins/node/opentelemetry-instrumentation-graphql": "0.48.0",
@@ -49,6 +50,7 @@
4950
"plugins/node/opentelemetry-instrumentation-mysql2": "0.46.0",
5051
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.46.0",
5152
"plugins/node/opentelemetry-instrumentation-net": "0.44.0",
53+
"plugins/node/opentelemetry-instrumentation-oracledb": "0.26.0",
5254
"plugins/node/opentelemetry-instrumentation-pg": "0.52.0",
5355
"plugins/node/opentelemetry-instrumentation-pino": "0.47.0",
5456
"plugins/node/opentelemetry-instrumentation-redis": "0.47.0",
@@ -62,6 +64,6 @@
6264
"plugins/web/opentelemetry-plugin-react-load": "0.32.0",
6365
"propagators/opentelemetry-propagator-instana": "0.4.0",
6466
"propagators/opentelemetry-propagator-ot-trace": "0.28.0",
65-
"propagators/propagator-aws-xray": "2.0.0",
66-
"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"
6769
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@types/node": "18.18.14",
5050
"@types/sinon": "17.0.4",
5151
"nock": "13.3.3",
52-
"nyc": "15.1.0",
52+
"nyc": "17.1.0",
5353
"rimraf": "5.0.10",
5454
"sinon": "15.2.0",
5555
"typescript": "5.0.4"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@types/node": "18.18.14",
5151
"@types/sinon": "17.0.4",
5252
"nock": "13.3.3",
53-
"nyc": "15.1.0",
53+
"nyc": "17.1.0",
5454
"rimraf": "5.0.10",
5555
"sinon": "15.2.0",
5656
"typescript": "5.0.4"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@types/node": "18.18.14",
4343
"@types/sinon": "17.0.4",
4444
"nock": "13.3.3",
45-
"nyc": "15.1.0",
45+
"nyc": "17.1.0",
4646
"rimraf": "5.0.10",
4747
"typescript": "5.0.4"
4848
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@types/sinon": "17.0.4",
4545
"eslint-plugin-header": "^3.1.1",
4646
"nock": "13.3.3",
47-
"nyc": "15.1.0",
47+
"nyc": "17.1.0",
4848
"rimraf": "5.0.10",
4949
"sinon": "15.2.0",
5050
"typescript": "5.0.4"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@types/node": "18.18.14",
5050
"@types/semver": "7.5.8",
5151
"nock": "13.3.3",
52-
"nyc": "15.1.0",
52+
"nyc": "17.1.0",
5353
"rimraf": "5.0.10",
5454
"typescript": "5.0.4"
5555
},

0 commit comments

Comments
 (0)