10000 wip · getsentry/sentry-python@08c7946 · GitHub
[go: up one dir, main page]
Skip to content

Commit 08c7946

Browse files
szokeasaurusrexszokeasaurusrex
committed
wip
1 parent 51249fc commit 08c7946

File tree

3 files changed

+23
-12
lines changed

3 files changed

+23
-12
lines changed

‎sentry_sdk/tracing.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -701,8 +701,7 @@ def finish(self, scope=None, end_timestamp=None):
701701
except AttributeError:
702702
self.timestamp = datetime.now(timezone.utc)
703703

704-
scope = sentry_sdk.get_current_scope()
705-
maybe_create_breadcrumbs_from_span(scope, self)
704+
maybe_create_breadcrumbs_from_span(self)
706705

707706
return None
708707

‎sentry_sdk/tracing_utils.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,10 @@ def record_sql_queries(
158158
yield span
159159

160160

161-
def maybe_create_breadcrumbs_from_span(scope, span):
162-
# type: (sentry_sdk.Scope, sentry_sdk.tracing.Span) -> None
161+
def maybe_create_breadcrumbs_from_span(span):
162+
# type: (sentry_sdk.tracing.Span) -> None
163163
if span.op == OP.DB_REDIS:
164-
scope.add_breadcrumb(
164+
sentry_sdk.add_breadcrumb(
165165
message=span.description, type="redis", category="redis", data=span._tags
166166
)
167167

@@ -175,14 +175,14 @@ def maybe_create_breadcrumbs_from_span(scope, span):
175175
level = "warning"
176176

177177
if level:
178-
scope.add_breadcrumb(
178+
sentry_sdk.add_breadcrumb(
179179
type="http", category="httplib", data=span._data, level=level
180180
)
181181
else:
182-
scope.add_breadcrumb(type="http", category="httplib", data=span._data)
182+
sentry_sdk.add_breadcrumb(type="http", category="httplib", data=span._data)
183183

184184
elif span.op == "subprocess":
185-
scope.add_breadcrumb(
185+
sentry_sdk.add_breadcrumb(
186186
type="subprocess",
187187
category="subprocess",
188188
message=span.description,

‎tests/integrations/httpx/test_httpx.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,20 @@ def before_breadcrumb(crumb, hint):
3030
events = capture_events()
3131

3232
if asyncio.iscoroutinefunction(httpx_client.get):
33+
34+
async def get_response_and_capture_message():
35+
response = await httpx_client.get(url)
36+
capture_message("Testing!")
37+
return response
38+
3339
response = asyncio.get_event_loop().run_until_complete(
34-
httpx_client.get(url)
40+
get_response_and_capture_message()
3541
)
3642
else:
3743
response = httpx_client.get(url)
44+
capture_message("Testing!")
3845

3946
assert response.status_code == 200
40-
capture_message("Testing!")
4147

4248
(event,) = events
4349

@@ -84,14 +90,20 @@ def test_crumb_capture_client_error(
8490
events = capture_events()
8591

8692
if asyncio.iscoroutinefunction(httpx_client.get):
93+
94+
async def get_response_and_capture_message():
95+
response = await httpx_client.get(url)
96+
capture_message("Testing!")
97+
return response
98+
8799
response = asyncio.get_event_loop().run_until_complete(
88-
httpx_client.get(url)
100+
get_response_and_capture_message()
89101
)
90102
else:
91103
response = httpx_client.get(url)
104+
capture_message("Testing!")
92105

93106
assert response.status_code == status_code
94-
capture_message("Testing!")
95107

96108
(event,) = events
97109

0 commit comments

Comments
 (0)
0