mirror of
https://github.com/open-telemetry/opentelemetry-python-contrib.git
synced 2025-08-01 06:33:52 +08:00
Use sqlalchemy version in sqlalchemy commenter instead of opentelemetry library version (#2404)
* Use sqlalchemy version in sqlalchemy commenter instead of opentelemetry library version The SqlAlchemy commenter is currently using the library version in the comment it emits, e.g.: ``` { 'db_driver': 'psycopg2', 'db_framework': 'sqlalchemy:0.45b0' } ``` We should instead be using the sqlalchemy version here, as SqlCommenter did before * Fix lint * Fix lint * Add CHANGELOG entry --------- Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com>
This commit is contained in:
@ -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
|
||||
|
@ -15,13 +15,13 @@ import os
|
||||
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
|
||||
@ -227,7 +227,7 @@ class EngineTracer:
|
||||
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):
|
||||
|
Reference in New Issue
Block a user