Skip to content

Commit 17a8494

Browse files
sentrivanasentrivana
committed
Merge branch 'master' into potel-base
2 parents 3c5f761 + 269d96d commit 17a8494

File tree

5 files changed

+150
-7
lines changed

5 files changed

+150
-7
lines changed

‎sentry_sdk/client.py‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99

1010
from sentry_sdk._compat import PY37, check_uwsgi_thread_support
1111
from sentry_sdk.utils import (
12+
ContextVar,
1213
capture_internal_exceptions,
1314
current_stacktrace,
15+
env_to_bool,
1416
format_timestamp,
1517
get_sdk_name,
1618
get_type_name,
@@ -29,7 +31,6 @@
2931
ClientConstructor,
3032
)
3133
from sentry_sdk.integrations import _DEFAULT_INTEGRATIONS, setup_integrations
32-
from sentry_sdk.utils import ContextVar
3334
from sentry_sdk.sessions import SessionFlusher
3435
from sentry_sdk.envelope import Envelope
3536
from sentry_sdk.profiler.continuous_profiler import setup_continuous_profiler
@@ -103,11 +104,7 @@ def _get_options(*args, **kwargs):
103104
rv["environment"] = os.environ.get("SENTRY_ENVIRONMENT") or "production"
104105

105106
if rv["debug"] is None:
106-
rv["debug"] = os.environ.get("SENTRY_DEBUG", "False").lower() in (
107-
"true",
108-
"1",
109-
"t",
110-
)
107+
rv["debug"] = env_to_bool(os.environ.get("SENTRY_DEBUG", "False"), strict=True)
111108

112109
if rv["server_name"] is None and hasattr(socket, "gethostname"):
113110
rv["server_name"] = socket.gethostname()
@@ -370,6 +367,16 @@ def _capture_envelope(envelope):
370367
)
371368

372369
self.spotlight = None
370+
spotlight_config = self.options.get("spotlight")
371+
if spotlight_config is None and "SENTRY_SPOTLIGHT" in os.environ:
372+
spotlight_env_value = os.environ["SENTRY_SPOTLIGHT"]
373+
spotlight_config = env_to_bool(spotlight_env_value, strict=True)
374+
self.options["spotlight"] = (
375+
spotlight_config
376+
if spotlight_config is not None
377+
else spotlight_env_value
378+
)
379+
373380
if self.options.get("spotlight"):
374381
self.spotlight = setup_spotlight(self.options)
375382

‎sentry_sdk/spotlight.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
from sentry_sdk.envelope import Envelope
1313

1414

15+
DEFAULT_SPOTLIGHT_URL = "http://localhost:8969/stream"
16+
17+
1518
class SpotlightClient:
1619
def __init__(self, url):
1720
# type: (str) -> None
@@ -51,7 +54,7 @@ def setup_spotlight(options):
5154
if isinstance(url, str):
5255
pass
5356
elif url is True:
54-
url = "http://localhost:8969/stream"
57+
url = DEFAULT_SPOTLIGHT_URL
5558
else:
5659
return None
5760

‎sentry_sdk/utils.py‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,25 @@
7171

7272
SENSITIVE_DATA_SUBSTITUTE = "[Filtered]"
7373

74+
FALSY_ENV_VALUES = frozenset(("false", "f", "n", "no", "off", "0"))
75+
TRUTHY_ENV_VALUES = frozenset(("true", "t", "y", "yes", "on", "1"))
76+
77+
78+
def env_to_bool(value, *, strict=False):
79+
# type: (Any, Optional[bool]) -> bool | None
80+
"""Casts an ENV variable value to boolean using the constants defined above.
81+
In strict mode, it may return None if the value doesn't match any of the predefined values.
82+
"""
83+
normalized = str(value).lower() if value is not None else None
84+
85+
if normalized in FALSY_ENV_VALUES:
86+
return False
87+
88+
if normalized in TRUTHY_ENV_VALUES:
89+
return True
90+
91+
return None if strict else bool(value)
92+
7493

7594
def json_dumps(data):
7695
# type: (Any) -> bytes

