Skip to content

Commit 6dfc797

Browse files
trentmtrentm
committed
Merge branch 'main' into dataloader-custom-methods
2 parents 1e71d0d + 2aef158 commit 6dfc797

File tree

387 files changed

+40670
-37406
lines changed

Some content is hidden

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

387 files changed

+40670
-37406
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/peer-api.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
run: npm ci
2020

2121
- name: Check API dependency semantics
22-
run: npx lerna exec "node \$LERNA_ROOT_PATH/scripts/peer-api-check.js"
22+
run: node ./scripts/peer-api-check.js

‎.github/workflows/release-please-validate.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
- name: Checkout
1616
uses: actions/checkout@v4
1717

18-
- name: Install lerna
19-
run: npm install -g [email protected]
18+
- name: Install glob
19+
run: npm install glob
2020

2121
- name: Ensure Release Please Config and Manifest are in sync with the repository
2222
run: node scripts/check-release-please.mjs

‎.github/workflows/release-please.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ jobs:
7474
7575
# Release Please has already incremented versions and published tags, so we just
7676
# need to publish all unpublished versions to npm here
77-
# See: https://github.com/lerna/lerna/tree/main/commands/publish#bump-from-package
77+
# See: https://github.com/lerna/lerna/tree/main/libs/commands/publish#bump-from-package
7878
- name: Publish to npm
7979
# only publish if a release has been created
8080
if: ${{ steps.release.outputs.releases_created }}
8181
env:
8282
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
8383
NPM_CONFIG_PROVENANCE: true
84-
run: npx lerna publish from-package --no-push --no-private --no-git-tag-version --no-verify-access --yes
84+
run: npx lerna publish from-package --no-push --no-private --no-git-tag-version --yes

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

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ jobs:
3737
uses: actions/upload-artifact@v4
3838
with:
3939
name: tav-build-cache-${{ github.run_number }}
40-
path: node_modules/.cache/nx
40+
path: .nx
41+
include-hidden-files: true
42+
if-no-files-found: error
4143
retention-days: 1
4244

4345
tav:
@@ -80,6 +82,19 @@ jobs:
8082
--health-interval 10s
8183
--health-timeout 5s
8284
--health-retries 5
85+
oracledb:
86+
image: gvenzl/oracle-free:slim
87+
env:
88+
APP_USER: otel
89+
APP_USER_PASSWORD: secret
90+
ORACLE_PASSWORD: oracle
91+
ports:
92+
- 1521:1521
93+
options: >-
94+
--health-cmd "sqlplus system/oracle@//localhost/FREEPDB1"
95+
--health-interval 10s
96+
--health-timeout 5s
97+
--health-retries 5
8398
postgres:
8499
image: postgres:16-alpine
85100
env:
@@ -122,6 +137,12 @@ jobs:
122137
MYSQL_USER: otel
123138
OPENTELEMETRY_REDIS_HOST: localhost
124139
OPENTELEMETRY_REDIS_PORT: 6379
140+
ORACLE_HOSTNAME: localhost
141+
ORACLE_PORT: 1521
142+
ORACLE_CONNECTSTRING: localhost:1521/freepdb1
143+
ORACLE_USER: otel
144+
ORACLE_PASSWORD: secret
145+
ORACLE_SERVICENAME: FREEPDB1
125146
POSTGRES_DB: otel_pg_database
126147
POSTGRES_HOST: localhost
127148
POSTGRES_PORT: 5432
@@ -130,6 +151,7 @@ jobs:
130151
RUN_MONGODB_TESTS: 1
131152
RUN_MSSQL_TESTS: 1
132153
RUN_MYSQL_TESTS: 1
154+
RUN_ORACLEDB_TESTS: 1
133155
RUN_POSTGRES_TESTS: 1
134156
RUN_REDIS_TESTS: 1
135157
NPM_CONFIG_UNSAFE_PERM: true
@@ -141,15 +163,13 @@ jobs:
141163
- uses: actions/setup-node@v4
142164
with:
143165
node-version: ${{ matrix.node }}
144-
- name: Set MySQL variables
145-
run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql
146166
- name: Install
147167
run: npm ci
148168
- name: Download Build Artifacts
149169
uses: actions/download-artifact@v4
150170
with:
151171
name: tav-build-cache-${{ github.run_number }}
152-
path: node_modules/.cache/nx
172+
path: .nx
153173
- name: Build
154174
run: npm run compile
155175
- name: Run test-all-versions

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

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@ jobs:
2525
run: npm ci
2626
- name: Build
2727
run: npm run compile
28-
- name: Upload build artifact
28+
- name: Upload Build Artifacts
2929
uses: actions/upload-artifact@v4
3030
with:
3131
name: tests-build-cache-${{ github.run_number }}
32-
path: node_modules/.cache/nx
32+
path: .nx
33+
include-hidden-files: true
34+
if-no-files-found: error
3335
retention-days: 1
3436

