Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use sqlalchemy version in sqlalchemy commenter instead of opentelemetry library version #2404

Merged
merged 5 commits into from
Apr 22, 2024
Merged

Use sqlalchemy version in sqlalchemy commenter instead of opentelemetry library version #2404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f85a0b5
Use sqlalchemy version in sqlalchemy commenter instead of opentelemet…
nicknicolini Apr 9, 2024
0003788
Fix lint
ocelotl Apr 22, 2024
9954946
Fix lint
ocelotl Apr 22, 2024
25d866f
Add CHANGELOG entry
ocelotl Apr 22, 2024
2f45948
Merge branch 'main' into patch-1
ocelotl Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

- Use sqlalchemy version in sqlalchemy commenter instead of opentelemetry library version
([#2404](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2404))

### Added

- `opentelemetry-instrumentation-pika` Instrumentation for `channel.consume()` (supported
Expand Down
4 changes: 2 additions & 2 deletions ...lemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
import re
import weakref

import sqlalchemy
from sqlalchemy.event import ( # pylint: disable=no-name-in-module
listen,
remove,
)

from opentelemetry import trace
from opentelemetry.instrumentation.sqlalchemy.version import __version__
from opentelemetry.instrumentation.sqlcommenter_utils import _add_sql_comment
from opentelemetry.instrumentation.utils import _get_opentelemetry_values
from opentelemetry.semconv.trace import NetTransportValues, SpanAttributes
Expand Down Expand Up @@ -227,7 +227,7 @@ def _before_cur_exec(
commenter_data = {
"db_driver": conn.engine.driver,
# Driver/framework centric information.
"db_framework": f"sqlalchemy:{__version__}",
"db_framework": f"sqlalchemy:{sqlalchemy.__version__}",
}

if self.commenter_options.get("opentelemetry_values", True):
Expand Down
Loading