Skip to content

Commit 0726e0c

Browse files
david-lunadavid-luna
authored
Merge branch 'main' into remove-lerna
2 parents 05020c1 + e3c9150 commit 0726e0c

File tree

110 files changed

+1951
-967
lines changed

Some content is hidden

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

110 files changed

+1951
-967
lines changed

‎.github/workflows/update-otel-deps.yaml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Create or Update OpenTelemetry Update PR
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
create-or-update-deps-pr:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Fork
11+
run: gh repo fork open-telemetry/opentelemetry-js-contrib
12+
env:
13+
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
with:
17+
repository: opentelemetrybot/opentelemetry-js-contrib
18+
ref: main
19+
token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
20+
- name: Sync with upstream
21+
run: |
22+
git remote show origin
23+
git remote add upstream https://github.com/open-telemetry/opentelemetry-js-contrib.git
24+
git fetch upstream
25+
git reset --hard upstream/main
26+
git push origin main --force
27+
28+
- uses: actions/setup-node@v4
29+
with:
30+
cache: 'npm'
31+
cache-dependency-path: package-lock.json
32+
node-version: 22
33+
34+
- run: npm install -g npm@latest
35+
36+
- run: npm ci
37+
38+
- name: Create/Update Release PR
39+
run: |
40+
git config user.name opentelemetrybot
41+
git config user.email [email protected]
42+
git checkout -b feat/update-otel-deps
43+
node ./scripts/update-otel-deps.js
44+
git commit -am "feat(deps): update deps matching '@opentelemetry/*'"
45+
git push --set-upstream origin feat/update-otel-deps --force
46+
gh pr create --repo open-telemetry/opentelemetry-js-contrib --title 'chore: prepare next release' --body 'Updates all `@opentelemetry/*` dependencies to latest'
47+
env:
48+
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}

