Skip to content

Commit f8fb951

Browse files
committed
Merge branch 'main' into tm-pg-duration-metric-with-promises
2 parents fd844d6 + 836ae2d commit f8fb951

Some content is hidden

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

44 files changed

+3853
-494
lines changed

.github/component-label-map.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,14 @@ pkg:sql-common:
274274
- changed-files:
275275
- any-glob-to-any-file:
276276
- packages/opentelemetry-sql-common/**
277+
pkg:propagator-aws-xray:
278+
- changed-files:
279+
- any-glob-to-any-file:
280+
- propagators/propagator-aws-xray/**
281+
pkg:propagator-aws-xray-lambda:
282+
- changed-files:
283+
- any-glob-to-any-file:
284+
- propagators/propagator-aws-xray-lambda/**
277285
pkg-status:unmaintained:
278286
- changed-files:
279287
- any-glob-to-any-file:
@@ -296,3 +304,5 @@ pkg-status:unmaintained:
296304
- plugins/node/opentelemetry-instrumentation-restify/**
297305
- plugins/node/opentelemetry-instrumentation-router/**
298306
- propagators/opentelemetry-propagator-ot-trace/**
307+
- propagators/propagator-aws-xray/**
308+
- propagators/propagator-aws-xray-lambda/**

.github/component_owners.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ components:
145145
- kirrg001
146146
propagators/opentelemetry-propagator-ot-trace: []
147147
# Unmaintained
148+
propagators/propagator-aws-xray: [ ]
149+
# Unmaintained
150+
propagators/propagator-aws-xray-lambda: [ ]
151+
# Unmaintained
148152

149153
ignored-authors:
150154
- renovate-bot

.github/workflows/lint.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,3 @@ jobs:
1919
- name: Lint
2020
run: |
2121
npm run lint
22-
npm run lint:markdown
23-
npm run lint:readme

.release-please-manifest.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.3",
33
"detectors/node/opentelemetry-resource-detector-aws": "1.6.2",
44
"detectors/node/opentelemetry-resource-detector-azure": "0.2.11",
5-
"detectors/node/opentelemetry-resource-detector-container": "0.4.3",
5+
"detectors/node/opentelemetry-resource-detector-container": "0.4.4",
66
"detectors/node/opentelemetry-resource-detector-gcp": "0.29.12",
77
"detectors/node/opentelemetry-resource-detector-github": "0.29.0",
88
"detectors/node/opentelemetry-resource-detector-instana": "0.13.0",
99
"metapackages/auto-configuration-propagators": "0.3.1",
10-
"metapackages/auto-instrumentations-node": "0.50.2",
10+
"metapackages/auto-instrumentations-node": "0.51.0",
1111
"metapackages/auto-instrumentations-web": "0.41.0",
1212
"packages/baggage-span-processor": "0.3.1",
1313
"packages/opentelemetry-host-metrics": "0.35.4",
@@ -48,7 +48,7 @@
4848
"plugins/node/opentelemetry-instrumentation-mysql2": "0.41.0",
4949
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.40.0",
5050
"plugins/node/opentelemetry-instrumentation-net": "0.39.0",
51-
"plugins/node/opentelemetry-instrumentation-pg": "0.45.1",
51+
"plugins/node/opentelemetry-instrumentation-pg": "0.46.0",
5252
"plugins/node/opentelemetry-instrumentation-pino": "0.42.0",
5353
"plugins/node/opentelemetry-instrumentation-redis": "0.42.0",
5454
"plugins/node/opentelemetry-instrumentation-redis-4": "0.42.1",
@@ -60,5 +60,7 @@
6060
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.40.0",
6161
"plugins/web/opentelemetry-plugin-react-load": "0.31.0",
6262
"propagators/opentelemetry-propagator-instana": "0.3.2",
63-
"propagators/opentelemetry-propagator-ot-trace": "0.27.2"
63+
"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"
6466
}

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

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

3+
## [0.4.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.4.3...resource-detector-container-v0.4.4) (2024-10-16)
4+
5+
6+
### Bug Fixes
7+
8+
* **detector-container:** properly detect container ID when using Podman ([#2448](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2448)) ([ad560df](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/ad560dfc5f662d418a74b0b197b3f48e4ae002d0))
9+
310
## [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)
411

512

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-container",
3-
"version": "0.4.3",
3+
"version": "0.4.4",
44
"description": "Opentelemetry resource detector to get container resource attributes",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",

metapackages/auto-instrumentations-node/CHANGELOG.md

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

3+
## [0.51.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.50.2...auto-instrumentations-node-v0.51.0) (2024-10-16)
4+
5+
6+
### ⚠ BREAKING CHANGES
7+
8+
* **auto-instrumentations-node:** disable @opentelemetry/instrumentation-fs by default ([#2467](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2467))
9+
10+
### Features
11+
12+
* **auto-instrumentations-node:** disable @opentelemetry/instrumentation-fs by default ([#2467](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2467)) ([a558044](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/a55804415d39c751a3f5f58c00cf27747821302f))
13+
14+
15+
### Dependencies
16+
17+
* The following workspace dependencies were updated
18+
* dependencies
19+
* @opentelemetry/instrumentation-pg bumped from ^0.45.1 to ^0.46.0
20+
* @opentelemetry/resource-detector-container bumped from ^0.4.3 to ^0.4.4
21+
322
## [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)
423

524

metapackages/auto-instrumentations-node/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/auto-instrumentations-node",
3-
"version": "0.50.2",
3+
"version": "0.51.0",
44
"description": "Metapackage which bundles opentelemetry node core and contrib instrumentations",
55
"author": "OpenTelemetry Authors",
66
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-node#readme",
@@ -79,7 +79,7 @@
7979
"@opentelemetry/instrumentation-mysql2": "^0.41.0",
8080
"@opentelemetry/instrumentation-nestjs-core": "^0.40.0",
8181
"@opentelemetry/instrumentation-net": "^0.39.0",
82-
"@opentelemetry/instrumentation-pg": "^0.45.1",
82+
"@opentelemetry/instrumentation-pg": "^0.46.0",
8383
"@opentelemetry/instrumentation-pino": "^0.42.0",
8484
"@opentelemetry/instrumentation-redis": "^0.42.0",
8585
"@opentelemetry/instrumentation-redis-4": "^0.42.1",
@@ -92,7 +92,7 @@
9292
"@opentelemetry/resource-detector-alibaba-cloud": "^0.29.3",
9393
"@opentelemetry/resource-detector-aws": "^1.6.2",
9494
"@opentelemetry/resource-detector-azure": "^0.2.11",
95-
"@opentelemetry/resource-detector-container": "^0.4.3",
95+
"@opentelemetry/resource-detector-container": "^0.4.4",
9696
"@opentelemetry/resource-detector-gcp": "^0.29.12",
9797
"@opentelemetry/resources": "^1.24.0",
9898
"@opentelemetry/sdk-node": "^0.53.0"

0 commit comments

Comments
 (0)