Skip to content

Commit 2964f8a

Browse files
johnbleyjohnbley
authored
Merge branch 'main' into main
2 parents 54c0841 + b09cb40 commit 2964f8a

File tree

148 files changed

+2414
-2555
lines changed

Some content is hidden

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

148 files changed

+2414
-2555
lines changed

‎.github/component_owners.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
components:
33
detectors/node/opentelemetry-resource-detector-alibaba-cloud:
44
- legendecas
5-
detectors/node/opentelemetry-resource-detector-aws:
6-
- carolabadeer
5+
detectors/node/opentelemetry-resource-detector-aws: []
6+
# Unmaintained
77
detectors/node/opentelemetry-resource-detector-azure:
88
- jacksonweber
99
- hectorhdzg
@@ -16,8 +16,8 @@ components:
1616
# Unmaintained
1717
detectors/node/opentelemetry-resource-detector-instana:
1818
- kirrg001
19-
incubator/opentelemetry-sampler-aws-xray:
20-
- carolabadeer
19+
incubator/opentelemetry-sampler-aws-xray: []
20+
# Unmaintained
2121
metapackages/auto-configuration-propagators:
2222
- pichlermarc
2323
metapackages/auto-instrumentations-node:
@@ -35,8 +35,8 @@ components:
3535
- jamiedanielson
3636
packages/opentelemetry-host-metrics:
3737
- legendecas
38-
packages/opentelemetry-id-generator-aws-xray:
39-
- carolabadeer
38+
packages/opentelemetry-id-generator-aws-xray: []
39+
# Unmaintained
4040
packages/opentelemetry-propagation-utils:
4141
- dyladan
4242
- pichlermarc
@@ -69,10 +69,9 @@ components:
6969
- mottibec
7070
plugins/node/instrumentation-tedious: []
7171
# Unmaintained
72-
plugins/node/opentelemetry-instrumentation-aws-lambda:
73-
- carolabadeer
72+
plugins/node/opentelemetry-instrumentation-aws-lambda: []
73+
# Unmaintained
7474
plugins/node/opentelemetry-instrumentation-aws-sdk:
75-
- carolabadeer
7675
- blumamir
7776
plugins/node/opentelemetry-instrumentation-bunyan:
7877
- seemk

‎.github/workflows/close-stale.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ jobs:
4242
close-pr-message: 'This issue was closed because no owner or sponsor has been found after 14 days'
4343
stale-pr-label: pkg-status:unmaintained:autoclose-scheduled
4444
only-labels: pkg-status:unmaintained
45-
exempt-pr-labels: bug,has:sponsor,type:semconv-update,dependencies,autorelease:pending
45+
exempt-pr-labels: 'bug,has:sponsor,type:semconv-update,dependencies,autorelease: pending'
4646
remove-stale-when-updated: false

