Skip to content

Commit

Permalink
Merge branch 'main' into refactor/test-utils-transformer-types
Browse files Browse the repository at this point in the history
  • Loading branch information
pichlermarc authored Dec 4, 2024
2 parents f6e7f7a + 5df02cb commit 6d0f10c
Show file tree
Hide file tree
Showing 51 changed files with 858 additions and 568 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update-otel-deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
git checkout -b feat/update-otel-deps
node ./scripts/update-otel-deps.js
git commit -am "feat(deps): update deps matching '@opentelemetry/*'"
git push origin feat/update-otel-deps --force
git push --set-upstream origin feat/update-otel-deps --force
gh pr create --repo open-telemetry/opentelemetry-js-contrib --title 'chore: prepare next release' --body 'Updates all `@opentelemetry/*` dependencies to latest'
env:
GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.43.0",
"@opentelemetry/instrumentation-fs": "^0.17.0",
"@opentelemetry/instrumentation-http": "^0.55.0",
"@opentelemetry/instrumentation-http": "^0.56.0",
"@types/mocha": "8.2.3",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.43.0",
"@opentelemetry/instrumentation-http": "^0.55.0",
"@opentelemetry/instrumentation-http": "^0.56.0",
"@types/mocha": "8.2.3",
"@types/node": "18.18.14",
"@types/sinon": "10.0.20",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.43.0",
"@opentelemetry/instrumentation-http": "^0.55.0",
"@opentelemetry/instrumentation-http": "^0.56.0",
"@types/mocha": "8.2.3",
"@types/node": "18.18.14",
"@types/semver": "7.5.8",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/contrib-test-utils": "^0.43.0",
"@opentelemetry/sdk-node": "^0.55.0",
"@opentelemetry/sdk-node": "^0.56.0",
"@types/mocha": "8.2.3",
"@types/node": "18.18.14",
"@types/semver": "7.5.8",
Expand Down
8 changes: 4 additions & 4 deletions metapackages/auto-instrumentations-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.55.0",
"@opentelemetry/instrumentation": "^0.56.0",
"@opentelemetry/instrumentation-amqplib": "^0.44.0",
"@opentelemetry/instrumentation-aws-lambda": "^0.48.0",
"@opentelemetry/instrumentation-aws-sdk": "^0.47.0",
Expand All @@ -61,9 +61,9 @@
"@opentelemetry/instrumentation-fs": "^0.17.0",
"@opentelemetry/instrumentation-generic-pool": "^0.41.0",
"@opentelemetry/instrumentation-graphql": "^0.45.0",
"@opentelemetry/instrumentation-grpc": "^0.55.0",
"@opentelemetry/instrumentation-grpc": "^0.56.0",
"@opentelemetry/instrumentation-hapi": "^0.43.0",
"@opentelemetry/instrumentation-http": "^0.55.0",
"@opentelemetry/instrumentation-http": "^0.56.0",
"@opentelemetry/instrumentation-ioredis": "^0.45.0",
"@opentelemetry/instrumentation-kafkajs": "^0.5.0",
"@opentelemetry/instrumentation-knex": "^0.42.0",
Expand Down Expand Up @@ -92,7 +92,7 @@
"@opentelemetry/resource-detector-container": "^0.5.1",
"@opentelemetry/resource-detector-gcp": "^0.30.0",
"@opentelemetry/resources": "^1.24.0",
"@opentelemetry/sdk-node": "^0.55.0"
"@opentelemetry/sdk-node": "^0.56.0"
},
"files": [
"build/src/**/*.js",
Expand Down
6 changes: 3 additions & 3 deletions metapackages/auto-instrumentations-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@
"webpack-merge": "5.10.0"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.55.0",
"@opentelemetry/instrumentation": "^0.56.0",
"@opentelemetry/instrumentation-document-load": "^0.42.0",
"@opentelemetry/instrumentation-fetch": "^0.55.0",
"@opentelemetry/instrumentation-fetch": "^0.56.0",
"@opentelemetry/instrumentation-user-interaction": "^0.42.0",
"@opentelemetry/instrumentation-xml-http-request": "^0.55.0"
"@opentelemetry/instrumentation-xml-http-request": "^0.56.0"
},
"files": [
"build/src/**/*.js",
Expand Down
Loading

0 comments on commit 6d0f10c

Please sign in to comment.