Skip to content

Commit eef7ff6

Browse files
committed
trying without new tests
1 parent 678f515 commit eef7ff6

File tree

1 file changed

+100
-99
lines changed

1 file changed

+100
-99
lines changed

tests/integrations/threading/test_threading.py

Lines changed: 100 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import gc
22
from concurrent import futures
3-
from textwrap import dedent
3+
4+
# from textwrap import dedent
45
from threading import Thread
56

67
import pytest
@@ -175,101 +176,101 @@ def target():
175176
assert t.run.__qualname__ == original_run.__qualname__
176177

177178

178-
@pytest.mark.parametrize(
179-
"propagate_scope",
180-
(True, False),
181-
ids=["propagate_scope=True", "propagate_scope=False"],
182-
)
183-
def test_scope_data_not_leaked_in_threads(sentry_init, propagate_scope):
184-
sentry_init(
185-
integrations=[ThreadingIntegration(propagate_scope=propagate_scope)],
186-
)
187-
188-
sentry_sdk.set_tag("initial_tag", "initial_value")
189-
initial_iso_scope = sentry_sdk.get_isolation_scope()
190-
191-
def do_some_work():
192-
# check if we have the initial scope data propagated into the thread
193-
if propagate_scope:
194-
assert sentry_sdk.get_isolation_scope()._tags == {
195-
"initial_tag": "initial_value"
196-
}
197-
else:
198-
assert sentry_sdk.get_isolation_scope()._tags == {}
199-
200-
# change data in isolation scope in thread
201-
sentry_sdk.set_tag("thread_tag", "thread_value")
202-
203-
t = Thread(target=do_some_work)
204-
t.start()
205-
t.join()
206-
207-
# check if the initial scope data is not modified by the started thread
208-
assert initial_iso_scope._tags == {
209-
"initial_tag": "initial_value"
210-
}, "The isolation scope in the main thread should not be modified by the started thread."
211-
212-
213-
@pytest.mark.parametrize(
214-
"propagate_scope",
215-
(True, False),
216-
ids=["propagate_scope=True", "propagate_scope=False"],
217-
)
218-
def test_spans_from_multiple_threads(
219-
sentry_init, capture_events, render_span_tree, propagate_scope
220-
):
221-
sentry_init(
222-
traces_sample_rate=1.0,
223-
integrations=[ThreadingIntegration(propagate_scope=propagate_scope)],
224-
)
225-
events = capture_events()
226-
227-
def do_some_work(number):
228-
with sentry_sdk.start_span(
229-
op=f"inner-run-{number}", name=f"Thread: child-{number}"
230-
):
231-
pass
232-
233-
threads = []
234-
235-
with sentry_sdk.start_transaction(op="outer-trx"):
236-
for number in range(5):
237-
with sentry_sdk.start_span(
238-
op=f"outer-submit-{number}", name="Thread: main"
239-
):
240-
t = Thread(target=do_some_work, args=(number,))
241-
t.start()
242-
threads.append(t)
243-
244-
for t in threads:
245-
t.join()
246-
247-
(event,) = events
248-
if propagate_scope:
249-
assert render_span_tree(event) == dedent(
250-
"""\
251-
- op="outer-trx": description=null
252-
- op="outer-submit-0": description="Thread: main"
253-
- op="inner-run-0": description="Thread: child-0"
254-
- op="outer-submit-1": description="Thread: main"
255-
- op="inner-run-1": description="Thread: child-1"
256-
- op="outer-submit-2": description="Thread: main"
257-
- op="inner-run-2": description="Thread: child-2"
258-
- op="outer-submit-3": description="Thread: main"
259-
- op="inner-run-3": description="Thread: child-3"
260-
- op="outer-submit-4": description="Thread: main"
261-
- op="inner-run-4": description="Thread: child-4"\
262-
"""
263-
)
264-
265-
elif not propagate_scope:
266-
assert render_span_tree(event) == dedent(
267-
"""\
268-
- op="outer-trx": description=null
269-
- op="outer-submit-0": description="Thread: main"
270-
- op="outer-submit-1": description="Thread: main"
271-
- op="outer-submit-2": description="Thread: main"
272-
- op="outer-submit-3": description="Thread: main"
273-
- op="outer-submit-4": description="Thread: main"\
274-
"""
275-
)
179+
# @pytest.mark.parametrize(
180+
# "propagate_scope",
181+
# (True, False),
182+
# ids=["propagate_scope=True", "propagate_scope=False"],
183+
# )
184+
# def test_scope_data_not_leaked_in_threads(sentry_init, propagate_scope):
185+
# sentry_init(
186+
# integrations=[ThreadingIntegration(propagate_scope=propagate_scope)],
187+
# )
188+
189+
# sentry_sdk.set_tag("initial_tag", "initial_value")
190+
# initial_iso_scope = sentry_sdk.get_isolation_scope()
191+
192+
# def do_some_work():
193+
# # check if we have the initial scope data propagated into the thread
194+
# if propagate_scope:
195+
# assert sentry_sdk.get_isolation_scope()._tags == {
196+
# "initial_tag": "initial_value"
197+
# }
198+
# else:
199+
# assert sentry_sdk.get_isolation_scope()._tags == {}
200+
201+
# # change data in isolation scope in thread
202+
# sentry_sdk.set_tag("thread_tag", "thread_value")
203+
204+
# t = Thread(target=do_some_work)
205+
# t.start()
206+
# t.join()
207+
208+
# # check if the initial scope data is not modified by the started thread
209+
# assert initial_iso_scope._tags == {
210+
# "initial_tag": "initial_value"
211+
# }, "The isolation scope in the main thread should not be modified by the started thread."
212+
213+
214+
# @pytest.mark.parametrize(
215+
# "propagate_scope",
216+
# (True, False),
217+
# ids=["propagate_scope=True", "propagate_scope=False"],
218+
# )
219+
# def test_spans_from_multiple_threads(
220+
# sentry_init, capture_events, render_span_tree, propagate_scope
221+
# ):
222+
# sentry_init(
223+
# traces_sample_rate=1.0,
224+
# integrations=[ThreadingIntegration(propagate_scope=propagate_scope)],
225+
# )
226+
# events = capture_events()
227+
228+
# def do_some_work(number):
229+
# with sentry_sdk.start_span(
230+
# op=f"inner-run-{number}", name=f"Thread: child-{number}"
231+
# ):
232+
# pass
233+
234+
# threads = []
235+
236+
# with sentry_sdk.start_transaction(op="outer-trx"):
237+
# for number in range(5):
238+
# with sentry_sdk.start_span(
239+
# op=f"outer-submit-{number}", name="Thread: main"
240+
# ):
241+
# t = Thread(target=do_some_work, args=(number,))
242+
# t.start()
243+
# threads.append(t)
244+
245+
# for t in threads:
246+
# t.join()
247+
248+
# (event,) = events
249+
# if propagate_scope:
250+
# assert render_span_tree(event) == dedent(
251+
# """\
252+
# - op="outer-trx": description=null
253+
# - op="outer-submit-0": description="Thread: main"
254+
# - op="inner-run-0": description="Thread: child-0"
255+
# - op="outer-submit-1": description="Thread: main"
256+
# - op="inner-run-1": description="Thread: child-1"
257+
# - op="outer-submit-2": description="Thread: main"
258+
# - op="inner-run-2": description="Thread: child-2"
259+
# - op="outer-submit-3": description="Thread: main"
260+
# - op="inner-run-3": description="Thread: child-3"
261+
# - op="outer-submit-4": description="Thread: main"
262+
# - op="inner-run-4": description="Thread: child-4"\
263+
# """
264+
# )
265+
266+
# elif not propagate_scope:
267+
# assert render_span_tree(event) == dedent(
268+
# """\
269+
# - op="outer-trx": description=null
270+
# - op="outer-submit-0": description="Thread: main"
271+
# - op="outer-submit-1": description="Thread: main"
272+
# - op="outer-submit-2": description="Thread: main"
273+
# - op="outer-submit-3": description="Thread: main"
274+
# - op="outer-submit-4": description="Thread: main"\
275+
# """
276+
# )

0 commit comments

Comments
 (0)