‎.release-please-manifest.json‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
11
{
2-
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.0",
3-
"detectors/node/opentelemetry-resource-detector-aws": "1.5.2",
4-
"detectors/node/opentelemetry-resource-detector-azure": "0.2.9",
5-
"detectors/node/opentelemetry-resource-detector-container": "0.3.11",
6-
"detectors/node/opentelemetry-resource-detector-gcp": "0.29.10",
2+
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.29.1",
3+
"detectors/node/opentelemetry-resource-detector-aws": "1.6.1",
4+
"detectors/node/opentelemetry-resource-detector-azure": "0.2.11",
5+
"detectors/node/opentelemetry-resource-detector-container": "0.4.1",
6+
"detectors/node/opentelemetry-resource-detector-gcp": "0.29.11",
77
"detectors/node/opentelemetry-resource-detector-github": "0.29.0",
8-
"detectors/node/opentelemetry-resource-detector-instana": "0.11.0",
9-
"metapackages/auto-configuration-propagators": "0.2.0",
10-
"metapackages/auto-instrumentations-node": "0.49.1",
11-
"metapackages/auto-instrumentations-web": "0.40.0",
8+
"detectors/node/opentelemetry-resource-detector-instana": "0.12.0",
9+
"metapackages/auto-configuration-propagators": "0.3.0",
10+
"metapackages/auto-instrumentations-node": "0.50.0",
11+
"metapackages/auto-instrumentations-web": "0.41.0",
1212
"packages/baggage-span-processor": "0.3.1",
1313
"packages/opentelemetry-host-metrics": "0.35.3",
1414
"packages/opentelemetry-id-generator-aws-xray": "1.2.2",
15-
"packages/opentelemetry-propagation-utils": "0.30.10",
15+
"packages/opentelemetry-propagation-utils": "0.30.11",
1616
"packages/opentelemetry-redis-common": "0.36.2",
1717
"packages/opentelemetry-sql-common": "0.40.1",
18-
"packages/opentelemetry-test-utils": "0.40.0",
19-
"packages/winston-transport": "0.5.0",
20-
"plugins/node/instrumentation-amqplib": "0.41.0",
21-
"plugins/node/instrumentation-cucumber": "0.8.0",
22-
"plugins/node/instrumentation-dataloader": "0.11.0",
23-
"plugins/node/instrumentation-fs": "0.14.0",
24-
"plugins/node/instrumentation-kafkajs": "0.2.0",
25-
"plugins/node/instrumentation-lru-memoizer": "0.39.0",
26-
"plugins/node/instrumentation-mongoose": "0.40.0",
27-
"plugins/node/instrumentation-runtime-node": "0.6.0",
28-
"plugins/node/instrumentation-socket.io": "0.41.0",
29-
"plugins/node/instrumentation-tedious": "0.12.0",
30-
"plugins/node/instrumentation-undici": "0.4.0",
31-
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.43.0",
32-
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.43.1",
33-
"plugins/node/opentelemetry-instrumentation-bunyan": "0.40.0",
34-
"plugins/node/opentelemetry-instrumentation-cassandra": "0.40.0",
35-
"plugins/node/opentelemetry-instrumentation-connect": "0.38.0",
36-
"plugins/node/opentelemetry-instrumentation-dns": "0.38.0",
37-
"plugins/node/opentelemetry-instrumentation-express": "0.41.1",
38-
"plugins/node/opentelemetry-instrumentation-fastify": "0.38.0",
39-
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.38.0",
40-
"plugins/node/opentelemetry-instrumentation-graphql": "0.42.0",
41-
"plugins/node/opentelemetry-instrumentation-hapi": "0.40.0",
42-
"plugins/node/opentelemetry-instrumentation-ioredis": "0.42.0",
43-
"plugins/node/opentelemetry-instrumentation-knex": "0.39.0",
44-
"plugins/node/opentelemetry-instrumentation-koa": "0.42.0",
45-
"plugins/node/opentelemetry-instrumentation-memcached": "0.38.0",
46-
"plugins/node/opentelemetry-instrumentation-mongodb": "0.46.0",
47-
"plugins/node/opentelemetry-instrumentation-mysql": "0.40.0",
48-
"plugins/node/opentelemetry-instrumentation-mysql2": "0.40.0",
49-
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.39.0",
50-
"plugins/node/opentelemetry-instrumentation-net": "0.38.0",
51-
"plugins/node/opentelemetry-instrumentation-pg": "0.43.0",
52-
"plugins/node/opentelemetry-instrumentation-pino": "0.41.0",
53-
"plugins/node/opentelemetry-instrumentation-redis": "0.41.0",
54-
"plugins/node/opentelemetry-instrumentation-redis-4": "0.41.0",
55-
"plugins/node/opentelemetry-instrumentation-restify": "0.40.0",
56-
"plugins/node/opentelemetry-instrumentation-router": "0.39.0",
57-
"plugins/node/opentelemetry-instrumentation-winston": "0.39.0",
58-
"plugins/web/opentelemetry-instrumentation-document-load": "0.39.0",
59-
"plugins/web/opentelemetry-instrumentation-long-task": "0.39.0",
60-
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.39.0",
61-
"plugins/web/opentelemetry-plugin-react-load": "0.30.1",
18+
"packages/opentelemetry-test-utils": "0.41.0",
19+
"packages/winston-transport": "0.6.0",
20+
"plugins/node/instrumentation-amqplib": "0.42.0",
21+
"plugins/node/instrumentation-cucumber": "0.9.0",
22+
"plugins/node/instrumentation-dataloader": "0.12.0",
23+
"plugins/node/instrumentation-fs": "0.15.0",
24+
"plugins/node/instrumentation-kafkajs": "0.3.0",
25+
"plugins/node/instrumentation-lru-memoizer": "0.40.0",
26+
"plugins/node/instrumentation-mongoose": "0.42.0",
27+
"plugins/node/instrumentation-runtime-node": "0.7.0",
28+
"plugins/node/instrumentation-socket.io": "0.42.0",
29+
"plugins/node/instrumentation-tedious": "0.14.0",
30+
"plugins/node/instrumentation-undici": "0.6.0",
31+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.44.0",
32+
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.44.0",
33+
"plugins/node/opentelemetry-instrumentation-bunyan": "0.41.0",
34+
"plugins/node/opentelemetry-instrumentation-cassandra": "0.41.0",
35+
"plugins/node/opentelemetry-instrumentation-connect": "0.39.0",
36+
"plugins/node/opentelemetry-instrumentation-dns": "0.39.0",
37+
"plugins/node/opentelemetry-instrumentation-express": "0.42.0",
38+
"plugins/node/opentelemetry-instrumentation-fastify": "0.39.0",
39+
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.39.0",
40+
"plugins/node/opentelemetry-instrumentation-graphql": "0.43.0",
41+
"plugins/node/opentelemetry-instrumentation-hapi": "0.41.0",
42+
"plugins/node/opentelemetry-instrumentation-ioredis": "0.43.0",
43+
"plugins/node/opentelemetry-instrumentation-knex": "0.40.0",
44+
"plugins/node/opentelemetry-instrumentation-koa": "0.43.0",
45+
"plugins/node/opentelemetry-instrumentation-memcached": "0.39.0",
46+
"plugins/node/opentelemetry-instrumentation-mongodb": "0.47.0",
47+
"plugins/node/opentelemetry-instrumentation-mysql": "0.41.0",
48+
"plugins/node/opentelemetry-instrumentation-mysql2": "0.41.0",
49+
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.40.0",
50+
"plugins/node/opentelemetry-instrumentation-net": "0.39.0",
51+
"plugins/node/opentelemetry-instrumentation-pg": "0.44.0",
52+
"plugins/node/opentelemetry-instrumentation-pino": "0.42.0",
53+
"plugins/node/opentelemetry-instrumentation-redis": "0.42.0",
54+
"plugins/node/opentelemetry-instrumentation-redis-4": "0.42.0",
55+
"plugins/node/opentelemetry-instrumentation-restify": "0.41.0",
56+
"plugins/node/opentelemetry-instrumentation-router": "0.40.0",
57+
"plugins/node/opentelemetry-instrumentation-winston": "0.40.0",
58+
"plugins/web/opentelemetry-instrumentation-document-load": "0.40.0",
59+
"plugins/web/opentelemetry-instrumentation-long-task": "0.40.0",
60+
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.40.0",
61+
"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"
6464
}

