Skip to content

Commit

Permalink
Merge branch 'main' into fix/update-dep-title
Browse files Browse the repository at this point in the history
  • Loading branch information
pichlermarc authored Dec 18, 2024
2 parents 51bccb8 + 2dc302c commit ee35dec
Show file tree
Hide file tree
Showing 120 changed files with 17,095 additions and 15,820 deletions.
1 change: 0 additions & 1 deletion .github/component-label-map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -304,5 +304,4 @@ pkg-status:unmaintained:
- plugins/node/opentelemetry-instrumentation-restify/**
- plugins/node/opentelemetry-instrumentation-router/**
- propagators/opentelemetry-propagator-ot-trace/**
- propagators/propagator-aws-xray/**
- propagators/propagator-aws-xray-lambda/**
5 changes: 1 addition & 4 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: ["16"]
node: ["22"]
runs-on: ubuntu-latest
env:
NPM_CONFIG_UNSAFE_PERM: true
Expand All @@ -195,9 +195,6 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- name: Update npm to a version that supports workspaces (v7 or later)
if: ${{ matrix.node < 16 }}
run: npm install -g npm@9 # npm@9 supports node >=14.17.0
- name: Install
run: npm ci
- name: Download Build Artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-otel-deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
git checkout -b feat/update-otel-deps
node ./scripts/update-otel-deps.js
git commit -am "feat(deps): update deps matching '@opentelemetry/*'"
git push origin feat/update-otel-deps --force
git push --set-upstream origin feat/update-otel-deps --force
gh pr create --repo open-telemetry/opentelemetry-js-contrib --title "feat(deps): update deps matching '@opentelemetry/*'" --body 'Updates all `@opentelemetry/*` dependencies to latest'
env:
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
104 changes: 52 additions & 52 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
{
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.5",
"detectors/node/opentelemetry-resource-detector-aws": "1.8.0",
"detectors/node/opentelemetry-resource-detector-azure": "0.3.0",
"detectors/node/opentelemetry-resource-detector-container": "0.5.1",
"detectors/node/opentelemetry-resource-detector-gcp": "0.30.0",
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.6",
"detectors/node/opentelemetry-resource-detector-aws": "1.9.0",
"detectors/node/opentelemetry-resource-detector-azure": "0.4.0",
"detectors/node/opentelemetry-resource-detector-container": "0.5.2",
"detectors/node/opentelemetry-resource-detector-gcp": "0.31.0",
"detectors/node/opentelemetry-resource-detector-github": "0.29.0",
"detectors/node/opentelemetry-resource-detector-instana": "0.15.0",
"detectors/node/opentelemetry-resource-detector-instana": "0.16.0",
"metapackages/auto-configuration-propagators": "0.3.1",
"metapackages/auto-instrumentations-node": "0.53.0",
"metapackages/auto-instrumentations-web": "0.43.0",
"metapackages/auto-instrumentations-node": "0.54.0",
"metapackages/auto-instrumentations-web": "0.44.0",
"packages/baggage-span-processor": "0.3.1",
"packages/opentelemetry-host-metrics": "0.35.4",
"packages/opentelemetry-id-generator-aws-xray": "1.2.2",
"packages/opentelemetry-propagation-utils": "0.30.13",
"packages/opentelemetry-propagation-utils": "0.30.14",
"packages/opentelemetry-redis-common": "0.36.2",
"packages/opentelemetry-sql-common": "0.40.1",
"packages/opentelemetry-test-utils": "0.43.0",
"packages/winston-transport": "0.8.0",
"plugins/node/instrumentation-amqplib": "0.44.0",
"plugins/node/instrumentation-cucumber": "0.11.0",
"plugins/node/instrumentation-dataloader": "0.14.0",
"plugins/node/instrumentation-fs": "0.17.0",
"plugins/node/instrumentation-kafkajs": "0.5.0",
"plugins/node/instrumentation-lru-memoizer": "0.42.0",
"plugins/node/instrumentation-mongoose": "0.44.0",
"plugins/node/instrumentation-runtime-node": "0.10.0",
"plugins/node/instrumentation-socket.io": "0.44.0",
"plugins/node/instrumentation-tedious": "0.16.0",
"plugins/node/instrumentation-undici": "0.8.0",
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.48.0",
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.47.0",
"plugins/node/opentelemetry-instrumentation-bunyan": "0.43.0",
"plugins/node/opentelemetry-instrumentation-cassandra": "0.43.0",
"plugins/node/opentelemetry-instrumentation-connect": "0.41.0",
"plugins/node/opentelemetry-instrumentation-dns": "0.41.0",
"plugins/node/opentelemetry-instrumentation-express": "0.45.0",
"plugins/node/opentelemetry-instrumentation-fastify": "0.42.0",
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.41.0",
"plugins/node/opentelemetry-instrumentation-graphql": "0.45.0",
"plugins/node/opentelemetry-instrumentation-hapi": "0.43.0",
"plugins/node/opentelemetry-instrumentation-ioredis": "0.45.0",
"plugins/node/opentelemetry-instrumentation-knex": "0.42.0",
"plugins/node/opentelemetry-instrumentation-koa": "0.45.0",
"plugins/node/opentelemetry-instrumentation-memcached": "0.41.0",
"plugins/node/opentelemetry-instrumentation-mongodb": "0.49.0",
"plugins/node/opentelemetry-instrumentation-mysql": "0.43.0",
"plugins/node/opentelemetry-instrumentation-mysql2": "0.43.0",
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.42.0",
"plugins/node/opentelemetry-instrumentation-net": "0.41.0",
"plugins/node/opentelemetry-instrumentation-pg": "0.48.0",
"plugins/node/opentelemetry-instrumentation-pino": "0.44.0",
"plugins/node/opentelemetry-instrumentation-redis": "0.44.0",
"plugins/node/opentelemetry-instrumentation-redis-4": "0.44.0",
"plugins/node/opentelemetry-instrumentation-restify": "0.43.0",
"plugins/node/opentelemetry-instrumentation-router": "0.42.0",
"plugins/node/opentelemetry-instrumentation-winston": "0.42.0",
"plugins/web/opentelemetry-instrumentation-document-load": "0.42.0",
"plugins/web/opentelemetry-instrumentation-long-task": "0.42.0",
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.42.0",
"packages/opentelemetry-test-utils": "0.44.0",
"packages/winston-transport": "0.9.0",
"plugins/node/instrumentation-amqplib": "0.45.0",
"plugins/node/instrumentation-cucumber": "0.12.0",
"plugins/node/instrumentation-dataloader": "0.15.0",
"plugins/node/instrumentation-fs": "0.18.0",
"plugins/node/instrumentation-kafkajs": "0.6.0",
"plugins/node/instrumentation-lru-memoizer": "0.43.0",
"plugins/node/instrumentation-mongoose": "0.45.0",
"plugins/node/instrumentation-runtime-node": "0.11.0",
"plugins/node/instrumentation-socket.io": "0.45.0",
"plugins/node/instrumentation-tedious": "0.17.0",
"plugins/node/instrumentation-undici": "0.9.0",
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.49.0",
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.48.0",
"plugins/node/opentelemetry-instrumentation-bunyan": "0.44.0",
"plugins/node/opentelemetry-instrumentation-cassandra": "0.44.0",
"plugins/node/opentelemetry-instrumentation-connect": "0.42.0",
"plugins/node/opentelemetry-instrumentation-dns": "0.42.0",
"plugins/node/opentelemetry-instrumentation-express": "0.46.0",
"plugins/node/opentelemetry-instrumentation-fastify": "0.43.0",
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.42.0",
"plugins/node/opentelemetry-instrumentation-graphql": "0.46.0",
"plugins/node/opentelemetry-instrumentation-hapi": "0.44.0",
"plugins/node/opentelemetry-instrumentation-ioredis": "0.46.0",
"plugins/node/opentelemetry-instrumentation-knex": "0.43.0",
"plugins/node/opentelemetry-instrumentation-koa": "0.46.0",
"plugins/node/opentelemetry-instrumentation-memcached": "0.42.0",
"plugins/node/opentelemetry-instrumentation-mongodb": "0.50.0",
"plugins/node/opentelemetry-instrumentation-mysql": "0.44.0",
"plugins/node/opentelemetry-instrumentation-mysql2": "0.44.0",
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.43.0",
"plugins/node/opentelemetry-instrumentation-net": "0.42.0",
"plugins/node/opentelemetry-instrumentation-pg": "0.49.0",
"plugins/node/opentelemetry-instrumentation-pino": "0.45.0",
"plugins/node/opentelemetry-instrumentation-redis": "0.45.0",
"plugins/node/opentelemetry-instrumentation-redis-4": "0.45.0",
"plugins/node/opentelemetry-instrumentation-restify": "0.44.0",
"plugins/node/opentelemetry-instrumentation-router": "0.43.0",
"plugins/node/opentelemetry-instrumentation-winston": "0.43.0",
"plugins/web/opentelemetry-instrumentation-document-load": "0.43.0",
"plugins/web/opentelemetry-instrumentation-long-task": "0.43.0",
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.43.0",
"plugins/web/opentelemetry-plugin-react-load": "0.31.0",
"propagators/opentelemetry-propagator-instana": "0.3.2",
"propagators/opentelemetry-propagator-ot-trace": "0.27.2",
Expand Down
5 changes: 5 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ Maintainers may override the decisions of component owners, but should only do s

### Becoming a Component Owner

To become a component owner, contributors MUST be a member of the OpenTelemetry GitHub organization.
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).

To become a component owner, contributors SHOULD demonstrate prior knowledge of the instrumented package or the concepts therein.

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

## Component Lifecycle

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

Regardless of where instrumentation is hosted, it needs to be discoverable.
The [OpenTelemetry registry](https://opentelemetry.io/registry/) exists to ensure that instrumentation is discoverable.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## [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)


### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.43.0 to ^0.44.0

## [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)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-alibaba-cloud",
"version": "0.29.5",
"version": "0.29.6",
"description": "OpenTelemetry resource detector for Alibaba Cloud",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -39,7 +39,7 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.43.0",
"@opentelemetry/contrib-test-utils": "^0.44.0",
"@types/mocha": "8.2.3",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
Expand Down
15 changes: 15 additions & 0 deletions detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Changelog

## [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)


### Features

* **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))


### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.43.0 to ^0.44.0
* @opentelemetry/instrumentation-fs bumped from ^0.17.0 to ^0.18.0

## [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)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-aws",
"version": "1.8.0",
"version": "1.9.0",
"description": "OpenTelemetry SDK resource detector for AWS",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -38,9 +38,9 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.43.0",
"@opentelemetry/instrumentation-fs": "^0.17.0",
"@opentelemetry/instrumentation-http": "^0.55.0",
"@opentelemetry/contrib-test-utils": "^0.44.0",
"@opentelemetry/instrumentation-fs": "^0.18.0",
"@opentelemetry/instrumentation-http": "^0.56.0",
"@types/mocha": "8.2.3",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
Expand Down
14 changes: 14 additions & 0 deletions detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## [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)


### Features

* **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))


### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.43.0 to ^0.44.0

## [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)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-azure",
"version": "0.3.0",
"version": "0.4.0",
"description": "OpenTelemetry SDK resource detector for Azure",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -31,8 +31,8 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.43.0",
"@opentelemetry/instrumentation-http": "^0.55.0",
"@opentelemetry/contrib-test-utils": "^0.44.0",
"@opentelemetry/instrumentation-http": "^0.56.0",
"@types/mocha": "8.2.3",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

## [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)


### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.43.0 to ^0.44.0
* @opentelemetry/instrumentation-fs bumped from ^0.17.0 to ^0.18.0

## [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)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-container",
"version": "0.5.1",
"version": "0.5.2",
"description": "Opentelemetry resource detector to get container resource attributes",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -32,8 +32,8 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.43.0",
"@opentelemetry/instrumentation-fs": "^0.17.0",
"@opentelemetry/contrib-test-utils": "^0.44.0",
"@opentelemetry/instrumentation-fs": "^0.18.0",
"@types/mocha": "8.2.3",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
Expand Down
14 changes: 14 additions & 0 deletions detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## [0.31.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.30.0...resource-detector-gcp-v0.31.0) (2024-12-04)


### Features

* **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))


### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.43.0 to ^0.44.0

## [0.30.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.29.13...resource-detector-gcp-v0.30.0) (2024-11-18)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-gcp",
"version": "0.30.0",
"version": "0.31.0",
"description": "OpenTelemetry SDK resource detector for GCP",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -38,8 +38,8 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.43.0",
"@opentelemetry/instrumentation-http": "^0.55.0",
"@opentelemetry/contrib-test-utils": "^0.44.0",
"@opentelemetry/instrumentation-http": "^0.56.0",
"@types/mocha": "8.2.3",
"@types/node": "18.18.14",
"@types/semver": "7.5.8",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## [0.16.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.15.0...resource-detector-instana-v0.16.0) (2024-12-04)


### Features

* **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))


### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.43.0 to ^0.44.0

## [0.15.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-instana-v0.14.0...resource-detector-instana-v0.15.0) (2024-11-18)


Expand Down
Loading

0 comments on commit ee35dec

Please sign in to comment.