Skip to content

Commit 3f218e8

Browse files
pichlermarcpichlermarc
authored
Merge branch 'main' into docs/upate-contrib-guidelines
2 parents aebda94 + c2ad0af commit 3f218e8

File tree

143 files changed

+18208
-15866
lines changed

Some content is hidden

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

143 files changed

+18208
-15866
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,5 +304,4 @@ pkg-status:unmaintained:
304304
- plugins/node/opentelemetry-instrumentation-restify/**
305305
- plugins/node/opentelemetry-instrumentation-router/**
306306
- propagators/opentelemetry-propagator-ot-trace/**
307-
- propagators/propagator-aws-xray/**
308307
- propagators/propagator-aws-xray-lambda/**

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ jobs:
182182
strategy:
183183
fail-fast: false
184184
matrix:
185-
node: ["16"]
185+
node: ["22"]
186186
runs-on: ubuntu-latest
187187
env:
188188
NPM_CONFIG_UNSAFE_PERM: true
@@ -195,9 +195,6 @@ jobs:
195195
- uses: actions/setup-node@v4
196196
with:
197197
node-version: ${{ matrix.node }}
198-
- name: Update npm to a version that supports workspaces (v7 or later)
199-
if: ${{ matrix.node < 16 }}
200-
run: npm install -g npm@9 # npm@9 supports node >=14.17.0
201198
- name: Install
202199
run: npm ci
203200
- name: Download Build Artifacts

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
git checkout -b feat/update-otel-deps
4343
node ./scripts/update-otel-deps.js
4444
git commit -am "feat(deps): update deps matching '@opentelemetry/*'"
45-
git push 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'
45+
git push --set-upstream origin feat/update-otel-deps --force
46+
gh pr create --repo open-telemetry/opentelemetry-js-contrib --title "feat(deps): update deps matching '@opentelemetry/*'" --body 'Updates all `@opentelemetry/*` dependencies to latest'
4747
env:
4848
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}

‎.release-please-manifest.json‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
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.7",
3+
"detectors/node/opentelemetry-resource-detector-aws": "1.10.0",
4+
"detectors/node/opentelemetry-resource-detector-azure": "0.5.0",
5+
"detectors/node/opentelemetry-resource-detector-container": "0.5.3",
6+
"detectors/node/opentelemetry-resource-detector-gcp": "0.32.0",
77
"detectors/node/opentelemetry-resource-detector-github": "0.29.0",
8-
"detectors/node/opentelemetry-resource-detector-instana": "0.15.0",
9-
"metapackages/auto-configuration-propagators": "0.3.1",
10-
"metapackages/auto-instrumentations-node": "0.53.0",
11-
"metapackages/auto-instrumentations-web": "0.43.0",
8+
"detectors/node/opentelemetry-resource-detector-instana": "0.17.0",
9+
"metapackages/auto-configuration-propagators": "0.3.2",
10+
"metapackages/auto-instrumentations-node": "0.55.2",
11+
"metapackages/auto-instrumentations-web": "0.45.0",
1212
"packages/baggage-span-processor": "0.3.1",
13-
"packages/opentelemetry-host-metrics": "0.35.4",
13+
"packages/opentelemetry-host-metrics": "0.35.5",
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.15",
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.45.0",
19+
"packages/winston-transport": "0.10.0",
20+
"plugins/node/instrumentation-amqplib": "0.46.0",
21+
"plugins/node/instrumentation-cucumber": "0.13.0",
22+
"plugins/node/instrumentation-dataloader": "0.16.0",
23+
"plugins/node/instrumentation-fs": "0.19.0",
24+
"plugins/node/instrumentation-kafkajs": "0.7.0",
25+
"plugins/node/instrumentation-lru-memoizer": "0.44.0",
26+
"plugins/node/instrumentation-mongoose": "0.46.0",
27+
"plugins/node/instrumentation-runtime-node": "0.12.1",
28+
"plugins/node/instrumentation-socket.io": "0.46.0",
29+
"plugins/node/instrumentation-tedious": "0.18.0",
30+
"plugins/node/instrumentation-undici": "0.10.0",
31+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.50.1",
32+
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.49.0",
33+
"plugins/node/opentelemetry-instrumentation-bunyan": "0.45.0",
34+
"plugins/node/opentelemetry-instrumentation-cassandra": "0.45.0",
35+
"plugins/node/opentelemetry-instrumentation-connect": "0.43.0",
36+
"plugins/node/opentelemetry-instrumentation-dns": "0.43.0",
37+
"plugins/node/opentelemetry-instrumentation-express": "0.47.0",
38+
"plugins/node/opentelemetry-instrumentation-fastify": "0.44.0",
39+
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.43.0",
40+
"plugins/node/opentelemetry-instrumentation-graphql": "0.47.0",
41+
"plugins/node/opentelemetry-instrumentation-hapi": "0.45.1",
42+
"plugins/node/opentelemetry-instrumentation-ioredis": "0.47.0",
43+
"plugins/node/opentelemetry-instrumentation-knex": "0.44.0",
44+
"plugins/node/opentelemetry-instrumentation-koa": "0.47.0",
45+
"plugins/node/opentelemetry-instrumentation-memcached": "0.43.0",
46+
"plugins/node/opentelemetry-instrumentation-mongodb": "0.51.0",
47+
"plugins/node/opentelemetry-instrumentation-mysql": "0.45.0",
48+
"plugins/node/opentelemetry-instrumentation-mysql2": "0.45.0",
49+
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.44.0",
50+
"plugins/node/opentelemetry-instrumentation-net": "0.43.0",
51+
"plugins/node/opentelemetry-instrumentation-pg": "0.50.0",
52+
"plugins/node/opentelemetry-instrumentation-pino": "0.46.0",
53+
"plugins/node/opentelemetry-instrumentation-redis": "0.46.0",
54+
"plugins/node/opentelemetry-instrumentation-redis-4": "0.46.0",
55+
"plugins/node/opentelemetry-instrumentation-restify": "0.45.0",
56+
"plugins/node/opentelemetry-instrumentation-router": "0.44.0",
57+
"plugins/node/opentelemetry-instrumentation-winston": "0.44.0",
58+
"plugins/web/opentelemetry-instrumentation-document-load": "0.44.0",
59+
"plugins/web/opentelemetry-instrumentation-long-task": "0.44.0",
60+
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.44.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",
64-
"propagators/propagator-aws-xray": "1.26.0",
65-
"propagators/propagator-aws-xray-lambda": "0.53.0"
64+
"propagators/propagator-aws-xray": "1.26.1",
65+
"propagators/propagator-aws-xray-lambda": "0.53.1"
6666
}

‎CONTRIBUTING.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,9 @@ Maintainers may override the decisions of component owners, but should only do s
151151

152152
### Becoming a Component Owner
153153

154-
Prior to becoming an owner, contributors MUST be become [members](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#member) of the [OpenTelemetry organization](https://github.com/open-telemetry).
154+
To become a component owner, contributors MUST be a [member](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#member) of the OpenTelemetry GitHub organization.
155+
To become a member, follow the steps in the [community guidelines for membership requirements](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#requirements).
156+
155157
To become a component owner, contributors SHOULD demonstrate prior knowledge of the instrumented package or the concepts therein.
156158

157159
Ways do to so may be by providing proof of:
@@ -180,6 +182,7 @@ If all these conditions are met, aspiring component owners are encouraged to sel
180182
information provided on the issue - either approve or deny the ownership request. If the ownership request has been
181183
approved, the new component owner opens a PR to add themselves to the list of owners ([.github/component_owners.yml](.github/component_owners.yml))
182184
for that package.
185+
@open-telemetry/javascript-maintainers will add the component owner to @open-telemetry/javascript-contrib-triagers.
183186

184187
## Component Lifecycle
185188

@@ -313,6 +316,7 @@ When instrumentation cannot be included in a target package and there is good re
313316
Note that new instrumentation needs at least two contributors assigned to it as code-owners. It is the responsibility
314317
of the requesting party to reach out and find code-owners for the proposed instrumentation. The instrumentation request
315318
needs to be accepted before any pull requests for the instrumentation can be considered for merging.
319+
Review the guidelines for [Becoming a Component Owner](#becoming-a-component-owner).
316320

317321
Regardless of where instrumentation is hosted, it needs to be discoverable.
318322
The [OpenTelemetry registry](https://opentelemetry.io/registry/) exists to ensure that instrumentation is discoverable.

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

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

3+
## [0.29.7](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.6...resource-detector-alibaba-cloud-v0.29.7) (2024-12-18)
4+
5+
6+
### Dependencies
7+
8+
* The following workspace dependencies were updated
9+
* devDependencies
10+
* @opentelemetry/contrib-test-utils bumped from ^0.44.0 to ^0.45.0
11+
12+
## [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)
13+
14+
15+
### Dependencies
16+
17+
* The following workspace dependencies were updated
18+
* devDependencies
19+
* @opentelemetry/contrib-test-utils bumped from ^0.43.0 to ^0.44.0
20+
321
## [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)
422

523

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
{
22
"name": "@opentelemetry/resource-detector-alibaba-cloud",
3-
"version": "0.29.5",
3+
"version": "0.29.7",
44
"description": "OpenTelemetry resource detector for Alibaba Cloud",
55
"main": "build/src/index.js",
6+
"module": "build/esm/index.js",
67
"types": "build/src/index.d.ts",
78
"repository": "open-telemetry/opentelemetry-js-contrib",
89
"scripts": {
9-
"clean": "rimraf build/*",
10-
"compile": "tsc -p .",
10+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
11+
"compile": "tsc --build tsconfig.json tsconfig.esm.json",
1112
"lint": "eslint . --ext .ts",
1213
"lint:fix": "eslint . --ext .ts --fix",
1314
"prewatch": "npm run precompile",
1415
"prepublishOnly": "npm run compile",
1516
"test": "nyc mocha 'test/**/*.test.ts'",
1617
"tdd": "npm run test -- --watch-extensions ts --watch",
17-
"watch": "tsc -w"
18+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
1819
},
1920
"keywords": [
2021
"opentelemetry",
@@ -32,14 +33,17 @@
3233
"files": [
3334
"build/src/**/*.js",
3435
"build/src/**/*.js.map",
35-
"build/src/**/*.d.ts"
36+
"build/src/**/*.d.ts",
37+
"build/esm/**/*.js",
38+
"build/esm/**/*.js.map",
39+
"build/esm/**/*.d.ts"
3640
],
3741
"publishConfig": {
3842
"access": "public"
3943
},
4044
"devDependencies": {
4145
"@opentelemetry/api": "^1.0.0",
42-
"@opentelemetry/contrib-test-utils": "^0.43.0",
46+
"@opentelemetry/contrib-test-utils": "^0.45.0",
4347
"@types/mocha": "8.2.3",
4448
"@types/node": "18.18.14",
4549
"@types/sinon": "10.0.20",

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"extends": "../../../tsconfig.base.esm.json",
3+
"compilerOptions": {
4+
"rootDir": "src",
5+
"outDir": "build/esm",
6+
"tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo"
7+
},
8+
"include": [
9+
"src/**/*.ts"
10+
]
11+
}

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

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

3+
## [1.10.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.9.0...resource-detector-aws-v1.10.0) (2024-12-18)
4+
5+
6+
### Features
7+
8+
* **deps:** update deps matching '@opentelemetry/*' ([#2608](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2608)) ([aa46705](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/aa46705d2fd1bd5ee6d763ac8cd73a7630889d34))
9+
10+
11+
### Dependencies
12+
13+
* The following workspace dependencies were updated
14+
* devDependencies
15+
* @opentelemetry/contrib-test-utils bumped from ^0.44.0 to ^0.45.0
16+
* @opentelemetry/instrumentation-fs bumped from ^0.18.0 to ^0.19.0
17+
18+
## [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)
19+
20+
21+
### Features
22+
23+
* **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))
24+
25+
26+
### Dependencies
27+
28+
* The following workspace dependencies were updated
29+
* devDependencies
30+
* @opentelemetry/contrib-test-utils bumped from ^0.43.0 to ^0.44.0
31+
* @opentelemetry/instrumentation-fs bumped from ^0.17.0 to ^0.18.0
32+
333
## [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)
434

535

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
{
22
"name": "@opentelemetry/resource-detector-aws",
3-
"version": "1.8.0",
3+
"version": "1.10.0",
44
"description": "OpenTelemetry SDK resource detector for AWS",
55
"main": "build/src/index.js",
6+
"module": "build/esm/index.js",
67
"types": "build/src/index.d.ts",
78
"repository": "open-telemetry/opentelemetry-js-contrib",
89
"scripts": {
9-
"clean": "rimraf build/*",
10-
"compile": "tsc -p .",
10+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
11+
"compile": "tsc --build tsconfig.json tsconfig.esm.json",
1112
"lint": "eslint . --ext .ts",
1213
"lint:fix": "eslint . --ext .ts --fix",
1314
"prewatch": "npm run precompile",
1415
"prepublishOnly": "npm run compile",
1516
"test": "nyc mocha 'test/**/*.test.ts'",
1617
"tdd": "npm run test -- --watch-extensions ts --watch",
17-
"watch": "tsc -w"
18+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
1819
},
1920
"keywords": [
2021
"opentelemetry",
@@ -31,16 +32,19 @@
3132
"files": [
3233
"build/src/**/*.js",
3334
"build/src/**/*.js.map",
34-
"build/src/**/*.d.ts"
35+
"build/src/**/*.d.ts",
36+
"build/esm/**/*.js",
37+
"build/esm/**/*.js.map",
38+
"build/esm/**/*.d.ts"
3539
],
3640
"publishConfig": {
3741
"access": "public"
3842
},
3943
"devDependencies": {
4044
"@opentelemetry/api": "^1.0.0",
41-
"@opentelemetry/contrib-test-utils": "^0.43.0",
42-
"@opentelemetry/instrumentation-fs": "^0.17.0",
43-
"@opentelemetry/instrumentation-http": "^0.55.0",
45+
"@opentelemetry/contrib-test-utils": "^0.45.0",
46+
"@opentelemetry/instrumentation-fs": "^0.19.0",
47+
"@opentelemetry/instrumentation-http": "^0.57.0",
4448
"@types/mocha": "8.2.3",
4549
"@types/node": "18.18.14",
4650
"@types/sinon": "10.0.20",

0 commit comments

Comments
 (0)