‎tests/test_client.py‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
capture_event,
2020
set_tag,
2121
)
22+
from sentry_sdk.spotlight import DEFAULT_SPOTLIGHT_URL
2223
from sentry_sdk.utils import capture_internal_exception
2324
from sentry_sdk.integrations.executing import ExecutingIntegration
2425
from sentry_sdk.transport import Transport
@@ -1047,6 +1048,47 @@ def test_debug_option(
10471048
assert "something is wrong" not in caplog.text
10481049

10491050

1051+
@pytest.mark.parametrize(
1052+
"client_option,env_var_value,spotlight_url_expected",
1053+
[
1054+
(None, None, None),
1055+
(None, "", None),
1056+
(None, "F", None),
1057+
(False, None, None),
1058+
(False, "", None),
1059+
(False, "t", None),
1060+
(None, "t", DEFAULT_SPOTLIGHT_URL),
1061+
(None, "1", DEFAULT_SPOTLIGHT_URL),
1062+
(True, None, DEFAULT_SPOTLIGHT_URL),
1063+
(True, "http://localhost:8080/slurp", DEFAULT_SPOTLIGHT_URL),
1064+
("http://localhost:8080/slurp", "f", "http://localhost:8080/slurp"),
1065+
(None, "http://localhost:8080/slurp", "http://localhost:8080/slurp"),
1066+
],
1067+
)
1068+
def test_spotlight_option(
1069+
sentry_init,
1070+
monkeypatch,
1071+
client_option,
1072+
env_var_value,
1073+
spotlight_url_expected,
1074+
):
1075+
if env_var_value is None:
1076+
monkeypatch.delenv("SENTRY_SPOTLIGHT", raising=False)
1077+
else:
1078+
monkeypatch.setenv("SENTRY_SPOTLIGHT", env_var_value)
1079+
1080+
if client_option is None:
1081+
sentry_init()
1082+
else:
1083+
sentry_init(spotlight=client_option)
1084+
1085+
client = sentry_sdk.get_client()
1086+
url = client.spotlight.url if client.spotlight else None
1087+
assert (
1088+
url == spotlight_url_expected
1089+
), f"With config {client_option} and env {env_var_value}"
1090+
1091+
10501092
class IssuesSamplerTestConfig:
10511093
def __init__(
10521094
self,

‎tests/test_utils.py‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from sentry_sdk.utils import (
1313
Components,
1414
Dsn,
15+
env_to_bool,
1516
get_current_thread_meta,
1617
get_default_release,
1718
get_error_message,
@@ -59,6 +60,77 @@ def _normalize_distribution_name(name):
5960
return re.sub(r"[-_.]+", "-", name).lower()
6061

6162

63+
@pytest.mark.parametrize(
64+
"env_var_value,strict,expected",
65+
[
66+
(None, True, None),
67+
(None, False, False),
68+
("", True, None),
69+
("", False, False),
70+
("t", True, True),
71+
("T", True, True),
72+
("t", False, True),
73+
("T", False, True),
74+
("y", True, True),
75+
("Y", True, True),
76+
("y", False, True),
77+
("Y", False, True),
78+
("1", True, True),
79+
("1", False, True),
80+
("True", True, True),
81+
("True", False, True),
82+
("true", True, True),
83+
("true", False, True),
84+
("tRuE", True, True),
85+
("tRuE", False, True),
86+
("Yes", True, True),
87+
("Yes", False, True),
88+
("yes", True, True),
89+
("yes", False, True),
90+
("yEs", True, True),
91+
("yEs", False, True),
92+
("On", True, True),
93+
("On", False, True),
94+
("on", True, True),
95+
("on", False, True),
96+
("oN", True, True),
97+
("oN", False, True),
98+
("f", True, False),
99+
("f", False, False),
100+
("n", True, False),
101+
("N", True, False),
102+
("n", False, False),
103+
("N", False, False),
104+
("0", True, False),
105+
("0", False, False),
106+
("False", True, False),
107+
("False", False, False),
108+
("false", True, False),
109+
("false", False, False),
110+
("FaLsE", True, False),
111+
("FaLsE", False, False),
112+
("No", True, False),
113+
("No", False, False),
114+
("no", True, False),
115+
("no", False, False),
116+
("nO", True, False),
117+
("nO", False, False),
118+
("Off", True, False),
119+
("Off", False, False),
120+
("off", True, False),
121+
("off", False, False),
122+
("oFf", True, False),
123+
("oFf", False, False),
124+
("xxx", True, None),
125+
("xxx", False, True),
126+
],
127+
)
128+
def test_env_to_bool(env_var_value, strict, expected):
129+
assert (
130+
env_to_bool(env_var_value, strict=strict) == expected
131+
), f"Value: {env_var_value}, strict: {strict}"
132+
133+
62134
@pytest.mark.parametrize(
63135
("url", "expected_result"),
64136
[

0 commit comments

Comments
 (0)