Skip to content

Commit 518470f

Browse files
authored
Merge branch 'main' into capture-arn-sns-instrumnentation
2 parents 71dd4fa + 607d375 commit 518470f

File tree

161 files changed

+868
-506
lines changed

Some content is hidden

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

161 files changed

+868
-506
lines changed

.release-please-manifest.json

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.2","detectors/node/opentelemetry-resource-detector-aws":"1.3.2","detectors/node/opentelemetry-resource-detector-azure":"0.1.0","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"}
1+
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.3","detectors/node/opentelemetry-resource-detector-aws":"1.3.3","detectors/node/opentelemetry-resource-detector-azure":"0.2.0","detectors/node/opentelemetry-resource-detector-container":"0.3.3","detectors/node/opentelemetry-resource-detector-gcp":"0.29.3","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.3","metapackages/auto-instrumentations-node":"0.40.0","metapackages/auto-instrumentations-web":"0.34.0","packages/opentelemetry-host-metrics":"0.33.2","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.3","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.34.3","plugins/node/instrumentation-amqplib":"0.33.3","plugins/node/instrumentation-cucumber":"0.1.2","plugins/node/instrumentation-dataloader":"0.5.3","plugins/node/instrumentation-fs":"0.8.3","plugins/node/instrumentation-lru-memoizer":"0.33.3","plugins/node/instrumentation-mongoose":"0.33.3","plugins/node/instrumentation-socket.io":"0.34.3","plugins/node/instrumentation-tedious":"0.6.3","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.2","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.36.2","plugins/node/opentelemetry-instrumentation-bunyan":"0.33.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.34.0","plugins/node/opentelemetry-instrumentation-connect":"0.32.3","plugins/node/opentelemetry-instrumentation-dns":"0.32.4","plugins/node/opentelemetry-instrumentation-express":"0.33.3","plugins/node/opentelemetry-instrumentation-fastify":"0.32.4","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.4","plugins/node/opentelemetry-instrumentation-graphql":"0.36.0","plugins/node/opentelemetry-instrumentation-hapi":"0.33.2","plugins/node/opentelemetry-instrumentation-ioredis":"0.35.3","plugins/node/opentelemetry-instrumentation-knex":"0.32.3","plugins/node/opentelemetry-instrumentation-koa":"0.36.2","plugins/node/opentelemetry-instrumentation-memcached":"0.32.3","plugins/node/opentelemetry-instrumentation-mongodb":"0.37.2","plugins/node/opentelemetry-instrumentation-mysql":"0.34.3","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.3","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.3","plugins/node/opentelemetry-instrumentation-net":"0.32.3","plugins/node/opentelemetry-instrumentation-pg":"0.37.0","plugins/node/opentelemetry-instrumentation-pino":"0.34.3","plugins/node/opentelemetry-instrumentation-redis":"0.35.3","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.4","plugins/node/opentelemetry-instrumentation-restify":"0.34.2","plugins/node/opentelemetry-instrumentation-router":"0.33.3","plugins/node/opentelemetry-instrumentation-winston":"0.33.0","plugins/web/opentelemetry-instrumentation-document-load":"0.34.0","plugins/web/opentelemetry-instrumentation-long-task":"0.34.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.34.0","plugins/web/opentelemetry-plugin-react-load":"0.30.0","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"}

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ You will receive the following error :
5151
✖ type must be one of [ci, feat, fix, docs, style, refactor, perf, test, revert, chore] [type-enum]
5252
```
5353

54-
Here an exemple that will pass the verification: `git commit -s -am "chore(opentelemetry-core): update deps"`
54+
Here an example that will pass the verification: `git commit -s -am "chore(opentelemetry-core): update deps"`
5555

5656
### Fork
5757

detectors/node/opentelemetry-resource-detector-alibaba-cloud/.npmignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
* devDependencies
4343
* @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2
4444

45+
### Dependencies
46+
47+
* The following workspace dependencies were updated
48+
* devDependencies
49+
* @opentelemetry/contrib-test-utils bumped from ^0.34.2 to ^0.34.3
50+
4551
## [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)
4652

4753

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

Lines changed: 3 additions & 6 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.2",
3+
"version": "0.28.3",
44
"description": "OpenTelemetry resource detector for Alibaba Cloud",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -33,17 +33,14 @@
3333
"files": [
3434
"build/src/**/*.js",
3535
"build/src/**/*.js.map",
36-
"build/src/**/*.d.ts",
37-
"doc",
38-
"LICENSE",
39-
"README.md"
36+
"build/src/**/*.d.ts"
4037
],
4138
"publishConfig": {
4239
"access": "public"
4340
},
4441
"devDependencies": {
4542
"@opentelemetry/api": "^1.0.0",
46-
"@opentelemetry/contrib-test-utils": "^0.34.2",
43+
"@opentelemetry/contrib-test-utils": "^0.34.3",
4744
"@types/mocha": "8.2.3",
4845
"@types/node": "18.6.5",
4946
"@types/sinon": "10.0.18",

detectors/node/opentelemetry-resource-detector-aws/.npmignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
* devDependencies
4343
* @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.2
4444

45+
### Dependencies
46+
47+
* The following workspace dependencies were updated
48+
* devDependencies
49+
* @opentelemetry/contrib-test-utils bumped from ^0.34.2 to ^0.34.3
50+
4551
## [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)
4652

4753

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-aws",
3-
"version": "1.3.2",
3+
"version": "1.3.3",
44
"description": "OpenTelemetry SDK resource detector for AWS",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -32,17 +32,14 @@
3232
"files": [
3333
"build/src/**/*.js",
3434
"build/src/**/*.js.map",
35-
"build/src/**/*.d.ts",
36-
"doc",
37-
"LICENSE",
38-
"README.md"
35+
"build/src/**/*.d.ts"
3936
],
4037
"publishConfig": {
4138
"access": "public"
4239
},
4340
"devDependencies": {
4441
"@opentelemetry/api": "^1.0.0",
45-
"@opentelemetry/contrib-test-utils": "^0.34.2",
42+
"@opentelemetry/contrib-test-utils": "^0.34.3",
4643
"@types/mocha": "8.2.3",
4744
"@types/node": "18.6.5",
4845
"@types/sinon": "10.0.18",

detectors/node/opentelemetry-resource-detector-azure/.npmignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

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

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

3+
## [0.2.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.1.0...resource-detector-azure-v0.2.0) (2023-11-13)
4+
5+
6+
### Features
7+
8+
* Add Azure App Service, Azure Functions, and VM Resource Detectors ([#1740](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1740)) ([1b0caa6](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/1b0caa61972d969e3baea6a7db365e66dafe0c5d))
9+
10+
11+
### Dependencies
12+
13+
* The following workspace dependencies were updated
14+
* devDependencies
15+
* @opentelemetry/contrib-test-utils bumped from ^0.34.1 to ^0.34.3
16+
317
## [0.1.0]() ()
418

519
### Features

0 commit comments

Comments
 (0)