Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
pichlermarc authored Dec 19, 2023
2 parents 5b33b83 + 7e335c7 commit 4cb5e3a
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 42 deletions.
100 changes: 62 additions & 38 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugins/node/instrumentation-mongoose/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@types/node": "18.6.5",
"expect": "29.2.0",
"mocha": "7.2.0",
"mongoose": "6.11.5",
"mongoose": "6.12.3",
"nyc": "15.1.0",
"rimraf": "5.0.5",
"test-all-versions": "5.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@opentelemetry/sdk-trace-base": "^1.0.0",
"@opentelemetry/sdk-trace-node": "^1.0.0",
"@opentelemetry/semantic-conventions": "^1.0.0",
"axios": "^0.21.1",
"axios": "^1.6.0",
"cross-env": "^7.0.3",
"express": "^4.17.1"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@opentelemetry/instrumentation-koa": "^0.31.0",
"@opentelemetry/sdk-trace-node": "^1.0.0",
"@opentelemetry/sdk-trace-base": "^1.0.0",
"axios": "^0.21.1",
"axios": "^1.6.0",
"koa": "^2.13.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@opentelemetry/instrumentation-redis": "^0.32.0",
"@opentelemetry/sdk-trace-base": "^1.0.0",
"@opentelemetry/sdk-trace-node": "^1.0.0",
"axios": "^0.21.1",
"axios": "^1.6.0",
"express": "^4.17.1",
"redis": "^3.1.1"
},
Expand Down

0 comments on commit 4cb5e3a

Please sign in to comment.