‎archive/opentelemetry-browser-extension-autoinjection/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"@opentelemetry/resources": "^1.8.0",
7777
"@opentelemetry/sdk-trace-base": "^1.8.0",
7878
"@opentelemetry/sdk-trace-web": "^1.8.0",
79-
"@opentelemetry/semantic-conventions": "^1.0.0",
79+
"@opentelemetry/semantic-conventions": "^1.27.0",
8080
"change-case": "4.1.2",
8181
"json5": "2.2.0",
8282
"react": "17.0.2",

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

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

3+
## [0.29.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.29.0...resource-detector-alibaba-cloud-v0.29.1) (2024-09-02)
4+
5+
6+
### Dependencies
7+
8+
* The following workspace dependencies were updated
9+
* devDependencies
10+
* @opentelemetry/contrib-test-utils bumped from ^0.40.0 to ^0.41.0
11+
312
## [0.29.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.10...resource-detector-alibaba-cloud-v0.29.0) (2024-08-05)
413

514

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-alibaba-cloud",
3-
"version": "0.29.0",
3+
"version": "0.29.1",
44
"description": "OpenTelemetry resource detector for Alibaba Cloud",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -40,7 +40,7 @@
4040
},
4141
"devDependencies": {
4242
"@opentelemetry/api": "^1.0.0",
43-
"@opentelemetry/contrib-test-utils": "^0.40.0",
43+
"@opentelemetry/contrib-test-utils": "^0.41.0",
4444
"@types/mocha": "8.2.3",
4545
"@types/node": "18.6.5",
4646
"@types/sinon": "10.0.20",
@@ -57,7 +57,7 @@
5757
},
5858
"dependencies": {
5959
"@opentelemetry/resources": "^1.0.0",
60-
"@opentelemetry/semantic-conventions": "^1.22.0"
60+
"@opentelemetry/semantic-conventions": "^1.27.0"
6161
},
6262
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-alibaba-cloud#readme"
6363
}

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

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

