Skip to content

Commit

Permalink
Merge branch 'main' into refactor/mysql2-improve-span-name
Browse files Browse the repository at this point in the history
  • Loading branch information
@david-luna
david-luna authored Oct 11, 2024
2 parents aed3839 + 25ab243 commit 868ed59
Show file tree
Hide file tree
Showing 10 changed files with 65 additions and 24 deletions.
8 changes: 4 additions & 4 deletions .release-please-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.2",
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.3",
"detectors/node/opentelemetry-resource-detector-aws": "1.6.2",
"detectors/node/opentelemetry-resource-detector-azure": "0.2.11",
"detectors/node/opentelemetry-resource-detector-container": "0.4.2",
"detectors/node/opentelemetry-resource-detector-container": "0.4.3",
"detectors/node/opentelemetry-resource-detector-gcp": "0.29.12",
"detectors/node/opentelemetry-resource-detector-github": "0.29.0",
"detectors/node/opentelemetry-resource-detector-instana": "0.13.0",
"metapackages/auto-configuration-propagators": "0.3.1",
"metapackages/auto-instrumentations-node": "0.50.1",
"metapackages/auto-instrumentations-node": "0.50.2",
"metapackages/auto-instrumentations-web": "0.41.0",
"packages/baggage-span-processor": "0.3.1",
"packages/opentelemetry-host-metrics": "0.35.4",
Expand Down Expand Up @@ -48,7 +48,7 @@
"plugins/node/opentelemetry-instrumentation-mysql2": "0.41.0",
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.40.0",
"plugins/node/opentelemetry-instrumentation-net": "0.39.0",
"plugins/node/opentelemetry-instrumentation-pg": "0.45.0",
"plugins/node/opentelemetry-instrumentation-pg": "0.45.1",
"plugins/node/opentelemetry-instrumentation-pino": "0.42.0",
"plugins/node/opentelemetry-instrumentation-redis": "0.42.0",
"plugins/node/opentelemetry-instrumentation-redis-4": "0.42.1",
Expand Down
7 changes: 7 additions & 0 deletions detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [0.29.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.2...resource-detector-alibaba-cloud-v0.29.3) (2024-10-10)


### Bug Fixes

* add missing @opentelemetry/core dependency ([#2473](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2473)) ([4d66431](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4d66431a2ad480720bf6c33663a419ec1404cd33))

## [0.29.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.1...resource-detector-alibaba-cloud-v0.29.2) (2024-10-08)


Expand Down
3 changes: 2 additions & 1 deletion detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-alibaba-cloud",
"version": "0.29.2",
"version": "0.29.3",
"description": "OpenTelemetry resource detector for Alibaba Cloud",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -57,6 +57,7 @@
},
"dependencies": {
"@opentelemetry/resources": "^1.10.0",
"@opentelemetry/core": "^1.26.0",
"@opentelemetry/semantic-conventions": "^1.27.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-alibaba-cloud#readme"
Expand Down
7 changes: 7 additions & 0 deletions detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [0.4.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.4.2...resource-detector-container-v0.4.3) (2024-10-10)


### Bug Fixes

* add missing @opentelemetry/core dependency ([#2473](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2473)) ([4d66431](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4d66431a2ad480720bf6c33663a419ec1404cd33))

## [0.4.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.4.1...resource-detector-container-v0.4.2) (2024-10-08)


Expand Down
3 changes: 2 additions & 1 deletion detectors/node/opentelemetry-resource-detector-container/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-container",
"version": "0.4.2",
"version": "0.4.3",
"description": "Opentelemetry resource detector to get container resource attributes",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -51,6 +51,7 @@
},
"dependencies": {
"@opentelemetry/resources": "^1.10.0",
"@opentelemetry/core": "^1.26.0",
"@opentelemetry/semantic-conventions": "^1.27.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-container#readme"
Expand Down
11 changes: 11 additions & 0 deletions metapackages/auto-instrumentations-node/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## [0.50.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.50.1...auto-instrumentations-node-v0.50.2) (2024-10-10)


### Dependencies

* The following workspace dependencies were updated
* dependencies
* @opentelemetry/instrumentation-pg bumped from ^0.45.0 to ^0.45.1
* @opentelemetry/resource-detector-alibaba-cloud bumped from ^0.29.2 to ^0.29.3
* @opentelemetry/resource-detector-container bumped from ^0.4.2 to ^0.4.3

## [0.50.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.50.0...auto-instrumentations-node-v0.50.1) (2024-10-08)


Expand Down
8 changes: 4 additions & 4 deletions metapackages/auto-instrumentations-node/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/auto-instrumentations-node",
"version": "0.50.1",
"version": "0.50.2",
"description": "Metapackage which bundles opentelemetry node core and contrib instrumentations",
"author": "OpenTelemetry Authors",
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-node#readme",
Expand Down Expand Up @@ -79,7 +79,7 @@
"@opentelemetry/instrumentation-mysql2": "^0.41.0",
"@opentelemetry/instrumentation-nestjs-core": "^0.40.0",
"@opentelemetry/instrumentation-net": "^0.39.0",
"@opentelemetry/instrumentation-pg": "^0.45.0",
"@opentelemetry/instrumentation-pg": "^0.45.1",
"@opentelemetry/instrumentation-pino": "^0.42.0",
"@opentelemetry/instrumentation-redis": "^0.42.0",
"@opentelemetry/instrumentation-redis-4": "^0.42.1",
Expand All @@ -89,10 +89,10 @@
"@opentelemetry/instrumentation-tedious": "^0.14.0",
"@opentelemetry/instrumentation-undici": "^0.6.0",
"@opentelemetry/instrumentation-winston": "^0.40.0",
"@opentelemetry/resource-detector-alibaba-cloud": "^0.29.2",
"@opentelemetry/resource-detector-alibaba-cloud": "^0.29.3",
"@opentelemetry/resource-detector-aws": "^1.6.2",
"@opentelemetry/resource-detector-azure": "^0.2.11",
"@opentelemetry/resource-detector-container": "^0.4.2",
"@opentelemetry/resource-detector-container": "^0.4.3",
"@opentelemetry/resource-detector-gcp": "^0.29.12",
"@opentelemetry/resources": "^1.24.0",
"@opentelemetry/sdk-node": "^0.53.0"
Expand Down
30 changes: 18 additions & 12 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions plugins/node/opentelemetry-instrumentation-pg/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [0.45.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pg-v0.45.0...instrumentation-pg-v0.45.1) (2024-10-10)


### Bug Fixes

* add missing @opentelemetry/core dependency ([#2473](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2473)) ([4d66431](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/4d66431a2ad480720bf6c33663a419ec1404cd33))

## [0.45.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-pg-v0.44.0...instrumentation-pg-v0.45.0) (2024-10-08)


Expand Down
5 changes: 3 additions & 2 deletions plugins/node/opentelemetry-instrumentation-pg/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/instrumentation-pg",
"version": "0.45.0",
"version": "0.45.1",
"description": "OpenTelemetry instrumentation for `pg` and `pg-pool` database client for PostgreSQL",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -73,8 +73,9 @@
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/semantic-conventions": "^1.27.0",
"@opentelemetry/semantic-conventions": "1.27.0",
"@opentelemetry/sql-common": "^0.40.1",
"@opentelemetry/core": "^1.26.0",
"@types/pg": "8.6.1",
"@types/pg-pool": "2.0.6"
},
Expand Down

0 comments on commit 868ed59

Please sign in to comment.