Skip to content

Commit 97f33e1

Browse files
authored
Merge pull request open-telemetry#197 from opentelemetrybot/opentelemetrybot/merge-main
[AutoMerge][Main] Merging staged change(s) to main
2 parents 08a7478 + c7b0253 commit 97f33e1

File tree

207 files changed

+1951
-1144
lines changed

Some content is hidden

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

207 files changed

+1951
-1144
lines changed

auto-merge/contrib/.github/workflows/close-stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ jobs:
1717
close-pr-message: 'This PR was closed because it has been stale for 14 days with no activity.'
1818
stale-issue-label: stale
1919
stale-pr-label: stale
20-
exempt-issue-labels: never-stale,instrumentation-request
20+
exempt-issue-labels: never-stale,instrumentation-request,bug
2121
exempt-pr-labels: never-stale
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.1","detectors/node/opentelemetry-resource-detector-aws":"1.3.1","detectors/node/opentelemetry-resource-detector-container":"0.3.1","detectors/node/opentelemetry-resource-detector-gcp":"0.29.1","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.1","metapackages/auto-instrumentations-node":"0.39.2","metapackages/auto-instrumentations-web":"0.33.1","packages/opentelemetry-host-metrics":"0.33.1","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.1","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.1","plugins/node/instrumentation-amqplib":"0.33.1","plugins/node/instrumentation-cucumber":"0.1.0","plugins/node/instrumentation-dataloader":"0.5.1","plugins/node/instrumentation-fs":"0.8.1","plugins/node/instrumentation-lru-memoizer":"0.33.1","plugins/node/instrumentation-mongoose":"0.33.1","plugins/node/instrumentation-socket.io":"0.34.1","plugins/node/instrumentation-tedious":"0.6.1","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.36.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.32.1","plugins/node/opentelemetry-instrumentation-cassandra":"0.33.1","plugins/node/opentelemetry-instrumentation-connect":"0.32.1","plugins/node/opentelemetry-instrumentation-dns":"0.32.2","plugins/node/opentelemetry-instrumentation-express":"0.33.1","plugins/node/opentelemetry-instrumentation-fastify":"0.32.2","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.2","plugins/node/opentelemetry-instrumentation-graphql":"0.35.1","plugins/node/opentelemetry-instrumentation-hapi":"0.33.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.1","plugins/node/opentelemetry-instrumentation-knex":"0.32.1","plugins/node/opentelemetry-instrumentation-koa":"0.36.0","plugins/node/opentelemetry-instrumentation-memcached":"0.32.1","plugins/node/opentelemetry-instrumentation-mongodb":"0.37.0","plugins/node/opentelemetry-instrumentation-mysql":"0.34.1","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.1","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.1","plugins/node/opentelemetry-instrumentation-net":"0.32.1","plugins/node/opentelemetry-instrumentation-pg":"0.36.1","plugins/node/opentelemetry-instrumentation-pino":"0.34.1","plugins/node/opentelemetry-instrumentation-redis":"0.35.1","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.1","plugins/node/opentelemetry-instrumentation-restify":"0.34.0","plugins/node/opentelemetry-instrumentation-router":"0.33.1","plugins/node/opentelemetry-instrumentation-winston":"0.32.1","plugins/web/opentelemetry-instrumentation-document-load":"0.33.1","plugins/web/opentelemetry-instrumentation-long-task":"0.33.1","plugins/web/opentelemetry-instrumentation-user-interaction":"0.33.1","plugins/web/opentelemetry-plugin-react-load":"0.29.1","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}
1+
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.2","detectors/node/opentelemetry-resource-detector-aws":"1.3.2","detectors/node/opentelemetry-resource-detector-container":"0.3.2","detectors/node/opentelemetry-resource-detector-gcp":"0.29.2","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.2","metapackages/auto-instrumentations-node":"0.39.4","metapackages/auto-instrumentations-web":"0.33.2","packages/opentelemetry-host-metrics":"0.33.1","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.2","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.2","plugins/node/instrumentation-amqplib":"0.33.2","plugins/node/instrumentation-cucumber":"0.1.1","plugins/node/instrumentation-dataloader":"0.5.2","plugins/node/instrumentation-fs":"0.8.2","plugins/node/instrumentation-lru-memoizer":"0.33.2","plugins/node/instrumentation-mongoose":"0.33.2","plugins/node/instrumentation-socket.io":"0.34.2","plugins/node/instrumentation-tedious":"0.6.2","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.1","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.36.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.32.2","plugins/node/opentelemetry-instrumentation-cassandra":"0.33.2","plugins/node/opentelemetry-instrumentation-connect":"0.32.2","plugins/node/opentelemetry-instrumentation-dns":"0.32.3","plugins/node/opentelemetry-instrumentation-express":"0.33.2","plugins/node/opentelemetry-instrumentation-fastify":"0.32.3","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.3","plugins/node/opentelemetry-instrumentation-graphql":"0.35.2","plugins/node/opentelemetry-instrumentation-hapi":"0.33.1","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.2","plugins/node/opentelemetry-instrumentation-knex":"0.32.2","plugins/node/opentelemetry-instrumentation-koa":"0.36.1","plugins/node/opentelemetry-instrumentation-memcached":"0.32.2","plugins/node/opentelemetry-instrumentation-mongodb":"0.37.1","plugins/node/opentelemetry-instrumentation-mysql":"0.34.2","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.2","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.2","plugins/node/opentelemetry-instrumentation-net":"0.32.2","plugins/node/opentelemetry-instrumentation-pg":"0.36.2","plugins/node/opentelemetry-instrumentation-pino":"0.34.2","plugins/node/opentelemetry-instrumentation-redis":"0.35.2","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.3","plugins/node/opentelemetry-instrumentation-restify":"0.34.1","plugins/node/opentelemetry-instrumentation-router":"0.33.2","plugins/node/opentelemetry-instrumentation-winston":"0.32.2","plugins/web/opentelemetry-instrumentation-document-load":"0.33.2","plugins/web/opentelemetry-instrumentation-long-task":"0.33.2","plugins/web/opentelemetry-instrumentation-user-interaction":"0.33.2","plugins/web/opentelemetry-plugin-react-load":"0.29.1","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}

auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
* devDependencies
3737
* @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4
3838

39+
### Dependencies
40+
41+
* The following workspace dependencies were updated
42+
* devDependencies
43+
* @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2
44+
3945
## [0.28.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.0...resource-detector-alibaba-cloud-v0.28.1) (2023-08-14)
4046

4147

auto-merge/contrib/detectors/node/opentelemetry-resource-detector-alibaba-cloud/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-alibaba-cloud",
3-
"version": "0.28.1",
3+
"version": "0.28.2",
44
"description": "OpenTelemetry resource detector for Alibaba Cloud",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -43,14 +43,14 @@
4343
},
4444
"devDependencies": {
4545
"@opentelemetry/api": "^1.0.0",
46-
"@opentelemetry/contrib-test-utils": "^0.34.1",
46+
"@opentelemetry/contrib-test-utils": "^0.34.2",
4747
"@types/mocha": "8.2.3",
4848
"@types/node": "18.6.5",
49-
"@types/sinon": "10.0.16",
49+
"@types/sinon": "10.0.18",
5050
"mocha": "7.2.0",
5151
"nock": "13.3.3",
5252
"nyc": "15.1.0",
53-
"rimraf": "5.0.1",
53+
"rimraf": "5.0.5",
5454
"sinon": "15.2.0",
5555
"ts-mocha": "10.0.0",
5656
"typescript": "4.4.4"

auto-merge/contrib/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
* devDependencies
3737
* @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4
3838

39+
### Dependencies
40+
41+
* The following workspace dependencies were updated
42+
* devDependencies
43+
* @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2
44+
3945
## [1.3.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.3.0...resource-detector-aws-v1.3.1) (2023-08-14)
4046

4147

auto-merge/contrib/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.3.1",
3+
"version": "1.3.2",
44
"description": "OpenTelemetry SDK resource detector for AWS",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -42,14 +42,14 @@
4242
},
4343
"devDependencies": {
4444
"@opentelemetry/api": "^1.0.0",
45-
"@opentelemetry/contrib-test-utils": "^0.34.1",
45+
"@opentelemetry/contrib-test-utils": "^0.34.2",
4646
"@types/mocha": "8.2.3",
4747
"@types/node": "18.6.5",
48-
"@types/sinon": "10.0.16",
48+
"@types/sinon": "10.0.18",
4949
"mocha": "7.2.0",
5050
"nock": "13.3.3",
5151
"nyc": "15.1.0",
52-
"rimraf": "5.0.1",
52+
"rimraf": "5.0.5",
5353
"sinon": "15.2.0",
5454
"ts-mocha": "10.0.0",
5555
"typescript": "4.4.4"

auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,20 @@
3030
* devDependencies
3131
* @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4
3232

33+
## [0.3.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.3.1...resource-detector-container-v0.3.2) (2023-10-10)
34+
35+
36+
### Bug Fixes
37+
38+
* Update defect of of wrong resource attribute of "container.id" ([#1682](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1682)) ([5675c49](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/5675c49b2b58e6b159a47d1a9ff5b00bc30a94a0))
39+
40+
41+
### Dependencies
42+
43+
* The following workspace dependencies were updated
44+
* devDependencies
45+
* @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2
46+
3347
## [0.3.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-container-v0.3.0...resource-detector-container-v0.3.1) (2023-08-14)
3448

3549

auto-merge/contrib/detectors/node/opentelemetry-resource-detector-container/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-container",
3-
"version": "0.3.1",
3+
"version": "0.3.2",
44
"description": "Opentelemetry resource detector to get container resource attributes",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -36,15 +36,15 @@
3636
},
3737
"devDependencies": {
3838
"@opentelemetry/api": "^1.0.0",
39-
"@opentelemetry/contrib-test-utils": "^0.34.1",
39+
"@opentelemetry/contrib-test-utils": "^0.34.2",
4040
"@types/mocha": "8.2.3",
4141
"@types/node": "18.6.5",
42-
"@types/sinon": "10.0.16",
42+
"@types/sinon": "10.0.18",
4343
"eslint-plugin-header": "^3.1.1",
4444
"mocha": "7.2.0",
4545
"nock": "13.3.3",
4646
"nyc": "15.1.0",
47-
"rimraf": "5.0.1",
47+
"rimraf": "5.0.5",
4848
"sinon": "15.2.0",
4949
"ts-mocha": "10.0.0",
5050
"typescript": "4.4.4"

auto-merge/contrib/detectors/node/opentelemetry-resource-detector-gcp/CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@
3636
* devDependencies
3737
* @opentelemetry/contrib-test-utils bumped from ^0.33.3 to ^0.33.4
3838

39+
## [0.29.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.29.1...resource-detector-gcp-v0.29.2) (2023-10-10)
40+
41+
42+
### Bug Fixes
43+
44+
* **deps:** update all patch versions ([#1687](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1687)) ([47301c0](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/47301c038e4dc7d24797cb0b8426033ecc0374e6))
45+
46+
47+
### Dependencies
48+
49+
* The following workspace dependencies were updated
50+
* devDependencies
51+
* @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2
52+
3953
## [0.29.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-gcp-v0.29.0...resource-detector-gcp-v0.29.1) (2023-08-14)
4054

4155

auto-merge/contrib/detectors/node/opentelemetry-resource-detector-gcp/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-gcp",
3-
"version": "0.29.1",
3+
"version": "0.29.2",
44
"description": "OpenTelemetry SDK resource detector for GCP",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -42,14 +42,14 @@
4242
},
4343
"devDependencies": {
4444
"@opentelemetry/api": "^1.0.0",
45-
"@opentelemetry/contrib-test-utils": "^0.34.1",
45+
"@opentelemetry/contrib-test-utils": "^0.34.2",
4646
"@types/mocha": "8.2.3",
4747
"@types/node": "18.6.5",
48-
"@types/semver": "7.5.2",
48+
"@types/semver": "7.5.3",
4949
"mocha": "7.2.0",
5050
"nock": "13.3.3",
5151
"nyc": "15.1.0",
52-
"rimraf": "5.0.1",
52+
"rimraf": "5.0.5",
5353
"ts-mocha": "10.0.0",
5454
"typescript": "4.4.4"
5555
},

0 commit comments

Comments
 (0)