Skip to content

Commit

Permalink
Merge branch 'main' into aws-sdk-semattrs-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
trivikr authored Nov 26, 2024
2 parents 87ecc28 + d5215f3 commit faae679
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 23 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Reporting bugs is an important contribution. Please make sure to include:
### Before you start

Please read project contribution
[guide](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md)
[guide](https://github.com/open-telemetry/community/blob/main/guides/contributor)
for general practices for OpenTelemetry project.

#### Conventional commit
Expand Down
38 changes: 17 additions & 21 deletions package-lock.json

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

Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@opentelemetry/api": "^1.3.0"
},
"devDependencies": {
"@koa/router": "12.0.1",
"@koa/router": "13.1.0",
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/context-async-hooks": "^1.8.0",
"@opentelemetry/contrib-test-utils": "^0.43.0",
Expand Down

0 comments on commit faae679

Please sign in to comment.