Skip to content

Commit eb3f469

Browse files
committed
resolve conflict CHANGELOG
1 parent b55bead commit eb3f469

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616
### Added
1717
- `opentelemetry-instrumentation`: botocore: Add support for AWS Secrets Manager semantic convention attribute
1818
([#3765](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3765))
19-
19+
- `opentelemetry-instrumentation-dbapi`: Add support for `commenter_options` in `trace_integration` function to control SQLCommenter behavior
20+
([#3743](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3743))
2021
## Version 1.37.0/0.58b0 (2025-09-11)
2122

2223
### Fixed

0 commit comments

Comments
 (0)