Skip to content

chore(sqlalchemy): Drop transaction-based tracing #7199

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

Draft
sentrivana wants to merge 3 commits into
base: ivana/major/remove-transactions-asyncpg
Choose a base branch
from
+374 −915
Draft

chore(sqlalchemy): Drop transaction-based tracing #7199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2e25f4
chore(sqlalchemy): Drop transaction-based tracing
sentrivana Aug 13, 2026
0defc84
.
sentrivana Aug 13, 2026
8056ab0
this test is actually not compatible at all
sentrivana Aug 13, 2026
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
56 changes: 17 additions & 39 deletions sentry_sdk/integrations/sqlalchemy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from sentry_sdk.consts import SPANDATA, SPANSTATUS
from sentry_sdk.consts import SPANDATA
from sentry_sdk.integrations import DidNotEnable, Integration, _check_minimum_version
from sentry_sdk.traces import SpanStatus, StreamedSpan
from sentry_sdk.tracing import Span
from sentry_sdk.tracing_utils import (
add_query_source,
record_sql_queries,
Expand All @@ -22,7 +21,7 @@
from typing import TYPE_CHECKING

if TYPE_CHECKING:
from typing import Any, ContextManager, Optional, Union
from typing import Any, ContextManager, Optional


class SqlalchemyIntegration(Integration):
Expand Down Expand Up @@ -79,34 +78,26 @@ def _after_cursor_execute(
)

# Record query source immediately before span is finished: accurate end timestamp and before the span is flushed.
span: "Optional[Union[Span, StreamedSpan]]" = getattr(
context, "_sentry_sql_span", None
)
if isinstance(span, StreamedSpan):
with capture_internal_exceptions():
add_query_source(span)
span: "Optional[StreamedSpan]" = getattr(context, "_sentry_sql_span", None)
with capture_internal_exceptions():
add_query_source(span)

if ctx_mgr is not None:
context._sentry_sql_span_manager = None
ctx_mgr.__exit__(None, None, None)

if isinstance(span, Span):
with capture_internal_exceptions():
add_query_source(span)


def _handle_error(context: "Any", *args: "Any") -> None:
execution_context = context.execution_context
if execution_context is None:
return

span: "Optional[Span]" = getattr(execution_context, "_sentry_sql_span", None)
span: "Optional[StreamedSpan]" = getattr(
execution_context, "_sentry_sql_span", None
)

if span is not None:
if isinstance(span, StreamedSpan):
span.status = SpanStatus.ERROR
else:
span.set_status(SPANSTATUS.INTERNAL_ERROR)
span.status = SpanStatus.ERROR

# _after_cursor_execute does not get called for crashing SQL stmts. Judging
# from SQLAlchemy codebase it does seem like any error coming into this
Expand Down Expand Up @@ -142,43 +133,30 @@ def _get_db_system(name: str) -> "Optional[str]":
return None


def _set_db_data(span: "Union[Span, StreamedSpan]", conn: "Any") -> None:
def _set_db_data(span: "StreamedSpan", conn: "Any") -> None:
db_system = _get_db_system(conn.engine.name)

if isinstance(span, StreamedSpan):
if db_system is not None:
span.set_attribute(SPANDATA.DB_SYSTEM_NAME, db_system)
else:
if db_system is not None:
span.set_data(SPANDATA.DB_SYSTEM, db_system)

if isinstance(span, StreamedSpan):
set_on_span = span.set_attribute
else:
set_on_span = span.set_data
if db_system is not None:
span.set_attribute(SPANDATA.DB_SYSTEM_NAME, db_system)

try:
driver = conn.dialect.driver
if driver:
set_on_span(SPANDATA.DB_DRIVER_NAME, driver)
span.set_attribute(SPANDATA.DB_DRIVER_NAME, driver)
except Exception:
pass

if conn.engine.url is None:
return

db_name = conn.engine.url.database
if isinstance(span, StreamedSpan):
if db_name is not None:
span.set_attribute(SPANDATA.DB_NAMESPACE, db_name)
else:
if db_name is not None:
span.set_data(SPANDATA.DB_NAME, db_name)
if db_name is not None:
span.set_attribute(SPANDATA.DB_NAMESPACE, db_name)

server_address = conn.engine.url.host
if server_address is not None:
set_on_span(SPANDATA.SERVER_ADDRESS, server_address)
span.set_attribute(SPANDATA.SERVER_ADDRESS, server_address)

server_port = conn.engine.url.port
if server_port is not None:
set_on_span(SPANDATA.SERVER_PORT, server_port)
span.set_attribute(SPANDATA.SERVER_PORT, server_port)
Loading
Loading