3+
## [1.6.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.6.0...resource-detector-aws-v1.6.1) (2024-09-02)
4+
5+
6+
### Dependencies
7+
8+
* The following workspace dependencies were updated
9+
* devDependencies
10+
* @opentelemetry/contrib-test-utils bumped from ^0.40.0 to ^0.41.0
11+
12+
## [1.6.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.5.2...resource-detector-aws-v1.6.0) (2024-08-27)
13+
14+
15+
### Features
16+
17+
* **detector-aws:** add sync version for all detectors ([#2376](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2376)) ([167dced](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/167dced09de0d2104561542b4f83047fa656505f))
18+
19+
20+
### Bug Fixes
21+
22+
* **detectors:** reduce diag level on detectors failing to detect ([#2382](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2382)) ([d7a5bd4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/d7a5bd45838f34bab45f4ba235093fa686032622))
23+
324
## [1.5.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.5.1...resource-detector-aws-v1.5.2) (2024-07-03)
425

526

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
[![NPM Published Version][npm-img]][npm-url]
44
[![Apache License][license-image]][license-image]
55

6-
[component owners](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml): @carolabadeer
6+
[component owners](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/.github/component_owners.yml): N/A
77

88
Resource detector for Amazon Web Services.
99

1010
## Status
1111

12-
| Maturity | [Component Owner](../../.github/component_owners.yml) | Compatibility |
13-
| ----------------------------------------- | ----------------------------------------------------- | --------------------- |
14-
| [Stable](../../../CONTRIBUTING.md#stable) | @carolabadeer | API 1.0+<br/>SDK 1.0+ |
12+
| Maturity | [Component Owner](../../.github/component_owners.yml) | Compatibility |
13+
|-------------------------------------------------------|-------------------------------------------------------|-----------------------|
14+
| [Unmaintained](../../../CONTRIBUTING.md#unmaintained) | N/A | API 1.0+<br/>SDK 1.0+ |
1515

1616
## Installation
1717

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-aws",
3-
"version": "1.5.2",
3+
"version": "1.6.1",
44
"description": "OpenTelemetry SDK resource detector for AWS",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -39,7 +39,7 @@
3939
},
4040
"devDependencies": {
4141
"@opentelemetry/api": "^1.0.0",
42-
"@opentelemetry/contrib-test-utils": "^0.40.0",
42+
"@opentelemetry/contrib-test-utils": "^0.41.0",
4343
"@types/mocha": "8.2.3",
4444
"@types/node": "18.6.5",
4545
"@types/sinon": "10.0.20",
@@ -57,7 +57,7 @@
5757
"dependencies": {
5858
"@opentelemetry/core": "^1.0.0",
5959
"@opentelemetry/resources": "^1.10.0",
60-
"@opentelemetry/semantic-conventions": "^1.22.0"
60+
"@opentelemetry/semantic-conventions": "^1.27.0"
6161
},
6262
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-aws#readme"
6363
}

‎detectors/node/opentelemetry-resource-detector-aws/src/detectors/AwsEcsDetectorSync.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export class AwsEcsDetectorSync implements DetectorSync {
137137
}
138138
}
139139
} catch (e) {
140-
diag.warn('AwsEcsDetector failed to read container ID', e);
140+
diag.debug('AwsEcsDetector failed to read container ID', e);
141141
}
142142

143143
if (hostName || containerId) {

0 commit comments

Comments
 (0)