3537
unit-test:
@@ -83,6 +85,19 @@ jobs:
8385
--health-interval 10s
8486
--health-timeout 5s
8587
--health-retries 5
88+
oracledb:
89+
image: gvenzl/oracle-free:slim
90+
env:
91+
APP_USER: otel
92+
APP_USER_PASSWORD: secret
93+
ORACLE_PASSWORD: oracle
94+
ports:
95+
- 1521:1521
96+
options: >-
97+
--health-cmd "sqlplus system/oracle@//localhost/FREEPDB1"
98+
--health-interval 10s
99+
--health-timeout 5s
100+
--health-retries 5
86101
postgres:
87102
image: postgres:16-alpine
88103
env:
@@ -122,6 +137,7 @@ jobs:
122137
RUN_MONGODB_TESTS: 1
123138
RUN_MYSQL_TESTS: 1
124139
RUN_MSSQL_TESTS: 1
140+
RUN_ORACLEDB_TESTS: 1
125141
RUN_POSTGRES_TESTS: 1
126142
RUN_REDIS_TESTS: 1
127143
RUN_RABBIT_TESTS: 1
@@ -140,6 +156,12 @@ jobs:
140156
OPENTELEMETRY_MEMCACHED_PORT: 11211
141157
OPENTELEMETRY_REDIS_HOST: localhost
142158
OPENTELEMETRY_REDIS_PORT: 6379
159+
ORACLE_HOSTNAME: localhost
160+
ORACLE_PORT: 1521
161+
ORACLE_CONNECTSTRING: localhost:1521/freepdb1
162+
ORACLE_USER: otel
163+
ORACLE_PASSWORD: secret
164+
ORACLE_SERVICENAME: FREEPDB1
143165
POSTGRES_DB: otel_pg_database
144166
POSTGRES_HOST: localhost
145167
POSTGRES_PORT: 5432
@@ -154,15 +176,13 @@ jobs:
154176
- uses: actions/setup-node@v4
155177
with:
156178
node-version: ${{ matrix.node }}
157-
- name: Set MySQL variables
158-
run: mysql --user=root --password=${MYSQL_ROOT_PASSWORD} --host=${MYSQL_HOST} --port=${MYSQL_PORT} -e "SET GLOBAL log_output='TABLE'; SET GLOBAL general_log = 1;" mysql
159179
- name: Install
160180
run: npm ci
161181
- name: Download Build Artifacts
162182
uses: actions/download-artifact@v4
163183
with:
164184
name: tests-build-cache-${{ github.run_number }}
165-
path: node_modules/.cache/nx
185+
path: .nx
166186
- name: Build
167187
run: npm run compile
168188
- name: Unit tests (Full)
@@ -203,7 +223,7 @@ jobs:
203223
uses: actions/download-artifact@v4
204224
with:
205225
name: tests-build-cache-${{ github.run_number }}
206-
path: node_modules/.cache/nx
226+
path: .nx
207227
- name: Build
208228
run: npm run compile
209229
- name: Unit tests

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ docs
6969

7070
#lerna
7171
.changelog
72-
package.json.lerna_backup
72+
.nx
7373

7474
# OS generated files
7575
.DS_Store

‎.release-please-manifest.json‎