‎.release-please-manifest.json‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
11
{
2-
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.5",
3-
"detectors/node/opentelemetry-resource-detector-aws": "1.8.0",
4-
"detectors/node/opentelemetry-resource-detector-azure": "0.3.0",
5-
"detectors/node/opentelemetry-resource-detector-container": "0.5.1",
6-
"detectors/node/opentelemetry-resource-detector-gcp": "0.30.0",
2+
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.6",
3+
"detectors/node/opentelemetry-resource-detector-aws": "1.9.0",
4+
"detectors/node/opentelemetry-resource-detector-azure": "0.4.0",
5+
"detectors/node/opentelemetry-resource-detector-container": "0.5.2",
6+
"detectors/node/opentelemetry-resource-detector-gcp": "0.31.0",
77
"detectors/node/opentelemetry-resource-detector-github": "0.29.0",
8-
"detectors/node/opentelemetry-resource-detector-instana": "0.15.0",
8+
"detectors/node/opentelemetry-resource-detector-instana": "0.16.0",
99
"metapackages/auto-configuration-propagators": "0.3.1",
10-
"metapackages/auto-instrumentations-node": "0.53.0",
11-
"metapackages/auto-instrumentations-web": "0.43.0",
10+
"metapackages/auto-instrumentations-node": "0.54.0",
11+
"metapackages/auto-instrumentations-web": "0.44.0",
1212
"packages/baggage-span-processor": "0.3.1",
1313
"packages/opentelemetry-host-metrics": "0.35.4",
1414
"packages/opentelemetry-id-generator-aws-xray": "1.2.2",
15-
"packages/opentelemetry-propagation-utils": "0.30.13",
15+
"packages/opentelemetry-propagation-utils": "0.30.14",
1616
"packages/opentelemetry-redis-common": "0.36.2",
1717
"packages/opentelemetry-sql-common": "0.40.1",
18-
"packages/opentelemetry-test-utils": "0.43.0",
19-
"packages/winston-transport": "0.8.0",
20-
"plugins/node/instrumentation-amqplib": "0.44.0",
21-
"plugins/node/instrumentation-cucumber": "0.11.0",
22-
"plugins/node/instrumentation-dataloader": "0.14.0",
23-
"plugins/node/instrumentation-fs": "0.17.0",
24-
"plugins/node/instrumentation-kafkajs": "0.5.0",
25-
"plugins/node/instrumentation-lru-memoizer": "0.42.0",
26-
"plugins/node/instrumentation-mongoose": "0.44.0",
27-
"plugins/node/instrumentation-runtime-node": "0.10.0",
28-
"plugins/node/instrumentation-socket.io": "0.44.0",
29-
"plugins/node/instrumentation-tedious": "0.16.0",
30-
"plugins/node/instrumentation-undici": "0.8.0",
31-
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.48.0",
32-
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.47.0",
33-
"plugins/node/opentelemetry-instrumentation-bunyan": "0.43.0",
34-
"plugins/node/opentelemetry-instrumentation-cassandra": "0.43.0",
35-
"plugins/node/opentelemetry-instrumentation-connect": "0.41.0",
36-
"plugins/node/opentelemetry-instrumentation-dns": "0.41.0",
37-
"plugins/node/opentelemetry-instrumentation-express": "0.45.0",
38-
"plugins/node/opentelemetry-instrumentation-fastify": "0.42.0",
39-
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.41.0",
40-
"plugins/node/opentelemetry-instrumentation-graphql": "0.45.0",
41-
"plugins/node/opentelemetry-instrumentation-hapi": "0.43.0",
42-
"plugins/node/opentelemetry-instrumentation-ioredis": "0.45.0",
43-
"plugins/node/opentelemetry-instrumentation-knex": "0.42.0",
44-
"plugins/node/opentelemetry-instrumentation-koa": "0.45.0",
45-
"plugins/node/opentelemetry-instrumentation-memcached": "0.41.0",
46-
"plugins/node/opentelemetry-instrumentation-mongodb": "0.49.0",
47-
"plugins/node/opentelemetry-instrumentation-mysql": "0.43.0",
48-
"plugins/node/opentelemetry-instrumentation-mysql2": "0.43.0",
49-
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.42.0",
50-
"plugins/node/opentelemetry-instrumentation-net": "0.41.0",
51-
"plugins/node/opentelemetry-instrumentation-pg": "0.48.0",
52-
"plugins/node/opentelemetry-instrumentation-pino": "0.44.0",
53-
"plugins/node/opentelemetry-instrumentation-redis": "0.44.0",
54-
"plugins/node/opentelemetry-instrumentation-redis-4": "0.44.0",
55-
"plugins/node/opentelemetry-instrumentation-restify": "0.43.0",
56-
"plugins/node/opentelemetry-instrumentation-router": "0.42.0",
57-
"plugins/node/opentelemetry-instrumentation-winston": "0.42.0",
58-
"plugins/web/opentelemetry-instrumentation-document-load": "0.42.0",
59-
"plugins/web/opentelemetry-instrumentation-long-task": "0.42.0",
60-
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.42.0",
18+
"packages/opentelemetry-test-utils": "0.44.0",
19+
"packages/winston-transport": "0.9.0",
20+
"plugins/node/instrumentation-amqplib": "0.45.0",
21+
"plugins/node/instrumentation-cucumber": "0.12.0",
22+
"plugins/node/instrumentation-dataloader": "0.15.0",
23+
"plugins/node/instrumentation-fs": "0.18.0",
24+
"plugins/node/instrumentation-kafkajs": "0.6.0",
25+
"plugins/node/instrumentation-lru-memoizer": "0.43.0",
26+
"plugins/node/instrumentation-mongoose": "0.45.0",
27+
"plugins/node/instrumentation-runtime-node": "0.11.0",
28+
"plugins/node/instrumentation-socket.io": "0.45.0",
29+
"plugins/node/instrumentation-tedious": "0.17.0",
30+
"plugins/node/instrumentation-undici": "0.9.0",
31+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.49.0",
32+
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.48.0",
33+
"plugins/node/opentelemetry-instrumentation-bunyan": "0.44.0",
34+
"plugins/node/opentelemetry-instrumentation-cassandra": "0.44.0",
35+
"plugins/node/opentelemetry-instrumentation-connect": "0.42.0",
36+
"plugins/node/opentelemetry-instrumentation-dns": "0.42.0",
37+
"plugins/node/opentelemetry-instrumentation-express": "0.46.0",
38+
"plugins/node/opentelemetry-instrumentation-fastify": "0.43.0",
39+
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.42.0",
40+
"plugins/node/opentelemetry-instrumentation-graphql": "0.46.0",
41+
"plugins/node/opentelemetry-instrumentation-hapi": "0.44.0",
42+
"plugins/node/opentelemetry-instrumentation-ioredis": "0.46.0",
43+
"plugins/node/opentelemetry-instrumentation-knex": "0.43.0",
44+
"plugins/node/opentelemetry-instrumentation-koa": "0.46.0",
45+
"plugins/node/opentelemetry-instrumentation-memcached": "0.42.0",
46+
"plugins/node/opentelemetry-instrumentation-mongodb": "0.50.0",
47+
"plugins/node/opentelemetry-instrumentation-mysql": "0.44.0",
48+
"plugins/node/opentelemetry-instrumentation-mysql2": "0.44.0",
49+
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.43.0",
50+
"plugins/node/opentelemetry-instrumentation-net": "0.42.0",
51+
"plugins/node/opentelemetry-instrumentation-pg": "0.49.0",
52+
"plugins/node/opentelemetry-instrumentation-pino": "0.45.0",
53+
"plugins/node/opentelemetry-instrumentation-redis": "0.45.0",
54+
"plugins/node/opentelemetry-instrumentation-redis-4": "0.45.0",
55+
"plugins/node/opentelemetry-instrumentation-restify": "0.44.0",
56+
"plugins/node/opentelemetry-instrumentation-router": "0.43.0",
57+
"plugins/node/opentelemetry-instrumentation-winston": "0.43.0",
58+
"plugins/web/opentelemetry-instrumentation-document-load": "0.43.0",
59+
"plugins/web/opentelemetry-instrumentation-long-task": "0.43.0",
60+
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.43.0",
6161
"plugins/web/opentelemetry-plugin-react-load": "0.31.0",
6262
"propagators/opentelemetry-propagator-instana": "0.3.2",
6363
"propagators/opentelemetry-propagator-ot-trace": "0.27.2",

‎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.29.6](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.5...resource-detector-alibaba-cloud-v0.29.6) (2024-12-04)
4+
5+
6+
### Dependencies
7+
8+
* The following workspace dependencies were updated
9+
* devDependencies
10+
* @opentelemetry/contrib-test-utils bumped from ^0.43.0 to ^0.44.0
11+
312
## [0.29.5](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.4...resource-detector-alibaba-cloud-v0.29.5) (2024-11-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.29.5",
3+
"version": "0.29.6",
44
"description": "OpenTelemetry resource detector for Alibaba Cloud",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -38,7 +38,7 @@
3838
},
3939
"devDependencies": {
4040
"@opentelemetry/api": "^1.0.0",
41-
"@opentelemetry/contrib-test-utils": "^0.43.0",
41+
"@opentelemetry/contrib-test-utils": "^0.44.0",
4242
"@types/mocha": "8.2.3",
4343
"@types/node": "18.18.14",
4444
"@types/sinon": "10.0.20",

‎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+
## [1.9.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.8.0...resource-detector-aws-v1.9.0) (2024-12-04)
4+
5+
6+
### Features
7+
8+
* **deps:** update deps matching '@opentelemetry/*' ([#2582](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2582)) ([5df02cb](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/5df02cbb35681d2b5cce359dda7b023d7bf339f2))
9+
10+
11+
### Dependencies
12+
13+
* The following workspace dependencies were updated
14+
* devDependencies
15+
* @opentelemetry/contrib-test-utils bumped from ^0.43.0 to ^0.44.0
16+
* @opentelemetry/instrumentation-fs bumped from ^0.17.0 to ^0.18.0
17+
318
## [1.8.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.7.0...resource-detector-aws-v1.8.0) (2024-11-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": "1.8.0",
3+
"version": "1.9.0",
44
"description": "OpenTelemetry SDK resource detector for AWS",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -37,9 +37,9 @@
3737
},
3838
"devDependencies": {
3939
"@opentelemetry/api": "^1.0.0",
40-
"@opentelemetry/contrib-test-utils": "^0.43.0",
41-
"@opentelemetry/instrumentation-fs": "^0.17.0",
42-
"@opentelemetry/instrumentation-http": "^0.55.0",
40+
"@opentelemetry/contrib-test-utils": "^0.44.0",
41+
"@opentelemetry/instrumentation-fs": "^0.18.0",
42+
"@opentelemetry/instrumentation-http": "^0.56.0",
4343
"@types/mocha": "8.2.3",
4444
"@types/node": "18.18.14",
4545
"@types/sinon": "10.0.20",

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

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

3+
## [0.4.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.3.0...resource-detector-azure-v0.4.0) (2024-12-04)
4+
5+
6+
### Features
7+
8+
* **deps:** update deps matching '@opentelemetry/*' ([#2582](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2582)) ([5df02cb](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/5df02cbb35681d2b5cce359dda7b023d7bf339f2))
9+
10+
11+
### Dependencies
12+
13+
* The following workspace dependencies were updated
14+
* devDependencies
15+
* @opentelemetry/contrib-test-utils bumped from ^0.43.0 to ^0.44.0
16+
317
## [0.3.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.12...resource-detector-azure-v0.3.0) (2024-11-18)
418

519

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-azure",
3-
"version": "0.3.0",
3+
"version": "0.4.0",
44
"description": "OpenTelemetry SDK resource detector for Azure",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -30,8 +30,8 @@
3030
},
3131
"devDependencies": {
3232
"@opentelemetry/api": "^1.0.0",
33-
"@opentelemetry/contrib-test-utils": "^0.43.0",
34-
"@opentelemetry/instrumentation-http": "^0.55.0",
33+
"@opentelemetry/contrib-test-utils": "^0.44.0",
34+
"@opentelemetry/instrumentation-http": "^0.56.0",
3535
"@types/mocha": "8.2.3",
3636
"@types/node": "18.18.14",
3737
"@types/sinon": "10.0.20",

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

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

3+
## [0.5.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.5.1...resource-detector-container-v0.5.2) (2024-12-04)
4+
5+
6+
### Dependencies
7+
8+
* The following workspace dependencies were updated
9+
* devDependencies
10+
* @opentelemetry/contrib-test-utils bumped from ^0.43.0 to ^0.44.0
11+
* @opentelemetry/instrumentation-fs bumped from ^0.17.0 to ^0.18.0
12+
313
## [0.5.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.5.0...resource-detector-container-v0.5.1) (2024-11-18)
414

515

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-container",
3-
"version": "0.5.1",
3+
"version": "0.5.2",
44
"description": "Opentelemetry resource detector to get container resource attributes",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -31,8 +31,8 @@
3131
},
3232
"devDependencies": {
3333
"@opentelemetry/api": "^1.0.0",
34-
"@opentelemetry/contrib-test-utils": "^0.43.0",
35-
"@opentelemetry/instrumentation-fs": "^0.17.0",
34+
"@opentelemetry/contrib-test-utils": "^0.44.0",
35+
"@opentelemetry/instrumentation-fs": "^0.18.0",
3636
"@types/mocha": "8.2.3",
3737
"@types/node": "18.18.14",
3838
"@types/sinon": "10.0.20",

0 commit comments

Comments
 (0)