Skip to content

Commit

Permalink
Merge branch 'main' into tm-fastify-404
Browse files Browse the repository at this point in the history
  • Loading branch information
@pichlermarc
pichlermarc authored Nov 9, 2023
2 parents 342d976 + 5564096 commit 6094158
Show file tree
Hide file tree
Showing 50 changed files with 66 additions and 65 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fetch-depth: 0

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 14
registry-url: 'https://registry.npmjs.org'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-all-versions.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- name: Set MySQL variables
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit-test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- name: Set MySQL variables
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- name: Cache Dependencies
Expand Down
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-instana/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/contrib-test-utils": "^0.34.2",
"@opentelemetry/sdk-node": "^0.45.0",
"@opentelemetry/sdk-node": "^0.45.1",
"@types/mocha": "8.2.3",
"@types/node": "18.6.5",
"@types/semver": "7.5.3",
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
Expand Up @@ -49,7 +49,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/instrumentation-amqplib": "^0.33.2",
"@opentelemetry/instrumentation-aws-lambda": "^0.37.1",
"@opentelemetry/instrumentation-aws-sdk": "^0.36.1",
Expand All @@ -64,9 +64,9 @@
"@opentelemetry/instrumentation-fastify": "^0.32.3",
"@opentelemetry/instrumentation-generic-pool": "^0.32.3",
"@opentelemetry/instrumentation-graphql": "^0.35.2",
"@opentelemetry/instrumentation-grpc": "^0.45.0",
"@opentelemetry/instrumentation-grpc": "^0.45.1",
"@opentelemetry/instrumentation-hapi": "^0.33.1",
"@opentelemetry/instrumentation-http": "^0.45.0",
"@opentelemetry/instrumentation-http": "^0.45.1",
"@opentelemetry/instrumentation-ioredis": "^0.35.2",
"@opentelemetry/instrumentation-knex": "^0.32.2",
"@opentelemetry/instrumentation-koa": "^0.36.1",
Expand All @@ -92,6 +92,6 @@
"@opentelemetry/resource-detector-container": "^0.3.2",
"@opentelemetry/resource-detector-gcp": "^0.29.2",
"@opentelemetry/resources": "^1.12.0",
"@opentelemetry/sdk-node": "^0.45.0"
"@opentelemetry/sdk-node": "^0.45.1"
}
}
9 changes: 5 additions & 4 deletions metapackages/auto-instrumentations-web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0"
"@opentelemetry/api": "^1.3.0",
"zone.js": "0.11.4"
},
"devDependencies": {
"@babel/core": "7.22.17",
Expand Down Expand Up @@ -59,10 +60,10 @@
"webpack-merge": "5.8.0"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/instrumentation-document-load": "^0.33.2",
"@opentelemetry/instrumentation-fetch": "^0.45.0",
"@opentelemetry/instrumentation-fetch": "^0.45.1",
"@opentelemetry/instrumentation-user-interaction": "^0.33.2",
"@opentelemetry/instrumentation-xml-http-request": "^0.45.0"
"@opentelemetry/instrumentation-xml-http-request": "^0.45.1"
}
}
2 changes: 1 addition & 1 deletion packages/opentelemetry-test-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"dependencies": {
"@opentelemetry/core": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^1.3.1",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/sdk-trace-node": "^1.8.0",
"@opentelemetry/resources": "^1.8.0",
"@opentelemetry/sdk-trace-base": "^1.8.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-amqplib/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-cucumber/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-cucumber#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-dataloader/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0"
"@opentelemetry/instrumentation": "^0.45.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-dataloader#readme"
}
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-fs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-fs#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-lru-memoizer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0"
"@opentelemetry/instrumentation": "^0.45.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-lru-memoizer#readme"
}
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-mongoose/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-mongoose#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-socket.io/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/instrumentation-socket.io#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-tedious/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/tedious": "^4.0.10"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-aws-lambda/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/propagator-aws-xray": "^1.3.1",
"@opentelemetry/resources": "^1.8.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-aws-sdk/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@opentelemetry/propagation-utils": "^0.30.2"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-bunyan/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@types/bunyan": "1.8.9"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-bunyan#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-cassandra/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-cassandra#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-connect/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/connect": "3.4.36"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-dns/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"semver": "^7.5.4"
},
Expand Down
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-instrumentation-express/examples/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^1.0.0",
"@opentelemetry/exporter-zipkin": "^1.0.0",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/instrumentation-express": "0.28.0",
"@opentelemetry/instrumentation-http": "^0.45.0",
"@opentelemetry/instrumentation-http": "^0.45.1",
"@opentelemetry/resources": "^1.0.0",
"@opentelemetry/sdk-trace-base": "^1.0.0",
"@opentelemetry/sdk-trace-node": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-express/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/express": "4.17.18"
},
Expand Down
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-instrumentation-fastify/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/context-async-hooks": "^1.8.0",
"@opentelemetry/contrib-test-utils": "^0.34.2",
"@opentelemetry/instrumentation-http": "0.45.0",
"@opentelemetry/instrumentation-http": "0.45.1",
"@opentelemetry/sdk-trace-base": "^1.8.0",
"@opentelemetry/sdk-trace-node": "^1.8.0",
"@types/express": "4.17.18",
Expand All @@ -68,7 +68,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-fastify#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-generic-pool/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-generic-pool#readme"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-graphql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0"
"@opentelemetry/instrumentation": "^0.45.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-graphql#readme"
}
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-hapi/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/hapi__hapi": "20.0.13"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-ioredis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/redis-common": "^0.36.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/ioredis4": "npm:@types/ioredis@^4.28.10"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-knex/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-knex#readme"
Expand Down
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-instrumentation-koa/examples/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^1.0.0",
"@opentelemetry/exporter-zipkin": "^1.0.0",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation-http": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/instrumentation-http": "^0.45.1",
"@opentelemetry/instrumentation-koa": "^0.31.0",
"@opentelemetry/sdk-trace-node": "^1.0.0",
"@opentelemetry/sdk-trace-base": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-koa/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
},
"dependencies": {
"@opentelemetry/core": "^1.8.0",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/koa": "2.13.9",
"@types/koa__router": "12.0.1"
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-memcached/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/memcached": "^2.2.6"
},
Expand Down
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-instrumentation-mongodb/examples/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^1.0.0",
"@opentelemetry/exporter-zipkin": "^1.0.0",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation-http": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/instrumentation-http": "^0.45.1",
"@opentelemetry/instrumentation-mongodb": "^0.32.0",
"@opentelemetry/sdk-trace-node": "^1.0.0",
"@opentelemetry/sdk-trace-base": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mongodb/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"dependencies": {
"@opentelemetry/sdk-metrics": "^1.9.1",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-mongodb#readme"
Expand Down
6 changes: 3 additions & 3 deletions plugins/node/opentelemetry-instrumentation-mysql/examples/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/exporter-jaeger": "^1.0.0",
"@opentelemetry/exporter-zipkin": "^1.0.0",
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation-http": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/instrumentation-http": "^0.45.1",
"@opentelemetry/instrumentation-mysql": "^0.31.0",
"@opentelemetry/sdk-trace-base": "^1.0.0",
"@opentelemetry/sdk-trace-node": "^1.0.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.45.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.45.1",
"mysql": "^2.18.1"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js#readme",
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mysql/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/mysql": "2.15.22"
},
Expand Down
2 changes: 1 addition & 1 deletion plugins/node/opentelemetry-instrumentation-mysql2/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.0",
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@opentelemetry/sql-common": "^0.40.0"
},
Expand Down
Loading

0 comments on commit 6094158

Please sign in to comment.