Lines changed: 59 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +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.2",
3+
"detectors/node/opentelemetry-resource-detector-aws": "2.2.0",
4+
"detectors/node/opentelemetry-resource-detector-azure": "0.9.0",
5+
"detectors/node/opentelemetry-resource-detector-container": "0.7.2",
6+
"detectors/node/opentelemetry-resource-detector-gcp": "0.36.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.57.1",
11-
"metapackages/auto-instrumentations-web": "0.46.0",
8+
"detectors/node/opentelemetry-resource-detector-instana": "0.21.0",
9+
"metapackages/auto-configuration-propagators": "0.4.1",
10+
"metapackages/auto-instrumentations-node": "0.60.1",
11+
"metapackages/auto-instrumentations-web": "0.48.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.3.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.2",
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.0",
26-
"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",
29-
"plugins/node/instrumentation-socket.io": "0.47.0",
30-
"plugins/node/instrumentation-tedious": "0.19.0",
31-
"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",
34-
"plugins/node/opentelemetry-instrumentation-bunyan": "0.46.0",
35-
"plugins/node/opentelemetry-instrumentation-cassandra": "0.46.0",
36-
"plugins/node/opentelemetry-instrumentation-connect": "0.44.0",
37-
"plugins/node/opentelemetry-instrumentation-dns": "0.44.0",
38-
"plugins/node/opentelemetry-instrumentation-express": "0.48.0",
39-
"plugins/node/opentelemetry-instrumentation-fastify": "0.45.0",
40-
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.44.0",
41-
"plugins/node/opentelemetry-instrumentation-graphql": "0.48.0",
42-
"plugins/node/opentelemetry-instrumentation-hapi": "0.46.0",
43-
"plugins/node/opentelemetry-instrumentation-ioredis": "0.48.0",
44-
"plugins/node/opentelemetry-instrumentation-knex": "0.45.0",
45-
"plugins/node/opentelemetry-instrumentation-koa": "0.48.0",
46-
"plugins/node/opentelemetry-instrumentation-memcached": "0.44.0",
47-
"plugins/node/opentelemetry-instrumentation-mongodb": "0.53.0",
48-
"plugins/node/opentelemetry-instrumentation-mysql": "0.46.0",
49-
"plugins/node/opentelemetry-instrumentation-mysql2": "0.46.0",
50-
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.46.0",
51-
"plugins/node/opentelemetry-instrumentation-net": "0.44.0",
52-
"plugins/node/opentelemetry-instrumentation-pg": "0.52.0",
53-
"plugins/node/opentelemetry-instrumentation-pino": "0.47.0",
54-
"plugins/node/opentelemetry-instrumentation-redis": "0.47.0",
55-
"plugins/node/opentelemetry-instrumentation-redis-4": "0.47.0",
56-
"plugins/node/opentelemetry-instrumentation-restify": "0.46.0",
57-
"plugins/node/opentelemetry-instrumentation-router": "0.45.0",
58-
"plugins/node/opentelemetry-instrumentation-winston": "0.45.0",
59-
"plugins/web/opentelemetry-instrumentation-document-load": "0.45.0",
60-
"plugins/web/opentelemetry-instrumentation-long-task": "0.45.0",
61-
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.45.0",
62-
"plugins/web/opentelemetry-plugin-react-load": "0.32.0",
19+
"packages/opentelemetry-test-utils": "0.48.0",
20+
"packages/winston-transport": "0.13.0",
21+
"plugins/node/instrumentation-amqplib": "0.49.0",
22+
"plugins/node/instrumentation-cucumber": "0.17.0",
23+
"plugins/node/instrumentation-dataloader": "0.19.0",
24+
"plugins/node/instrumentation-fs": "0.22.0",
25+
"plugins/node/instrumentation-kafkajs": "0.11.0",
26+
"plugins/node/instrumentation-lru-memoizer": "0.47.0",
27+
"plugins/node/instrumentation-mongoose": "0.49.0",
28+
"plugins/node/instrumentation-runtime-node": "0.16.0",
29+
"plugins/node/instrumentation-socket.io": "0.49.0",
30+
"plugins/node/instrumentation-tedious": "0.21.0",
31+
"plugins/node/instrumentation-typeorm": "0.3.0",
32+
"plugins/node/instrumentation-undici": "0.13.1",
33+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.53.0",
34+
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.54.0",
35+
"plugins/node/opentelemetry-instrumentation-bunyan": "0.48.0",
36+
"plugins/node/opentelemetry-instrumentation-cassandra": "0.48.0",
37+
"plugins/node/opentelemetry-instrumentation-connect": "0.46.0",
38+
"plugins/node/opentelemetry-instrumentation-dns": "0.46.0",
39+
"plugins/node/opentelemetry-instrumentation-express": "0.51.0",
40+
"plugins/node/opentelemetry-instrumentation-fastify": "0.47.0",
41+
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.46.0",
42+
"plugins/node/opentelemetry-instrumentation-graphql": "0.50.0",
43+
"plugins/node/opentelemetry-instrumentation-hapi": "0.49.0",
44+
"plugins/node/opentelemetry-instrumentation-ioredis": "0.50.0",
45+
"plugins/node/opentelemetry-instrumentation-knex": "0.47.0",
46+
"plugins/node/opentelemetry-instrumentation-koa": "0.50.1",
47+
"plugins/node/opentelemetry-instrumentation-memcached": "0.46.0",
48+
"plugins/node/opentelemetry-instrumentation-mongodb": "0.55.1",
49+
"plugins/node/opentelemetry-instrumentation-mysql": "0.48.0",
50+
"plugins/node/opentelemetry-instrumentation-mysql2": "0.48.0",
51+
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.48.0",
52+
"plugins/node/opentelemetry-instrumentation-net": "0.46.1",
53+
"plugins/node/opentelemetry-instrumentation-oracledb": "0.28.0",
54+
"plugins/node/opentelemetry-instrumentation-pg": "0.54.0",
55+
"plugins/node/opentelemetry-instrumentation-pino": "0.49.0",
56+
"plugins/node/opentelemetry-instrumentation-redis": "0.49.1",
57+
"plugins/node/opentelemetry-instrumentation-redis-4": "0.49.0",
58+
"plugins/node/opentelemetry-instrumentation-restify": "0.48.1",
59+
"plugins/node/opentelemetry-instrumentation-router": "0.47.0",
60+
"plugins/node/opentelemetry-instrumentation-winston": "0.47.0",
61+
"plugins/web/opentelemetry-instrumentation-document-load": "0.47.0",
62+
"plugins/web/opentelemetry-instrumentation-long-task": "0.47.0",
63+
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.47.0",
64+
"plugins/web/opentelemetry-plugin-react-load": "0.34.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
}

0 commit comments

Comments
 (0)