Skip to content

Commit cc39900

Browse files
committed
test(sqlalchemy): Keep only the async bridge regression test
1 parent ceb11ac commit cc39900

1 file changed

Lines changed: 26 additions & 69 deletions

File tree

‎tests/integrations/sqlalchemy/test_sqlalchemy.py‎

Lines changed: 26 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -762,46 +762,19 @@ class Person(Base):
762762
raise AssertionError("No db span found")
763763

764764

765-
def _async_bridge_or_skip():
766-
# Not skipped when greenlet is missing: from 1.4 on, the test environments
767-
# must install it, and greenlet_spawn fails loudly without it.
768-
greenlet_spawn = getattr(sqlalchemy.util, "greenlet_spawn", None)
769-
if greenlet_spawn is None:
770-
pytest.skip("SQLAlchemy has no asyncio support before 1.4")
771-
return greenlet_spawn
772-
773-
774-
def _select_one_sources(run_query, span_streaming, capture_events, capture_items):
775-
if span_streaming:
776-
items = capture_items("span")
777-
with sentry_sdk.traces.start_span(name="custom parent"):
778-
run_query()
779-
sentry_sdk.flush()
780-
return [
781-
item.payload["attributes"].get(SPANDATA.CODE_FUNCTION)
782-
for item in items
783-
if item.payload["name"] == "SELECT 1"
784-
]
785-
786-
events = capture_events()
787-
with start_transaction(name="test_transaction", sampled=True):
788-
run_query()
789-
(event,) = events
790-
return [
791-
span["data"].get(SPANDATA.CODE_FUNCTION)
792-
for span in event["spans"]
793-
if span.get("description") == "SELECT 1"
794-
]
795-
796-
797765
@pytest.mark.parametrize("span_streaming", [True, False])
798766
def test_query_source_through_async_bridge(
799767
sentry_init,
800768
capture_events,
801769
capture_items,
802770
span_streaming,
803771
):
804-
greenlet_spawn = _async_bridge_or_skip()
772+
# Not skipped when greenlet is missing: from 1.4 on, the test environments
773+
# install it, and greenlet_spawn fails loudly without it.
774+
greenlet_spawn = getattr(sqlalchemy.util, "greenlet_spawn", None)
775+
if greenlet_spawn is None:
776+
pytest.skip("SQLAlchemy has no asyncio support before 1.4")
777+
805778
sentry_init(
806779
integrations=[SqlalchemyIntegration()],
807780
traces_sample_rate=1.0,
@@ -825,46 +798,30 @@ def run_query():
825798
finally:
826799
loop.close()
827800

828-
sources = _select_one_sources(
829-
run_query, span_streaming, capture_events, capture_items
830-
)
801+
if span_streaming:
802+
items = capture_items("span")
803+
with sentry_sdk.traces.start_span(name="custom parent"):
804+
run_query()
805+
sentry_sdk.flush()
806+
sources = [
807+
item.payload["attributes"].get(SPANDATA.CODE_FUNCTION)
808+
for item in items
809+
if item.payload["name"] == "SELECT 1"
810+
]
811+
else:
812+
events = capture_events()
813+
with start_transaction(name="test_transaction", sampled=True):
814+
run_query()
815+
(event,) = events
816+
sources = [
817+
span["data"].get(SPANDATA.CODE_FUNCTION)
818+
for span in event["spans"]
819+
if span.get("description") == "SELECT 1"
820+
]
831821

832822
assert sources == ["query_from_coroutine"]
833823

834824

835-
def test_query_source_not_taken_from_unrelated_greenlet_parent(
836-
sentry_init, capture_events
837-
):
838-
_async_bridge_or_skip()
839-
import greenlet
840-
841-
sentry_init(
842-
integrations=[SqlalchemyIntegration()],
843-
traces_sample_rate=1.0,
844-
enable_db_query_source=True,
845-
db_query_source_threshold_ms=0,
846-
)
847-
engine = create_engine("sqlite:///:memory:")
848-
849-
def unrelated_wait():
850-
greenlet.getcurrent().parent.switch()
851-
852-
def run_query():
853-
with engine.connect() as connection:
854-
# A greenlet's parent is not necessarily its caller: this one's
855-
# parent is suspended in code unrelated to the query.
856-
waiter = greenlet.greenlet(unrelated_wait)
857-
waiter.switch()
858-
driver = greenlet.greenlet(connection.execute, parent=waiter)
859-
if hasattr(driver, "gr_context"):
860-
driver.gr_context = greenlet.getcurrent().gr_context
861-
driver.switch(text("SELECT 1"))
862-
863-
sources = _select_one_sources(run_query, False, capture_events, None)
864-
865-
assert sources == [None]
866-
867-
868825
@pytest.mark.parametrize("span_streaming", [True, False])
869826
def test_query_source_with_module_in_search_path(
870827
sentry_init,

0 commit comments

Comments
 (0)