From 0f7ae818eefaff1f0f2d1a4efc300c33df25e73b Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 7 Sep 2020 09:35:43 +0200
Subject: [PATCH 0001/2327] ref: Refactor transport tests to reuse code
---
tests/test_transport.py | 49 ++++++++++++++++++-----------------------
1 file changed, 21 insertions(+), 28 deletions(-)
diff --git a/tests/test_transport.py b/tests/test_transport.py
index 773ec60e7a..00fcd9b1e8 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -11,14 +11,12 @@
from sentry_sdk.integrations.logging import LoggingIntegration
-@pytest.fixture(params=[True, False])
-def make_client(request):
- def inner(*args, **kwargs):
- client = Client(*args, **kwargs)
- if request.param:
- client = pickle.loads(pickle.dumps(client))
-
- return client
+@pytest.fixture
+def make_client(request, httpserver):
+ def inner(**kwargs):
+ return Client(
+ "http://foobar{}/132".format(httpserver.url[len("http://") :]), **kwargs
+ )
return inner
@@ -26,6 +24,7 @@ def inner(*args, **kwargs):
@pytest.mark.forked
@pytest.mark.parametrize("debug", (True, False))
@pytest.mark.parametrize("client_flush_method", ["close", "flush"])
+@pytest.mark.parametrize("pickle", (True, False))
def test_transport_works(
httpserver,
request,
@@ -34,15 +33,16 @@ def test_transport_works(
debug,
make_client,
client_flush_method,
+ pickle,
maybe_monkeypatched_threading,
):
httpserver.serve_content("ok", 200)
-
caplog.set_level(logging.DEBUG)
+ client = make_client(debug=debug)
+
+ if pickle:
+ client = pickle.loads(pickle.dumps(client))
- client = make_client(
- "http://foobar@{}/123".format(httpserver.url[len("http://") :]), debug=debug
- )
Hub.current.bind_client(client)
request.addfinalizer(lambda: Hub.current.bind_client(None))
@@ -58,11 +58,10 @@ def test_transport_works(
assert any("Sending event" in record.msg for record in caplog.records) == debug
-def test_transport_infinite_loop(httpserver, request):
+def test_transport_infinite_loop(httpserver, request, make_client):
httpserver.serve_content("ok", 200)
- client = Client(
- "http://foobar@{}/123".format(httpserver.url[len("http://") :]),
+ client = make_client(
debug=True,
# Make sure we cannot create events from our own logging
integrations=[LoggingIntegration(event_level=logging.DEBUG)],
@@ -110,8 +109,8 @@ def test_parse_rate_limits(input, expected):
assert dict(_parse_rate_limits(input, now=NOW)) == expected
-def test_simple_rate_limits(httpserver, capsys, caplog):
- client = Client(dsn="http://foobar@{}/123".format(httpserver.url[len("http://") :]))
+def test_simple_rate_limits(httpserver, capsys, caplog, make_client):
+ client = make_client()
httpserver.serve_content("no", 429, headers={"Retry-After": "4"})
client.capture_event({"type": "transaction"})
@@ -130,10 +129,8 @@ def test_simple_rate_limits(httpserver, capsys, caplog):
@pytest.mark.parametrize("response_code", [200, 429])
-def test_data_category_limits(httpserver, capsys, caplog, response_code):
- client = Client(
- dict(dsn="http://foobar@{}/123".format(httpserver.url[len("http://") :]))
- )
+def test_data_category_limits(httpserver, capsys, caplog, response_code, make_client):
+ client = make_client()
httpserver.serve_content(
"hm",
response_code,
@@ -162,15 +159,11 @@ def test_data_category_limits(httpserver, capsys, caplog, response_code):
@pytest.mark.parametrize("response_code", [200, 429])
def test_complex_limits_without_data_category(
- httpserver, capsys, caplog, response_code
+ httpserver, capsys, caplog, response_code, make_client
):
- client = Client(
- dict(dsn="http://foobar@{}/123".format(httpserver.url[len("http://") :]))
- )
+ client = make_client()
httpserver.serve_content(
- "hm",
- response_code,
- headers={"X-Sentry-Rate-Limits": "4711::organization"},
+ "hm", response_code, headers={"X-Sentry-Rate-Limits": "4711::organization"},
)
client.capture_event({"type": "transaction"})
From e81bf69e88cb6dc64a2d278cab4222fdebc70db2 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Wed, 9 Sep 2020 12:02:21 +0200
Subject: [PATCH 0002/2327] pin pyrsistent
---
test-requirements.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/test-requirements.txt b/test-requirements.txt
index 4761182f41..bd518645e2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,6 +5,7 @@ Werkzeug==0.15.5
pytest-localserver==0.5.0
pytest-cov==2.8.1
jsonschema==3.2.0
+pyrsistent==0.16.0 # TODO(py3): 0.17.0 requires python3, see https://github.com/tobgu/pyrsistent/issues/205
gevent
eventlet
From 51a802259d8287eab7896592644f3f7911fab552 Mon Sep 17 00:00:00 2001
From: sentry-bot
Date: Wed, 9 Sep 2020 10:30:56 +0000
Subject: [PATCH 0003/2327] fix: Formatting
---
tests/test_transport.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/test_transport.py b/tests/test_transport.py
index 00fcd9b1e8..801259ca8a 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -163,7 +163,9 @@ def test_complex_limits_without_data_category(
):
client = make_client()
httpserver.serve_content(
- "hm", response_code, headers={"X-Sentry-Rate-Limits": "4711::organization"},
+ "hm",
+ response_code,
+ headers={"X-Sentry-Rate-Limits": "4711::organization"},
)
client.capture_event({"type": "transaction"})
From d2efb74e2a071ac372f185889e4569cc25ab2dce Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Wed, 9 Sep 2020 12:36:21 +0200
Subject: [PATCH 0004/2327] chore: Fix test
---
tests/test_transport.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/test_transport.py b/tests/test_transport.py
index 801259ca8a..4c37d3e157 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -24,7 +24,7 @@ def inner(**kwargs):
@pytest.mark.forked
@pytest.mark.parametrize("debug", (True, False))
@pytest.mark.parametrize("client_flush_method", ["close", "flush"])
-@pytest.mark.parametrize("pickle", (True, False))
+@pytest.mark.parametrize("use_pickle", (True, False))
def test_transport_works(
httpserver,
request,
@@ -33,14 +33,14 @@ def test_transport_works(
debug,
make_client,
client_flush_method,
- pickle,
+ use_pickle,
maybe_monkeypatched_threading,
):
httpserver.serve_content("ok", 200)
caplog.set_level(logging.DEBUG)
client = make_client(debug=debug)
- if pickle:
+ if use_pickle:
client = pickle.loads(pickle.dumps(client))
Hub.current.bind_client(client)
From 86815d68e2dfbc7fb3042e16b15154f0b424fc96 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Wed, 9 Sep 2020 12:50:07 +0200
Subject: [PATCH 0005/2327] chore: Fix test
---
tests/test_transport.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/test_transport.py b/tests/test_transport.py
index 4c37d3e157..84425a2ac4 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -15,7 +15,7 @@
def make_client(request, httpserver):
def inner(**kwargs):
return Client(
- "http://foobar{}/132".format(httpserver.url[len("http://") :]), **kwargs
+ "http://foobar@{}/132".format(httpserver.url[len("http://") :]), **kwargs
)
return inner
From a5883a380bae7a5193b3365d44efc57ed66d7d30 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Wed, 9 Sep 2020 13:25:02 +0200
Subject: [PATCH 0006/2327] chore: Pin celery dependency
---
tox.ini | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tox.ini b/tox.ini
index bcb1fdfa3c..ecbbbe41dc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -128,6 +128,8 @@ deps =
celery-4.1: Celery>=4.1,<4.2
celery-4.2: Celery>=4.2,<4.3
celery-4.3: Celery>=4.3,<4.4
+ # https://github.com/celery/vine/pull/29#issuecomment-689498382
+ celery-4.3: vine<5.0.0
# https://github.com/celery/celery/issues/6153
celery-4.4: Celery>=4.4,<4.5,!=4.4.4
From 3f206c213ecc3b13c9cb42375b0226f495685f64 Mon Sep 17 00:00:00 2001
From: Gleekzone <46584253+Gleekzone@users.noreply.github.com>
Date: Wed, 9 Sep 2020 14:35:51 -0500
Subject: [PATCH 0007/2327] feat: Integration for Chalice (#779)
Co-authored-by: sentry-bot
Co-authored-by: Markus Unterwaditzer
---
sentry_sdk/integrations/chalice.py | 109 ++++++++++++++++++++
setup.py | 1 +
tests/integrations/chalice/__init__.py | 3 +
tests/integrations/chalice/test_chalice.py | 111 +++++++++++++++++++++
tox.ini | 5 +
5 files changed, 229 insertions(+)
create mode 100644 sentry_sdk/integrations/chalice.py
create mode 100644 tests/integrations/chalice/__init__.py
create mode 100644 tests/integrations/chalice/test_chalice.py
diff --git a/sentry_sdk/integrations/chalice.py b/sentry_sdk/integrations/chalice.py
new file mode 100644
index 0000000000..ade1c7f10f
--- /dev/null
+++ b/sentry_sdk/integrations/chalice.py
@@ -0,0 +1,109 @@
+import sys
+
+from sentry_sdk._compat import reraise
+from sentry_sdk.hub import Hub
+from sentry_sdk.integrations import Integration
+from sentry_sdk.integrations.aws_lambda import _make_request_event_processor
+from sentry_sdk.utils import (
+ capture_internal_exceptions,
+ event_from_exception,
+)
+from sentry_sdk._types import MYPY
+from sentry_sdk._functools import wraps
+
+import chalice # type: ignore
+from chalice import Chalice, ChaliceViewError
+from chalice.app import EventSourceHandler as ChaliceEventSourceHandler # type: ignore
+
+if MYPY:
+ from typing import Any
+ from typing import TypeVar
+ from typing import Callable
+
+ F = TypeVar("F", bound=Callable[..., Any])
+
+
+class EventSourceHandler(ChaliceEventSourceHandler): # type: ignore
+ def __call__(self, event, context):
+ # type: (Any, Any) -> Any
+ hub = Hub.current
+ client = hub.client # type: Any
+
+ with hub.push_scope() as scope:
+ with capture_internal_exceptions():
+ configured_time = context.get_remaining_time_in_millis()
+ scope.add_event_processor(
+ _make_request_event_processor(event, context, configured_time)
+ )
+ try:
+ event_obj = self.event_class(event, context)
+ return self.func(event_obj)
+ except Exception:
+ exc_info = sys.exc_info()
+ event, hint = event_from_exception(
+ exc_info,
+ client_options=client.options,
+ mechanism={"type": "chalice", "handled": False},
+ )
+ hub.capture_event(event, hint=hint)
+ hub.flush()
+ reraise(*exc_info)
+
+
+def _get_view_function_response(app, view_function, function_args):
+ # type: (Any, F, Any) -> F
+ @wraps(view_function)
+ def wrapped_view_function(**function_args):
+ # type: (**Any) -> Any
+ hub = Hub.current
+ client = hub.client # type: Any
+ with hub.push_scope() as scope:
+ with capture_internal_exceptions():
+ configured_time = app.lambda_context.get_remaining_time_in_millis()
+ scope.transaction = app.lambda_context.function_name
+ scope.add_event_processor(
+ _make_request_event_processor(
+ app.current_request.to_dict(),
+ app.lambda_context,
+ configured_time,
+ )
+ )
+ try:
+ return view_function(**function_args)
+ except Exception as exc:
+ if isinstance(exc, ChaliceViewError):
+ raise
+ exc_info = sys.exc_info()
+ event, hint = event_from_exception(
+ exc_info,
+ client_options=client.options,
+ mechanism={"type": "chalice", "handled": False},
+ )
+ hub.capture_event(event, hint=hint)
+ hub.flush()
+ raise
+
+ return wrapped_view_function # type: ignore
+
+
+class ChaliceIntegration(Integration):
+ identifier = "chalice"
+
+ @staticmethod
+ def setup_once():
+ # type: () -> None
+ old_get_view_function_response = Chalice._get_view_function_response
+
+ def sentry_event_response(app, view_function, function_args):
+ # type: (Any, F, **Any) -> Any
+ wrapped_view_function = _get_view_function_response(
+ app, view_function, function_args
+ )
+
+ return old_get_view_function_response(
+ app, wrapped_view_function, function_args
+ )
+
+ Chalice._get_view_function_response = sentry_event_response
+ # for everything else (like events)
+ chalice.app.EventSourceHandler = EventSourceHandler
diff --git a/setup.py b/setup.py
index 27f6e4c2ba..f1b8ee70ee 100644
--- a/setup.py
+++ b/setup.py
@@ -38,6 +38,7 @@
"sqlalchemy": ["sqlalchemy>=1.2"],
"pyspark": ["pyspark>=2.4.4"],
"pure_eval": ["pure_eval", "executing", "asttokens"],
+ "chalice": ["chalice>=1.16.0"],
},
classifiers=[
"Development Status :: 5 - Production/Stable",
diff --git a/tests/integrations/chalice/__init__.py b/tests/integrations/chalice/__init__.py
new file mode 100644
index 0000000000..9f8680b4b2
--- /dev/null
+++ b/tests/integrations/chalice/__init__.py
@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("chalice")
diff --git a/tests/integrations/chalice/test_chalice.py b/tests/integrations/chalice/test_chalice.py
new file mode 100644
index 0000000000..8bb33a5cb6
--- /dev/null
+++ b/tests/integrations/chalice/test_chalice.py
@@ -0,0 +1,111 @@
+import pytest
+import time
+from chalice import Chalice, BadRequestError
+from chalice.local import LambdaContext, LocalGateway
+
+from sentry_sdk.integrations.chalice import ChaliceIntegration
+
+from pytest_chalice.handlers import RequestHandler
+
+
+def _generate_lambda_context(self):
+ # Monkeypatch of the function _generate_lambda_context
+ # from the class LocalGateway
+ # for mock the timeout
+ # type: () -> LambdaContext
+ if self._config.lambda_timeout is None:
+ timeout = 10 * 1000
+ else:
+ timeout = self._config.lambda_timeout * 1000
+ return LambdaContext(
+ function_name=self._config.function_name,
+ memory_size=self._config.lambda_memory_size,
+ max_runtime_ms=timeout,
+ )
+
+
+@pytest.fixture
+def app(sentry_init):
+ sentry_init(integrations=[ChaliceIntegration()])
+ app = Chalice(app_name="sentry_chalice")
+
+ @app.route("/boom")
+ def boom():
+ raise Exception("boom goes the dynamite!")
+
+ @app.route("/context")
+ def has_request():
+ raise Exception("boom goes the dynamite!")
+
+ @app.route("/badrequest")
+ def badrequest():
+ raise BadRequestError("bad-request")
+
+ LocalGateway._generate_lambda_context = _generate_lambda_context
+
+ return app
+
+
+@pytest.fixture
+def lambda_context_args():
+ return ["lambda_name", 256]
+
+
+def test_exception_boom(app, client: RequestHandler) -> None:
+ response = client.get("/boom")
+ assert response.status_code == 500
+ assert response.json == dict(
+ [
+ ("Code", "InternalServerError"),
+ ("Message", "An internal server error occurred."),
+ ]
+ )
+
+
+def test_has_request(app, capture_events, client: RequestHandler):
+ events = capture_events()
+
+ response = client.get("/context")
+ assert response.status_code == 500
+
+ (event,) = events
+ assert event["level"] == "error"
+ (exception,) = event["exception"]["values"]
+ assert exception["type"] == "Exception"
+
+
+def test_scheduled_event(app, lambda_context_args):
+ @app.schedule("rate(1 minutes)")
+ def every_hour(event):
+ raise Exception("schedule event!")
+
+ context = LambdaContext(
+ *lambda_context_args, max_runtime_ms=10000, time_source=time
+ )
+
+ lambda_event = {
+ "version": "0",
+ "account": "120987654312",
+ "region": "us-west-1",
+ "detail": {},
+ "detail-type": "Scheduled Event",
+ "source": "aws.events",
+ "time": "1970-01-01T00:00:00Z",
+ "id": "event-id",
+ "resources": ["arn:aws:events:us-west-1:120987654312:rule/my-schedule"],
+ }
+ with pytest.raises(Exception) as exc_info:
+ every_hour(lambda_event, context=context)
+ assert str(exc_info.value) == "schedule event!"
+
+
+def test_bad_reques(client: RequestHandler) -> None:
+ response = client.get("/badrequest")
+
+ assert response.status_code == 400
+ assert response.json == dict(
+ [
+ ("Code", "BadRequestError"),
+ ("Message", "BadRequestError: bad-request"),
+ ]
+ )
diff --git a/tox.ini b/tox.ini
index ecbbbe41dc..6be2512ca0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -75,6 +75,8 @@ envlist =
{py3.5,py3.6,py3.7,py3.8,py3.9}-pure_eval
+ {py3.6,py3.7,py3.8}-chalice
+
[testenv]
deps =
-r test-requirements.txt
@@ -194,6 +196,8 @@ deps =
py3.8: hypothesis
pure_eval: pure_eval
+ chalice: chalice>=1.16.0
+ chalice: pytest-chalice==0.0.5
setenv =
PYTHONDONTWRITEBYTECODE=1
@@ -219,6 +223,7 @@ setenv =
sqlalchemy: TESTPATH=tests/integrations/sqlalchemy
spark: TESTPATH=tests/integrations/spark
pure_eval: TESTPATH=tests/integrations/pure_eval
+ chalice: TESTPATH=tests/integrations/chalice
COVERAGE_FILE=.coverage-{envname}
passenv =
From 7a2e4e860c6d4930ebfcc18503345bf058da9912 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Wed, 9 Sep 2020 21:38:13 +0200
Subject: [PATCH 0008/2327] doc: Changelog for 0.17.4
---
CHANGES.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 2bc50dda9f..7ea4a7288e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,10 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 0.17.4
+
+* New integration for the Chalice web framework for AWS Lambda. Thanks to the folks at Cuenca MX!
+
## 0.17.3
* Fix an issue with the `pure_eval` integration in interaction with trimming where `pure_eval` would create a lot of useless local variables that then drown out the useful ones in trimming.
From 9573f5ac0fb73a32824c7936d97247a3d09b417e Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Wed, 9 Sep 2020 21:38:23 +0200
Subject: [PATCH 0009/2327] release: 0.17.4
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index c583c77404..8ca7a908ed 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.17.3"
+release = "0.17.4"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index d34fb747ed..b92daa887b 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -88,7 +88,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.17.3"
+VERSION = "0.17.4"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index f1b8ee70ee..943bbfd91e 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
setup(
name="sentry-sdk",
- version="0.17.3",
+ version="0.17.4",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From cd6ef0c1bd4878ee5552c0cb37c0b74d9b705329 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 14 Sep 2020 10:18:58 +0200
Subject: [PATCH 0010/2327] fix: Fix deadlock in transport due to GC running
(#814)
Co-authored-by: sentry-bot
---
mypy.ini | 4 +
sentry_sdk/_compat.py | 2 -
sentry_sdk/_queue.py | 227 ++++++++++++++++++++++++++++++++++++++++++
sentry_sdk/worker.py | 42 +++-----
tox.ini | 8 +-
5 files changed, 252 insertions(+), 31 deletions(-)
create mode 100644 sentry_sdk/_queue.py
diff --git a/mypy.ini b/mypy.ini
index 06f02ac59c..15d39693e5 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -54,3 +54,7 @@ ignore_missing_imports = True
ignore_missing_imports = True
[mypy-pure_eval.*]
ignore_missing_imports = True
+
+[mypy-sentry_sdk._queue]
+ignore_missing_imports = True
+disallow_untyped_defs = False
diff --git a/sentry_sdk/_compat.py b/sentry_sdk/_compat.py
index e7933e53da..b7f79c1f48 100644
--- a/sentry_sdk/_compat.py
+++ b/sentry_sdk/_compat.py
@@ -19,7 +19,6 @@
import urlparse # noqa
text_type = unicode # noqa
- import Queue as queue # noqa
string_types = (str, text_type)
number_types = (int, long, float) # noqa
@@ -37,7 +36,6 @@ def implements_str(cls):
else:
import urllib.parse as urlparse # noqa
- import queue # noqa
text_type = str
string_types = (text_type,) # type: Tuple[type]
diff --git a/sentry_sdk/_queue.py b/sentry_sdk/_queue.py
new file mode 100644
index 0000000000..e368da2229
--- /dev/null
+++ b/sentry_sdk/_queue.py
@@ -0,0 +1,227 @@
+"""
+A fork of Python 3.6's stdlib queue with Lock swapped out for RLock to avoid a
+deadlock while garbage collecting.
+
+See
+https://codewithoutrules.com/2017/08/16/concurrency-python/
+https://bugs.python.org/issue14976
+https://github.com/sqlalchemy/sqlalchemy/blob/4eb747b61f0c1b1c25bdee3856d7195d10a0c227/lib/sqlalchemy/queue.py#L1
+
+We also vendor the code to evade eventlet's broken monkeypatching, see
+https://github.com/getsentry/sentry-python/pull/484
+"""
+
+import threading
+
+from collections import deque
+from time import time
+
+from sentry_sdk._types import MYPY
+
+if MYPY:
+ from typing import Any
+
+__all__ = ["Empty", "Full", "Queue"]
+
+
+class Empty(Exception):
+ "Exception raised by Queue.get(block=0)/get_nowait()."
+ pass
+
+
+class Full(Exception):
+ "Exception raised by Queue.put(block=0)/put_nowait()."
+ pass
+
+
+class Queue(object):
+ """Create a queue object with a given maximum size.
+
+ If maxsize is <= 0, the queue size is infinite.
+ """
+
+ def __init__(self, maxsize=0):
+ self.maxsize = maxsize
+ self._init(maxsize)
+
+ # mutex must be held whenever the queue is mutating. All methods
+ # that acquire mutex must release it before returning. mutex
+ # is shared between the three conditions, so acquiring and
+ # releasing the conditions also acquires and releases mutex.
+ self.mutex = threading.RLock()
+
+ # Notify not_empty whenever an item is added to the queue; a
+ # thread waiting to get is notified then.
+ self.not_empty = threading.Condition(self.mutex)
+
+ # Notify not_full whenever an item is removed from the queue;
+ # a thread waiting to put is notified then.
+ self.not_full = threading.Condition(self.mutex)
+
+ # Notify all_tasks_done whenever the number of unfinished tasks
+ # drops to zero; thread waiting to join() is notified to resume
+ self.all_tasks_done = threading.Condition(self.mutex)
+ self.unfinished_tasks = 0
+
+ def task_done(self):
+ """Indicate that a formerly enqueued task is complete.
+
+ Used by Queue consumer threads. For each get() used to fetch a task,
+ a subsequent call to task_done() tells the queue that the processing
+ on the task is complete.
+
+ If a join() is currently blocking, it will resume when all items
+ have been processed (meaning that a task_done() call was received
+ for every item that had been put() into the queue).
+
+ Raises a ValueError if called more times than there were items
+ placed in the queue.
+ """
+ with self.all_tasks_done:
+ unfinished = self.unfinished_tasks - 1
+ if unfinished <= 0:
+ if unfinished < 0:
+ raise ValueError("task_done() called too many times")
+ self.all_tasks_done.notify_all()
+ self.unfinished_tasks = unfinished
+
+ def join(self):
+ """Blocks until all items in the Queue have been gotten and processed.
+
+ The count of unfinished tasks goes up whenever an item is added to the
+ queue. The count goes down whenever a consumer thread calls task_done()
+ to indicate the item was retrieved and all work on it is complete.
+
+ When the count of unfinished tasks drops to zero, join() unblocks.
+ """
+ with self.all_tasks_done:
+ while self.unfinished_tasks:
+ self.all_tasks_done.wait()
+
+ def qsize(self):
+ """Return the approximate size of the queue (not reliable!)."""
+ with self.mutex:
+ return self._qsize()
+
+ def empty(self):
+ """Return True if the queue is empty, False otherwise (not reliable!).
+
+ This method is likely to be removed at some point. Use qsize() == 0
+ as a direct substitute, but be aware that either approach risks a race
+ condition where a queue can grow before the result of empty() or
+ qsize() can be used.
+
+ To create code that needs to wait for all queued tasks to be
+ completed, the preferred technique is to use the join() method.
+ """
+ with self.mutex:
+ return not self._qsize()
+
+ def full(self):
+ """Return True if the queue is full, False otherwise (not reliable!).
+
+ This method is likely to be removed at some point. Use qsize() >= n
+ as a direct substitute, but be aware that either approach risks a race
+ condition where a queue can shrink before the result of full() or
+ qsize() can be used.
+ """
+ with self.mutex:
+ return 0 < self.maxsize <= self._qsize()
+
+ def put(self, item, block=True, timeout=None):
+ """Put an item into the queue.
+
+ If optional args 'block' is true and 'timeout' is None (the default),
+ block if necessary until a free slot is available. If 'timeout' is
+ a non-negative number, it blocks at most 'timeout' seconds and raises
+ the Full exception if no free slot was available within that time.
+ Otherwise ('block' is false), put an item on the queue if a free slot
+ is immediately available, else raise the Full exception ('timeout'
+ is ignored in that case).
+ """
+ with self.not_full:
+ if self.maxsize > 0:
+ if not block:
+ if self._qsize() >= self.maxsize:
+ raise Full()
+ elif timeout is None:
+ while self._qsize() >= self.maxsize:
+ self.not_full.wait()
+ elif timeout < 0:
+ raise ValueError("'timeout' must be a non-negative number")
+ else:
+ endtime = time() + timeout
+ while self._qsize() >= self.maxsize:
+ remaining = endtime - time()
+ if remaining <= 0.0:
+ raise Full
+ self.not_full.wait(remaining)
+ self._put(item)
+ self.unfinished_tasks += 1
+ self.not_empty.notify()
+
+ def get(self, block=True, timeout=None):
+ """Remove and return an item from the queue.
+
+ If optional args 'block' is true and 'timeout' is None (the default),
+ block if necessary until an item is available. If 'timeout' is
+ a non-negative number, it blocks at most 'timeout' seconds and raises
+ the Empty exception if no item was available within that time.
+ Otherwise ('block' is false), return an item if one is immediately
+ available, else raise the Empty exception ('timeout' is ignored
+ in that case).
+ """
+ with self.not_empty:
+ if not block:
+ if not self._qsize():
+ raise Empty()
+ elif timeout is None:
+ while not self._qsize():
+ self.not_empty.wait()
+ elif timeout < 0:
+ raise ValueError("'timeout' must be a non-negative number")
+ else:
+ endtime = time() + timeout
+ while not self._qsize():
+ remaining = endtime - time()
+ if remaining <= 0.0:
+ raise Empty()
+ self.not_empty.wait(remaining)
+ item = self._get()
+ self.not_full.notify()
+ return item
+
+ def put_nowait(self, item):
+ """Put an item into the queue without blocking.
+
+ Only enqueue the item if a free slot is immediately available.
+ Otherwise raise the Full exception.
+ """
+ return self.put(item, block=False)
+
+ def get_nowait(self):
+ """Remove and return an item from the queue without blocking.
+
+ Only get an item if one is immediately available. Otherwise
+ raise the Empty exception.
+ """
+ return self.get(block=False)
+
+ # Override these methods to implement other queue organizations
+ # (e.g. stack or priority queue).
+ # These will only be called with appropriate locks held
+
+ # Initialize the queue representation
+ def _init(self, maxsize):
+ self.queue = deque() # type: Any
+
+ def _qsize(self):
+ return len(self.queue)
+
+ # Put a new item in the queue
+ def _put(self, item):
+ self.queue.append(item)
+
+ # Get an item from the queue
+ def _get(self):
+ return self.queue.popleft()
diff --git a/sentry_sdk/worker.py b/sentry_sdk/worker.py
index b5f2ea8ae6..8550f1081c 100644
--- a/sentry_sdk/worker.py
+++ b/sentry_sdk/worker.py
@@ -1,14 +1,14 @@
import os
+import threading
-from threading import Thread, Lock
from time import sleep, time
-from sentry_sdk._compat import queue, check_thread_support
+from sentry_sdk._compat import check_thread_support
+from sentry_sdk._queue import Queue, Full
from sentry_sdk.utils import logger
from sentry_sdk._types import MYPY
if MYPY:
- from queue import Queue
from typing import Any
from typing import Optional
from typing import Callable
@@ -18,12 +18,12 @@
class BackgroundWorker(object):
- def __init__(self):
- # type: () -> None
+ def __init__(self, queue_size=30):
+ # type: (int) -> None
check_thread_support()
- self._queue = queue.Queue(30) # type: Queue[Any]
- self._lock = Lock()
- self._thread = None # type: Optional[Thread]
+ self._queue = Queue(queue_size) # type: Queue
+ self._lock = threading.Lock()
+ self._thread = None # type: Optional[threading.Thread]
self._thread_for_pid = None # type: Optional[int]
@property
@@ -45,38 +45,24 @@ def _timed_queue_join(self, timeout):
deadline = time() + timeout
queue = self._queue
- real_all_tasks_done = getattr(
- queue, "all_tasks_done", None
- ) # type: Optional[Any]
- if real_all_tasks_done is not None:
- real_all_tasks_done.acquire()
- all_tasks_done = real_all_tasks_done # type: Optional[Any]
- elif queue.__module__.startswith("eventlet."):
- all_tasks_done = getattr(queue, "_cond", None)
- else:
- all_tasks_done = None
+ queue.all_tasks_done.acquire()
try:
while queue.unfinished_tasks:
delay = deadline - time()
if delay <= 0:
return False
- if all_tasks_done is not None:
- all_tasks_done.wait(timeout=delay)
- else:
- # worst case, we just poll the number of remaining tasks
- sleep(0.1)
+ queue.all_tasks_done.wait(timeout=delay)
return True
finally:
- if real_all_tasks_done is not None:
- real_all_tasks_done.release()
+ queue.all_tasks_done.release()
def start(self):
# type: () -> None
with self._lock:
if not self.is_alive:
- self._thread = Thread(
+ self._thread = threading.Thread(
target=self._target, name="raven-sentry.BackgroundWorker"
)
self._thread.setDaemon(True)
@@ -94,7 +80,7 @@ def kill(self):
if self._thread:
try:
self._queue.put_nowait(_TERMINATOR)
- except queue.Full:
+ except Full:
logger.debug("background worker queue full, kill failed")
self._thread = None
@@ -123,7 +109,7 @@ def submit(self, callback):
self._ensure_thread()
try:
self._queue.put_nowait(callback)
- except queue.Full:
+ except Full:
logger.debug("background worker queue full, dropping event")
def _target(self):
diff --git a/tox.ini b/tox.ini
index 6be2512ca0..e841b3c9a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -246,7 +246,13 @@ basepython =
py3.7: python3.7
py3.8: python3.8
py3.9: python3.9
- linters: python3
+
+ # Python version is pinned here because flake8 actually behaves differently
+ # depending on which version is used. You can patch this out to point to
+ # some random Python 3 binary, but then you get guaranteed mismatches with
+ # CI. Other tools such as mypy and black have options that pin the Python
+ # version.
+ linters: python3.8
pypy: pypy
commands =
From 13b137526f8de6aec5dcccec9a045219855bc372 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 14 Sep 2020 10:20:10 +0200
Subject: [PATCH 0011/2327] chore: Un-pin pyrsistent
---
test-requirements.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/test-requirements.txt b/test-requirements.txt
index bd518645e2..4761182f41 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,6 @@ Werkzeug==0.15.5
pytest-localserver==0.5.0
pytest-cov==2.8.1
jsonschema==3.2.0
-pyrsistent==0.16.0 # TODO(py3): 0.17.0 requires python3, see https://github.com/tobgu/pyrsistent/issues/205
gevent
eventlet
From 3d5b5eeba722f069ddb27761758728b782505bcb Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 14 Sep 2020 10:46:36 +0200
Subject: [PATCH 0012/2327] Revert "chore: Un-pin pyrsistent"
This reverts commit 13b137526f8de6aec5dcccec9a045219855bc372.
---
test-requirements.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/test-requirements.txt b/test-requirements.txt
index 4761182f41..bd518645e2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,6 +5,7 @@ Werkzeug==0.15.5
pytest-localserver==0.5.0
pytest-cov==2.8.1
jsonschema==3.2.0
+pyrsistent==0.16.0 # TODO(py3): 0.17.0 requires python3, see https://github.com/tobgu/pyrsistent/issues/205
gevent
eventlet
From ce83b95cd5038569b938fac94e1ad8bb49423043 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 14 Sep 2020 13:11:48 +0200
Subject: [PATCH 0013/2327] fix: Allow ASGI middleware to capture exceptions in
nested call (#817)
Co-authored-by: sentry-bot
---
sentry_sdk/integrations/asgi.py | 10 ++++++++--
tests/integrations/asgi/test_asgi.py | 25 ++++++++++++++++++++++++-
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py
index 79071db788..7a0d0bd339 100644
--- a/sentry_sdk/integrations/asgi.py
+++ b/sentry_sdk/integrations/asgi.py
@@ -107,8 +107,14 @@ async def _run_asgi3(self, scope, receive, send):
async def _run_app(self, scope, callback):
# type: (Any, Any) -> Any
- if _asgi_middleware_applied.get(False):
- return await callback()
+ is_recursive_asgi_middleware = _asgi_middleware_applied.get(False)
+
+ if is_recursive_asgi_middleware:
+ try:
+ return await callback()
+ except Exception as exc:
+ _capture_exception(Hub.current, exc)
+ raise exc from None
_asgi_middleware_applied.set(True)
try:
diff --git a/tests/integrations/asgi/test_asgi.py b/tests/integrations/asgi/test_asgi.py
index 2561537708..521c7c8302 100644
--- a/tests/integrations/asgi/test_asgi.py
+++ b/tests/integrations/asgi/test_asgi.py
@@ -1,7 +1,7 @@
import sys
import pytest
-from sentry_sdk import Hub, capture_message
+from sentry_sdk import Hub, capture_message, last_event_id
from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
from starlette.applications import Starlette
from starlette.responses import PlainTextResponse
@@ -179,3 +179,26 @@ async def app(scope, receive, send):
"url": "ws://testserver/",
}
)
+
+
+def test_starlette_last_event_id(app, sentry_init, capture_events, request):
+ sentry_init(send_default_pii=True)
+ events = capture_events()
+
+ @app.route("/handlederror")
+ def handlederror(request):
+ raise ValueError("oh no")
+
+ @app.exception_handler(500)
+ def handler(*args, **kwargs):
+ return PlainTextResponse(last_event_id(), status_code=500)
+
+ client = TestClient(SentryAsgiMiddleware(app), raise_server_exceptions=False)
+ response = client.get("/handlederror")
+ assert response.status_code == 500
+
+ (event,) = events
+ assert response.content.strip().decode("ascii") == event["event_id"]
+ (exception,) = event["exception"]["values"]
+ assert exception["type"] == "ValueError"
+ assert exception["value"] == "oh no"
From b2bde78bb99214b70bb8e0c90cd30d2309309b77 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 14 Sep 2020 14:38:09 +0200
Subject: [PATCH 0014/2327] doc: Changelog for 0.17.5
---
CHANGES.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 7ea4a7288e..4ee6bf11db 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,12 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+
+## 0.17.5
+
+* Work around an issue in the Python stdlib that makes the entire process deadlock during garbage collection if events are sent from a `__del__` implementation.
+* Add possibility to wrap ASGI application twice in middleware to enable split up of request scope data and exception catching.
+
## 0.17.4
* New integration for the Chalice web framework for AWS Lambda. Thanks to the folks at Cuenca MX!
From 11ad711f615345219d7614f467f94276afcfd512 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 14 Sep 2020 14:38:27 +0200
Subject: [PATCH 0015/2327] release: 0.17.5
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 8ca7a908ed..d8977e9f43 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.17.4"
+release = "0.17.5"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index b92daa887b..f0fdcd9297 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -88,7 +88,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.17.4"
+VERSION = "0.17.5"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 943bbfd91e..0e446236e5 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
setup(
name="sentry-sdk",
- version="0.17.4",
+ version="0.17.5",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 5976dea31aef5fa66ad99d61fa89fd7d77242016 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Tue, 15 Sep 2020 22:33:10 +0200
Subject: [PATCH 0016/2327] chore: Clean up Flask CI and test 0.10 (#822)
---
sentry_sdk/integrations/flask.py | 4 ++--
tox.ini | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py
index 49611787f0..86fcd76a16 100644
--- a/sentry_sdk/integrations/flask.py
+++ b/sentry_sdk/integrations/flask.py
@@ -69,8 +69,8 @@ def setup_once():
except (ValueError, TypeError):
raise DidNotEnable("Unparsable Flask version: {}".format(FLASK_VERSION))
- if version < (0, 11):
- raise DidNotEnable("Flask 0.11 or newer is required.")
+ if version < (0, 10):
+ raise DidNotEnable("Flask 0.10 or newer is required.")
request_started.connect(_request_started)
got_request_exception.connect(_capture_exception)
diff --git a/tox.ini b/tox.ini
index e841b3c9a6..c76954c61c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,8 +25,9 @@ envlist =
{py3.5,py3.6,py3.7}-django-{2.0,2.1}
{py3.7,py3.8,py3.9}-django-{2.2,3.0,3.1,dev}
- {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{1.1,1.0,0.11,0.12}
- {py3.6,py3.7,py3.8,py3.9}-flask-{1.1,1.0,0.11,0.12,dev}
+ {pypy,py2.7,py3.4,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12,1.0}
+ {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-1.1
+ {py3.6,py3.7,py3.8,py3.9}-flask-dev
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-bottle-0.12
@@ -104,6 +105,7 @@ deps =
django-dev: git+https://github.com/django/django.git#egg=Django
flask: flask-login
+ flask-0.10: Flask>=0.10,<0.11
flask-0.11: Flask>=0.11,<0.12
flask-0.12: Flask>=0.12,<0.13
flask-1.0: Flask>=1.0,<1.1
From 0910047b416dbebbac5cfc7919668aa24fea89a6 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Tue, 15 Sep 2020 22:35:42 +0200
Subject: [PATCH 0017/2327] doc: Changelog for 0.17.6
---
CHANGES.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 4ee6bf11db..e5af24fb9b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -28,6 +28,10 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 0.17.6
+
+* Support for Flask 0.10 (only relaxing verson check)
+
## 0.17.5
* Work around an issue in the Python stdlib that makes the entire process deadlock during garbage collection if events are sent from a `__del__` implementation.
From b07367a3d06cfeaabd44095c5e73c944f97d5661 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Tue, 15 Sep 2020 22:35:59 +0200
Subject: [PATCH 0018/2327] release: 0.17.6
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index d8977e9f43..d6eb1ca059 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.17.5"
+release = "0.17.6"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index f0fdcd9297..242ad1ce8a 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -88,7 +88,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.17.5"
+VERSION = "0.17.6"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 0e446236e5..8b3071f31c 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
setup(
name="sentry-sdk",
- version="0.17.5",
+ version="0.17.6",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From b953a66321acb81c4e930dee9455adf08a041886 Mon Sep 17 00:00:00 2001
From: Michael K
Date: Mon, 21 Sep 2020 07:38:04 +0000
Subject: [PATCH 0019/2327] doc: Fix typo (#827)
---
CHANGES.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index e5af24fb9b..d2faabed70 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -30,7 +30,7 @@ A major release `N` implies the previous release `N-1` will no longer receive up
## 0.17.6
-* Support for Flask 0.10 (only relaxing verson check)
+* Support for Flask 0.10 (only relaxing version check)
## 0.17.5
From c95bda7f1183c56799028880ca6905e8d2aedf40 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 21 Sep 2020 09:40:49 +0200
Subject: [PATCH 0020/2327] chore: Un-break Travis build by testing Chalice
pinned
---
tox.ini | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tox.ini b/tox.ini
index c76954c61c..78d73a14aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -76,7 +76,7 @@ envlist =
{py3.5,py3.6,py3.7,py3.8,py3.9}-pure_eval
- {py3.6,py3.7,py3.8}-chalice
+ {py3.6,py3.7,py3.8}-chalice-{1.16,1.17,1.18,1.19}
[testenv]
deps =
@@ -198,7 +198,10 @@ deps =
py3.8: hypothesis
pure_eval: pure_eval
- chalice: chalice>=1.16.0
+ chalice-1.16: chalice>=1.16.0,<1.17.0
+ chalice-1.17: chalice>=1.17.0,<1.18.0
+ chalice-1.18: chalice>=1.18.0,<1.19.0
+ chalice-1.19: chalice>=1.19.0,<1.20.0
chalice: pytest-chalice==0.0.5
setenv =
From 93f6d33889f3cc51181cb395f339b0672b1c080a Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 21 Sep 2020 14:23:16 +0200
Subject: [PATCH 0021/2327] fix(transport): Use correct data category for
transaction events (#826)
Co-authored-by: Rodolfo Carvalho
Co-authored-by: sentry-bot
---
sentry_sdk/envelope.py | 28 +++++++++++++--------------
sentry_sdk/transport.py | 23 ++++++++++++----------
tests/conftest.py | 13 +++++++++++--
tests/test_client.py | 42 +++++++++++++++++++++++++++++++++++++++++
tests/test_transport.py | 11 +++++++----
5 files changed, 86 insertions(+), 31 deletions(-)
diff --git a/sentry_sdk/envelope.py b/sentry_sdk/envelope.py
index 516b50886b..b0b88e6c41 100644
--- a/sentry_sdk/envelope.py
+++ b/sentry_sdk/envelope.py
@@ -20,13 +20,6 @@
from sentry_sdk._types import Event, EventDataCategory
-def get_event_data_category(event):
- # type: (Event) -> EventDataCategory
- if event.get("type") == "transaction":
- return "transaction"
- return "error"
-
-
class Envelope(object):
def __init__(
self,
@@ -230,15 +223,17 @@ def __repr__(self):
@property
def data_category(self):
# type: (...) -> EventDataCategory
- rv = "default" # type: Any
- event = self.get_event()
- if event is not None:
- rv = get_event_data_category(event)
+ ty = self.headers.get("type")
+ if ty == "session":
+ return "session"
+ elif ty == "attachment":
+ return "attachment"
+ elif ty == "transaction":
+ return "transaction"
+ elif ty == "event":
+ return "error"
else:
- ty = self.headers.get("type")
- if ty in ("session", "attachment"):
- rv = ty
- return rv
+ return "default"
def get_bytes(self):
# type: (...) -> bytes
@@ -246,6 +241,9 @@ def get_bytes(self):
def get_event(self):
# type: (...) -> Optional[Event]
+ """
+ Returns an error event if there is one.
+ """
if self.headers.get("type") == "event" and self.payload.json is not None:
return self.payload.json
return None
diff --git a/sentry_sdk/transport.py b/sentry_sdk/transport.py
index 582e4cf383..4571e96204 100644
--- a/sentry_sdk/transport.py
+++ b/sentry_sdk/transport.py
@@ -9,7 +9,7 @@
from sentry_sdk.utils import Dsn, logger, capture_internal_exceptions, json_dumps
from sentry_sdk.worker import BackgroundWorker
-from sentry_sdk.envelope import Envelope, get_event_data_category
+from sentry_sdk.envelope import Envelope
from sentry_sdk._types import MYPY
@@ -58,7 +58,8 @@ def capture_event(
self, event # type: Event
):
# type: (...) -> None
- """This gets invoked with the event dictionary when an event should
+ """
+ This gets invoked with the event dictionary when an event should
be sent to sentry.
"""
raise NotImplementedError()
@@ -67,14 +68,15 @@ def capture_envelope(
self, envelope # type: Envelope
):
# type: (...) -> None
- """This gets invoked with an envelope when an event should
- be sent to sentry. The default implementation invokes `capture_event`
- if the envelope contains an event and ignores all other envelopes.
"""
- event = envelope.get_event()
- if event is not None:
- self.capture_event(event)
- return None
+ Send an envelope to Sentry.
+
+ Envelopes are a data container format that can hold any type of data
+ submitted to Sentry. We use it for transactions and sessions, but
+ regular "error" events should go through `capture_event` for backwards
+ compat.
+ """
+ raise NotImplementedError()
def flush(
self,
@@ -208,7 +210,8 @@ def _send_event(
self, event # type: Event
):
# type: (...) -> None
- if self._check_disabled(get_event_data_category(event)):
+
+ if self._check_disabled("error"):
return None
body = io.BytesIO()
diff --git a/tests/conftest.py b/tests/conftest.py
index 648cde8050..36ab1d9159 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -132,8 +132,16 @@ def check_string_keys(map):
check_string_keys(event)
validate_event_schema(event)
+ def check_envelope(envelope):
+ with capture_internal_exceptions():
+ # Assert error events are sent without envelope to server, for compat.
+ assert not any(item.data_category == "error" for item in envelope.items)
+ assert not any(item.get_event() is not None for item in envelope.items)
+
def inner(client):
- monkeypatch.setattr(client, "transport", TestTransport(check_event))
+ monkeypatch.setattr(
+ client, "transport", TestTransport(check_event, check_envelope)
+ )
return inner
@@ -167,9 +175,10 @@ def inner(*a, **kw):
class TestTransport(Transport):
- def __init__(self, capture_event_callback):
+ def __init__(self, capture_event_callback, capture_envelope_callback):
Transport.__init__(self)
self.capture_event = capture_event_callback
+ self.capture_envelope = capture_envelope_callback
self._queue = None
diff --git a/tests/test_client.py b/tests/test_client.py
index d9a13157e4..1b3d608dcc 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -14,6 +14,7 @@
capture_message,
capture_exception,
capture_event,
+ start_transaction,
)
from sentry_sdk.integrations.executing import ExecutingIntegration
from sentry_sdk.transport import Transport
@@ -726,3 +727,44 @@ def test_init_string_types(dsn, sentry_init):
Hub.current.client.dsn
== "http://894b7d594095440f8dfea9b300e6f572@localhost:8000/2"
)
+
+
+def test_envelope_types():
+ """
+ Tests for calling the right transport method (capture_event vs
+ capture_envelope) from the SDK client for different data types.
+ """
+
+ envelopes = []
+ events = []
+
+ class CustomTransport(Transport):
+ def capture_envelope(self, envelope):
+ envelopes.append(envelope)
+
+ def capture_event(self, event):
+ events.append(event)
+
+ with Hub(Client(traces_sample_rate=1.0, transport=CustomTransport())):
+ event_id = capture_message("hello")
+
+ # Assert error events get passed in via capture_event
+ assert not envelopes
+ event = events.pop()
+
+ assert event["event_id"] == event_id
+ assert "type" not in event
+
+ with start_transaction(name="foo"):
+ pass
+
+ # Assert transactions get passed in via capture_envelope
+ assert not events
+ envelope = envelopes.pop()
+
+ (item,) = envelope.items
+ assert item.data_category == "transaction"
+ assert item.headers.get("type") == "transaction"
+
+ assert not envelopes
+ assert not events
diff --git a/tests/test_transport.py b/tests/test_transport.py
index 84425a2ac4..96145eb951 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -117,6 +117,7 @@ def test_simple_rate_limits(httpserver, capsys, caplog, make_client):
client.flush()
assert len(httpserver.requests) == 1
+ assert httpserver.requests[0].url.endswith("/api/132/envelope/")
del httpserver.requests[:]
assert set(client.transport._disabled_until) == set([None])
@@ -141,12 +142,13 @@ def test_data_category_limits(httpserver, capsys, caplog, response_code, make_cl
client.flush()
assert len(httpserver.requests) == 1
+ assert httpserver.requests[0].url.endswith("/api/132/envelope/")
del httpserver.requests[:]
assert set(client.transport._disabled_until) == set(["transaction"])
- client.transport.capture_event({"type": "transaction"})
- client.transport.capture_event({"type": "transaction"})
+ client.capture_event({"type": "transaction"})
+ client.capture_event({"type": "transaction"})
client.flush()
assert not httpserver.requests
@@ -172,12 +174,13 @@ def test_complex_limits_without_data_category(
client.flush()
assert len(httpserver.requests) == 1
+ assert httpserver.requests[0].url.endswith("/api/132/envelope/")
del httpserver.requests[:]
assert set(client.transport._disabled_until) == set([None])
- client.transport.capture_event({"type": "transaction"})
- client.transport.capture_event({"type": "transaction"})
+ client.capture_event({"type": "transaction"})
+ client.capture_event({"type": "transaction"})
client.capture_event({"type": "event"})
client.flush()
From 633dba9393561ba423371bad4509796f9e78096f Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 21 Sep 2020 23:08:39 +0200
Subject: [PATCH 0022/2327] fix(celery): Fix dropped transactions under Celery
4.2+ (#825)
* Work around https://github.com/celery/celery/issues/4875 which causes us to lose transaction events. Fix #824
* Rewrite celery testsuite to use redis backend and test transactions too. This is better because it works on more celery versions (memory backend is often broken). However, this still does not trigger the bug, so I guess for this to be properly tested we'd need to install rabbitmq into CI? No thanks
---
.travis.yml | 1 +
sentry_sdk/integrations/celery.py | 47 +++++++++++-------
sentry_sdk/tracing.py | 2 +-
tests/conftest.py | 10 +++-
tests/integrations/celery/test_celery.py | 62 ++++++++++++++++--------
tox.ini | 4 +-
6 files changed, 85 insertions(+), 41 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ef24eed4ce..5bf138a656 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ dist: xenial
services:
- postgresql
+ - redis-server
language: python
diff --git a/sentry_sdk/integrations/celery.py b/sentry_sdk/integrations/celery.py
index 86714e2111..1a11d4a745 100644
--- a/sentry_sdk/integrations/celery.py
+++ b/sentry_sdk/integrations/celery.py
@@ -93,15 +93,23 @@ def apply_async(*args, **kwargs):
hub = Hub.current
integration = hub.get_integration(CeleryIntegration)
if integration is not None and integration.propagate_traces:
- headers = None
- for key, value in hub.iter_trace_propagation_headers():
- if headers is None:
- headers = dict(kwargs.get("headers") or {})
- headers[key] = value
- if headers is not None:
- kwargs["headers"] = headers
-
with hub.start_span(op="celery.submit", description=task.name):
+ with capture_internal_exceptions():
+ headers = dict(hub.iter_trace_propagation_headers())
+ if headers:
+ kwarg_headers = kwargs.setdefault("headers", {})
+ kwarg_headers.update(headers)
+
+ # https://github.com/celery/celery/issues/4875
+ #
+ # Need to setdefault the inner headers too since other
+ # tracing tools (dd-trace-py) also employ this exact
+ # workaround and we don't want to break them.
+ #
+ # This is not reproducible outside of AMQP, therefore no
+ # tests!
+ kwarg_headers.setdefault("headers", {}).update(headers)
+
return f(*args, **kwargs)
else:
return f(*args, **kwargs)
@@ -130,19 +138,22 @@ def _inner(*args, **kwargs):
scope.clear_breadcrumbs()
scope.add_event_processor(_make_event_processor(task, *args, **kwargs))
- transaction = Transaction.continue_from_headers(
- args[3].get("headers") or {},
- op="celery.task",
- name="unknown celery task",
- )
-
- # Could possibly use a better hook than this one
- transaction.set_status("ok")
+ transaction = None
+ # Celery task objects are not a thing to be trusted. Even
+ # something such as attribute access can fail.
with capture_internal_exceptions():
- # Celery task objects are not a thing to be trusted. Even
- # something such as attribute access can fail.
+ transaction = Transaction.continue_from_headers(
+ args[3].get("headers") or {},
+ op="celery.task",
+ name="unknown celery task",
+ )
+
transaction.name = task.name
+ transaction.set_status("ok")
+
+ if transaction is None:
+ return f(*args, **kwargs)
with hub.start_transaction(transaction):
return f(*args, **kwargs)
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 9064a96805..3028284ac3 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -318,7 +318,7 @@ def set_status(self, value):
def set_http_status(self, http_status):
# type: (int) -> None
- self.set_tag("http.status_code", http_status)
+ self.set_tag("http.status_code", str(http_status))
if http_status < 400:
self.set_status("ok")
diff --git a/tests/conftest.py b/tests/conftest.py
index 36ab1d9159..0a17d135fc 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -197,7 +197,7 @@ def append_event(event):
def append_envelope(envelope):
for item in envelope:
if item.headers.get("type") in ("event", "transaction"):
- events.append(item.payload.json)
+ test_client.transport.capture_event(item.payload.json)
return old_capture_envelope(envelope)
monkeypatch.setattr(test_client.transport, "capture_event", append_event)
@@ -233,8 +233,14 @@ def append_envelope(envelope):
@pytest.fixture
-def capture_events_forksafe(monkeypatch):
+def capture_events_forksafe(monkeypatch, capture_events, request):
def inner():
+ in_process_events = capture_events()
+
+ @request.addfinalizer
+ def _():
+ assert not in_process_events
+
events_r, events_w = os.pipe()
events_r = os.fdopen(events_r, "rb", 0)
events_w = os.fdopen(events_w, "wb", 0)
diff --git a/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py
index ed06e8f2b0..13c7c4dd46 100644
--- a/tests/integrations/celery/test_celery.py
+++ b/tests/integrations/celery/test_celery.py
@@ -22,17 +22,41 @@ def inner(signal, f):
@pytest.fixture
-def init_celery(sentry_init):
- def inner(propagate_traces=True, **kwargs):
+def init_celery(sentry_init, request):
+ def inner(propagate_traces=True, backend="always_eager", **kwargs):
sentry_init(
integrations=[CeleryIntegration(propagate_traces=propagate_traces)],
**kwargs
)
celery = Celery(__name__)
- if VERSION < (4,):
- celery.conf.CELERY_ALWAYS_EAGER = True
+
+ if backend == "always_eager":
+ if VERSION < (4,):
+ celery.conf.CELERY_ALWAYS_EAGER = True
+ else:
+ celery.conf.task_always_eager = True
+ elif backend == "redis":
+ # broken on celery 3
+ if VERSION < (4,):
+ pytest.skip("Redis backend broken for some reason")
+
+ # this backend requires capture_events_forksafe
+ celery.conf.worker_max_tasks_per_child = 1
+ celery.conf.broker_url = "redis://127.0.0.1:6379"
+ celery.conf.result_backend = "redis://127.0.0.1:6379"
+ celery.conf.task_always_eager = False
+
+ Hub.main.bind_client(Hub.current.client)
+ request.addfinalizer(lambda: Hub.main.bind_client(None))
+
+ # Once we drop celery 3 we can use the celery_worker fixture
+ w = worker.worker(app=celery)
+ t = threading.Thread(target=w.run)
+ t.daemon = True
+ t.start()
else:
- celery.conf.task_always_eager = True
+ raise ValueError(backend)
+
return celery
return inner
@@ -273,15 +297,10 @@ def dummy_task(self):
@pytest.mark.forked
-@pytest.mark.skipif(VERSION < (4,), reason="in-memory backend broken")
-def test_transport_shutdown(request, celery, capture_events_forksafe, tmpdir):
- events = capture_events_forksafe()
+def test_redis_backend(init_celery, capture_events_forksafe, tmpdir):
+ celery = init_celery(traces_sample_rate=1.0, backend="redis", debug=True)
- celery.conf.worker_max_tasks_per_child = 1
- celery.conf.broker_url = "memory://localhost/"
- celery.conf.broker_backend = "memory"
- celery.conf.result_backend = "file://{}".format(tmpdir.mkdir("celery-results"))
- celery.conf.task_always_eager = False
+ events = capture_events_forksafe()
runs = []
@@ -290,21 +309,26 @@ def dummy_task(self):
runs.append(1)
1 / 0
- res = dummy_task.delay()
-
- w = worker.worker(app=celery)
- t = threading.Thread(target=w.run)
- t.daemon = True
- t.start()
+ # Curious: Cannot use delay() here or py2.7-celery-4.2 crashes
+ res = dummy_task.apply_async()
with pytest.raises(Exception):
# Celery 4.1 raises a gibberish exception
res.wait()
+ # if this is nonempty, the worker never really forked
+ assert not runs
+
event = events.read_event()
(exception,) = event["exception"]["values"]
assert exception["type"] == "ZeroDivisionError"
+ transaction = events.read_event()
+ assert (
+ transaction["contexts"]["trace"]["trace_id"]
+ == event["contexts"]["trace"]["trace_id"]
+ )
+
events.read_flush()
# if this is nonempty, the worker never really forked
diff --git a/tox.ini b/tox.ini
index 78d73a14aa..eb85a4b654 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,7 +38,8 @@ envlist =
{py3.6,py3.7}-sanic-19
# TODO: Add py3.9
- {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.1,4.2,4.3,4.4}
+ {pypy,py2.7,py3.5,py3.6}-celery-{4.1,4.2}
+ {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.3,4.4}
{pypy,py2.7}-celery-3
{py2.7,py3.7}-beam-{2.12,2.13}
@@ -128,6 +129,7 @@ deps =
beam-2.13: apache-beam>=2.13.0, <2.14.0
beam-master: git+https://github.com/apache/beam#egg=apache-beam&subdirectory=sdks/python
+ celery: redis
celery-3: Celery>=3.1,<4.0
celery-4.1: Celery>=4.1,<4.2
celery-4.2: Celery>=4.2,<4.3
From 23463fa9b59657470c48d746e3a5ec5e22018bd3 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 21 Sep 2020 23:10:46 +0200
Subject: [PATCH 0023/2327] doc: Changelog for 0.17.7
---
CHANGES.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index d2faabed70..2f94c970ba 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,10 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 0.17.7
+
+* Internal: Change data category for transaction envelopes.
+* Fix a bug under Celery 4.2+ that may have caused disjoint traces or missing transactions.
## 0.17.6
From 4164228cab04f56844a29513a6b4403e3e22ddab Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 21 Sep 2020 23:11:07 +0200
Subject: [PATCH 0024/2327] release: 0.17.7
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index d6eb1ca059..287c85ff0b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.17.6"
+release = "0.17.7"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 242ad1ce8a..43b563616d 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -88,7 +88,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.17.6"
+VERSION = "0.17.7"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 8b3071f31c..2dddc58933 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
setup(
name="sentry-sdk",
- version="0.17.6",
+ version="0.17.7",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From b0f2f41a3669bbdf5c69e74e64bc9e7eaeb2806a Mon Sep 17 00:00:00 2001
From: Gleekzone <46584253+Gleekzone@users.noreply.github.com>
Date: Wed, 23 Sep 2020 02:55:10 -0500
Subject: [PATCH 0025/2327] fix(chalice): Enable support for Chalice 1.20
(#832)
Co-authored-by: sentry-bot
---
sentry_sdk/integrations/chalice.py | 28 +++++++++++++++++++++++-----
tox.ini | 3 ++-
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/sentry_sdk/integrations/chalice.py b/sentry_sdk/integrations/chalice.py
index ade1c7f10f..e7d2777b53 100644
--- a/sentry_sdk/integrations/chalice.py
+++ b/sentry_sdk/integrations/chalice.py
@@ -2,7 +2,7 @@
from sentry_sdk._compat import reraise
from sentry_sdk.hub import Hub
-from sentry_sdk.integrations import Integration
+from sentry_sdk.integrations import Integration, DidNotEnable
from sentry_sdk.integrations.aws_lambda import _make_request_event_processor
from sentry_sdk.utils import (
capture_internal_exceptions,
@@ -22,6 +22,11 @@
F = TypeVar("F", bound=Callable[..., Any])
+try:
+ from chalice import __version__ as CHALICE_VERSION
+except ImportError:
+ raise DidNotEnable("Chalice is not installed")
+
class EventSourceHandler(ChaliceEventSourceHandler): # type: ignore
def __call__(self, event, context):
@@ -36,8 +41,7 @@ def __call__(self, event, context):
_make_request_event_processor(event, context, configured_time)
)
try:
- event_obj = self.event_class(event, context)
- return self.func(event_obj)
+ return ChaliceEventSourceHandler.__call__(self, event, context)
except Exception:
exc_info = sys.exc_info()
event, hint = event_from_exception(
@@ -92,7 +96,18 @@ class ChaliceIntegration(Integration):
@staticmethod
def setup_once():
# type: () -> None
- old_get_view_function_response = Chalice._get_view_function_response
+ try:
+ version = tuple(map(int, CHALICE_VERSION.split(".")[:3]))
+ except (ValueError, TypeError):
+ raise DidNotEnable("Unparsable Chalice version: {}".format(CHALICE_VERSION))
+ if version < (1, 20):
+ old_get_view_function_response = Chalice._get_view_function_response
+ else:
+ from chalice.app import RestAPIEventHandler
+
+ old_get_view_function_response = (
+ RestAPIEventHandler._get_view_function_response
+ )
def sentry_event_response(app, view_function, function_args):
# type: (Any, F, **Any) -> Any
@@ -104,6 +119,9 @@ def sentry_event_response(app, view_function, function_args):
app, wrapped_view_function, function_args
)
- Chalice._get_view_function_response = sentry_event_response
+ if version < (1, 20):
+ Chalice._get_view_function_response = sentry_event_response
+ else:
+ RestAPIEventHandler._get_view_function_response = sentry_event_response
# for everything else (like events)
chalice.app.EventSourceHandler = EventSourceHandler
diff --git a/tox.ini b/tox.ini
index eb85a4b654..331dc0c192 100644
--- a/tox.ini
+++ b/tox.ini
@@ -77,7 +77,7 @@ envlist =
{py3.5,py3.6,py3.7,py3.8,py3.9}-pure_eval
- {py3.6,py3.7,py3.8}-chalice-{1.16,1.17,1.18,1.19}
+ {py3.6,py3.7,py3.8}-chalice-{1.16,1.17,1.18,1.19,1.20}
[testenv]
deps =
@@ -204,6 +204,7 @@ deps =
chalice-1.17: chalice>=1.17.0,<1.18.0
chalice-1.18: chalice>=1.18.0,<1.19.0
chalice-1.19: chalice>=1.19.0,<1.20.0
+ chalice-1.20: chalice>=1.20.0,<1.21.0
chalice: pytest-chalice==0.0.5
setenv =
From 4bf4859087f2018f072fc0be472b7a12b58563e9 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Wed, 23 Sep 2020 16:33:26 +0200
Subject: [PATCH 0026/2327] fix: Second attempt at fixing trace propagation in
Celery 4.2+ (#831)
Follow-up to #824 #825
---
sentry_sdk/integrations/celery.py | 20 ++++++++++++--------
tests/conftest.py | 6 +-----
tests/integrations/celery/test_celery.py | 16 +++++++++++++---
3 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/sentry_sdk/integrations/celery.py b/sentry_sdk/integrations/celery.py
index 1a11d4a745..2b51fe1f00 100644
--- a/sentry_sdk/integrations/celery.py
+++ b/sentry_sdk/integrations/celery.py
@@ -61,7 +61,6 @@ def sentry_build_tracer(name, task, *args, **kwargs):
# short-circuits to task.run if it thinks it's safe.
task.__call__ = _wrap_task_call(task, task.__call__)
task.run = _wrap_task_call(task, task.run)
- task.apply_async = _wrap_apply_async(task, task.apply_async)
# `build_tracer` is apparently called for every task
# invocation. Can't wrap every celery task for every invocation
@@ -72,6 +71,10 @@ def sentry_build_tracer(name, task, *args, **kwargs):
trace.build_tracer = sentry_build_tracer
+ from celery.app.task import Task # type: ignore
+
+ Task.apply_async = _wrap_apply_async(Task.apply_async)
+
_patch_worker_exit()
# This logger logs every status of every task that ran on the worker.
@@ -85,19 +88,22 @@ def sentry_build_tracer(name, task, *args, **kwargs):
ignore_logger("celery.redirected")
-def _wrap_apply_async(task, f):
- # type: (Any, F) -> F
+def _wrap_apply_async(f):
+ # type: (F) -> F
@wraps(f)
def apply_async(*args, **kwargs):
# type: (*Any, **Any) -> Any
hub = Hub.current
integration = hub.get_integration(CeleryIntegration)
if integration is not None and integration.propagate_traces:
- with hub.start_span(op="celery.submit", description=task.name):
+ with hub.start_span(op="celery.submit", description=args[0].name):
with capture_internal_exceptions():
headers = dict(hub.iter_trace_propagation_headers())
+
if headers:
- kwarg_headers = kwargs.setdefault("headers", {})
+ # Note: kwargs can contain headers=None, so no setdefault!
+ # Unsure which backend though.
+ kwarg_headers = kwargs.get("headers") or {}
kwarg_headers.update(headers)
# https://github.com/celery/celery/issues/4875
@@ -105,10 +111,8 @@ def apply_async(*args, **kwargs):
# Need to setdefault the inner headers too since other
# tracing tools (dd-trace-py) also employ this exact
# workaround and we don't want to break them.
- #
- # This is not reproducible outside of AMQP, therefore no
- # tests!
kwarg_headers.setdefault("headers", {}).update(headers)
+ kwargs["headers"] = kwarg_headers
return f(*args, **kwargs)
else:
diff --git a/tests/conftest.py b/tests/conftest.py
index 0a17d135fc..1c368a5b14 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -235,11 +235,7 @@ def append_envelope(envelope):
@pytest.fixture
def capture_events_forksafe(monkeypatch, capture_events, request):
def inner():
- in_process_events = capture_events()
-
- @request.addfinalizer
- def _():
- assert not in_process_events
+ capture_events()
events_r, events_w = os.pipe()
events_r = os.fdopen(events_r, "rb", 0)
diff --git a/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py
index 13c7c4dd46..6ef50bc093 100644
--- a/tests/integrations/celery/test_celery.py
+++ b/tests/integrations/celery/test_celery.py
@@ -42,6 +42,7 @@ def inner(propagate_traces=True, backend="always_eager", **kwargs):
# this backend requires capture_events_forksafe
celery.conf.worker_max_tasks_per_child = 1
+ celery.conf.worker_concurrency = 1
celery.conf.broker_url = "redis://127.0.0.1:6379"
celery.conf.result_backend = "redis://127.0.0.1:6379"
celery.conf.task_always_eager = False
@@ -297,7 +298,7 @@ def dummy_task(self):
@pytest.mark.forked
-def test_redis_backend(init_celery, capture_events_forksafe, tmpdir):
+def test_redis_backend_trace_propagation(init_celery, capture_events_forksafe, tmpdir):
celery = init_celery(traces_sample_rate=1.0, backend="redis", debug=True)
events = capture_events_forksafe()
@@ -309,8 +310,9 @@ def dummy_task(self):
runs.append(1)
1 / 0
- # Curious: Cannot use delay() here or py2.7-celery-4.2 crashes
- res = dummy_task.apply_async()
+ with start_transaction(name="submit_celery"):
+ # Curious: Cannot use delay() here or py2.7-celery-4.2 crashes
+ res = dummy_task.apply_async()
with pytest.raises(Exception):
# Celery 4.1 raises a gibberish exception
@@ -319,6 +321,13 @@ def dummy_task(self):
# if this is nonempty, the worker never really forked
assert not runs
+ submit_transaction = events.read_event()
+ assert submit_transaction["type"] == "transaction"
+ assert submit_transaction["transaction"] == "submit_celery"
+ (span,) = submit_transaction["spans"]
+ assert span["op"] == "celery.submit"
+ assert span["description"] == "dummy_task"
+
event = events.read_event()
(exception,) = event["exception"]["values"]
assert exception["type"] == "ZeroDivisionError"
@@ -327,6 +336,7 @@ def dummy_task(self):
assert (
transaction["contexts"]["trace"]["trace_id"]
== event["contexts"]["trace"]["trace_id"]
+ == submit_transaction["contexts"]["trace"]["trace_id"]
)
events.read_flush()
From 780af72d1132350f42ef121c5377e09e6048435f Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Wed, 23 Sep 2020 16:35:05 +0200
Subject: [PATCH 0027/2327] doc: Changelog for 0.17.8
---
CHANGES.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 2f94c970ba..7f558caded 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,12 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+
+## 0.17.8
+
+* Fix yet another bug with disjoint traces in Celery.
+* Added support for Chalice 1.20. Thanks again to the folks at Cuenca MX!
+
## 0.17.7
* Internal: Change data category for transaction envelopes.
From 7383b54505a4f107266db02f308928c8a8ffe0ff Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Wed, 23 Sep 2020 16:35:14 +0200
Subject: [PATCH 0028/2327] release: 0.17.8
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 287c85ff0b..102fa18b88 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.17.7"
+release = "0.17.8"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 43b563616d..595f749b41 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -88,7 +88,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.17.7"
+VERSION = "0.17.8"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 2dddc58933..c373e7aabf 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
setup(
name="sentry-sdk",
- version="0.17.7",
+ version="0.17.8",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From e234998ae82a9cffa6fb3718801c55ba24a86bab Mon Sep 17 00:00:00 2001
From: Alberto Leal
Date: Thu, 24 Sep 2020 04:02:40 -0400
Subject: [PATCH 0029/2327] feat(envelope): Add some useful envelope methods
(#793)
Co-authored-by: Rodolfo Carvalho
Co-authored-by: Mark Story
---
sentry_sdk/envelope.py | 30 +++++++++++++++++--
tests/test_envelope.py | 66 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 94 insertions(+), 2 deletions(-)
create mode 100644 tests/test_envelope.py
diff --git a/sentry_sdk/envelope.py b/sentry_sdk/envelope.py
index b0b88e6c41..b268e7987a 100644
--- a/sentry_sdk/envelope.py
+++ b/sentry_sdk/envelope.py
@@ -6,6 +6,7 @@
from sentry_sdk._compat import text_type
from sentry_sdk._types import MYPY
from sentry_sdk.sessions import Session
+from sentry_sdk.tracing import Transaction
from sentry_sdk.utils import json_dumps
if MYPY:
@@ -50,6 +51,12 @@ def add_event(
# type: (...) -> None
self.add_item(Item(payload=PayloadRef(json=event), type="event"))
+ def add_transaction(
+ self, transaction # type: Transaction
+ ):
+ # type: (...) -> None
+ self.add_item(Item(payload=PayloadRef(json=transaction), type="transaction"))
+
def add_session(
self, session # type: Union[Session, Any]
):
@@ -72,6 +79,14 @@ def get_event(self):
return event
return None
+ def get_transaction_event(self):
+ # type: (...) -> Optional[Event]
+ for item in self.items:
+ event = item.get_transaction_event()
+ if event is not None:
+ return event
+ return None
+
def __iter__(self):
# type: (...) -> Iterator[Item]
return iter(self.items)
@@ -220,6 +235,11 @@ def __repr__(self):
self.data_category,
)
+ @property
+ def type(self):
+ # type: (...) -> Optional[str]
+ return self.headers.get("type")
+
@property
def data_category(self):
# type: (...) -> EventDataCategory
@@ -244,7 +264,13 @@ def get_event(self):
"""
Returns an error event if there is one.
"""
- if self.headers.get("type") == "event" and self.payload.json is not None:
+ if self.type == "event" and self.payload.json is not None:
+ return self.payload.json
+ return None
+
+ def get_transaction_event(self):
+ # type: (...) -> Optional[Event]
+ if self.type == "transaction" and self.payload.json is not None:
return self.payload.json
return None
@@ -277,7 +303,7 @@ def deserialize_from(
headers = json.loads(line)
length = headers["length"]
payload = f.read(length)
- if headers.get("type") == "event":
+ if headers.get("type") in ("event", "transaction"):
rv = cls(headers=headers, payload=PayloadRef(json=json.loads(payload)))
else:
rv = cls(headers=headers, payload=payload)
diff --git a/tests/test_envelope.py b/tests/test_envelope.py
new file mode 100644
index 0000000000..96c33f0c99
--- /dev/null
+++ b/tests/test_envelope.py
@@ -0,0 +1,66 @@
+from sentry_sdk.envelope import Envelope
+from sentry_sdk.sessions import Session
+
+
+def generate_transaction_item():
+ return {
+ "event_id": "d2132d31b39445f1938d7e21b6bf0ec4",
+ "type": "transaction",
+ "transaction": "/organizations/:orgId/performance/:eventSlug/",
+ "start_timestamp": 1597976392.6542819,
+ "timestamp": 1597976400.6189718,
+ "contexts": {
+ "trace": {
+ "trace_id": "4C79F60C11214EB38604F4AE0781BFB2",
+ "span_id": "FA90FDEAD5F74052",
+ "type": "trace",
+ }
+ },
+ "spans": [
+ {
+ "description": "",
+ "op": "react.mount",
+ "parent_span_id": "8f5a2b8768cafb4e",
+ "span_id": "bd429c44b67a3eb4",
+ "start_timestamp": 1597976393.4619668,
+ "timestamp": 1597976393.4718769,
+ "trace_id": "ff62a8b040f340bda5d830223def1d81",
+ }
+ ],
+ }
+
+
+def test_basic_event():
+ envelope = Envelope()
+
+ expected = {"message": "Hello, World!"}
+ envelope.add_event(expected)
+
+ assert envelope.get_event() == {"message": "Hello, World!"}
+
+
+def test_transaction_event():
+ envelope = Envelope()
+
+ transaction_item = generate_transaction_item()
+ transaction_item.update({"event_id": "a" * 32})
+ envelope.add_transaction(transaction_item)
+
+ # typically it should not be possible to be able to add a second transaction;
+ # but we do it anyways
+ another_transaction_item = generate_transaction_item()
+ envelope.add_transaction(another_transaction_item)
+
+ # should only fetch the first inserted transaction event
+ assert envelope.get_transaction_event() == transaction_item
+
+
+def test_session():
+ envelope = Envelope()
+
+ expected = Session()
+ envelope.add_session(expected)
+
+ for item in envelope:
+ if item.type == "session":
+ assert item.payload.json == expected.to_json()
From db86d6101792ddcb4381bbb5fb29e20c13e6041a Mon Sep 17 00:00:00 2001
From: Xavier Fernandez
Date: Thu, 24 Sep 2020 23:19:30 +0200
Subject: [PATCH 0030/2327] tests: parametrize proxy tests (#836)
---
tests/test_client.py | 249 +++++++++++++++++++++++++------------------
1 file changed, 148 insertions(+), 101 deletions(-)
diff --git a/tests/test_client.py b/tests/test_client.py
index 1b3d608dcc..2819e84a5a 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -55,107 +55,154 @@ def test_transport_option(monkeypatch):
assert str(Client(transport=transport).dsn) == dsn
-def test_proxy_http_use(monkeypatch):
- client = Client("http://foo@sentry.io/123", http_proxy="http://localhost/123")
- assert client.transport._pool.proxy.scheme == "http"
-
-
-def test_proxy_https_use(monkeypatch):
- client = Client("https://foo@sentry.io/123", http_proxy="https://localhost/123")
- assert client.transport._pool.proxy.scheme == "https"
-
-
-def test_proxy_both_select_http(monkeypatch):
- client = Client(
- "http://foo@sentry.io/123",
- https_proxy="https://localhost/123",
- http_proxy="http://localhost/123",
- )
- assert client.transport._pool.proxy.scheme == "http"
-
-
-def test_proxy_both_select_https(monkeypatch):
- client = Client(
- "https://foo@sentry.io/123",
- https_proxy="https://localhost/123",
- http_proxy="http://localhost/123",
- )
- assert client.transport._pool.proxy.scheme == "https"
-
-
-def test_proxy_http_fallback_http(monkeypatch):
- client = Client("https://foo@sentry.io/123", http_proxy="http://localhost/123")
- assert client.transport._pool.proxy.scheme == "http"
-
-
-def test_proxy_none_noenv(monkeypatch):
- client = Client("http://foo@sentry.io/123")
- assert client.transport._pool.proxy is None
-
-
-def test_proxy_none_httpenv_select(monkeypatch):
- monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
- client = Client("http://foo@sentry.io/123")
- assert client.transport._pool.proxy.scheme == "http"
-
-
-def test_proxy_none_httpsenv_select(monkeypatch):
- monkeypatch.setenv("HTTPS_PROXY", "https://localhost/123")
- client = Client("https://foo@sentry.io/123")
- assert client.transport._pool.proxy.scheme == "https"
-
-
-def test_proxy_none_httpenv_fallback(monkeypatch):
- monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
- client = Client("https://foo@sentry.io/123")
- assert client.transport._pool.proxy.scheme == "http"
-
-
-def test_proxy_bothselect_bothen(monkeypatch):
- monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
- monkeypatch.setenv("HTTPS_PROXY", "https://localhost/123")
- client = Client("https://foo@sentry.io/123", http_proxy="", https_proxy="")
- assert client.transport._pool.proxy is None
-
-
-def test_proxy_bothavoid_bothenv(monkeypatch):
- monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
- monkeypatch.setenv("HTTPS_PROXY", "https://localhost/123")
- client = Client("https://foo@sentry.io/123", http_proxy=None, https_proxy=None)
- assert client.transport._pool.proxy.scheme == "https"
-
-
-def test_proxy_bothselect_httpenv(monkeypatch):
- monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
- client = Client("https://foo@sentry.io/123", http_proxy=None, https_proxy=None)
- assert client.transport._pool.proxy.scheme == "http"
-
-
-def test_proxy_httpselect_bothenv(monkeypatch):
- monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
- monkeypatch.setenv("HTTPS_PROXY", "https://localhost/123")
- client = Client("https://foo@sentry.io/123", http_proxy=None, https_proxy="")
- assert client.transport._pool.proxy.scheme == "http"
-
-
-def test_proxy_httpsselect_bothenv(monkeypatch):
- monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
- monkeypatch.setenv("HTTPS_PROXY", "https://localhost/123")
- client = Client("https://foo@sentry.io/123", http_proxy="", https_proxy=None)
- assert client.transport._pool.proxy.scheme == "https"
-
-
-def test_proxy_httpselect_httpsenv(monkeypatch):
- monkeypatch.setenv("HTTPS_PROXY", "https://localhost/123")
- client = Client("https://foo@sentry.io/123", http_proxy=None, https_proxy="")
- assert client.transport._pool.proxy is None
-
-
-def test_proxy_httpsselect_bothenv_http(monkeypatch):
- monkeypatch.setenv("HTTP_PROXY", "http://localhost/123")
- monkeypatch.setenv("HTTPS_PROXY", "https://localhost/123")
- client = Client("http://foo@sentry.io/123", http_proxy=None, https_proxy=None)
- assert client.transport._pool.proxy.scheme == "http"
+@pytest.mark.parametrize(
+ "testcase",
+ [
+ {
+ "dsn": "http://foo@sentry.io/123",
+ "env_http_proxy": None,
+ "env_https_proxy": None,
+ "arg_http_proxy": "http://localhost/123",
+ "arg_https_proxy": None,
+ "expected_proxy_scheme": "http",
+ },
+ {
+ "dsn": "https://foo@sentry.io/123",
+ "env_http_proxy": None,
+ "env_https_proxy": None,
+ "arg_http_proxy": "https://localhost/123",
+ "arg_https_proxy": None,
+ "expected_proxy_scheme": "https",
+ },
+ {
+ "dsn": "http://foo@sentry.io/123",
+ "env_http_proxy": None,
+ "env_https_proxy": None,
+ "arg_http_proxy": "http://localhost/123",
+ "arg_https_proxy": "https://localhost/123",
+ "expected_proxy_scheme": "http",
+ },
+ {
+ "dsn": "https://foo@sentry.io/123",
+ "env_http_proxy": None,
+ "env_https_proxy": None,
+ "arg_http_proxy": "http://localhost/123",
+ "arg_https_proxy": "https://localhost/123",
+ "expected_proxy_scheme": "https",
+ },
+ {
+ "dsn": "https://foo@sentry.io/123",
+ "env_http_proxy": None,
+ "env_https_proxy": None,
+ "arg_http_proxy": "http://localhost/123",
+ "arg_https_proxy": None,
+ "expected_proxy_scheme": "http",
+ },
+ {
+ "dsn": "http://foo@sentry.io/123",
+ "env_http_proxy": None,
+ "env_https_proxy": None,
+ "arg_http_proxy": None,
+ "arg_https_proxy": None,
+ "expected_proxy_scheme": None,
+ },
+ {
+ "dsn": "http://foo@sentry.io/123",
+ "env_http_proxy": "http://localhost/123",
+ "env_https_proxy": None,
+ "arg_http_proxy": None,
+ "arg_https_proxy": None,
+ "expected_proxy_scheme": "http",
+ },
+ {
+ "dsn": "https://foo@sentry.io/123",
+ "env_http_proxy": None,
+ "env_https_proxy": "https://localhost/123",
+ "arg_http_proxy": None,
+ "arg_https_proxy": None,
+ "expected_proxy_scheme": "https",
+ },
+ {
+ "dsn": "https://foo@sentry.io/123",
+ "env_http_proxy": "http://localhost/123",
+ "env_https_proxy": None,
+ "arg_http_proxy": None,
+ "arg_https_proxy": None,
+ "expected_proxy_scheme": "http",
+ },
+ {
+ "dsn": "https://foo@sentry.io/123",
+ "env_http_proxy": "http://localhost/123",
+ "env_https_proxy": "https://localhost/123",
+ "arg_http_proxy": "",
+ "arg_https_proxy": "",
+ "expected_proxy_scheme": None,
+ },
+ {
+ "dsn": "https://foo@sentry.io/123",
+ "env_http_proxy": "http://localhost/123",
+ "env_https_proxy": "https://localhost/123",
+ "arg_http_proxy": None,
+ "arg_https_proxy": None,
+ "expected_proxy_scheme": "https",
+ },
+ {
+ "dsn": "https://foo@sentry.io/123",
+ "env_http_proxy": "http://localhost/123",
+ "env_https_proxy": None,
+ "arg_http_proxy": None,
+ "arg_https_proxy": None,
+ "expected_proxy_scheme": "http",
+ },
+ {
+ "dsn": "https://foo@sentry.io/123",
+ "env_http_proxy": "http://localhost/123",
+ "env_https_proxy": "https://localhost/123",
+ "arg_http_proxy": None,
+ "arg_https_proxy": "",
+ "expected_proxy_scheme": "http",
+ },
+ {
+ "dsn": "https://foo@sentry.io/123",
+ "env_http_proxy": "http://localhost/123",
+ "env_https_proxy": "https://localhost/123",
+ "arg_http_proxy": "",
+ "arg_https_proxy": None,
+ "expected_proxy_scheme": "https",
+ },
+ {
+ "dsn": "https://foo@sentry.io/123",
+ "env_http_proxy": None,
+ "env_https_proxy": "https://localhost/123",
+ "arg_http_proxy": None,
+ "arg_https_proxy": "",
+ "expected_proxy_scheme": None,
+ },
+ {
+ "dsn": "http://foo@sentry.io/123",
+ "env_http_proxy": "http://localhost/123",
+ "env_https_proxy": "https://localhost/123",
+ "arg_http_proxy": None,
+ "arg_https_proxy": None,
+ "expected_proxy_scheme": "http",
+ },
+ ],
+)
+def test_proxy(monkeypatch, testcase):
+ if testcase["env_http_proxy"] is not None:
+ monkeypatch.setenv("HTTP_PROXY", testcase["env_http_proxy"])
+ if testcase["env_https_proxy"] is not None:
+ monkeypatch.setenv("HTTPS_PROXY", testcase["env_https_proxy"])
+ kwargs = {}
+ if testcase["arg_http_proxy"] is not None:
+ kwargs["http_proxy"] = testcase["arg_http_proxy"]
+ if testcase["arg_https_proxy"] is not None:
+ kwargs["https_proxy"] = testcase["arg_https_proxy"]
+ client = Client(testcase["dsn"], **kwargs)
+ if testcase["expected_proxy_scheme"] is None:
+ assert client.transport._pool.proxy is None
+ else:
+ assert client.transport._pool.proxy.scheme == testcase["expected_proxy_scheme"]
def test_simple_transport(sentry_init):
From 86d14b0be0c6205c27edb4bf27b3460e1563956d Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Thu, 24 Sep 2020 23:19:58 +0200
Subject: [PATCH 0031/2327] fix(serialization): Do not crash if tag is nan
(#835)
Co-authored-by: sentry-bot
---
sentry_sdk/serializer.py | 8 +++++++-
tests/test_client.py | 6 ++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/sentry_sdk/serializer.py b/sentry_sdk/serializer.py
index 4acb6cd72d..fc293f6a65 100644
--- a/sentry_sdk/serializer.py
+++ b/sentry_sdk/serializer.py
@@ -1,4 +1,5 @@
import sys
+import math
from datetime import datetime
@@ -273,7 +274,12 @@ def _serialize_node_impl(
return _flatten_annotated(result)
if obj is None or isinstance(obj, (bool, number_types)):
- return obj if not should_repr_strings else safe_repr(obj)
+ if should_repr_strings or (
+ isinstance(obj, float) and (math.isinf(obj) or math.isnan(obj))
+ ):
+ return safe_repr(obj)
+ else:
+ return obj
elif isinstance(obj, datetime):
return (
diff --git a/tests/test_client.py b/tests/test_client.py
index 2819e84a5a..2934524ffb 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -15,6 +15,7 @@
capture_exception,
capture_event,
start_transaction,
+ set_tag,
)
from sentry_sdk.integrations.executing import ExecutingIntegration
from sentry_sdk.transport import Transport
@@ -463,6 +464,10 @@ def test_nan(sentry_init, capture_events):
events = capture_events()
try:
+ # should_repr_strings=False
+ set_tag("mynan", float("nan"))
+
+ # should_repr_strings=True
nan = float("nan") # noqa
1 / 0
except Exception:
@@ -472,6 +477,7 @@ def test_nan(sentry_init, capture_events):
frames = event["exception"]["values"][0]["stacktrace"]["frames"]
(frame,) = frames
assert frame["vars"]["nan"] == "nan"
+ assert event["tags"]["mynan"] == "nan"
def test_cyclic_frame_vars(sentry_init, capture_events):
From 4d16ef66a01912ff8ca55c4a1d33cbe414c93c60 Mon Sep 17 00:00:00 2001
From: Xavier Fernandez
Date: Mon, 28 Sep 2020 08:43:59 +0200
Subject: [PATCH 0032/2327] Add basic support for no_proxy environment variable
(#838)
---
sentry_sdk/transport.py | 16 ++++++++++++++--
tests/test_client.py | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/sentry_sdk/transport.py b/sentry_sdk/transport.py
index 4571e96204..47d9ff6e35 100644
--- a/sentry_sdk/transport.py
+++ b/sentry_sdk/transport.py
@@ -276,6 +276,17 @@ def _get_pool_options(self, ca_certs):
"ca_certs": ca_certs or certifi.where(),
}
+ def _in_no_proxy(self, parsed_dsn):
+ # type: (Dsn) -> bool
+ no_proxy = getproxies().get("no")
+ if not no_proxy:
+ return False
+ for host in no_proxy.split(","):
+ host = host.strip()
+ if parsed_dsn.host.endswith(host) or parsed_dsn.netloc.endswith(host):
+ return True
+ return False
+
def _make_pool(
self,
parsed_dsn, # type: Dsn
@@ -285,14 +296,15 @@ def _make_pool(
):
# type: (...) -> Union[PoolManager, ProxyManager]
proxy = None
+ no_proxy = self._in_no_proxy(parsed_dsn)
# try HTTPS first
if parsed_dsn.scheme == "https" and (https_proxy != ""):
- proxy = https_proxy or getproxies().get("https")
+ proxy = https_proxy or (not no_proxy and getproxies().get("https"))
# maybe fallback to HTTP proxy
if not proxy and (http_proxy != ""):
- proxy = http_proxy or getproxies().get("http")
+ proxy = http_proxy or (not no_proxy and getproxies().get("http"))
opts = self._get_pool_options(ca_certs)
diff --git a/tests/test_client.py b/tests/test_client.py
index 2934524ffb..b6e5a5f174 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -187,6 +187,43 @@ def test_transport_option(monkeypatch):
"arg_https_proxy": None,
"expected_proxy_scheme": "http",
},
+ # NO_PROXY testcases
+ {
+ "dsn": "http://foo@sentry.io/123",
+ "env_http_proxy": "http://localhost/123",
+ "env_https_proxy": None,
+ "env_no_proxy": "sentry.io,example.com",
+ "arg_http_proxy": None,
+ "arg_https_proxy": None,
+ "expected_proxy_scheme": None,
+ },
+ {
+ "dsn": "https://foo@sentry.io/123",
+ "env_http_proxy": None,
+ "env_https_proxy": "https://localhost/123",
+ "env_no_proxy": "example.com,sentry.io",
+ "arg_http_proxy": None,
+ "arg_https_proxy": None,
+ "expected_proxy_scheme": None,
+ },
+ {
+ "dsn": "http://foo@sentry.io/123",
+ "env_http_proxy": None,
+ "env_https_proxy": None,
+ "env_no_proxy": "sentry.io,example.com",
+ "arg_http_proxy": "http://localhost/123",
+ "arg_https_proxy": None,
+ "expected_proxy_scheme": "http",
+ },
+ {
+ "dsn": "https://foo@sentry.io/123",
+ "env_http_proxy": None,
+ "env_https_proxy": None,
+ "env_no_proxy": "sentry.io,example.com",
+ "arg_http_proxy": None,
+ "arg_https_proxy": "https://localhost/123",
+ "expected_proxy_scheme": "https",
+ },
],
)
def test_proxy(monkeypatch, testcase):
@@ -194,6 +231,8 @@ def test_proxy(monkeypatch, testcase):
monkeypatch.setenv("HTTP_PROXY", testcase["env_http_proxy"])
if testcase["env_https_proxy"] is not None:
monkeypatch.setenv("HTTPS_PROXY", testcase["env_https_proxy"])
+ if testcase.get("env_no_proxy") is not None:
+ monkeypatch.setenv("NO_PROXY", testcase["env_no_proxy"])
kwargs = {}
if testcase["arg_http_proxy"] is not None:
kwargs["http_proxy"] = testcase["arg_http_proxy"]
From 867beae5f6006d3dbda4b20a9ae7264f935fb163 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 28 Sep 2020 13:55:51 +0200
Subject: [PATCH 0033/2327] chore: Add Celery 5 to CI (#839)
Co-authored-by: sentry-bot
---
tests/integrations/celery/test_celery.py | 17 +++++++++++++----
tox.ini | 4 +++-
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py
index 6ef50bc093..32b3021b1a 100644
--- a/tests/integrations/celery/test_celery.py
+++ b/tests/integrations/celery/test_celery.py
@@ -51,10 +51,19 @@ def inner(propagate_traces=True, backend="always_eager", **kwargs):
request.addfinalizer(lambda: Hub.main.bind_client(None))
# Once we drop celery 3 we can use the celery_worker fixture
- w = worker.worker(app=celery)
- t = threading.Thread(target=w.run)
- t.daemon = True
- t.start()
+ if VERSION < (5,):
+ worker_fn = worker.worker(app=celery).run
+ else:
+ from celery.bin.base import CLIContext
+
+ worker_fn = lambda: worker.worker(
+ obj=CLIContext(app=celery, no_color=True, workdir=".", quiet=False),
+ args=[],
+ )
+
+ worker_thread = threading.Thread(target=worker_fn)
+ worker_thread.daemon = True
+ worker_thread.start()
else:
raise ValueError(backend)
diff --git a/tox.ini b/tox.ini
index 331dc0c192..6fde6ce6b8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,9 +38,10 @@ envlist =
{py3.6,py3.7}-sanic-19
# TODO: Add py3.9
+ {pypy,py2.7}-celery-3
{pypy,py2.7,py3.5,py3.6}-celery-{4.1,4.2}
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.3,4.4}
- {pypy,py2.7}-celery-3
+ {py3.6,py3.7,py3.8}-celery-5.0
{py2.7,py3.7}-beam-{2.12,2.13}
@@ -138,6 +139,7 @@ deps =
celery-4.3: vine<5.0.0
# https://github.com/celery/celery/issues/6153
celery-4.4: Celery>=4.4,<4.5,!=4.4.4
+ celery-5.0: Celery>=5.0,<5.1
requests: requests>=2.0
From 7022cd89e92640a570a52854aaa55e296c442145 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Tue, 29 Sep 2020 08:49:05 +0200
Subject: [PATCH 0034/2327] chore: Remove failing Django test from CI
There is actually no point in testing it.
---
tox.ini | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tox.ini b/tox.ini
index 6fde6ce6b8..e902dea412 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,8 @@ envlist =
# {py2.7,py3.7}-django-{1.11,2.2}
{pypy,py2.7}-django-{1.6,1.7}
- {pypy,py2.7,py3.5}-django-{1.8,1.9,1.10,1.11}
+ {pypy,py2.7,py3.5}-django-{1.8,1.9,1.10}
+ {pypy,py2.7}-django-{1.8,1.9,1.10,1.11}
{py3.5,py3.6,py3.7}-django-{2.0,2.1}
{py3.7,py3.8,py3.9}-django-{2.2,3.0,3.1,dev}
From cdf21deee0a1e5ea75d065de924061b81f30595b Mon Sep 17 00:00:00 2001
From: shantanu73
Date: Tue, 29 Sep 2020 14:45:21 +0530
Subject: [PATCH 0035/2327] Capturing Performance monitoring transactions for
AWS and GCP (#830)
Co-authored-by: Shantanu Dhiman
Co-authored-by: Markus Unterwaditzer
Co-authored-by: Markus Unterwaditzer
---
sentry_sdk/integrations/aws_lambda.py | 43 +++++----
sentry_sdk/integrations/gcp.py | 75 ++++++++++-----
tests/integrations/aws_lambda/test_aws.py | 89 ++++++++++++++++--
tests/integrations/gcp/test_gcp.py | 108 +++++++++++++++++++---
4 files changed, 252 insertions(+), 63 deletions(-)
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
index 2bfac27f9a..a81b77932d 100644
--- a/sentry_sdk/integrations/aws_lambda.py
+++ b/sentry_sdk/integrations/aws_lambda.py
@@ -3,6 +3,7 @@
import sys
from sentry_sdk.hub import Hub, _should_send_default_pii
+from sentry_sdk.tracing import Transaction
from sentry_sdk._compat import reraise
from sentry_sdk.utils import (
AnnotatedValue,
@@ -78,10 +79,10 @@ def sentry_handler(event, context, *args, **kwargs):
with hub.push_scope() as scope:
with capture_internal_exceptions():
scope.clear_breadcrumbs()
- scope.transaction = context.function_name
scope.add_event_processor(
_make_request_event_processor(event, context, configured_time)
)
+ scope.set_tag("aws_region", context.invoked_function_arn.split(":")[3])
# Starting the Timeout thread only if the configured time is greater than Timeout warning
# buffer and timeout_warning parameter is set True.
if (
@@ -99,17 +100,22 @@ def sentry_handler(event, context, *args, **kwargs):
# Starting the thread to raise timeout warning exception
timeout_thread.start()
- try:
- return handler(event, context, *args, **kwargs)
- except Exception:
- exc_info = sys.exc_info()
- event, hint = event_from_exception(
- exc_info,
- client_options=client.options,
- mechanism={"type": "aws_lambda", "handled": False},
- )
- hub.capture_event(event, hint=hint)
- reraise(*exc_info)
+ headers = event.get("headers", {})
+ transaction = Transaction.continue_from_headers(
+ headers, op="serverless.function", name=context.function_name
+ )
+ with hub.start_transaction(transaction):
+ try:
+ return handler(event, context, *args, **kwargs)
+ except Exception:
+ exc_info = sys.exc_info()
+ event, hint = event_from_exception(
+ exc_info,
+ client_options=client.options,
+ mechanism={"type": "aws_lambda", "handled": False},
+ )
+ hub.capture_event(event, hint=hint)
+ reraise(*exc_info)
return sentry_handler # type: ignore
@@ -277,11 +283,6 @@ def event_processor(event, hint, start_time=start_time):
if "headers" in aws_event:
request["headers"] = _filter_headers(aws_event["headers"])
- if aws_event.get("body", None):
- # Unfortunately couldn't find a way to get structured body from AWS
- # event. Meaning every body is unstructured to us.
- request["data"] = AnnotatedValue("", {"rem": [["!raw", "x", 0, 0]]})
-
if _should_send_default_pii():
user_info = event.setdefault("user", {})
@@ -293,6 +294,14 @@ def event_processor(event, hint, start_time=start_time):
if ip is not None:
user_info.setdefault("ip_address", ip)
+ if "body" in aws_event:
+ request["data"] = aws_event.get("body", "")
+ else:
+ if aws_event.get("body", None):
+ # Unfortunately couldn't find a way to get structured body from AWS
+ # event. Meaning every body is unstructured to us.
+ request["data"] = AnnotatedValue("", {"rem": [["!raw", "x", 0, 0]]})
+
event["request"] = request
return event
diff --git a/sentry_sdk/integrations/gcp.py b/sentry_sdk/integrations/gcp.py
index 8935a5d932..42bbe8dd2e 100644
--- a/sentry_sdk/integrations/gcp.py
+++ b/sentry_sdk/integrations/gcp.py
@@ -2,15 +2,18 @@
from os import environ
import sys
-from sentry_sdk.hub import Hub
+from sentry_sdk.hub import Hub, _should_send_default_pii
+from sentry_sdk.tracing import Transaction
from sentry_sdk._compat import reraise
from sentry_sdk.utils import (
+ AnnotatedValue,
capture_internal_exceptions,
event_from_exception,
logger,
TimeoutThread,
)
from sentry_sdk.integrations import Integration
+from sentry_sdk.integrations._wsgi_common import _filter_headers
from sentry_sdk._types import MYPY
@@ -31,13 +34,13 @@
def _wrap_func(func):
# type: (F) -> F
- def sentry_func(*args, **kwargs):
- # type: (*Any, **Any) -> Any
+ def sentry_func(functionhandler, event, *args, **kwargs):
+ # type: (Any, Any, *Any, **Any) -> Any
hub = Hub.current
integration = hub.get_integration(GcpIntegration)
if integration is None:
- return func(*args, **kwargs)
+ return func(functionhandler, event, *args, **kwargs)
# If an integration is there, a client has to be there.
client = hub.client # type: Any
@@ -47,7 +50,7 @@ def sentry_func(*args, **kwargs):
logger.debug(
"The configured timeout could not be fetched from Cloud Functions configuration."
)
- return func(*args, **kwargs)
+ return func(functionhandler, event, *args, **kwargs)
configured_time = int(configured_time)
@@ -56,11 +59,10 @@ def sentry_func(*args, **kwargs):
with hub.push_scope() as scope:
with capture_internal_exceptions():
scope.clear_breadcrumbs()
- scope.transaction = environ.get("FUNCTION_NAME")
scope.add_event_processor(
- _make_request_event_processor(configured_time, initial_time)
+ _make_request_event_processor(event, configured_time, initial_time)
)
- try:
+ scope.set_tag("gcp_region", environ.get("FUNCTION_REGION"))
if (
integration.timeout_warning
and configured_time > TIMEOUT_WARNING_BUFFER
@@ -71,19 +73,28 @@ def sentry_func(*args, **kwargs):
# Starting the thread to raise timeout warning exception
timeout_thread.start()
- return func(*args, **kwargs)
- except Exception:
- exc_info = sys.exc_info()
- event, hint = event_from_exception(
- exc_info,
- client_options=client.options,
- mechanism={"type": "gcp", "handled": False},
- )
- hub.capture_event(event, hint=hint)
- reraise(*exc_info)
- finally:
- # Flush out the event queue
- hub.flush()
+
+ headers = {}
+ if hasattr(event, "headers"):
+ headers = event.headers
+ transaction = Transaction.continue_from_headers(
+ headers, op="serverless.function", name=environ.get("FUNCTION_NAME", "")
+ )
+ with hub.start_transaction(transaction):
+ try:
+ return func(functionhandler, event, *args, **kwargs)
+ except Exception:
+ exc_info = sys.exc_info()
+ event, hint = event_from_exception(
+ exc_info,
+ client_options=client.options,
+ mechanism={"type": "gcp", "handled": False},
+ )
+ hub.capture_event(event, hint=hint)
+ reraise(*exc_info)
+ finally:
+ # Flush out the event queue
+ hub.flush()
return sentry_func # type: ignore
@@ -113,8 +124,8 @@ def setup_once():
)
-def _make_request_event_processor(configured_timeout, initial_time):
- # type: (Any, Any) -> EventProcessor
+def _make_request_event_processor(gcp_event, configured_timeout, initial_time):
+ # type: (Any, Any, Any) -> EventProcessor
def event_processor(event, hint):
# type: (Event, Hint) -> Optional[Event]
@@ -143,6 +154,24 @@ def event_processor(event, hint):
request["url"] = "gcp:///{}".format(environ.get("FUNCTION_NAME"))
+ if hasattr(gcp_event, "method"):
+ request["method"] = gcp_event.method
+
+ if hasattr(gcp_event, "query_string"):
+ request["query_string"] = gcp_event.query_string.decode("utf-8")
+
+ if hasattr(gcp_event, "headers"):
+ request["headers"] = _filter_headers(gcp_event.headers)
+
+ if _should_send_default_pii():
+ if hasattr(gcp_event, "data"):
+ request["data"] = gcp_event.data
+ else:
+ if hasattr(gcp_event, "data"):
+ # Unfortunately couldn't find a way to get structured body from GCP
+ # event. Meaning every body is unstructured to us.
+ request["data"] = AnnotatedValue("", {"rem": [["!raw", "x", 0, 0]]})
+
event["request"] = request
return event
diff --git a/tests/integrations/aws_lambda/test_aws.py b/tests/integrations/aws_lambda/test_aws.py
index e473bffc7e..38fdef87ca 100644
--- a/tests/integrations/aws_lambda/test_aws.py
+++ b/tests/integrations/aws_lambda/test_aws.py
@@ -40,6 +40,19 @@ def event_processor(event):
# to print less to logs.
return event
+def envelope_processor(envelope):
+ (item,) = envelope.items
+ envelope_json = json.loads(item.get_bytes())
+
+ envelope_data = {}
+ envelope_data[\"contexts\"] = {}
+ envelope_data[\"type\"] = envelope_json[\"type\"]
+ envelope_data[\"transaction\"] = envelope_json[\"transaction\"]
+ envelope_data[\"contexts\"][\"trace\"] = envelope_json[\"contexts\"][\"trace\"]
+ envelope_data[\"request\"] = envelope_json[\"request\"]
+
+ return envelope_data
+
class TestTransport(HttpTransport):
def _send_event(self, event):
event = event_processor(event)
@@ -49,6 +62,10 @@ def _send_event(self, event):
# us one.
print("\\nEVENT: {}\\n".format(json.dumps(event)))
+ def _send_envelope(self, envelope):
+ envelope = envelope_processor(envelope)
+ print("\\nENVELOPE: {}\\n".format(json.dumps(envelope)))
+
def init_sdk(timeout_warning=False, **extra_init_args):
sentry_sdk.init(
dsn="https://123abc@example.com/123",
@@ -91,21 +108,26 @@ def inner(code, payload, timeout=30, syntax_check=True):
)
events = []
+ envelopes = []
for line in base64.b64decode(response["LogResult"]).splitlines():
print("AWS:", line)
- if not line.startswith(b"EVENT: "):
+ if line.startswith(b"EVENT: "):
+ line = line[len(b"EVENT: ") :]
+ events.append(json.loads(line.decode("utf-8")))
+ elif line.startswith(b"ENVELOPE: "):
+ line = line[len(b"ENVELOPE: ") :]
+ envelopes.append(json.loads(line.decode("utf-8")))
+ else:
continue
- line = line[len(b"EVENT: ") :]
- events.append(json.loads(line.decode("utf-8")))
- return events, response
+ return envelopes, events, response
return inner
def test_basic(run_lambda_function):
- events, response = run_lambda_function(
+ envelopes, events, response = run_lambda_function(
LAMBDA_PRELUDE
+ dedent(
"""
@@ -160,7 +182,7 @@ def test_initialization_order(run_lambda_function):
as seen by AWS already runs. At this point at least draining the queue
should work."""
- events, _response = run_lambda_function(
+ envelopes, events, _response = run_lambda_function(
LAMBDA_PRELUDE
+ dedent(
"""
@@ -180,7 +202,7 @@ def test_handler(event, context):
def test_request_data(run_lambda_function):
- events, _response = run_lambda_function(
+ envelopes, events, _response = run_lambda_function(
LAMBDA_PRELUDE
+ dedent(
"""
@@ -235,7 +257,7 @@ def test_init_error(run_lambda_function, lambda_runtime):
if lambda_runtime == "python2.7":
pytest.skip("initialization error not supported on Python 2.7")
- events, response = run_lambda_function(
+ envelopes, events, response = run_lambda_function(
LAMBDA_PRELUDE
+ (
"def event_processor(event):\n"
@@ -252,7 +274,7 @@ def test_init_error(run_lambda_function, lambda_runtime):
def test_timeout_error(run_lambda_function):
- events, response = run_lambda_function(
+ envelopes, events, response = run_lambda_function(
LAMBDA_PRELUDE
+ dedent(
"""
@@ -291,3 +313,52 @@ def test_handler(event, context):
log_stream = event["extra"]["cloudwatch logs"]["log_stream"]
assert re.match(log_stream_re, log_stream)
+
+
+def test_performance_no_error(run_lambda_function):
+ envelopes, events, response = run_lambda_function(
+ LAMBDA_PRELUDE
+ + dedent(
+ """
+ init_sdk(traces_sample_rate=1.0)
+
+ def test_handler(event, context):
+ return "test_string"
+ """
+ ),
+ b'{"foo": "bar"}',
+ )
+
+ (envelope,) = envelopes
+ assert envelope["type"] == "transaction"
+ assert envelope["contexts"]["trace"]["op"] == "serverless.function"
+ assert envelope["transaction"].startswith("test_function_")
+ assert envelope["transaction"] in envelope["request"]["url"]
+
+
+def test_performance_error(run_lambda_function):
+ envelopes, events, response = run_lambda_function(
+ LAMBDA_PRELUDE
+ + dedent(
+ """
+ init_sdk(traces_sample_rate=1.0)
+
+ def test_handler(event, context):
+ raise Exception("something went wrong")
+ """
+ ),
+ b'{"foo": "bar"}',
+ )
+
+ (event,) = events
+ assert event["level"] == "error"
+ (exception,) = event["exception"]["values"]
+ assert exception["type"] == "Exception"
+ assert exception["value"] == "something went wrong"
+
+ (envelope,) = envelopes
+
+ assert envelope["type"] == "transaction"
+ assert envelope["contexts"]["trace"]["op"] == "serverless.function"
+ assert envelope["transaction"].startswith("test_function_")
+ assert envelope["transaction"] in envelope["request"]["url"]
diff --git a/tests/integrations/gcp/test_gcp.py b/tests/integrations/gcp/test_gcp.py
index 6fe5b5967b..fa234a0da3 100644
--- a/tests/integrations/gcp/test_gcp.py
+++ b/tests/integrations/gcp/test_gcp.py
@@ -33,7 +33,6 @@
gcp_functions.worker_v1 = Mock()
gcp_functions.worker_v1.FunctionHandler = Mock()
gcp_functions.worker_v1.FunctionHandler.invoke_user_function = cloud_function
-function = gcp_functions.worker_v1.FunctionHandler.invoke_user_function
import sentry_sdk
@@ -48,6 +47,10 @@ def event_processor(event):
time.sleep(1)
return event
+def envelope_processor(envelope):
+ (item,) = envelope.items
+ return item.get_bytes()
+
class TestTransport(HttpTransport):
def _send_event(self, event):
event = event_processor(event)
@@ -55,7 +58,11 @@ def _send_event(self, event):
# therefore cannot be interleaved with other threads. This is why we
# explicitly add a newline at the end even though `print` would provide
# us one.
- print("EVENTS: {}".format(json.dumps(event)))
+ print("\\nEVENT: {}\\n".format(json.dumps(event)))
+
+ def _send_envelope(self, envelope):
+ envelope = envelope_processor(envelope)
+ print("\\nENVELOPE: {}\\n".format(envelope.decode(\"utf-8\")))
def init_sdk(timeout_warning=False, **extra_init_args):
sentry_sdk.init(
@@ -74,6 +81,7 @@ def run_cloud_function():
def inner(code, subprocess_kwargs=()):
event = []
+ envelope = []
# STEP : Create a zip of cloud function
@@ -102,19 +110,31 @@ def inner(code, subprocess_kwargs=()):
)
stream = os.popen("python {}/main.py".format(tmpdir))
- event = stream.read()
- event = json.loads(event[len("EVENT: ") :])
+ stream_data = stream.read()
+
+ for line in stream_data.splitlines():
+ print("GCP:", line)
+ if line.startswith("EVENT: "):
+ line = line[len("EVENT: ") :]
+ event = json.loads(line)
+ elif line.startswith("ENVELOPE: "):
+ line = line[len("ENVELOPE: ") :]
+ envelope = json.loads(line)
+ else:
+ continue
- return event
+ return envelope, event
return inner
def test_handled_exception(run_cloud_function):
- event = run_cloud_function(
+ envelope, event = run_cloud_function(
dedent(
"""
- def cloud_function():
+ functionhandler = None
+ event = {}
+ def cloud_function(functionhandler, event):
raise Exception("something went wrong")
"""
)
@@ -122,7 +142,7 @@ def cloud_function():
+ dedent(
"""
init_sdk(timeout_warning=False)
- gcp_functions.worker_v1.FunctionHandler.invoke_user_function()
+ gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event)
"""
)
)
@@ -135,10 +155,12 @@ def cloud_function():
def test_unhandled_exception(run_cloud_function):
- event = run_cloud_function(
+ envelope, event = run_cloud_function(
dedent(
"""
- def cloud_function():
+ functionhandler = None
+ event = {}
+ def cloud_function(functionhandler, event):
x = 3/0
return "3"
"""
@@ -147,7 +169,7 @@ def cloud_function():
+ dedent(
"""
init_sdk(timeout_warning=False)
- gcp_functions.worker_v1.FunctionHandler.invoke_user_function()
+ gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event)
"""
)
)
@@ -160,10 +182,12 @@ def cloud_function():
def test_timeout_error(run_cloud_function):
- event = run_cloud_function(
+ envelope, event = run_cloud_function(
dedent(
"""
- def cloud_function():
+ functionhandler = None
+ event = {}
+ def cloud_function(functionhandler, event):
time.sleep(10)
return "3"
"""
@@ -172,7 +196,7 @@ def cloud_function():
+ dedent(
"""
init_sdk(timeout_warning=True)
- gcp_functions.worker_v1.FunctionHandler.invoke_user_function()
+ gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event)
"""
)
)
@@ -185,3 +209,59 @@ def cloud_function():
== "WARNING : Function is expected to get timed out. Configured timeout duration = 3 seconds."
)
assert exception["mechanism"] == {"type": "threading", "handled": False}
+
+
+def test_performance_no_error(run_cloud_function):
+ envelope, event = run_cloud_function(
+ dedent(
+ """
+ functionhandler = None
+ event = {}
+ def cloud_function(functionhandler, event):
+ return "test_string"
+ """
+ )
+ + FUNCTIONS_PRELUDE
+ + dedent(
+ """
+ init_sdk(traces_sample_rate=1.0)
+ gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event)
+ """
+ )
+ )
+
+ assert envelope["type"] == "transaction"
+ assert envelope["contexts"]["trace"]["op"] == "serverless.function"
+ assert envelope["transaction"].startswith("Google Cloud function")
+ assert envelope["transaction"] in envelope["request"]["url"]
+
+
+def test_performance_error(run_cloud_function):
+ envelope, event = run_cloud_function(
+ dedent(
+ """
+ functionhandler = None
+ event = {}
+ def cloud_function(functionhandler, event):
+ raise Exception("something went wrong")
+ """
+ )
+ + FUNCTIONS_PRELUDE
+ + dedent(
+ """
+ init_sdk(traces_sample_rate=1.0)
+ gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event)
+ """
+ )
+ )
+
+ assert envelope["type"] == "transaction"
+ assert envelope["contexts"]["trace"]["op"] == "serverless.function"
+ assert envelope["transaction"].startswith("Google Cloud function")
+ assert envelope["transaction"] in envelope["request"]["url"]
+ assert event["level"] == "error"
+ (exception,) = event["exception"]["values"]
+
+ assert exception["type"] == "Exception"
+ assert exception["value"] == "something went wrong"
+ assert exception["mechanism"] == {"type": "gcp", "handled": False}
From 5d89fa7df83277cb7179d9d1344c17d480fb6fff Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Tue, 29 Sep 2020 17:02:32 +0200
Subject: [PATCH 0036/2327] fix(django): Do not patch resolver_match (#842)
Co-authored-by: sentry-bot
---
sentry_sdk/integrations/django/__init__.py | 4 +-
sentry_sdk/integrations/django/views.py | 70 +++++++--------------
tests/integrations/django/myapp/settings.py | 5 ++
3 files changed, 30 insertions(+), 49 deletions(-)
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index 60fa874f18..008dc386bb 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -39,7 +39,7 @@
from sentry_sdk.integrations.django.transactions import LEGACY_RESOLVER
from sentry_sdk.integrations.django.templates import get_template_frame_from_exception
from sentry_sdk.integrations.django.middleware import patch_django_middlewares
-from sentry_sdk.integrations.django.views import patch_resolver
+from sentry_sdk.integrations.django.views import patch_views
if MYPY:
@@ -200,7 +200,7 @@ def _django_queryset_repr(value, hint):
_patch_channels()
patch_django_middlewares()
- patch_resolver()
+ patch_views()
_DRF_PATCHED = False
diff --git a/sentry_sdk/integrations/django/views.py b/sentry_sdk/integrations/django/views.py
index 24cfb73282..b73ebf29ea 100644
--- a/sentry_sdk/integrations/django/views.py
+++ b/sentry_sdk/integrations/django/views.py
@@ -5,63 +5,39 @@
if MYPY:
from typing import Any
- from django.urls.resolvers import ResolverMatch
-
-def patch_resolver():
+def patch_views():
# type: () -> None
- try:
- from django.urls.resolvers import URLResolver
- except ImportError:
- try:
- from django.urls.resolvers import RegexURLResolver as URLResolver
- except ImportError:
- from django.core.urlresolvers import RegexURLResolver as URLResolver
+ from django.core.handlers.base import BaseHandler
from sentry_sdk.integrations.django import DjangoIntegration
- old_resolve = URLResolver.resolve
-
- def resolve(self, path):
- # type: (URLResolver, Any) -> ResolverMatch
- hub = Hub.current
- integration = hub.get_integration(DjangoIntegration)
-
- if integration is None or not integration.middleware_spans:
- return old_resolve(self, path)
+ old_make_view_atomic = BaseHandler.make_view_atomic
- return _wrap_resolver_match(hub, old_resolve(self, path))
+ @_functools.wraps(old_make_view_atomic)
+ def sentry_patched_make_view_atomic(self, *args, **kwargs):
+ # type: (Any, *Any, **Any) -> Any
+ callback = old_make_view_atomic(self, *args, **kwargs)
- URLResolver.resolve = resolve
+ # XXX: The wrapper function is created for every request. Find more
+ # efficient way to wrap views (or build a cache?)
+ hub = Hub.current
+ integration = hub.get_integration(DjangoIntegration)
-def _wrap_resolver_match(hub, resolver_match):
- # type: (Hub, ResolverMatch) -> ResolverMatch
-
- # XXX: The wrapper function is created for every request. Find more
- # efficient way to wrap views (or build a cache?)
-
- old_callback = resolver_match.func
+ if integration is not None and integration.middleware_spans:
- # Explicitly forward `csrf_exempt` in case it is not an attribute in
- # callback.__dict__, but rather a class attribute (on a class
- # implementing __call__) such as this:
- #
- # class Foo(object):
- # csrf_exempt = True
- #
- # def __call__(self, request): ...
- #
- # We have had this in the Sentry codebase (for no good reason, but
- # nevertheless we broke user code)
- assigned = _functools.WRAPPER_ASSIGNMENTS + ("csrf_exempt",)
+ @_functools.wraps(callback)
+ def sentry_wrapped_callback(request, *args, **kwargs):
+ # type: (Any, *Any, **Any) -> Any
+ with hub.start_span(
+ op="django.view", description=request.resolver_match.view_name
+ ):
+ return callback(request, *args, **kwargs)
- @_functools.wraps(old_callback, assigned=assigned)
- def callback(*args, **kwargs):
- # type: (*Any, **Any) -> Any
- with hub.start_span(op="django.view", description=resolver_match.view_name):
- return old_callback(*args, **kwargs)
+ else:
+ sentry_wrapped_callback = callback
- resolver_match.func = callback
+ return sentry_wrapped_callback
- return resolver_match
+ BaseHandler.make_view_atomic = sentry_patched_make_view_atomic
diff --git a/tests/integrations/django/myapp/settings.py b/tests/integrations/django/myapp/settings.py
index 235df5c8bd..adbf5d94fa 100644
--- a/tests/integrations/django/myapp/settings.py
+++ b/tests/integrations/django/myapp/settings.py
@@ -59,6 +59,11 @@
class TestMiddleware(MiddlewareMixin):
def process_request(self, request):
+ # https://github.com/getsentry/sentry-python/issues/837 -- We should
+ # not touch the resolver_match because apparently people rely on it.
+ if request.resolver_match:
+ assert not getattr(request.resolver_match.callback, "__wrapped__", None)
+
if "middleware-exc" in request.path:
1 / 0
From 8649febb1735b3ec76dc61d4d12098d7cc49a310 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Tue, 29 Sep 2020 17:05:11 +0200
Subject: [PATCH 0037/2327] doc: Changelog for 0.18.0
---
CHANGES.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 7f558caded..14b3ac1690 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,11 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 0.18.0
+
+* **Breaking change**: The `no_proxy` environment variable is now honored when inferring proxy settings from the system. Thanks Xavier Fernandez!
+* Added Performance/Tracing support for AWS and GCP functions.
+* Fix an issue with Django instrumentation where the SDK modified `resolver_match.callback` and broke user code.
## 0.17.8
From a7f572569842744d7567cd4f81344fbdb8dbe23c Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Tue, 29 Sep 2020 17:05:29 +0200
Subject: [PATCH 0038/2327] release: 0.18.0
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 102fa18b88..0721f16539 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.17.8"
+release = "0.18.0"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 595f749b41..e76666637e 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -88,7 +88,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.17.8"
+VERSION = "0.18.0"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index c373e7aabf..87e51b7279 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
setup(
name="sentry-sdk",
- version="0.17.8",
+ version="0.18.0",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From af163ff176b2c22952443dc5ec535aed98656fc2 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 5 Oct 2020 14:07:30 +0200
Subject: [PATCH 0039/2327] test: Make tornado tests more lenient for 6.1b1
---
tests/integrations/tornado/test_tornado.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/integrations/tornado/test_tornado.py b/tests/integrations/tornado/test_tornado.py
index effc36e106..0cec16c4b7 100644
--- a/tests/integrations/tornado/test_tornado.py
+++ b/tests/integrations/tornado/test_tornado.py
@@ -63,8 +63,8 @@ def test_basic(tornado_testcase, sentry_init, capture_events):
"headers": {
"Accept-Encoding": "gzip",
"Connection": "close",
- "Host": host,
"Cookie": "name=value; name2=value2; name3=value3",
+ **request["headers"],
},
"cookies": {"name": "value", "name2": "value2", "name3": "value3"},
"method": "GET",
From 4de85f5406b6b7c4b59834a341cff6d45fffdfa1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 5 Oct 2020 12:54:06 +0000
Subject: [PATCH 0040/2327] build(deps): bump flake8 from 3.8.3 to 3.8.4
Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.8.3 to 3.8.4.
- [Release notes](https://gitlab.com/pycqa/flake8/tags)
- [Commits](https://gitlab.com/pycqa/flake8/compare/3.8.3...3.8.4)
Signed-off-by: dependabot-preview[bot]
---
linter-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linter-requirements.txt b/linter-requirements.txt
index 0d1fc81a2f..0bcf11e3b3 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -1,5 +1,5 @@
black==20.8b1
-flake8==3.8.3
+flake8==3.8.4
flake8-import-order==0.18.1
mypy==0.782
flake8-bugbear==20.1.4
From 91c7a8fcb8e94b37e7dba74e66f7d0992f3cf145 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 5 Oct 2020 12:53:49 +0000
Subject: [PATCH 0041/2327] build(deps): bump checkouts/data-schemas from
`36c6664` to `b20959c`
Bumps [checkouts/data-schemas](https://github.com/getsentry/sentry-data-schemas) from `36c6664` to `b20959c`.
- [Release notes](https://github.com/getsentry/sentry-data-schemas/releases)
- [Commits](https://github.com/getsentry/sentry-data-schemas/compare/36c6664435960c80a0bac61308e5b753a564c035...b20959cbb66ddde11224be5f5eb3b90286140826)
Signed-off-by: dependabot-preview[bot]
---
checkouts/data-schemas | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/checkouts/data-schemas b/checkouts/data-schemas
index 36c6664435..b20959cbb6 160000
--- a/checkouts/data-schemas
+++ b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit 36c6664435960c80a0bac61308e5b753a564c035
+Subproject commit b20959cbb66ddde11224be5f5eb3b90286140826
From a7f7e2ab140392b5c669fa69b6156c48fd156872 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Mon, 12 Oct 2020 06:43:06 -0700
Subject: [PATCH 0042/2327] feat(test): Add `only` pytest marker (#852)
This adds a pytest marker similar to `it.only` in jest.
---
pytest.ini | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pytest.ini b/pytest.ini
index 19cf3a00e8..4e440e2a47 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,6 @@
[pytest]
DJANGO_SETTINGS_MODULE = tests.integrations.django.myapp.settings
addopts = --tb=short
-markers = tests_internal_exceptions
+markers =
+ tests_internal_exceptions
+ only: A temporary marker, to make pytest only run the tests with the mark, similar to jest's `it.only`. To use, run `pytest -v -m only`.
From 356ad6c9703ec4274fe964cf0cfb568712d9dfe8 Mon Sep 17 00:00:00 2001
From: Daniel Griesser
Date: Tue, 13 Oct 2020 09:50:43 +0200
Subject: [PATCH 0043/2327] feat: Auto enable integrations=true (#845)
* feat: Auto enable integrations=true
* fix: Formatting
* ref: Remove experiments flag
* fix: Formatting
Co-authored-by: sentry-bot
---
sentry_sdk/client.py | 6 +++---
sentry_sdk/consts.py | 1 +
tests/integrations/flask/test_flask.py | 2 +-
tests/test_basics.py | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 8705a119d0..168198adb9 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -128,9 +128,9 @@ def _send_sessions(sessions):
self.integrations = setup_integrations(
self.options["integrations"],
with_defaults=self.options["default_integrations"],
- with_auto_enabling_integrations=self.options["_experiments"].get(
- "auto_enabling_integrations", False
- ),
+ with_auto_enabling_integrations=self.options[
+ "auto_enabling_integrations"
+ ],
)
finally:
_client_init_debug.set(old_debug)
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index e76666637e..9604418a65 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -64,6 +64,7 @@ def __init__(
ca_certs=None, # type: Optional[str]
propagate_traces=True, # type: bool
traces_sample_rate=0.0, # type: float
+ auto_enabling_integrations=True, # type: bool
_experiments={}, # type: Experiments # noqa: B006
):
# type: (...) -> None
diff --git a/tests/integrations/flask/test_flask.py b/tests/integrations/flask/test_flask.py
index 4839892221..4d49015811 100644
--- a/tests/integrations/flask/test_flask.py
+++ b/tests/integrations/flask/test_flask.py
@@ -45,7 +45,7 @@ def hi():
@pytest.fixture(params=("auto", "manual"))
def integration_enabled_params(request):
if request.param == "auto":
- return {"_experiments": {"auto_enabling_integrations": True}}
+ return {"auto_enabling_integrations": True}
elif request.param == "manual":
return {"integrations": [flask_sentry.FlaskIntegration()]}
else:
diff --git a/tests/test_basics.py b/tests/test_basics.py
index f5b25514c7..d7cc2d58cb 100644
--- a/tests/test_basics.py
+++ b/tests/test_basics.py
@@ -43,7 +43,7 @@ def error_processor(event, exc_info):
def test_auto_enabling_integrations_catches_import_error(sentry_init, caplog):
caplog.set_level(logging.DEBUG)
- sentry_init(_experiments={"auto_enabling_integrations": True}, debug=True)
+ sentry_init(auto_enabling_integrations=True, debug=True)
for import_string in _AUTO_ENABLING_INTEGRATIONS:
assert any(
From 2c1e25aa263043aea24c1973f0e7c826a73a2489 Mon Sep 17 00:00:00 2001
From: Daniel Griesser
Date: Tue, 13 Oct 2020 09:53:12 +0200
Subject: [PATCH 0044/2327] meta: Prepare 0.19.0
---
CHANGES.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 14b3ac1690..f5446e9a3e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,10 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 0.19.0
+
+* Removed `_experiments.auto_enabling_integrations` in favor of just `auto_enabling_integrations` which is now enabled by default.
+
## 0.18.0
* **Breaking change**: The `no_proxy` environment variable is now honored when inferring proxy settings from the system. Thanks Xavier Fernandez!
From 6cdc4bed8e8606a9bb24a1ce32e0564db134fe8a Mon Sep 17 00:00:00 2001
From: Daniel Griesser
Date: Tue, 13 Oct 2020 10:07:39 +0200
Subject: [PATCH 0045/2327] ref: Remove experiments for auto integrations
---
sentry_sdk/consts.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 9604418a65..807a4ee250 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -25,7 +25,6 @@
{
"max_spans": Optional[int],
"record_sql_params": Optional[bool],
- "auto_enabling_integrations": Optional[bool],
"auto_session_tracking": Optional[bool],
"smart_transaction_trimming": Optional[bool],
},
From 584bfe29f76d754d4b50d6d7ab785cec368b2205 Mon Sep 17 00:00:00 2001
From: Daniel Griesser
Date: Tue, 13 Oct 2020 10:08:03 +0200
Subject: [PATCH 0046/2327] release: 0.19.0
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 0721f16539..0252ff2542 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.18.0"
+release = "0.19.0"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 807a4ee250..5ae352bdbc 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -88,7 +88,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.18.0"
+VERSION = "0.19.0"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 87e51b7279..755a0865e5 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
setup(
name="sentry-sdk",
- version="0.18.0",
+ version="0.19.0",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From b36c548f3762fd8928b09838d4ee6a19cb3833e1 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Tue, 13 Oct 2020 09:40:37 -0700
Subject: [PATCH 0047/2327] ref(tests): Split up tracing tests (#857)
No behavior changes, just movin' stuff around.
---
tests/tracing/test_deprecated.py | 20 ++++
.../test_integration_tests.py} | 107 +-----------------
tests/tracing/test_misc.py | 45 ++++++++
tests/tracing/test_sampling.py | 34 ++++++
4 files changed, 100 insertions(+), 106 deletions(-)
create mode 100644 tests/tracing/test_deprecated.py
rename tests/{test_tracing.py => tracing/test_integration_tests.py} (55%)
create mode 100644 tests/tracing/test_misc.py
create mode 100644 tests/tracing/test_sampling.py
diff --git a/tests/tracing/test_deprecated.py b/tests/tracing/test_deprecated.py
new file mode 100644
index 0000000000..0ce9096b6e
--- /dev/null
+++ b/tests/tracing/test_deprecated.py
@@ -0,0 +1,20 @@
+from sentry_sdk import start_span
+
+from sentry_sdk.tracing import Span
+
+
+def test_start_span_to_start_transaction(sentry_init, capture_events):
+ # XXX: this only exists for backwards compatibility with code before
+ # Transaction / start_transaction were introduced.
+ sentry_init(traces_sample_rate=1.0)
+ events = capture_events()
+
+ with start_span(transaction="/1/"):
+ pass
+
+ with start_span(Span(transaction="/2/")):
+ pass
+
+ assert len(events) == 2
+ assert events[0]["transaction"] == "/1/"
+ assert events[1]["transaction"] == "/2/"
diff --git a/tests/test_tracing.py b/tests/tracing/test_integration_tests.py
similarity index 55%
rename from tests/test_tracing.py
rename to tests/tracing/test_integration_tests.py
index 683f051c36..7423e4bd1e 100644
--- a/tests/test_tracing.py
+++ b/tests/tracing/test_integration_tests.py
@@ -10,7 +10,7 @@
start_span,
start_transaction,
)
-from sentry_sdk.tracing import Span, Transaction
+from sentry_sdk.tracing import Transaction
@pytest.mark.parametrize("sample_rate", [0.0, 1.0])
@@ -46,23 +46,6 @@ def test_basic(sentry_init, capture_events, sample_rate):
assert not events
-def test_start_span_to_start_transaction(sentry_init, capture_events):
- # XXX: this only exists for backwards compatibility with code before
- # Transaction / start_transaction were introduced.
- sentry_init(traces_sample_rate=1.0)
- events = capture_events()
-
- with start_span(transaction="/1/"):
- pass
-
- with start_span(Span(transaction="/2/")):
- pass
-
- assert len(events) == 2
- assert events[0]["transaction"] == "/1/"
- assert events[1]["transaction"] == "/2/"
-
-
@pytest.mark.parametrize("sampled", [True, False, None])
def test_continue_from_headers(sentry_init, capture_events, sampled):
sentry_init(traces_sample_rate=1.0)
@@ -114,19 +97,6 @@ def test_continue_from_headers(sentry_init, capture_events, sampled):
assert message["message"] == "hello"
-def test_sampling_decided_only_for_transactions(sentry_init, capture_events):
- sentry_init(traces_sample_rate=0.5)
-
- with start_transaction(name="hi") as transaction:
- assert transaction.sampled is not None
-
- with start_span() as span:
- assert span.sampled == transaction.sampled
-
- with start_span() as span:
- assert span.sampled is None
-
-
@pytest.mark.parametrize(
"args,expected_refcount",
[({"traces_sample_rate": 1.0}, 100), ({"traces_sample_rate": 0.0}, 0)],
@@ -156,67 +126,6 @@ def foo():
assert len(references) == expected_refcount
-def test_span_trimming(sentry_init, capture_events):
- sentry_init(traces_sample_rate=1.0, _experiments={"max_spans": 3})
- events = capture_events()
-
- with start_transaction(name="hi"):
- for i in range(10):
- with start_span(op="foo{}".format(i)):
- pass
-
- (event,) = events
- span1, span2 = event["spans"]
- assert span1["op"] == "foo0"
- assert span2["op"] == "foo1"
-
-
-def test_nested_transaction_sampling_override():
- with start_transaction(name="outer", sampled=True) as outer_transaction:
- assert outer_transaction.sampled is True
- with start_transaction(name="inner", sampled=False) as inner_transaction:
- assert inner_transaction.sampled is False
- assert outer_transaction.sampled is True
-
-
-def test_transaction_method_signature(sentry_init, capture_events):
- sentry_init(traces_sample_rate=1.0)
- events = capture_events()
-
- with pytest.raises(TypeError):
- start_span(name="foo")
- assert len(events) == 0
-
- with start_transaction() as transaction:
- pass
- assert transaction.name == ""
- assert len(events) == 1
-
- with start_transaction() as transaction:
- transaction.name = "name-known-after-transaction-started"
- assert len(events) == 2
-
- with start_transaction(name="a"):
- pass
- assert len(events) == 3
-
- with start_transaction(Transaction(name="c")):
- pass
- assert len(events) == 4
-
-
-def test_no_double_sampling(sentry_init, capture_events):
- # Transactions should not be subject to the global/error sample rate.
- # Only the traces_sample_rate should apply.
- sentry_init(traces_sample_rate=1.0, sample_rate=0.0)
- events = capture_events()
-
- with start_transaction(name="/"):
- pass
-
- assert len(events) == 1
-
-
def test_transactions_do_not_go_through_before_send(sentry_init, capture_events):
def before_send(event, hint):
raise RuntimeError("should not be called")
@@ -228,17 +137,3 @@ def before_send(event, hint):
pass
assert len(events) == 1
-
-
-def test_get_transaction_from_scope(sentry_init, capture_events):
- sentry_init(traces_sample_rate=1.0)
- events = capture_events()
-
- with start_transaction(name="/"):
- with start_span(op="child-span"):
- with start_span(op="child-child-span"):
- scope = Hub.current.scope
- assert scope.span.op == "child-child-span"
- assert scope.transaction.name == "/"
-
- assert len(events) == 1
diff --git a/tests/tracing/test_misc.py b/tests/tracing/test_misc.py
new file mode 100644
index 0000000000..ce717437ea
--- /dev/null
+++ b/tests/tracing/test_misc.py
@@ -0,0 +1,45 @@
+import pytest
+
+from sentry_sdk import start_span, start_transaction
+from sentry_sdk.tracing import Transaction
+
+
+def test_span_trimming(sentry_init, capture_events):
+ sentry_init(traces_sample_rate=1.0, _experiments={"max_spans": 3})
+ events = capture_events()
+
+ with start_transaction(name="hi"):
+ for i in range(10):
+ with start_span(op="foo{}".format(i)):
+ pass
+
+ (event,) = events
+ span1, span2 = event["spans"]
+ assert span1["op"] == "foo0"
+ assert span2["op"] == "foo1"
+
+
+def test_transaction_method_signature(sentry_init, capture_events):
+ sentry_init(traces_sample_rate=1.0)
+ events = capture_events()
+
+ with pytest.raises(TypeError):
+ start_span(name="foo")
+ assert len(events) == 0
+
+ with start_transaction() as transaction:
+ pass
+ assert transaction.name == ""
+ assert len(events) == 1
+
+ with start_transaction() as transaction:
+ transaction.name = "name-known-after-transaction-started"
+ assert len(events) == 2
+
+ with start_transaction(name="a"):
+ pass
+ assert len(events) == 3
+
+ with start_transaction(Transaction(name="c")):
+ pass
+ assert len(events) == 4
diff --git a/tests/tracing/test_sampling.py b/tests/tracing/test_sampling.py
new file mode 100644
index 0000000000..476d5e78c9
--- /dev/null
+++ b/tests/tracing/test_sampling.py
@@ -0,0 +1,34 @@
+from sentry_sdk import start_span, start_transaction
+
+
+def test_sampling_decided_only_for_transactions(sentry_init, capture_events):
+ sentry_init(traces_sample_rate=0.5)
+
+ with start_transaction(name="hi") as transaction:
+ assert transaction.sampled is not None
+
+ with start_span() as span:
+ assert span.sampled == transaction.sampled
+
+ with start_span() as span:
+ assert span.sampled is None
+
+
+def test_nested_transaction_sampling_override():
+ with start_transaction(name="outer", sampled=True) as outer_transaction:
+ assert outer_transaction.sampled is True
+ with start_transaction(name="inner", sampled=False) as inner_transaction:
+ assert inner_transaction.sampled is False
+ assert outer_transaction.sampled is True
+
+
+def test_no_double_sampling(sentry_init, capture_events):
+ # Transactions should not be subject to the global/error sample rate.
+ # Only the traces_sample_rate should apply.
+ sentry_init(traces_sample_rate=1.0, sample_rate=0.0)
+ events = capture_events()
+
+ with start_transaction(name="/"):
+ pass
+
+ assert len(events) == 1
From e12a3506383ecb156ef6a702c0ad3e84488270cf Mon Sep 17 00:00:00 2001
From: shantanu73
Date: Wed, 14 Oct 2020 15:36:45 +0530
Subject: [PATCH 0048/2327] fix: Incorrect timeout warnings in AWS Lambda and
GCP integrations (#854)
1) Added code to stop thread in aws_lambda.py & gcp.py.
2) Modified logic of run() function of class TimeoutThread to remove the dependency on time.sleep() and to stop the thread either when the original handler returns (by calling the stop method) or the timeout is reached, conditionally raising ServerlessTimeoutWarning.
Co-authored-by: Shantanu Dhiman
Co-authored-by: Rodolfo Carvalho
---
sentry_sdk/integrations/aws_lambda.py | 8 +++++++-
sentry_sdk/integrations/gcp.py | 3 +++
sentry_sdk/utils.py | 11 +++++++++--
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
index a81b77932d..e206eded60 100644
--- a/sentry_sdk/integrations/aws_lambda.py
+++ b/sentry_sdk/integrations/aws_lambda.py
@@ -83,6 +83,8 @@ def sentry_handler(event, context, *args, **kwargs):
_make_request_event_processor(event, context, configured_time)
)
scope.set_tag("aws_region", context.invoked_function_arn.split(":")[3])
+
+ timeout_thread = None
# Starting the Timeout thread only if the configured time is greater than Timeout warning
# buffer and timeout_warning parameter is set True.
if (
@@ -94,7 +96,8 @@ def sentry_handler(event, context, *args, **kwargs):
) / MILLIS_TO_SECONDS
timeout_thread = TimeoutThread(
- waiting_time, configured_time / MILLIS_TO_SECONDS
+ waiting_time,
+ configured_time / MILLIS_TO_SECONDS,
)
# Starting the thread to raise timeout warning exception
@@ -116,6 +119,9 @@ def sentry_handler(event, context, *args, **kwargs):
)
hub.capture_event(event, hint=hint)
reraise(*exc_info)
+ finally:
+ if timeout_thread:
+ timeout_thread.stop()
return sentry_handler # type: ignore
diff --git a/sentry_sdk/integrations/gcp.py b/sentry_sdk/integrations/gcp.py
index 42bbe8dd2e..4f5d69bd65 100644
--- a/sentry_sdk/integrations/gcp.py
+++ b/sentry_sdk/integrations/gcp.py
@@ -63,6 +63,7 @@ def sentry_func(functionhandler, event, *args, **kwargs):
_make_request_event_processor(event, configured_time, initial_time)
)
scope.set_tag("gcp_region", environ.get("FUNCTION_REGION"))
+ timeout_thread = None
if (
integration.timeout_warning
and configured_time > TIMEOUT_WARNING_BUFFER
@@ -93,6 +94,8 @@ def sentry_func(functionhandler, event, *args, **kwargs):
hub.capture_event(event, hint=hint)
reraise(*exc_info)
finally:
+ if timeout_thread:
+ timeout_thread.stop()
# Flush out the event queue
hub.flush()
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 2da4b6b617..2a8798adb0 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -3,7 +3,6 @@
import logging
import os
import sys
-import time
import threading
from datetime import datetime
@@ -891,11 +890,19 @@ def __init__(self, waiting_time, configured_timeout):
threading.Thread.__init__(self)
self.waiting_time = waiting_time
self.configured_timeout = configured_timeout
+ self._stop_event = threading.Event()
+
+ def stop(self):
+ # type: () -> None
+ self._stop_event.set()
def run(self):
# type: () -> None
- time.sleep(self.waiting_time)
+ self._stop_event.wait(self.waiting_time)
+
+ if self._stop_event.is_set():
+ return
integer_configured_timeout = int(self.configured_timeout)
From 9af0dc812c19babe0f33e8f7e7eb4041f654449d Mon Sep 17 00:00:00 2001
From: Daniel Griesser
Date: Fri, 16 Oct 2020 10:21:34 +0200
Subject: [PATCH 0049/2327] fix: Import blinker check (#860)
* fix: Import blinker check
* fix: linter
---
mypy.ini | 3 ++-
sentry_sdk/integrations/flask.py | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/mypy.ini b/mypy.ini
index 15d39693e5..dd095e4d13 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -54,7 +54,8 @@ ignore_missing_imports = True
ignore_missing_imports = True
[mypy-pure_eval.*]
ignore_missing_imports = True
-
+[mypy-blinker.*]
+ignore_missing_imports = True
[mypy-sentry_sdk._queue]
ignore_missing_imports = True
disallow_untyped_defs = False
diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py
index 86fcd76a16..f6306e5a41 100644
--- a/sentry_sdk/integrations/flask.py
+++ b/sentry_sdk/integrations/flask.py
@@ -43,6 +43,10 @@
except ImportError:
raise DidNotEnable("Flask is not installed")
+try:
+ import blinker # noqa
+except ImportError:
+ raise DidNotEnable("blinker is not installed")
TRANSACTION_STYLE_VALUES = ("endpoint", "url")
From a9ce3a6d61776a860c301d4ff759c6b06b3f76c0 Mon Sep 17 00:00:00 2001
From: Daniel Griesser
Date: Fri, 16 Oct 2020 10:23:04 +0200
Subject: [PATCH 0050/2327] prepare: 0.19.1
---
CHANGES.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index f5446e9a3e..17ae6973a4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,11 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 0.19.1
+
+* Fix dependency check for `blinker` fixes #858
+* Fix incorrect timeout warnings in AWS Lambda and GCP integrations #854
+
## 0.19.0
* Removed `_experiments.auto_enabling_integrations` in favor of just `auto_enabling_integrations` which is now enabled by default.
From cad0947c62759d2197a5d64a3545f0ab02540788 Mon Sep 17 00:00:00 2001
From: Daniel Griesser
Date: Fri, 16 Oct 2020 10:23:16 +0200
Subject: [PATCH 0051/2327] release: 0.19.1
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 0252ff2542..ab839fd91c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.19.0"
+release = "0.19.1"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 5ae352bdbc..e6676f32af 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -88,7 +88,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.19.0"
+VERSION = "0.19.1"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 755a0865e5..5f2679b55d 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
setup(
name="sentry-sdk",
- version="0.19.0",
+ version="0.19.1",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 097e36d636091cac424cc639fcedec8619054cbc Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Fri, 16 Oct 2020 07:58:32 -0700
Subject: [PATCH 0052/2327] fix(dev): Set VSCode Python path (#866)
VSCode can't seem to resolve the env without this.
---
.vscode/settings.json | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 .vscode/settings.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000..c7cadb4d6c
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "python.pythonPath": ".venv/bin/python"
+}
\ No newline at end of file
From e873bdb071146b1fd31814ae5f742f6a4f7abe39 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Fri, 16 Oct 2020 09:29:43 -0700
Subject: [PATCH 0053/2327] ref(tracing): Pre-`traces_sampler` documentation
additions (#865)
Comments and docstrings, expanded __repr__s for Span and Transaction, a few variable name changes. No behavior change.
---
pytest.ini | 2 +-
sentry_sdk/integrations/flask.py | 3 +-
sentry_sdk/scope.py | 2 +
sentry_sdk/tracing.py | 83 ++++++++++++++++-------
tests/conftest.py | 2 +
tests/integrations/stdlib/test_httplib.py | 4 ++
tests/tracing/test_integration_tests.py | 7 ++
tests/tracing/test_misc.py | 6 ++
8 files changed, 83 insertions(+), 26 deletions(-)
diff --git a/pytest.ini b/pytest.ini
index 4e440e2a47..c00b03296c 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -2,5 +2,5 @@
DJANGO_SETTINGS_MODULE = tests.integrations.django.myapp.settings
addopts = --tb=short
markers =
- tests_internal_exceptions
+ tests_internal_exceptions: Handle internal exceptions just as the SDK does, to test it. (Otherwise internal exceptions are recorded and reraised.)
only: A temporary marker, to make pytest only run the tests with the mark, similar to jest's `it.only`. To use, run `pytest -v -m only`.
diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py
index f6306e5a41..fe630ea50a 100644
--- a/sentry_sdk/integrations/flask.py
+++ b/sentry_sdk/integrations/flask.py
@@ -104,7 +104,8 @@ def _request_started(sender, **kwargs):
with hub.configure_scope() as scope:
request = _request_ctx_stack.top.request
- # Rely on WSGI middleware to start a trace
+ # Set the transaction name here, but rely on WSGI middleware to actually
+ # start the transaction
try:
if integration.transaction_style == "endpoint":
scope.transaction = request.url_rule.endpoint
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
index 30bf014068..bc3df8b97b 100644
--- a/sentry_sdk/scope.py
+++ b/sentry_sdk/scope.py
@@ -77,6 +77,8 @@ class Scope(object):
"_level",
"_name",
"_fingerprint",
+ # note that for legacy reasons, _transaction is the transaction *name*,
+ # not a Transaction object (the object is stored in _span)
"_transaction",
"_user",
"_tags",
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 3028284ac3..af256d583e 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -111,6 +111,11 @@ class Span(object):
def __new__(cls, **kwargs):
# type: (**Any) -> Any
+ """
+ Backwards-compatible implementation of Span and Transaction
+ creation.
+ """
+
# TODO: consider removing this in a future release.
# This is for backwards compatibility with releases before Transaction
# existed, to allow for a smoother transition.
@@ -166,8 +171,10 @@ def init_span_recorder(self, maxlen):
def __repr__(self):
# type: () -> str
- return "<%s(trace_id=%r, span_id=%r, parent_span_id=%r, sampled=%r)>" % (
+ return "<%s(op=%r, description:%r, trace_id=%r, span_id=%r, parent_span_id=%r, sampled=%r)>" % (
self.__class__.__name__,
+ self.op,
+ self.description,
self.trace_id,
self.span_id,
self.parent_span_id,
@@ -200,8 +207,9 @@ def start_child(self, **kwargs):
"""
Start a sub-span from the current span or transaction.
- Takes the same arguments as the initializer of :py:class:`Span`. No
- attributes other than the sample rate are inherited.
+ Takes the same arguments as the initializer of :py:class:`Span`. The
+ trace id, sampling decision, and span recorder are inherited from the
+ current span/transaction.
"""
kwargs.setdefault("sampled", self.sampled)
@@ -227,6 +235,14 @@ def continue_from_environ(
**kwargs # type: Any
):
# type: (...) -> Transaction
+ """
+ Create a Transaction with the given params, then add in data pulled from
+ the 'sentry-trace' header in the environ (if any) before returning the
+ Transaction.
+
+ If the 'sentry-trace' header is malformed or missing, just create and
+ return a Transaction instance with the given params.
+ """
if cls is Span:
logger.warning(
"Deprecated: use Transaction.continue_from_environ "
@@ -241,16 +257,25 @@ def continue_from_headers(
**kwargs # type: Any
):
# type: (...) -> Transaction
+ """
+ Create a Transaction with the given params, then add in data pulled from
+ the 'sentry-trace' header (if any) before returning the Transaction.
+
+ If the 'sentry-trace' header is malformed or missing, just create and
+ return a Transaction instance with the given params.
+ """
if cls is Span:
logger.warning(
"Deprecated: use Transaction.continue_from_headers "
"instead of Span.continue_from_headers."
)
- parent = Transaction.from_traceparent(headers.get("sentry-trace"), **kwargs)
- if parent is None:
- parent = Transaction(**kwargs)
- parent.same_process_as_parent = False
- return parent
+ transaction = Transaction.from_traceparent(
+ headers.get("sentry-trace"), **kwargs
+ )
+ if transaction is None:
+ transaction = Transaction(**kwargs)
+ transaction.same_process_as_parent = False
+ return transaction
def iter_headers(self):
# type: () -> Generator[Tuple[str, str], None, None]
@@ -263,6 +288,13 @@ def from_traceparent(
**kwargs # type: Any
):
# type: (...) -> Optional[Transaction]
+ """
+ Create a Transaction with the given params, then add in data pulled from
+ the given 'sentry-trace' header value before returning the Transaction.
+
+ If the header value is malformed or missing, just create and return a
+ Transaction instance with the given params.
+ """
if cls is Span:
logger.warning(
"Deprecated: use Transaction.from_traceparent "
@@ -279,20 +311,23 @@ def from_traceparent(
if match is None:
return None
- trace_id, span_id, sampled_str = match.groups()
+ trace_id, parent_span_id, sampled_str = match.groups()
if trace_id is not None:
trace_id = "{:032x}".format(int(trace_id, 16))
- if span_id is not None:
- span_id = "{:016x}".format(int(span_id, 16))
+ if parent_span_id is not None:
+ parent_span_id = "{:016x}".format(int(parent_span_id, 16))
if sampled_str:
- sampled = sampled_str != "0" # type: Optional[bool]
+ parent_sampled = sampled_str != "0" # type: Optional[bool]
else:
- sampled = None
+ parent_sampled = None
return Transaction(
- trace_id=trace_id, parent_span_id=span_id, sampled=sampled, **kwargs
+ trace_id=trace_id,
+ parent_span_id=parent_span_id,
+ sampled=parent_sampled,
+ **kwargs
)
def to_traceparent(self):
@@ -436,16 +471,14 @@ def __init__(
def __repr__(self):
# type: () -> str
- return (
- "<%s(name=%r, trace_id=%r, span_id=%r, parent_span_id=%r, sampled=%r)>"
- % (
- self.__class__.__name__,
- self.name,
- self.trace_id,
- self.span_id,
- self.parent_span_id,
- self.sampled,
- )
+ return "<%s(name=%r, op=%r, trace_id=%r, span_id=%r, parent_span_id=%r, sampled=%r)>" % (
+ self.__class__.__name__,
+ self.name,
+ self.op,
+ self.trace_id,
+ self.span_id,
+ self.parent_span_id,
+ self.sampled,
)
def finish(self, hub=None):
@@ -454,7 +487,9 @@ def finish(self, hub=None):
# This transaction is already finished, ignore.
return None
+ # This is a de facto proxy for checking if sampled = False
if self._span_recorder is None:
+ logger.debug("Discarding transaction because sampled = False")
return None
hub = hub or self.hub or sentry_sdk.Hub.current
diff --git a/tests/conftest.py b/tests/conftest.py
index 1c368a5b14..d5589238b5 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -48,6 +48,8 @@ def _capture_internal_exception(self, exc_info):
@request.addfinalizer
def _():
+ # rerasise the errors so that this just acts as a pass-through (that
+ # happens to keep track of the errors which pass through it)
for e in errors:
reraise(*e)
diff --git a/tests/integrations/stdlib/test_httplib.py b/tests/integrations/stdlib/test_httplib.py
index a8d9a6a458..ed062761bb 100644
--- a/tests/integrations/stdlib/test_httplib.py
+++ b/tests/integrations/stdlib/test_httplib.py
@@ -4,13 +4,17 @@
import pytest
try:
+ # py3
from urllib.request import urlopen
except ImportError:
+ # py2
from urllib import urlopen
try:
+ # py2
from httplib import HTTPSConnection
except ImportError:
+ # py3
from http.client import HTTPSConnection
from sentry_sdk import capture_message
diff --git a/tests/tracing/test_integration_tests.py b/tests/tracing/test_integration_tests.py
index 7423e4bd1e..3f5025e41f 100644
--- a/tests/tracing/test_integration_tests.py
+++ b/tests/tracing/test_integration_tests.py
@@ -51,11 +51,13 @@ def test_continue_from_headers(sentry_init, capture_events, sampled):
sentry_init(traces_sample_rate=1.0)
events = capture_events()
+ # make a parent transaction (normally this would be in a different service)
with start_transaction(name="hi"):
with start_span() as old_span:
old_span.sampled = sampled
headers = dict(Hub.current.iter_trace_propagation_headers())
+ # test that the sampling decision is getting encoded in the header correctly
header = headers["sentry-trace"]
if sampled is True:
assert header.endswith("-1")
@@ -64,6 +66,8 @@ def test_continue_from_headers(sentry_init, capture_events, sampled):
if sampled is None:
assert header.endswith("-")
+ # child transaction, to prove that we can read 'sentry-trace' header data
+ # correctly
transaction = Transaction.continue_from_headers(headers, name="WRONG")
assert transaction is not None
assert transaction.sampled == sampled
@@ -72,6 +76,9 @@ def test_continue_from_headers(sentry_init, capture_events, sampled):
assert transaction.parent_span_id == old_span.span_id
assert transaction.span_id != old_span.span_id
+ # add child transaction to the scope, to show that the captured message will
+ # be tagged with the trace id (since it happens while the transaction is
+ # open)
with start_transaction(transaction):
with configure_scope() as scope:
scope.transaction = "ho"
diff --git a/tests/tracing/test_misc.py b/tests/tracing/test_misc.py
index ce717437ea..8cb4988f2a 100644
--- a/tests/tracing/test_misc.py
+++ b/tests/tracing/test_misc.py
@@ -14,6 +14,12 @@ def test_span_trimming(sentry_init, capture_events):
pass
(event,) = events
+
+ # the transaction is its own first span (which counts for max_spans) but it
+ # doesn't show up in the span list in the event, so this is 1 less than our
+ # max_spans value
+ assert len(event["spans"]) == 2
+
span1, span2 = event["spans"]
assert span1["op"] == "foo0"
assert span2["op"] == "foo1"
From cb96afce8b54217a251b7dec0f39febd28aa2b1b Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Fri, 16 Oct 2020 21:39:09 +0200
Subject: [PATCH 0054/2327] feat: Automatically determine release and
environment (#871)
---
sentry_sdk/client.py | 6 +++--
sentry_sdk/utils.py | 52 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 168198adb9..bc9048214b 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -12,6 +12,8 @@
disable_capture_event,
format_timestamp,
get_type_name,
+ get_default_release,
+ get_default_environment,
handle_in_app,
logger,
)
@@ -62,10 +64,10 @@ def _get_options(*args, **kwargs):
rv["dsn"] = os.environ.get("SENTRY_DSN")
if rv["release"] is None:
- rv["release"] = os.environ.get("SENTRY_RELEASE")
+ rv["release"] = get_default_release()
if rv["environment"] is None:
- rv["environment"] = os.environ.get("SENTRY_ENVIRONMENT")
+ rv["environment"] = get_default_environment(rv["release"])
if rv["server_name"] is None and hasattr(socket, "gethostname"):
rv["server_name"] = socket.gethostname()
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 2a8798adb0..d39b0c1e40 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -4,6 +4,7 @@
import os
import sys
import threading
+import subprocess
from datetime import datetime
@@ -52,6 +53,57 @@ def _get_debug_hub():
pass
+def get_default_release():
+ # type: () -> Optional[str]
+ """Try to guess a default release."""
+ release = os.environ.get("SENTRY_RELEASE")
+ if release:
+ return release
+
+ with open(os.path.devnull, "w+") as null:
+ try:
+ release = (
+ subprocess.Popen(
+ ["git", "rev-parse", "--short", "HEAD"],
+ stdout=subprocess.PIPE,
+ stderr=null,
+ stdin=null,
+ )
+ .communicate()[0]
+ .strip()
+ .decode("utf-8")
+ )
+ except (OSError, IOError):
+ pass
+
+ if release:
+ return release
+
+ for var in (
+ "HEROKU_SLUG_COMMIT",
+ "SOURCE_VERSION",
+ "CODEBUILD_RESOLVED_SOURCE_VERSION",
+ "CIRCLE_SHA1",
+ "GAE_DEPLOYMENT_ID",
+ ):
+ release = os.environ.get(var)
+ if release:
+ return release
+ return None
+
+
+def get_default_environment(
+ release=None, # type: Optional[str]
+):
+ # type: (...) -> Optional[str]
+ rv = os.environ.get("SENTRY_ENVIRONMENT")
+ if rv:
+ return rv
+ if release is not None:
+ return "production"
+ return None
+
+
class CaptureInternalException(object):
__slots__ = ()
From ed0e15db544c392a7a1d6be973644a54f01c08a0 Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Fri, 16 Oct 2020 21:40:54 +0200
Subject: [PATCH 0055/2327] doc: Added changelog entry for automatic releases
---
CHANGES.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 17ae6973a4..a7425b7fb9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,10 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 0.19.2
+
+* Added support for automatic release and environment configuration for some common situations.
+
## 0.19.1
* Fix dependency check for `blinker` fixes #858
From b2badefc7dce6af6b2603ca24275b66e11f746f4 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Sat, 17 Oct 2020 00:04:56 -0700
Subject: [PATCH 0056/2327] pin pytest-django version (#873)
---
tox.ini | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/tox.ini b/tox.ini
index e902dea412..cb0008702f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -91,7 +91,18 @@ deps =
{py2.7,py3.7,py3.8,py3.9}-django-{1.11,2.2,3.0,3.1,dev}: psycopg2-binary
django-{1.6,1.7,1.8}: pytest-django<3.0
- django-{1.9,1.10,1.11,2.0,2.1,2.2,3.0,3.1}: pytest-django>=3.0
+
+ ; TODO: once we upgrade pytest to at least 5.4, we can split it like this:
+ ; django-{1.9,1.10,1.11,2.0,2.1}: pytest-django<4.0
+ ; django-{2.2,3.0,3.1}: pytest-django>=4.0
+
+ ; (note that py3.9, on which we recently began testing, only got official
+ ; support in pytest-django >=4.0, so we probablly want to upgrade the whole
+ ; kit and kaboodle at some point soon)
+
+ ; see https://pytest-django.readthedocs.io/en/latest/changelog.html#v4-0-0-2020-10-16
+ django-{1.9,1.10,1.11,2.0,2.1,2.2,3.0,3.1}: pytest-django<4.0
+
django-dev: git+https://github.com/pytest-dev/pytest-django#egg=pytest-django
django-1.6: Django>=1.6,<1.7
From f0bbd04b5a581041456caa5214cb46e826ba8e4f Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 19 Oct 2020 10:35:17 +0200
Subject: [PATCH 0057/2327] fix: Fix crash with Django 3.1 async views (#851)
Co-authored-by: william chu
Co-authored-by: sentry-bot
---
sentry_sdk/integrations/django/asgi.py | 23 ++++++++++--
sentry_sdk/integrations/django/views.py | 40 +++++++++++++++++----
tests/integrations/django/asgi/test_asgi.py | 34 ++++++++++++++----
tests/integrations/django/myapp/urls.py | 4 +++
tests/integrations/django/myapp/views.py | 18 ++++++++--
5 files changed, 101 insertions(+), 18 deletions(-)
diff --git a/sentry_sdk/integrations/django/asgi.py b/sentry_sdk/integrations/django/asgi.py
index 075870574e..3c690fb6a1 100644
--- a/sentry_sdk/integrations/django/asgi.py
+++ b/sentry_sdk/integrations/django/asgi.py
@@ -6,10 +6,9 @@
`django.core.handlers.asgi`.
"""
-from sentry_sdk import Hub
+from sentry_sdk import Hub, _functools
from sentry_sdk._types import MYPY
-from sentry_sdk.integrations.django import DjangoIntegration
from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
if MYPY:
@@ -21,6 +20,9 @@
def patch_django_asgi_handler_impl(cls):
# type: (Any) -> None
+
+ from sentry_sdk.integrations.django import DjangoIntegration
+
old_app = cls.__call__
async def sentry_patched_asgi_handler(self, scope, receive, send):
@@ -50,6 +52,9 @@ async def sentry_patched_get_response_async(self, request):
def patch_channels_asgi_handler_impl(cls):
# type: (Any) -> None
+
+ from sentry_sdk.integrations.django import DjangoIntegration
+
old_app = cls.__call__
async def sentry_patched_asgi_handler(self, receive, send):
@@ -64,3 +69,17 @@ async def sentry_patched_asgi_handler(self, receive, send):
return await middleware(self.scope)(receive, send)
cls.__call__ = sentry_patched_asgi_handler
+
+
+def wrap_async_view(hub, callback):
+ # type: (Hub, Any) -> Any
+ @_functools.wraps(callback)
+ async def sentry_wrapped_callback(request, *args, **kwargs):
+ # type: (Any, *Any, **Any) -> Any
+
+ with hub.start_span(
+ op="django.view", description=request.resolver_match.view_name
+ ):
+ return await callback(request, *args, **kwargs)
+
+ return sentry_wrapped_callback
diff --git a/sentry_sdk/integrations/django/views.py b/sentry_sdk/integrations/django/views.py
index b73ebf29ea..51f1abc8fb 100644
--- a/sentry_sdk/integrations/django/views.py
+++ b/sentry_sdk/integrations/django/views.py
@@ -6,6 +6,18 @@
from typing import Any
+try:
+ from asyncio import iscoroutinefunction
+except ImportError:
+ iscoroutinefunction = None # type: ignore
+
+
+try:
+ from sentry_sdk.integrations.django.asgi import wrap_async_view
+except (ImportError, SyntaxError):
+ wrap_async_view = None # type: ignore
+
+
def patch_views():
# type: () -> None
@@ -27,13 +39,14 @@ def sentry_patched_make_view_atomic(self, *args, **kwargs):
if integration is not None and integration.middleware_spans:
- @_functools.wraps(callback)
- def sentry_wrapped_callback(request, *args, **kwargs):
- # type: (Any, *Any, **Any) -> Any
- with hub.start_span(
- op="django.view", description=request.resolver_match.view_name
- ):
- return callback(request, *args, **kwargs)
+ if (
+ iscoroutinefunction is not None
+ and wrap_async_view is not None
+ and iscoroutinefunction(callback)
+ ):
+ sentry_wrapped_callback = wrap_async_view(hub, callback)
+ else:
+ sentry_wrapped_callback = _wrap_sync_view(hub, callback)
else:
sentry_wrapped_callback = callback
@@ -41,3 +54,16 @@ def sentry_wrapped_callback(request, *args, **kwargs):
return sentry_wrapped_callback
BaseHandler.make_view_atomic = sentry_patched_make_view_atomic
+
+
+def _wrap_sync_view(hub, callback):
+ # type: (Hub, Any) -> Any
+ @_functools.wraps(callback)
+ def sentry_wrapped_callback(request, *args, **kwargs):
+ # type: (Any, *Any, **Any) -> Any
+ with hub.start_span(
+ op="django.view", description=request.resolver_match.view_name
+ ):
+ return callback(request, *args, **kwargs)
+
+ return sentry_wrapped_callback
diff --git a/tests/integrations/django/asgi/test_asgi.py b/tests/integrations/django/asgi/test_asgi.py
index 5b886bb011..6eea32caa7 100644
--- a/tests/integrations/django/asgi/test_asgi.py
+++ b/tests/integrations/django/asgi/test_asgi.py
@@ -1,12 +1,8 @@
-import pytest
-
import django
-
+import pytest
from channels.testing import HttpCommunicator
-
from sentry_sdk import capture_message
from sentry_sdk.integrations.django import DjangoIntegration
-
from tests.integrations.django.myapp.asgi import channels_application
APPS = [channels_application]
@@ -18,7 +14,7 @@
@pytest.mark.parametrize("application", APPS)
@pytest.mark.asyncio
-async def test_basic(sentry_init, capture_events, application, request):
+async def test_basic(sentry_init, capture_events, application):
sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
events = capture_events()
@@ -46,3 +42,29 @@ async def test_basic(sentry_init, capture_events, application, request):
capture_message("hi")
event = events[-1]
assert "request" not in event
+
+
+@pytest.mark.parametrize("application", APPS)
+@pytest.mark.asyncio
+@pytest.mark.skipif(
+ django.VERSION < (3, 1), reason="async views have been introduced in Django 3.1"
+)
+async def test_async_views(sentry_init, capture_events, application):
+ sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
+
+ events = capture_events()
+
+ comm = HttpCommunicator(application, "GET", "/async_message")
+ response = await comm.get_response()
+ assert response["status"] == 200
+
+ (event,) = events
+
+ assert event["transaction"] == "/async_message"
+ assert event["request"] == {
+ "cookies": {},
+ "headers": {},
+ "method": "GET",
+ "query_string": None,
+ "url": "/async_message",
+ }
diff --git a/tests/integrations/django/myapp/urls.py b/tests/integrations/django/myapp/urls.py
index f29c2173e9..5131d8674f 100644
--- a/tests/integrations/django/myapp/urls.py
+++ b/tests/integrations/django/myapp/urls.py
@@ -57,7 +57,11 @@ def path(path, *args, **kwargs):
),
]
+# async views
+if views.async_message is not None:
+ urlpatterns.append(path("async_message", views.async_message, name="async_message"))
+# rest framework
try:
urlpatterns.append(
path("rest-framework-exc", views.rest_framework_exc, name="rest_framework_exc")
diff --git a/tests/integrations/django/myapp/views.py b/tests/integrations/django/myapp/views.py
index 85ac483818..1c78837ee4 100644
--- a/tests/integrations/django/myapp/views.py
+++ b/tests/integrations/django/myapp/views.py
@@ -1,11 +1,12 @@
+from django import VERSION
from django.contrib.auth import login
from django.contrib.auth.models import User
from django.core.exceptions import PermissionDenied
-from django.http import HttpResponse, HttpResponseServerError, HttpResponseNotFound
+from django.http import HttpResponse, HttpResponseNotFound, HttpResponseServerError
from django.shortcuts import render
-from django.views.generic import ListView
-from django.views.decorators.csrf import csrf_exempt
from django.utils.decorators import method_decorator
+from django.views.decorators.csrf import csrf_exempt
+from django.views.generic import ListView
try:
from rest_framework.decorators import api_view
@@ -120,3 +121,14 @@ def permission_denied_exc(*args, **kwargs):
def csrf_hello_not_exempt(*args, **kwargs):
return HttpResponse("ok")
+
+
+if VERSION >= (3, 1):
+ # Use exec to produce valid Python 2
+ exec(
+ """async def async_message(request):
+ sentry_sdk.capture_message("hi")
+ return HttpResponse("ok")"""
+ )
+else:
+ async_message = None
From 62ca43a4638ac6a2f4f8e7864275049894b13299 Mon Sep 17 00:00:00 2001
From: Adam Johnson
Date: Mon, 19 Oct 2020 09:44:14 +0100
Subject: [PATCH 0058/2327] Add documentation and changelog links on PyPI
(#859)
These appear on the sidebar and provide neat, somewhat standard shortcuts to useful places. cf. [scout-apm](https://pypi.org/project/scout-apm/) , as defined in https://github.com/scoutapp/scout_apm_python/blob/631f2432f643d256ad5ab7ff6b8f7b95b14231f5/setup.py#L44
---
setup.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/setup.py b/setup.py
index 5f2679b55d..bcfe73152b 100644
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,10 @@
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
+ project_urls={
+ "Documentation": "https://docs.sentry.io/platforms/python/",
+ "Changelog": "https://github.com/getsentry/sentry-python/blob/master/CHANGES.md",
+ },
description="Python client for Sentry (https://sentry.io)",
long_description=__doc__,
packages=find_packages(exclude=("tests", "tests.*")),
From c752e9f28d733b85ef7eb5616bc0c9871c848317 Mon Sep 17 00:00:00 2001
From: Chillar Anand
Date: Mon, 19 Oct 2020 16:20:13 +0530
Subject: [PATCH 0059/2327] fix(django): Fix complex either url patterns in
Django (#875)
---
sentry_sdk/integrations/django/transactions.py | 2 +-
tests/integrations/django/test_transactions.py | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/sentry_sdk/integrations/django/transactions.py b/sentry_sdk/integrations/django/transactions.py
index f20866ef95..146a71a362 100644
--- a/sentry_sdk/integrations/django/transactions.py
+++ b/sentry_sdk/integrations/django/transactions.py
@@ -37,7 +37,7 @@ def get_regex(resolver_or_pattern):
class RavenResolver(object):
_optional_group_matcher = re.compile(r"\(\?\:([^\)]+)\)")
- _named_group_matcher = re.compile(r"\(\?P<(\w+)>[^\)]+\)")
+ _named_group_matcher = re.compile(r"\(\?P<(\w+)>[^\)]+\)+")
_non_named_group_matcher = re.compile(r"\([^\)]+\)")
# [foo|bar|baz]
_either_option_matcher = re.compile(r"\[([^\]]+)\|([^\]]+)\]")
diff --git a/tests/integrations/django/test_transactions.py b/tests/integrations/django/test_transactions.py
index 5cf3f17c32..799eaa4e89 100644
--- a/tests/integrations/django/test_transactions.py
+++ b/tests/integrations/django/test_transactions.py
@@ -19,6 +19,7 @@
example_url_conf = (
url(r"^api/(?P[\w_-]+)/store/$", lambda x: ""),
+ url(r"^api/(?P(v1|v2))/author/$", lambda x: ""),
url(r"^report/", lambda x: ""),
url(r"^example/", include(included_url_conf)),
)
@@ -36,6 +37,14 @@ def test_legacy_resolver_complex_match():
assert result == "/api/{project_id}/store/"
+def test_legacy_resolver_complex_either_match():
+ resolver = RavenResolver()
+ result = resolver.resolve("/api/v1/author/", example_url_conf)
+ assert result == "/api/{version}/author/"
+ result = resolver.resolve("/api/v2/author/", example_url_conf)
+ assert result == "/api/{version}/author/"
+
+
def test_legacy_resolver_included_match():
resolver = RavenResolver()
result = resolver.resolve("/example/foo/bar/baz", example_url_conf)
From 1cf5d8dc275f364ce89b3d0469a3e233817743f8 Mon Sep 17 00:00:00 2001
From: Anton Ovchar <47284881+asovchar@users.noreply.github.com>
Date: Mon, 19 Oct 2020 14:26:26 +0300
Subject: [PATCH 0060/2327] Add transaction styling for aiohttp integration
(#876)
---
sentry_sdk/integrations/aiohttp.py | 22 ++++++++++++-
tests/integrations/aiohttp/test_aiohttp.py | 37 ++++++++++++++++++++++
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py
index 61973ee9b6..a9c82544a0 100644
--- a/sentry_sdk/integrations/aiohttp.py
+++ b/sentry_sdk/integrations/aiohttp.py
@@ -43,9 +43,21 @@
from sentry_sdk._types import EventProcessor
+TRANSACTION_STYLE_VALUES = ("handler_name", "method_and_path_pattern")
+
+
class AioHttpIntegration(Integration):
identifier = "aiohttp"
+ def __init__(self, transaction_style="handler_name"):
+ # type: (str) -> None
+ if transaction_style not in TRANSACTION_STYLE_VALUES:
+ raise ValueError(
+ "Invalid value for transaction_style: %s (must be in %s)"
+ % (transaction_style, TRANSACTION_STYLE_VALUES)
+ )
+ self.transaction_style = transaction_style
+
@staticmethod
def setup_once():
# type: () -> None
@@ -120,10 +132,18 @@ async def sentry_urldispatcher_resolve(self, request):
# type: (UrlDispatcher, Request) -> AbstractMatchInfo
rv = await old_urldispatcher_resolve(self, request)
+ hub = Hub.current
+ integration = hub.get_integration(AioHttpIntegration)
+
name = None
try:
- name = transaction_from_function(rv.handler)
+ if integration.transaction_style == "handler_name":
+ name = transaction_from_function(rv.handler)
+ elif integration.transaction_style == "method_and_path_pattern":
+ route_info = rv.get_info()
+ pattern = route_info.get("path") or route_info.get("formatter")
+ name = "{} {}".format(request.method, pattern)
except Exception:
pass
diff --git a/tests/integrations/aiohttp/test_aiohttp.py b/tests/integrations/aiohttp/test_aiohttp.py
index 0b2819f2cc..05f235e12a 100644
--- a/tests/integrations/aiohttp/test_aiohttp.py
+++ b/tests/integrations/aiohttp/test_aiohttp.py
@@ -2,6 +2,7 @@
import json
from contextlib import suppress
+import pytest
from aiohttp import web
from aiohttp.client import ServerDisconnectedError
@@ -186,3 +187,39 @@ async def hello(request):
event["transaction"]
== "tests.integrations.aiohttp.test_aiohttp.test_tracing..hello"
)
+
+
+@pytest.mark.parametrize(
+ "transaction_style,expected_transaction",
+ [
+ (
+ "handler_name",
+ "tests.integrations.aiohttp.test_aiohttp.test_transaction_style..hello",
+ ),
+ ("method_and_path_pattern", "GET /{var}"),
+ ],
+)
+async def test_transaction_style(
+ sentry_init, aiohttp_client, capture_events, transaction_style, expected_transaction
+):
+ sentry_init(
+ integrations=[AioHttpIntegration(transaction_style=transaction_style)],
+ traces_sample_rate=1.0,
+ )
+
+ async def hello(request):
+ return web.Response(text="hello")
+
+ app = web.Application()
+ app.router.add_get(r"/{var}", hello)
+
+ events = capture_events()
+
+ client = await aiohttp_client(app)
+ resp = await client.get("/1")
+ assert resp.status == 200
+
+ (event,) = events
+
+ assert event["type"] == "transaction"
+ assert event["transaction"] == expected_transaction
From 44fbdce0c512e9577055ba269e43f02cc37c2cfd Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Mon, 19 Oct 2020 15:21:29 -0700
Subject: [PATCH 0061/2327] feat(dev): Add fixtures for testing
`traces_sampler` (#867)
Adds `StringContaining` and `DictionaryContaining` matchers for assertions about function call arguments.
---
test-requirements.txt | 1 +
tests/conftest.py | 86 +++++++++++++++++++++++++++++++++++++++++++
tox.ini | 3 ++
3 files changed, 90 insertions(+)
diff --git a/test-requirements.txt b/test-requirements.txt
index bd518645e2..4112712ebb 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,6 +6,7 @@ pytest-localserver==0.5.0
pytest-cov==2.8.1
jsonschema==3.2.0
pyrsistent==0.16.0 # TODO(py3): 0.17.0 requires python3, see https://github.com/tobgu/pyrsistent/issues/205
+mock # for testing under python < 3.3
gevent
eventlet
diff --git a/tests/conftest.py b/tests/conftest.py
index d5589238b5..499bfc7cf0 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,5 +1,6 @@
import os
import json
+from types import FunctionType
import pytest
import jsonschema
@@ -36,6 +37,11 @@ def benchmark():
else:
del pytest_benchmark
+try:
+ from unittest import mock # python 3.3 and above
+except ImportError:
+ import mock # python < 3.3
+
@pytest.fixture(autouse=True)
def internal_exceptions(request, monkeypatch):
@@ -327,3 +333,83 @@ def render_span(span):
return "\n".join(render_span(root_span))
return inner
+
+
+@pytest.fixture(name="StringContaining")
+def string_containing_matcher():
+ """
+ An object which matches any string containing the substring passed to the
+ object at instantiation time.
+
+ Useful for assert_called_with, assert_any_call, etc.
+
+ Used like this:
+
+ >>> f = mock.Mock(return_value=None)
+ >>> f("dogs are great")
+ >>> f.assert_any_call("dogs") # will raise AssertionError
+ Traceback (most recent call last):
+ ...
+ AssertionError: mock('dogs') call not found
+ >>> f.assert_any_call(StringContaining("dogs")) # no AssertionError
+
+ """
+
+ class StringContaining(object):
+ def __init__(self, substring):
+ self.substring = substring
+
+ def __eq__(self, test_string):
+ if not isinstance(test_string, str):
+ return False
+
+ return self.substring in test_string
+
+ return StringContaining
+
+
+@pytest.fixture(name="DictionaryContaining")
+def dictionary_containing_matcher():
+ """
+ An object which matches any dictionary containing all key-value pairs from
+ the dictionary passed to the object at instantiation time.
+
+ Useful for assert_called_with, assert_any_call, etc.
+
+ Used like this:
+
+ >>> f = mock.Mock(return_value=None)
+ >>> f({"dogs": "yes", "cats": "maybe"})
+ >>> f.assert_any_call({"dogs": "yes"}) # will raise AssertionError
+ Traceback (most recent call last):
+ ...
+ AssertionError: mock({'dogs': 'yes'}) call not found
+ >>> f.assert_any_call(DictionaryContaining({"dogs": "yes"})) # no AssertionError
+ """
+
+ class DictionaryContaining(object):
+ def __init__(self, subdict):
+ self.subdict = subdict
+
+ def __eq__(self, test_dict):
+ if not isinstance(test_dict, dict):
+ return False
+
+ return all(test_dict.get(key) == self.subdict[key] for key in self.subdict)
+
+ return DictionaryContaining
+
+
+@pytest.fixture(name="FunctionMock")
+def function_mock():
+ """
+ Just like a mock.Mock object, but one which always passes an isfunction
+ test.
+ """
+
+ class FunctionMock(mock.Mock):
+ def __init__(self, *args, **kwargs):
+ super(FunctionMock, self).__init__(*args, **kwargs)
+ self.__class__ = FunctionType
+
+ return FunctionMock
diff --git a/tox.ini b/tox.ini
index cb0008702f..a29ba612fd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -83,6 +83,9 @@ envlist =
[testenv]
deps =
+ # if you change test-requirements.txt and your change is not being reflected
+ # in what's installed by tox (when running tox locally), try running tox
+ # with the -r flag
-r test-requirements.txt
django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: djangorestframework>=3.0.0,<4.0.0
From 34d9d7307379933516e803fb9d76f590a00cc139 Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Tue, 20 Oct 2020 12:12:59 +0200
Subject: [PATCH 0062/2327] feat(attachments): Add basic support for
attachments (#856)
---
sentry_sdk/attachments.py | 55 +++++++++++++++++++++++++++++++++++++++
sentry_sdk/client.py | 41 +++++++++++++++++------------
sentry_sdk/envelope.py | 42 +++++++-----------------------
sentry_sdk/scope.py | 39 ++++++++++++++++++++++++++-
tests/conftest.py | 6 +++--
tests/test_basics.py | 34 ++++++++++++++++++++++++
6 files changed, 166 insertions(+), 51 deletions(-)
create mode 100644 sentry_sdk/attachments.py
diff --git a/sentry_sdk/attachments.py b/sentry_sdk/attachments.py
new file mode 100644
index 0000000000..b7b6b0b45b
--- /dev/null
+++ b/sentry_sdk/attachments.py
@@ -0,0 +1,55 @@
+import os
+import mimetypes
+
+from sentry_sdk._types import MYPY
+from sentry_sdk.envelope import Item, PayloadRef
+
+if MYPY:
+ from typing import Optional, Union, Callable
+
+
+class Attachment(object):
+ def __init__(
+ self,
+ bytes=None, # type: Union[None, bytes, Callable[[], bytes]]
+ filename=None, # type: Optional[str]
+ path=None, # type: Optional[str]
+ content_type=None, # type: Optional[str]
+ add_to_transactions=False, # type: bool
+ ):
+ # type: (...) -> None
+ if bytes is None and path is None:
+ raise TypeError("path or raw bytes required for attachment")
+ if filename is None and path is not None:
+ filename = os.path.basename(path)
+ if filename is None:
+ raise TypeError("filename is required for attachment")
+ if content_type is None:
+ content_type = mimetypes.guess_type(filename)[0]
+ self.bytes = bytes
+ self.filename = filename
+ self.path = path
+ self.content_type = content_type
+ self.add_to_transactions = add_to_transactions
+
+ def to_envelope_item(self):
+ # type: () -> Item
+ """Returns an envelope item for this attachment."""
+ payload = None # type: Union[None, PayloadRef, bytes]
+ if self.bytes is not None:
+ if callable(self.bytes):
+ payload = self.bytes()
+ else:
+ payload = self.bytes
+ else:
+ payload = PayloadRef(path=self.path)
+ return Item(
+ payload=payload,
+ type="attachment",
+ content_type=self.content_type,
+ filename=self.filename,
+ )
+
+ def __repr__(self):
+ # type: () -> str
+ return "" % (self.filename,)
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index bc9048214b..19dd4ab33d 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -23,7 +23,7 @@
from sentry_sdk.integrations import setup_integrations
from sentry_sdk.utils import ContextVar
from sentry_sdk.sessions import SessionFlusher
-from sentry_sdk.envelope import Envelope, Item, PayloadRef
+from sentry_sdk.envelope import Envelope
from sentry_sdk._types import MYPY
@@ -146,7 +146,7 @@ def dsn(self):
def _prepare_event(
self,
event, # type: Event
- hint, # type: Optional[Hint]
+ hint, # type: Hint
scope, # type: Optional[Scope]
):
# type: (...) -> Optional[Event]
@@ -154,8 +154,6 @@ def _prepare_event(
if event.get("timestamp") is None:
event["timestamp"] = datetime.utcnow()
- hint = dict(hint or ()) # type: Hint
-
if scope is not None:
event_ = scope.apply_to_event(event, hint)
if event_ is None:
@@ -322,10 +320,13 @@ def capture_event(
if hint is None:
hint = {}
event_id = event.get("event_id")
+ hint = dict(hint or ()) # type: Hint
+
if event_id is None:
event["event_id"] = event_id = uuid.uuid4().hex
if not self._should_capture(event, hint, scope):
return None
+
event_opt = self._prepare_event(event, hint, scope)
if event_opt is None:
return None
@@ -336,19 +337,27 @@ def capture_event(
if session:
self._update_session_from_event(session, event)
- if event_opt.get("type") == "transaction":
- # Transactions should go to the /envelope/ endpoint.
- self.transport.capture_envelope(
- Envelope(
- headers={
- "event_id": event_opt["event_id"],
- "sent_at": format_timestamp(datetime.utcnow()),
- },
- items=[
- Item(payload=PayloadRef(json=event_opt), type="transaction"),
- ],
- )
+ attachments = hint.get("attachments")
+ is_transaction = event_opt.get("type") == "transaction"
+
+ if is_transaction or attachments:
+ # Transactions or events with attachments should go to the
+ # /envelope/ endpoint.
+ envelope = Envelope(
+ headers={
+ "event_id": event_opt["event_id"],
+ "sent_at": format_timestamp(datetime.utcnow()),
+ }
)
+
+ if is_transaction:
+ envelope.add_transaction(event_opt)
+ else:
+ envelope.add_event(event_opt)
+
+ for attachment in attachments or ():
+ envelope.add_item(attachment.to_envelope_item())
+ self.transport.capture_envelope(envelope)
else:
# All other events go to the /store/ endpoint.
self.transport.capture_event(event_opt)
diff --git a/sentry_sdk/envelope.py b/sentry_sdk/envelope.py
index b268e7987a..119abf810f 100644
--- a/sentry_sdk/envelope.py
+++ b/sentry_sdk/envelope.py
@@ -1,17 +1,14 @@
import io
import json
-import shutil
import mimetypes
from sentry_sdk._compat import text_type
from sentry_sdk._types import MYPY
from sentry_sdk.sessions import Session
-from sentry_sdk.tracing import Transaction
-from sentry_sdk.utils import json_dumps
+from sentry_sdk.utils import json_dumps, capture_internal_exceptions
if MYPY:
from typing import Any
- from typing import Tuple
from typing import Optional
from typing import Union
from typing import Dict
@@ -24,7 +21,7 @@
class Envelope(object):
def __init__(
self,
- headers=None, # type: Optional[Dict[str, str]]
+ headers=None, # type: Optional[Dict[str, Any]]
items=None, # type: Optional[List[Item]]
):
# type: (...) -> None
@@ -52,7 +49,7 @@ def add_event(
self.add_item(Item(payload=PayloadRef(json=event), type="event"))
def add_transaction(
- self, transaction # type: Transaction
+ self, transaction # type: Event
):
# type: (...) -> None
self.add_item(Item(payload=PayloadRef(json=transaction), type="transaction"))
@@ -148,34 +145,15 @@ def get_bytes(self):
# type: (...) -> bytes
if self.bytes is None:
if self.path is not None:
- with open(self.path, "rb") as f:
- self.bytes = f.read()
+ with capture_internal_exceptions():
+ with open(self.path, "rb") as f:
+ self.bytes = f.read()
elif self.json is not None:
self.bytes = json_dumps(self.json)
else:
self.bytes = b""
return self.bytes
- def _prepare_serialize(self):
- # type: (...) -> Tuple[Any, Any]
- if self.path is not None and self.bytes is None:
- f = open(self.path, "rb")
- f.seek(0, 2)
- length = f.tell()
- f.seek(0, 0)
-
- def writer(out):
- # type: (Any) -> None
- try:
- shutil.copyfileobj(f, out)
- finally:
- f.close()
-
- return length, writer
-
- bytes = self.get_bytes()
- return len(bytes), lambda f: f.write(bytes)
-
@property
def inferred_content_type(self):
# type: (...) -> str
@@ -199,7 +177,7 @@ class Item(object):
def __init__(
self,
payload, # type: Union[bytes, text_type, PayloadRef]
- headers=None, # type: Optional[Dict[str, str]]
+ headers=None, # type: Optional[Dict[str, Any]]
type=None, # type: Optional[str]
content_type=None, # type: Optional[str]
filename=None, # type: Optional[str]
@@ -279,11 +257,11 @@ def serialize_into(
):
# type: (...) -> None
headers = dict(self.headers)
- length, writer = self.payload._prepare_serialize()
- headers["length"] = length
+ bytes = self.get_bytes()
+ headers["length"] = len(bytes)
f.write(json_dumps(headers))
f.write(b"\n")
- writer(f)
+ f.write(bytes)
f.write(b"\n")
def serialize(self):
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
index bc3df8b97b..62e2320dc6 100644
--- a/sentry_sdk/scope.py
+++ b/sentry_sdk/scope.py
@@ -6,6 +6,7 @@
from sentry_sdk._types import MYPY
from sentry_sdk.utils import logger, capture_internal_exceptions
from sentry_sdk.tracing import Transaction
+from sentry_sdk.attachments import Attachment
if MYPY:
from typing import Any
@@ -90,6 +91,7 @@ class Scope(object):
"_should_capture",
"_span",
"_session",
+ "_attachments",
"_force_auto_session_tracking",
)
@@ -112,6 +114,7 @@ def clear(self):
self._tags = {} # type: Dict[str, Any]
self._contexts = {} # type: Dict[str, Dict[str, Any]]
self._extras = {} # type: Dict[str, Any]
+ self._attachments = [] # type: List[Attachment]
self.clear_breadcrumbs()
self._should_capture = True
@@ -251,6 +254,26 @@ def clear_breadcrumbs(self):
"""Clears breadcrumb buffer."""
self._breadcrumbs = deque() # type: Deque[Breadcrumb]
+ def add_attachment(
+ self,
+ bytes=None, # type: Optional[bytes]
+ filename=None, # type: Optional[str]
+ path=None, # type: Optional[str]
+ content_type=None, # type: Optional[str]
+ add_to_transactions=False, # type: bool
+ ):
+ # type: (...) -> None
+ """Adds an attachment to future events sent."""
+ self._attachments.append(
+ Attachment(
+ bytes=bytes,
+ path=path,
+ filename=filename,
+ content_type=content_type,
+ add_to_transactions=add_to_transactions,
+ )
+ )
+
def add_event_processor(
self, func # type: EventProcessor
):
@@ -310,10 +333,21 @@ def _drop(event, cause, ty):
logger.info("%s (%s) dropped event (%s)", ty, cause, event)
return None
+ is_transaction = event.get("type") == "transaction"
+
+ # put all attachments into the hint. This lets callbacks play around
+ # with attachments. We also later pull this out of the hint when we
+ # create the envelope.
+ attachments_to_send = hint.get("attachments") or []
+ for attachment in self._attachments:
+ if not is_transaction or attachment.add_to_transactions:
+ attachments_to_send.append(attachment)
+ hint["attachments"] = attachments_to_send
+
if self._level is not None:
event["level"] = self._level
- if event.get("type") != "transaction":
+ if not is_transaction:
event.setdefault("breadcrumbs", {}).setdefault("values", []).extend(
self._breadcrumbs
)
@@ -379,6 +413,8 @@ def update_from_scope(self, scope):
self._breadcrumbs.extend(scope._breadcrumbs)
if scope._span:
self._span = scope._span
+ if scope._attachments:
+ self._attachments.extend(scope._attachments)
def update_from_kwargs(
self,
@@ -425,6 +461,7 @@ def __copy__(self):
rv._span = self._span
rv._session = self._session
rv._force_auto_session_tracking = self._force_auto_session_tracking
+ rv._attachments = list(self._attachments)
return rv
diff --git a/tests/conftest.py b/tests/conftest.py
index 499bfc7cf0..e0dcc717bb 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -143,8 +143,10 @@ def check_string_keys(map):
def check_envelope(envelope):
with capture_internal_exceptions():
# Assert error events are sent without envelope to server, for compat.
- assert not any(item.data_category == "error" for item in envelope.items)
- assert not any(item.get_event() is not None for item in envelope.items)
+ # This does not apply if any item in the envelope is an attachment.
+ if not any(x.type == "attachment" for x in envelope.items):
+ assert not any(item.data_category == "error" for item in envelope.items)
+ assert not any(item.get_event() is not None for item in envelope.items)
def inner(client):
monkeypatch.setattr(
diff --git a/tests/test_basics.py b/tests/test_basics.py
index d7cc2d58cb..128b85d7a4 100644
--- a/tests/test_basics.py
+++ b/tests/test_basics.py
@@ -1,3 +1,4 @@
+import os
import logging
import pytest
@@ -222,6 +223,39 @@ def test_breadcrumbs(sentry_init, capture_events):
assert len(event["breadcrumbs"]["values"]) == 0
+def test_attachments(sentry_init, capture_envelopes):
+ sentry_init()
+ envelopes = capture_envelopes()
+
+ this_file = os.path.abspath(__file__.rstrip("c"))
+
+ with configure_scope() as scope:
+ scope.add_attachment(bytes=b"Hello World!", filename="message.txt")
+ scope.add_attachment(path=this_file)
+
+ capture_exception(ValueError())
+
+ (envelope,) = envelopes
+
+ assert len(envelope.items) == 3
+ assert envelope.get_event()["exception"] is not None
+
+ attachments = [x for x in envelope.items if x.type == "attachment"]
+ (message, pyfile) = attachments
+
+ assert message.headers["filename"] == "message.txt"
+ assert message.headers["type"] == "attachment"
+ assert message.headers["content_type"] == "text/plain"
+ assert message.payload.bytes == message.payload.get_bytes() == b"Hello World!"
+
+ assert pyfile.headers["filename"] == os.path.basename(this_file)
+ assert pyfile.headers["type"] == "attachment"
+ assert pyfile.headers["content_type"].startswith("text/")
+ assert pyfile.payload.bytes is None
+ with open(this_file, "rb") as f:
+ assert pyfile.payload.get_bytes() == f.read()
+
+
def test_integration_scoping(sentry_init, capture_events):
logger = logging.getLogger("test_basics")
From 4fab6dfaf17d90f6739964025dc538b9a83b8387 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Tue, 20 Oct 2020 08:10:01 -0700
Subject: [PATCH 0063/2327] fix(dev): Pin `eventlet` version (#880)
See https://github.com/eventlet/eventlet/issues/660.
---
test-requirements.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test-requirements.txt b/test-requirements.txt
index 4112712ebb..e6cb573190 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,7 +9,8 @@ pyrsistent==0.16.0 # TODO(py3): 0.17.0 requires python3, see https://github.com/
mock # for testing under python < 3.3
gevent
-eventlet
+# https://github.com/eventlet/eventlet/issues/660
+eventlet==0.28.0
# https://github.com/eventlet/eventlet/issues/619
dnspython<2.0
From 2348f52a08b88d9bd7cadf190273386deb0f3ed7 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Tue, 20 Oct 2020 13:53:39 -0700
Subject: [PATCH 0064/2327] fix(serialization): Adjust breadcrumb check for new
structure (#883)
Fixes a bug which resulted in events being capped at 10 breadcrumbs. More details in the PR description.
---
sentry_sdk/consts.py | 4 +++-
sentry_sdk/serializer.py | 4 ++--
tests/test_client.py | 25 +++++++++++++++++++++++++
3 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index e6676f32af..cc200107f6 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -31,6 +31,8 @@
total=False,
)
+DEFAULT_MAX_BREADCRUMBS = 100
+
# This type exists to trick mypy and PyCharm into thinking `init` and `Client`
# take these arguments (even though they take opaque **kwargs)
@@ -39,7 +41,7 @@ def __init__(
self,
dsn=None, # type: Optional[str]
with_locals=True, # type: bool
- max_breadcrumbs=100, # type: int
+ max_breadcrumbs=DEFAULT_MAX_BREADCRUMBS, # type: int
release=None, # type: Optional[str]
environment=None, # type: Optional[str]
server_name=None, # type: Optional[str]
diff --git a/sentry_sdk/serializer.py b/sentry_sdk/serializer.py
index fc293f6a65..4dc4bb5177 100644
--- a/sentry_sdk/serializer.py
+++ b/sentry_sdk/serializer.py
@@ -188,8 +188,8 @@ def _is_databag():
if p0 == "request" and path[1] == "data":
return True
- if p0 == "breadcrumbs":
- path[1]
+ if p0 == "breadcrumbs" and path[1] == "values":
+ path[2]
return True
if p0 == "extra":
diff --git a/tests/test_client.py b/tests/test_client.py
index b6e5a5f174..9137f4115a 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -10,6 +10,7 @@
from sentry_sdk import (
Hub,
Client,
+ add_breadcrumb,
configure_scope,
capture_message,
capture_exception,
@@ -21,6 +22,8 @@
from sentry_sdk.transport import Transport
from sentry_sdk._compat import reraise, text_type, PY2
from sentry_sdk.utils import HAS_CHAINED_EXCEPTIONS
+from sentry_sdk.serializer import MAX_DATABAG_BREADTH
+from sentry_sdk.consts import DEFAULT_MAX_BREADCRUMBS
if PY2:
# Importing ABCs from collections is deprecated, and will stop working in 3.8
@@ -611,6 +614,10 @@ def inner():
(event,) = events
+ assert (
+ len(event["exception"]["values"][0]["stacktrace"]["frames"][0]["vars"]["a"])
+ == MAX_DATABAG_BREADTH
+ )
assert len(json.dumps(event)) < 10000
@@ -860,3 +867,21 @@ def capture_event(self, event):
assert not envelopes
assert not events
+
+
+@pytest.mark.parametrize(
+ "sdk_options, expected_breadcrumbs",
+ [({}, DEFAULT_MAX_BREADCRUMBS), ({"max_breadcrumbs": 50}, 50)],
+)
+def test_max_breadcrumbs_option(
+ sentry_init, capture_events, sdk_options, expected_breadcrumbs
+):
+ sentry_init(sdk_options)
+ events = capture_events()
+
+ for _ in range(1231):
+ add_breadcrumb({"type": "sourdough"})
+
+ capture_message("dogs are great")
+
+ assert len(events[0]["breadcrumbs"]["values"]) == expected_breadcrumbs
From 4137a8d9db174a2fbd03ce9e44334fbc189d7048 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Wed, 21 Oct 2020 10:19:43 -0700
Subject: [PATCH 0065/2327] feat(tracing): Add types for `traces_sampler`
implementation (#864)
- Types for the `traces_sampler` itself (the function and its input)
- A new attribute on the `Transaction` class tracking the parent sampling decision separately from the sampling decision of the transaction itself, since part of the `traces_sampler` spec is that there needs to be a difference between an inherited decision and an explicitly set decision.
---
sentry_sdk/_types.py | 6 ++++++
sentry_sdk/consts.py | 8 +++++++-
sentry_sdk/tracing.py | 4 +++-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/sentry_sdk/_types.py b/sentry_sdk/_types.py
index 7b727422a1..95e4ac3ba3 100644
--- a/sentry_sdk/_types.py
+++ b/sentry_sdk/_types.py
@@ -5,6 +5,7 @@
if MYPY:
+ from numbers import Real
from types import TracebackType
from typing import Any
from typing import Callable
@@ -12,6 +13,7 @@
from typing import Optional
from typing import Tuple
from typing import Type
+ from typing import Union
from typing_extensions import Literal
ExcInfo = Tuple[
@@ -24,10 +26,14 @@
Breadcrumb = Dict[str, Any]
BreadcrumbHint = Dict[str, Any]
+ SamplingContext = Dict[str, Any]
+
EventProcessor = Callable[[Event, Hint], Optional[Event]]
ErrorProcessor = Callable[[Event, ExcInfo], Optional[Event]]
BreadcrumbProcessor = Callable[[Breadcrumb, BreadcrumbHint], Optional[Breadcrumb]]
+ TracesSampler = Callable[[SamplingContext], Union[Real, bool]]
+
# https://github.com/python/mypy/issues/5710
NotImplementedType = Any
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index cc200107f6..01cc7568fa 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -14,7 +14,12 @@
from sentry_sdk.transport import Transport
from sentry_sdk.integrations import Integration
- from sentry_sdk._types import Event, EventProcessor, BreadcrumbProcessor
+ from sentry_sdk._types import (
+ BreadcrumbProcessor,
+ Event,
+ EventProcessor,
+ TracesSampler,
+ )
# Experiments are feature flags to enable and disable certain unstable SDK
# functionality. Changing them from the defaults (`None`) in production
@@ -65,6 +70,7 @@ def __init__(
ca_certs=None, # type: Optional[str]
propagate_traces=True, # type: bool
traces_sample_rate=0.0, # type: float
+ traces_sampler=None, # type: Optional[TracesSampler]
auto_enabling_integrations=True, # type: bool
_experiments={}, # type: Experiments # noqa: B006
):
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index af256d583e..80b4b377d9 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -449,11 +449,12 @@ def get_trace_context(self):
class Transaction(Span):
- __slots__ = ("name",)
+ __slots__ = ("name", "parent_sampled")
def __init__(
self,
name="", # type: str
+ parent_sampled=None, # type: Optional[bool]
**kwargs # type: Any
):
# type: (...) -> None
@@ -468,6 +469,7 @@ def __init__(
name = kwargs.pop("transaction")
Span.__init__(self, **kwargs)
self.name = name
+ self.parent_sampled = parent_sampled
def __repr__(self):
# type: () -> str
From 874a46799ff771c5406e5d03fa962c2e835ce1bc Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Wed, 21 Oct 2020 11:25:39 -0700
Subject: [PATCH 0066/2327] feat(tracing): Add helper functions for new
`traces_sampler` option (#869)
- A function to determine if tracing is enabled
- A function to validate sample rates returned from `traces_sampler`
- A `to_json` method in the `Transaction` class building upon the one already in the `Span` class
---
sentry_sdk/tracing.py | 49 +++++++++++++++++++++++++++++++---
sentry_sdk/utils.py | 10 +++++++
tests/tracing/test_sampling.py | 41 ++++++++++++++++++++++++++++
3 files changed, 97 insertions(+), 3 deletions(-)
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 80b4b377d9..c908120032 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -1,9 +1,11 @@
import re
import uuid
import contextlib
+import math
import time
from datetime import datetime, timedelta
+from numbers import Real
import sentry_sdk
@@ -407,8 +409,8 @@ def finish(self, hub=None):
_maybe_create_breadcrumbs_from_span(hub, self)
return None
- def to_json(self, client):
- # type: (Optional[sentry_sdk.Client]) -> Dict[str, Any]
+ def to_json(self):
+ # type: () -> Dict[str, Any]
rv = {
"trace_id": self.trace_id,
"span_id": self.span_id,
@@ -517,7 +519,7 @@ def finish(self, hub=None):
return None
finished_spans = [
- span.to_json(client)
+ span.to_json()
for span in self._span_recorder.spans
if span is not self and span.timestamp is not None
]
@@ -534,6 +536,47 @@ def finish(self, hub=None):
}
)
+ def to_json(self):
+ # type: () -> Dict[str, Any]
+ rv = super(Transaction, self).to_json()
+
+ rv["name"] = self.name
+ rv["sampled"] = self.sampled
+ rv["parent_sampled"] = self.parent_sampled
+
+ return rv
+
+
+def _is_valid_sample_rate(rate):
+ # type: (Any) -> bool
+ """
+ Checks the given sample rate to make sure it is valid type and value (a
+ boolean or a number between 0 and 1, inclusive).
+ """
+
+ # both booleans and NaN are instances of Real, so a) checking for Real
+ # checks for the possibility of a boolean also, and b) we have to check
+ # separately for NaN
+ if not isinstance(rate, Real) or math.isnan(rate):
+ logger.warning(
+ "[Tracing] Given sample rate is invalid. Sample rate must be a boolean or a number between 0 and 1. Got {rate} of type {type}.".format(
+ rate=rate, type=type(rate)
+ )
+ )
+ return False
+
+ # in case rate is a boolean, it will get cast to 1 if it's True and 0 if it's False
+ rate = float(rate)
+ if rate < 0 or rate > 1:
+ logger.warning(
+ "[Tracing] Given sample rate is invalid. Sample rate must be between 0 and 1. Got {rate}.".format(
+ rate=rate
+ )
+ )
+ return False
+
+ return True
+
def _format_sql(cursor, sql):
# type: (Any, str) -> Optional[str]
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index d39b0c1e40..983465b26f 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -968,3 +968,13 @@ def run(self):
integer_configured_timeout
)
)
+
+
+def has_tracing_enabled(options):
+ # type: (Dict[str, Any]) -> bool
+ """
+ Returns True if either traces_sample_rate or traces_sampler is
+ non-zero/defined, False otherwise.
+ """
+
+ return bool(options.get("traces_sample_rate") or options.get("traces_sampler"))
diff --git a/tests/tracing/test_sampling.py b/tests/tracing/test_sampling.py
index 476d5e78c9..d166efb0a4 100644
--- a/tests/tracing/test_sampling.py
+++ b/tests/tracing/test_sampling.py
@@ -1,4 +1,13 @@
+import pytest
+
from sentry_sdk import start_span, start_transaction
+from sentry_sdk.tracing import _is_valid_sample_rate
+from sentry_sdk.utils import logger
+
+try:
+ from unittest import mock # python 3.3 and above
+except ImportError:
+ import mock # python < 3.3
def test_sampling_decided_only_for_transactions(sentry_init, capture_events):
@@ -32,3 +41,35 @@ def test_no_double_sampling(sentry_init, capture_events):
pass
assert len(events) == 1
+
+
+@pytest.mark.parametrize(
+ "rate",
+ [0.0, 0.1231, 1.0, True, False],
+)
+def test_accepts_valid_sample_rate(rate):
+ with mock.patch.object(logger, "warning", mock.Mock()):
+ result = _is_valid_sample_rate(rate)
+ assert logger.warning.called is False
+ assert result is True
+
+
+@pytest.mark.parametrize(
+ "rate",
+ [
+ "dogs are great", # wrong type
+ (0, 1), # wrong type
+ {"Maisey": "Charllie"}, # wrong type
+ [True, True], # wrong type
+ {0.2012}, # wrong type
+ float("NaN"), # wrong type
+ None, # wrong type
+ -1.121, # wrong value
+ 1.231, # wrong value
+ ],
+)
+def test_warns_on_invalid_sample_rate(rate, StringContaining): # noqa: N803
+ with mock.patch.object(logger, "warning", mock.Mock()):
+ result = _is_valid_sample_rate(rate)
+ logger.warning.assert_any_call(StringContaining("Given sample rate is invalid"))
+ assert result is False
From 5bb6ffc729cc5f553cb7a4872944a6f43ebcad3d Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Wed, 21 Oct 2020 11:32:22 -0700
Subject: [PATCH 0067/2327] feat(tracing): Make spans point to their
transactions (#870)
---
sentry_sdk/tracing.py | 13 +++++-
tests/tracing/test_misc.py | 83 +++++++++++++++++++++++++++++++++++++-
2 files changed, 92 insertions(+), 4 deletions(-)
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index c908120032..690c477f78 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -109,6 +109,9 @@ class Span(object):
"_span_recorder",
"hub",
"_context_manager_state",
+ # TODO: rename this "transaction" once we fully and truly deprecate the
+ # old "transaction" attribute (which was actually the transaction name)?
+ "_containing_transaction",
)
def __new__(cls, **kwargs):
@@ -164,6 +167,7 @@ def __init__(
self.timestamp = None # type: Optional[datetime]
self._span_recorder = None # type: Optional[_SpanRecorder]
+ self._containing_transaction = None # type: Optional[Transaction]
def init_span_recorder(self, maxlen):
# type: (int) -> None
@@ -210,8 +214,8 @@ def start_child(self, **kwargs):
Start a sub-span from the current span or transaction.
Takes the same arguments as the initializer of :py:class:`Span`. The
- trace id, sampling decision, and span recorder are inherited from the
- current span/transaction.
+ trace id, sampling decision, transaction pointer, and span recorder are
+ inherited from the current span/transaction.
"""
kwargs.setdefault("sampled", self.sampled)
@@ -219,6 +223,11 @@ def start_child(self, **kwargs):
trace_id=self.trace_id, span_id=None, parent_span_id=self.span_id, **kwargs
)
+ if isinstance(self, Transaction):
+ rv._containing_transaction = self
+ else:
+ rv._containing_transaction = self._containing_transaction
+
rv._span_recorder = recorder = self._span_recorder
if recorder:
recorder.add(rv)
diff --git a/tests/tracing/test_misc.py b/tests/tracing/test_misc.py
index 8cb4988f2a..f5b8aa5e85 100644
--- a/tests/tracing/test_misc.py
+++ b/tests/tracing/test_misc.py
@@ -1,7 +1,7 @@
import pytest
-from sentry_sdk import start_span, start_transaction
-from sentry_sdk.tracing import Transaction
+from sentry_sdk import Hub, start_span, start_transaction
+from sentry_sdk.tracing import Span, Transaction
def test_span_trimming(sentry_init, capture_events):
@@ -49,3 +49,82 @@ def test_transaction_method_signature(sentry_init, capture_events):
with start_transaction(Transaction(name="c")):
pass
assert len(events) == 4
+
+
+def test_finds_transaction_on_scope(sentry_init):
+ sentry_init(traces_sample_rate=1.0)
+
+ transaction = start_transaction(name="dogpark")
+
+ scope = Hub.current.scope
+
+ # See note in Scope class re: getters and setters of the `transaction`
+ # property. For the moment, assigning to scope.transaction merely sets the
+ # transaction name, rather than putting the transaction on the scope, so we
+ # have to assign to _span directly.
+ scope._span = transaction
+
+ # Reading scope.property, however, does what you'd expect, and returns the
+ # transaction on the scope.
+ assert scope.transaction is not None
+ assert isinstance(scope.transaction, Transaction)
+ assert scope.transaction.name == "dogpark"
+
+ # If the transaction is also set as the span on the scope, it can be found
+ # by accessing _span, too.
+ assert scope._span is not None
+ assert isinstance(scope._span, Transaction)
+ assert scope._span.name == "dogpark"
+
+
+def test_finds_transaction_when_decedent_span_is_on_scope(
+ sentry_init,
+):
+ sentry_init(traces_sample_rate=1.0)
+
+ transaction = start_transaction(name="dogpark")
+ child_span = transaction.start_child(op="sniffing")
+
+ scope = Hub.current.scope
+ scope._span = child_span
+
+ # this is the same whether it's the transaction itself or one of its
+ # decedents directly attached to the scope
+ assert scope.transaction is not None
+ assert isinstance(scope.transaction, Transaction)
+ assert scope.transaction.name == "dogpark"
+
+ # here we see that it is in fact the span on the scope, rather than the
+ # transaction itself
+ assert scope._span is not None
+ assert isinstance(scope._span, Span)
+ assert scope._span.op == "sniffing"
+
+
+def test_finds_orphan_span_on_scope(sentry_init):
+ # this is deprecated behavior which may be removed at some point (along with
+ # the start_span function)
+ sentry_init(traces_sample_rate=1.0)
+
+ span = start_span(op="sniffing")
+
+ scope = Hub.current.scope
+ scope._span = span
+
+ assert scope._span is not None
+ assert isinstance(scope._span, Span)
+ assert scope._span.op == "sniffing"
+
+
+def test_finds_non_orphan_span_on_scope(sentry_init):
+ sentry_init(traces_sample_rate=1.0)
+
+ transaction = start_transaction(name="dogpark")
+ child_span = transaction.start_child(op="sniffing")
+
+ scope = Hub.current.scope
+ scope._span = child_span
+
+ assert scope._span is not None
+ assert isinstance(scope._span, Span)
+ assert scope._span.op == "sniffing"
From 644bfa842bc31a020da1fc8dc53e070febacad9a Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Wed, 21 Oct 2020 12:51:13 -0700
Subject: [PATCH 0068/2327] fix(tracing): Make unsampled transactions findable
on the scope (#872)
---
sentry_sdk/scope.py | 24 ++++++++++++++++++------
tests/tracing/test_sampling.py | 16 +++++++++++++++-
2 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
index 62e2320dc6..3aaca430a1 100644
--- a/sentry_sdk/scope.py
+++ b/sentry_sdk/scope.py
@@ -144,14 +144,26 @@ def fingerprint(self, value):
def transaction(self):
# type: () -> Any
# would be type: () -> Optional[Transaction], see https://github.com/python/mypy/issues/3004
- """Return the transaction (root span) in the scope."""
- if self._span is None or self._span._span_recorder is None:
- return None
- try:
- return self._span._span_recorder.spans[0]
- except (AttributeError, IndexError):
+ """Return the transaction (root span) in the scope, if any."""
+
+ # there is no span/transaction on the scope
+ if self._span is None:
return None
+ # the span on the scope is itself a transaction
+ if isinstance(self._span, Transaction):
+ return self._span
+
+ # the span on the scope isn't a transaction but belongs to one
+ if self._span._containing_transaction:
+ return self._span._containing_transaction
+
+ # there's a span (not a transaction) on the scope, but it was started on
+ # its own, not as the descendant of a transaction (this is deprecated
+ # behavior, but as long as the start_span function exists, it can still
+ # happen)
+ return None
+
@transaction.setter
def transaction(self, value):
# type: (Any) -> None
diff --git a/tests/tracing/test_sampling.py b/tests/tracing/test_sampling.py
index d166efb0a4..25a5eb9392 100644
--- a/tests/tracing/test_sampling.py
+++ b/tests/tracing/test_sampling.py
@@ -1,6 +1,6 @@
import pytest
-from sentry_sdk import start_span, start_transaction
+from sentry_sdk import Hub, start_span, start_transaction
from sentry_sdk.tracing import _is_valid_sample_rate
from sentry_sdk.utils import logger
@@ -73,3 +73,17 @@ def test_warns_on_invalid_sample_rate(rate, StringContaining): # noqa: N803
result = _is_valid_sample_rate(rate)
logger.warning.assert_any_call(StringContaining("Given sample rate is invalid"))
assert result is False
+
+
+@pytest.mark.parametrize("sampling_decision", [True, False])
+def test_get_transaction_and_span_from_scope_regardless_of_sampling_decision(
+ sentry_init, sampling_decision
+):
+ sentry_init(traces_sample_rate=1.0)
+
+ with start_transaction(name="/", sampled=sampling_decision):
+ with start_span(op="child-span"):
+ with start_span(op="child-child-span"):
+ scope = Hub.current.scope
+ assert scope.span.op == "child-child-span"
+ assert scope.transaction.name == "/"
From dd4ff15f55fc5de45312ec17642aab5240aa3216 Mon Sep 17 00:00:00 2001
From: Sergey Shepelev
Date: Thu, 22 Oct 2020 12:33:12 +0300
Subject: [PATCH 0069/2327] unpin eventlet and dnspython (#885)
---
test-requirements.txt | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/test-requirements.txt b/test-requirements.txt
index e6cb573190..3ba7e1a44c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,10 +9,7 @@ pyrsistent==0.16.0 # TODO(py3): 0.17.0 requires python3, see https://github.com/
mock # for testing under python < 3.3
gevent
-# https://github.com/eventlet/eventlet/issues/660
-eventlet==0.28.0
-# https://github.com/eventlet/eventlet/issues/619
-dnspython<2.0
+eventlet
newrelic
executing
From 52830558bb535d7ff8e09b27703c99425262067f Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Thu, 22 Oct 2020 11:17:59 -0700
Subject: [PATCH 0070/2327] Add `traces_sampler` option (#863)
---
sentry_sdk/consts.py | 2 +-
sentry_sdk/hub.py | 25 ++-
sentry_sdk/tracing.py | 121 +++++++++-
sentry_sdk/utils.py | 10 -
tests/conftest.py | 21 --
.../sqlalchemy/test_sqlalchemy.py | 4 +-
tests/tracing/test_integration_tests.py | 2 +-
tests/tracing/test_sampling.py | 208 +++++++++++++++++-
8 files changed, 341 insertions(+), 52 deletions(-)
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 01cc7568fa..3075d320df 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -69,7 +69,7 @@ def __init__(
attach_stacktrace=False, # type: bool
ca_certs=None, # type: Optional[str]
propagate_traces=True, # type: bool
- traces_sample_rate=0.0, # type: float
+ traces_sample_rate=None, # type: Optional[float]
traces_sampler=None, # type: Optional[TracesSampler]
auto_enabling_integrations=True, # type: bool
_experiments={}, # type: Experiments # noqa: B006
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
index c2e92ef89f..52937e477f 100644
--- a/sentry_sdk/hub.py
+++ b/sentry_sdk/hub.py
@@ -1,5 +1,4 @@
import copy
-import random
import sys
from datetime import datetime
@@ -505,20 +504,28 @@ def start_transaction(
When the transaction is finished, it will be sent to Sentry with all its
finished child spans.
"""
+ custom_sampling_context = kwargs.pop("custom_sampling_context", {})
+
+ # if we haven't been given a transaction, make one
if transaction is None:
kwargs.setdefault("hub", self)
transaction = Transaction(**kwargs)
- client, scope = self._stack[-1]
-
- if transaction.sampled is None:
- sample_rate = client and client.options["traces_sample_rate"] or 0
- transaction.sampled = random.random() < sample_rate
-
+ # use traces_sample_rate, traces_sampler, and/or inheritance to make a
+ # sampling decision
+ sampling_context = {
+ "transaction_context": transaction.to_json(),
+ "parent_sampled": transaction.parent_sampled,
+ }
+ sampling_context.update(custom_sampling_context)
+ transaction._set_initial_sampling_decision(sampling_context=sampling_context)
+
+ # we don't bother to keep spans if we already know we're not going to
+ # send the transaction
if transaction.sampled:
max_spans = (
- client and client.options["_experiments"].get("max_spans") or 1000
- )
+ self.client and self.client.options["_experiments"].get("max_spans")
+ ) or 1000
transaction.init_span_recorder(maxlen=max_spans)
return transaction
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 690c477f78..060394619c 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -2,6 +2,7 @@
import uuid
import contextlib
import math
+import random
import time
from datetime import datetime, timedelta
@@ -9,7 +10,11 @@
import sentry_sdk
-from sentry_sdk.utils import capture_internal_exceptions, logger, to_string
+from sentry_sdk.utils import (
+ capture_internal_exceptions,
+ logger,
+ to_string,
+)
from sentry_sdk._compat import PY2
from sentry_sdk._types import MYPY
@@ -28,6 +33,8 @@
from typing import List
from typing import Tuple
+ from sentry_sdk._types import SamplingContext
+
_traceparent_header_format_re = re.compile(
"^[ \t]*" # whitespace
"([0-9a-f]{32})?" # trace_id
@@ -337,7 +344,7 @@ def from_traceparent(
return Transaction(
trace_id=trace_id,
parent_span_id=parent_span_id,
- sampled=parent_sampled,
+ parent_sampled=parent_sampled,
**kwargs
)
@@ -555,6 +562,116 @@ def to_json(self):
return rv
+ def _set_initial_sampling_decision(self, sampling_context):
+ # type: (SamplingContext) -> None
+ """
+ Sets the transaction's sampling decision, according to the following
+ precedence rules:
+
+ 1. If a sampling decision is passed to `start_transaction`
+ (`start_transaction(name: "my transaction", sampled: True)`), that
+ decision will be used, regardlesss of anything else
+
+ 2. If `traces_sampler` is defined, its decision will be used. It can
+ choose to keep or ignore any parent sampling decision, or use the
+ sampling context data to make its own decision or to choose a sample
+ rate for the transaction.
+
+ 3. If `traces_sampler` is not defined, but there's a parent sampling
+ decision, the parent sampling decision will be used.
+
+ 4. If `traces_sampler` is not defined and there's no parent sampling
+ decision, `traces_sample_rate` will be used.
+ """
+
+ hub = self.hub or sentry_sdk.Hub.current
+ client = hub.client
+ options = (client and client.options) or {}
+ transaction_description = "{op}transaction <{name}>".format(
+ op=("<" + self.op + "> " if self.op else ""), name=self.name
+ )
+
+ # nothing to do if there's no client or if tracing is disabled
+ if not client or not has_tracing_enabled(options):
+ self.sampled = False
+ return
+
+ # if the user has forced a sampling decision by passing a `sampled`
+ # value when starting the transaction, go with that
+ if self.sampled is not None:
+ return
+
+ # we would have bailed already if neither `traces_sampler` nor
+ # `traces_sample_rate` were defined, so one of these should work; prefer
+ # the hook if so
+ sample_rate = (
+ options["traces_sampler"](sampling_context)
+ if callable(options.get("traces_sampler"))
+ else (
+ # default inheritance behavior
+ sampling_context["parent_sampled"]
+ if sampling_context["parent_sampled"] is not None
+ else options["traces_sample_rate"]
+ )
+ )
+
+ # Since this is coming from the user (or from a function provided by the
+ # user), who knows what we might get. (The only valid values are
+ # booleans or numbers between 0 and 1.)
+ if not _is_valid_sample_rate(sample_rate):
+ logger.warning(
+ "[Tracing] Discarding {transaction_description} because of invalid sample rate.".format(
+ transaction_description=transaction_description,
+ )
+ )
+ self.sampled = False
+ return
+
+ # if the function returned 0 (or false), or if `traces_sample_rate` is
+ # 0, it's a sign the transaction should be dropped
+ if not sample_rate:
+ logger.debug(
+ "[Tracing] Discarding {transaction_description} because {reason}".format(
+ transaction_description=transaction_description,
+ reason=(
+ "traces_sampler returned 0 or False"
+ if callable(options.get("traces_sampler"))
+ else "traces_sample_rate is set to 0"
+ ),
+ )
+ )
+ self.sampled = False
+ return
+
+ # Now we roll the dice. random.random is inclusive of 0, but not of 1,
+ # so strict < is safe here. In case sample_rate is a boolean, cast it
+ # to a float (True becomes 1.0 and False becomes 0.0)
+ self.sampled = random.random() < float(sample_rate)
+
+ if self.sampled:
+ logger.debug(
+ "[Tracing] Starting {transaction_description}".format(
+ transaction_description=transaction_description,
+ )
+ )
+ else:
+ logger.debug(
+ "[Tracing] Discarding {transaction_description} because it's not included in the random sample (sampling rate = {sample_rate})".format(
+ transaction_description=transaction_description,
+ sample_rate=float(sample_rate),
+ )
+ )
+
+
+def has_tracing_enabled(options):
+ # type: (Dict[str, Any]) -> bool
+ """
+ Returns True if either traces_sample_rate or traces_sampler is
+ non-zero/defined, False otherwise.
+ """
+
+ return bool(options.get("traces_sample_rate") or options.get("traces_sampler"))
+
def _is_valid_sample_rate(rate):
# type: (Any) -> bool
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 983465b26f..d39b0c1e40 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -968,13 +968,3 @@ def run(self):
integer_configured_timeout
)
)
-
-
-def has_tracing_enabled(options):
- # type: (Dict[str, Any]) -> bool
- """
- Returns True if either traces_sample_rate or traces_sampler is
- non-zero/defined, False otherwise.
- """
-
- return bool(options.get("traces_sample_rate") or options.get("traces_sampler"))
diff --git a/tests/conftest.py b/tests/conftest.py
index e0dcc717bb..2d77b41d19 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,6 +1,5 @@
import os
import json
-from types import FunctionType
import pytest
import jsonschema
@@ -37,11 +36,6 @@ def benchmark():
else:
del pytest_benchmark
-try:
- from unittest import mock # python 3.3 and above
-except ImportError:
- import mock # python < 3.3
-
@pytest.fixture(autouse=True)
def internal_exceptions(request, monkeypatch):
@@ -400,18 +394,3 @@ def __eq__(self, test_dict):
return all(test_dict.get(key) == self.subdict[key] for key in self.subdict)
return DictionaryContaining
-
-
-@pytest.fixture(name="FunctionMock")
-def function_mock():
- """
- Just like a mock.Mock object, but one which always passes an isfunction
- test.
- """
-
- class FunctionMock(mock.Mock):
- def __init__(self, *args, **kwargs):
- super(FunctionMock, self).__init__(*args, **kwargs)
- self.__class__ = FunctionType
-
- return FunctionMock
diff --git a/tests/integrations/sqlalchemy/test_sqlalchemy.py b/tests/integrations/sqlalchemy/test_sqlalchemy.py
index 504d6bdbf2..2821126387 100644
--- a/tests/integrations/sqlalchemy/test_sqlalchemy.py
+++ b/tests/integrations/sqlalchemy/test_sqlalchemy.py
@@ -76,7 +76,9 @@ class Address(Base):
def test_transactions(sentry_init, capture_events, render_span_tree):
sentry_init(
- integrations=[SqlalchemyIntegration()], _experiments={"record_sql_params": True}
+ integrations=[SqlalchemyIntegration()],
+ _experiments={"record_sql_params": True},
+ traces_sample_rate=1.0,
)
events = capture_events()
diff --git a/tests/tracing/test_integration_tests.py b/tests/tracing/test_integration_tests.py
index 3f5025e41f..298f460d59 100644
--- a/tests/tracing/test_integration_tests.py
+++ b/tests/tracing/test_integration_tests.py
@@ -70,7 +70,7 @@ def test_continue_from_headers(sentry_init, capture_events, sampled):
# correctly
transaction = Transaction.continue_from_headers(headers, name="WRONG")
assert transaction is not None
- assert transaction.sampled == sampled
+ assert transaction.parent_sampled == sampled
assert transaction.trace_id == old_span.trace_id
assert transaction.same_process_as_parent is False
assert transaction.parent_span_id == old_span.span_id
diff --git a/tests/tracing/test_sampling.py b/tests/tracing/test_sampling.py
index 25a5eb9392..672110ada2 100644
--- a/tests/tracing/test_sampling.py
+++ b/tests/tracing/test_sampling.py
@@ -1,7 +1,9 @@
+import random
+
import pytest
from sentry_sdk import Hub, start_span, start_transaction
-from sentry_sdk.tracing import _is_valid_sample_rate
+from sentry_sdk.tracing import Transaction, _is_valid_sample_rate
from sentry_sdk.utils import logger
try:
@@ -23,12 +25,17 @@ def test_sampling_decided_only_for_transactions(sentry_init, capture_events):
assert span.sampled is None
-def test_nested_transaction_sampling_override():
- with start_transaction(name="outer", sampled=True) as outer_transaction:
- assert outer_transaction.sampled is True
- with start_transaction(name="inner", sampled=False) as inner_transaction:
- assert inner_transaction.sampled is False
- assert outer_transaction.sampled is True
+@pytest.mark.parametrize("sampled", [True, False])
+def test_nested_transaction_sampling_override(sentry_init, sampled):
+ sentry_init(traces_sample_rate=1.0)
+
+ with start_transaction(name="outer", sampled=sampled) as outer_transaction:
+ assert outer_transaction.sampled is sampled
+ with start_transaction(
+ name="inner", sampled=(not sampled)
+ ) as inner_transaction:
+ assert inner_transaction.sampled is not sampled
+ assert outer_transaction.sampled is sampled
def test_no_double_sampling(sentry_init, capture_events):
@@ -87,3 +94,190 @@ def test_get_transaction_and_span_from_scope_regardless_of_sampling_decision(
scope = Hub.current.scope
assert scope.span.op == "child-child-span"
assert scope.transaction.name == "/"
+
+
+@pytest.mark.parametrize(
+ "traces_sample_rate,expected_decision",
+ [(0.0, False), (0.25, False), (0.75, True), (1.00, True)],
+)
+def test_uses_traces_sample_rate_correctly(
+ sentry_init,
+ traces_sample_rate,
+ expected_decision,
+):
+ sentry_init(traces_sample_rate=traces_sample_rate)
+
+ with mock.patch.object(random, "random", return_value=0.5):
+
+ transaction = start_transaction(name="dogpark")
+ assert transaction.sampled is expected_decision
+
+
+@pytest.mark.parametrize(
+ "traces_sampler_return_value,expected_decision",
+ [(0.0, False), (0.25, False), (0.75, True), (1.00, True)],
+)
+def test_uses_traces_sampler_return_value_correctly(
+ sentry_init,
+ traces_sampler_return_value,
+ expected_decision,
+):
+ sentry_init(traces_sampler=mock.Mock(return_value=traces_sampler_return_value))
+
+ with mock.patch.object(random, "random", return_value=0.5):
+
+ transaction = start_transaction(name="dogpark")
+ assert transaction.sampled is expected_decision
+
+
+@pytest.mark.parametrize("traces_sampler_return_value", [True, False])
+def test_tolerates_traces_sampler_returning_a_boolean(
+ sentry_init, traces_sampler_return_value
+):
+ sentry_init(traces_sampler=mock.Mock(return_value=traces_sampler_return_value))
+
+ transaction = start_transaction(name="dogpark")
+ assert transaction.sampled is traces_sampler_return_value
+
+
+@pytest.mark.parametrize("sampling_decision", [True, False])
+def test_only_captures_transaction_when_sampled_is_true(
+ sentry_init, sampling_decision, capture_events
+):
+ sentry_init(traces_sampler=mock.Mock(return_value=sampling_decision))
+ events = capture_events()
+
+ transaction = start_transaction(name="dogpark")
+ transaction.finish()
+
+ assert len(events) == (1 if sampling_decision else 0)
+
+
+@pytest.mark.parametrize(
+ "traces_sample_rate,traces_sampler_return_value", [(0, True), (1, False)]
+)
+def test_prefers_traces_sampler_to_traces_sample_rate(
+ sentry_init,
+ traces_sample_rate,
+ traces_sampler_return_value,
+):
+ # make traces_sample_rate imply the opposite of traces_sampler, to prove
+ # that traces_sampler takes precedence
+ traces_sampler = mock.Mock(return_value=traces_sampler_return_value)
+ sentry_init(
+ traces_sample_rate=traces_sample_rate,
+ traces_sampler=traces_sampler,
+ )
+
+ transaction = start_transaction(name="dogpark")
+ assert traces_sampler.called is True
+ assert transaction.sampled is traces_sampler_return_value
+
+
+@pytest.mark.parametrize("parent_sampling_decision", [True, False])
+def test_ignores_inherited_sample_decision_when_traces_sampler_defined(
+ sentry_init, parent_sampling_decision
+):
+ # make traces_sampler pick the opposite of the inherited decision, to prove
+ # that traces_sampler takes precedence
+ traces_sampler = mock.Mock(return_value=not parent_sampling_decision)
+ sentry_init(traces_sampler=traces_sampler)
+
+ transaction = start_transaction(
+ name="dogpark", parent_sampled=parent_sampling_decision
+ )
+ assert transaction.sampled is not parent_sampling_decision
+
+
+@pytest.mark.parametrize("explicit_decision", [True, False])
+def test_traces_sampler_doesnt_overwrite_explicitly_passed_sampling_decision(
+ sentry_init, explicit_decision
+):
+ # make traces_sampler pick the opposite of the explicit decision, to prove
+ # that the explicit decision takes precedence
+ traces_sampler = mock.Mock(return_value=not explicit_decision)
+ sentry_init(traces_sampler=traces_sampler)
+
+ transaction = start_transaction(name="dogpark", sampled=explicit_decision)
+ assert transaction.sampled is explicit_decision
+
+
+@pytest.mark.parametrize("parent_sampling_decision", [True, False])
+def test_inherits_parent_sampling_decision_when_traces_sampler_undefined(
+ sentry_init, parent_sampling_decision
+):
+ # make sure the parent sampling decision is the opposite of what
+ # traces_sample_rate would produce, to prove the inheritance takes
+ # precedence
+ sentry_init(traces_sample_rate=0.5)
+ mock_random_value = 0.25 if parent_sampling_decision is False else 0.75
+
+ with mock.patch.object(random, "random", return_value=mock_random_value):
+ transaction = start_transaction(
+ name="dogpark", parent_sampled=parent_sampling_decision
+ )
+ assert transaction.sampled is parent_sampling_decision
+
+
+@pytest.mark.parametrize("parent_sampling_decision", [True, False])
+def test_passes_parent_sampling_decision_in_sampling_context(
+ sentry_init, parent_sampling_decision
+):
+ sentry_init(traces_sample_rate=1.0)
+
+ sentry_trace_header = (
+ "12312012123120121231201212312012-1121201211212012-{sampled}".format(
+ sampled=int(parent_sampling_decision)
+ )
+ )
+
+ transaction = Transaction.from_traceparent(sentry_trace_header, name="dogpark")
+ spy = mock.Mock(wraps=transaction)
+ start_transaction(transaction=spy)
+
+ # there's only one call (so index at 0) and kwargs are always last in a call
+ # tuple (so index at -1)
+ sampling_context = spy._set_initial_sampling_decision.mock_calls[0][-1][
+ "sampling_context"
+ ]
+ assert "parent_sampled" in sampling_context
+ # because we passed in a spy, attribute access requires unwrapping
+ assert sampling_context["parent_sampled"]._mock_wraps is parent_sampling_decision
+
+
+def test_passes_custom_samling_context_from_start_transaction_to_traces_sampler(
+ sentry_init, DictionaryContaining # noqa: N803
+):
+ traces_sampler = mock.Mock()
+ sentry_init(traces_sampler=traces_sampler)
+
+ start_transaction(custom_sampling_context={"dogs": "yes", "cats": "maybe"})
+
+ traces_sampler.assert_any_call(
+ DictionaryContaining({"dogs": "yes", "cats": "maybe"})
+ )
+
+
+@pytest.mark.parametrize(
+ "traces_sampler_return_value",
+ [
+ "dogs are great", # wrong type
+ (0, 1), # wrong type
+ {"Maisey": "Charllie"}, # wrong type
+ [True, True], # wrong type
+ {0.2012}, # wrong type
+ float("NaN"), # wrong type
+ None, # wrong type
+ -1.121, # wrong value
+ 1.231, # wrong value
+ ],
+)
+def test_warns_and_sets_sampled_to_false_on_invalid_traces_sampler_return_value(
+ sentry_init, traces_sampler_return_value, StringContaining # noqa: N803
+):
+ sentry_init(traces_sampler=mock.Mock(return_value=traces_sampler_return_value))
+
+ with mock.patch.object(logger, "warning", mock.Mock()):
+ transaction = start_transaction(name="dogpark")
+ logger.warning.assert_any_call(StringContaining("Given sample rate is invalid"))
+ assert transaction.sampled is False
From 34f173fa6cd37332a85c11b62ffd18d72e7f8136 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Mon, 26 Oct 2020 15:46:47 -0700
Subject: [PATCH 0071/2327] feat(dev): Add object matcher pytest fixture (#890)
---
tests/conftest.py | 70 ++++++++++++++++++++++++--
tests/test_conftest.py | 110 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 177 insertions(+), 3 deletions(-)
create mode 100644 tests/test_conftest.py
diff --git a/tests/conftest.py b/tests/conftest.py
index 2d77b41d19..6c53e502ef 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -341,7 +341,7 @@ def string_containing_matcher():
Used like this:
- >>> f = mock.Mock(return_value=None)
+ >>> f = mock.Mock()
>>> f("dogs are great")
>>> f.assert_any_call("dogs") # will raise AssertionError
Traceback (most recent call last):
@@ -359,6 +359,9 @@ def __eq__(self, test_string):
if not isinstance(test_string, str):
return False
+ if len(self.substring) > len(test_string):
+ return False
+
return self.substring in test_string
return StringContaining
@@ -374,7 +377,7 @@ def dictionary_containing_matcher():
Used like this:
- >>> f = mock.Mock(return_value=None)
+ >>> f = mock.Mock()
>>> f({"dogs": "yes", "cats": "maybe"})
>>> f.assert_any_call({"dogs": "yes"}) # will raise AssertionError
Traceback (most recent call last):
@@ -391,6 +394,67 @@ def __eq__(self, test_dict):
if not isinstance(test_dict, dict):
return False
- return all(test_dict.get(key) == self.subdict[key] for key in self.subdict)
+ if len(self.subdict) > len(test_dict):
+ return False
+
+ # Have to test self == other (rather than vice-versa) in case
+ # any of the values in self.subdict is another matcher with a custom
+ # __eq__ method (in LHS == RHS, LHS's __eq__ is tried before RHS's).
+ # In other words, this order is important so that examples like
+ # {"dogs": "are great"} == DictionaryContaining({"dogs": StringContaining("great")})
+ # evaluate to True
+ return all(self.subdict[key] == test_dict.get(key) for key in self.subdict)
return DictionaryContaining
+
+
+@pytest.fixture(name="ObjectDescribedBy")
+def object_described_by_matcher():
+ """
+ An object which matches any other object with the given properties.
+
+ Available properties currently are "type" (a type object) and "attrs" (a
+ dictionary).
+
+ Useful for assert_called_with, assert_any_call, etc.
+
+ Used like this:
+
+ >>> class Dog(object):
+ ... pass
+ ...
+ >>> maisey = Dog()
+ >>> maisey.name = "Maisey"
+ >>> maisey.age = 7
+ >>> f = mock.Mock()
+ >>> f(maisey)
+ >>> f.assert_any_call(ObjectDescribedBy(type=Dog)) # no AssertionError
+ >>> f.assert_any_call(ObjectDescribedBy(attrs={"name": "Maisey"})) # no AssertionError
+ """
+
+ class ObjectDescribedBy(object):
+ def __init__(self, type=None, attrs=None):
+ self.type = type
+ self.attrs = attrs
+
+ def __eq__(self, test_obj):
+ if self.type:
+ if not isinstance(test_obj, self.type):
+ return False
+
+ # all checks here done with getattr rather than comparing to
+ # __dict__ because __dict__ isn't guaranteed to exist
+ if self.attrs:
+ # attributes must exist AND values must match
+ try:
+ if any(
+ getattr(test_obj, attr_name) != attr_value
+ for attr_name, attr_value in self.attrs.items()
+ ):
+ return False # wrong attribute value
+ except AttributeError: # missing attribute
+ return False
+
+ return True
+
+ return ObjectDescribedBy
diff --git a/tests/test_conftest.py b/tests/test_conftest.py
new file mode 100644
index 0000000000..8a2d4cee24
--- /dev/null
+++ b/tests/test_conftest.py
@@ -0,0 +1,110 @@
+import pytest
+
+
+@pytest.mark.parametrize(
+ "test_string, expected_result",
+ [
+ # type matches
+ ("dogs are great!", True), # full containment - beginning
+ ("go, dogs, go!", True), # full containment - middle
+ ("I like dogs", True), # full containment - end
+ ("dogs", True), # equality
+ ("", False), # reverse containment
+ ("dog", False), # reverse containment
+ ("good dog!", False), # partial overlap
+ ("cats", False), # no overlap
+ # type mismatches
+ (1231, False),
+ (11.21, False),
+ ([], False),
+ ({}, False),
+ (True, False),
+ ],
+)
+def test_string_containing(
+ test_string, expected_result, StringContaining # noqa: N803
+):
+
+ assert (test_string == StringContaining("dogs")) is expected_result
+
+
+@pytest.mark.parametrize(
+ "test_dict, expected_result",
+ [
+ # type matches
+ ({"dogs": "yes", "cats": "maybe", "spiders": "nope"}, True), # full containment
+ ({"dogs": "yes", "cats": "maybe"}, True), # equality
+ ({}, False), # reverse containment
+ ({"dogs": "yes"}, False), # reverse containment
+ ({"dogs": "yes", "birds": "only outside"}, False), # partial overlap
+ ({"coyotes": "from afar"}, False), # no overlap
+ # type mismatches
+ ('{"dogs": "yes", "cats": "maybe"}', False),
+ (1231, False),
+ (11.21, False),
+ ([], False),
+ (True, False),
+ ],
+)
+def test_dictionary_containing(
+ test_dict, expected_result, DictionaryContaining # noqa: N803
+):
+
+ assert (
+ test_dict == DictionaryContaining({"dogs": "yes", "cats": "maybe"})
+ ) is expected_result
+
+
+class Animal(object): # noqa: B903
+ def __init__(self, name=None, age=None, description=None):
+ self.name = name
+ self.age = age
+ self.description = description
+
+
+class Dog(Animal):
+ pass
+
+
+class Cat(Animal):
+ pass
+
+
+@pytest.mark.parametrize(
+ "test_obj, type_and_attrs_result, type_only_result, attrs_only_result",
+ [
+ # type matches
+ (Dog("Maisey", 7, "silly"), True, True, True), # full attr containment
+ (Dog("Maisey", 7), True, True, True), # type and attr equality
+ (Dog(), False, True, False), # reverse attr containment
+ (Dog("Maisey"), False, True, False), # reverse attr containment
+ (Dog("Charlie", 7, "goofy"), False, True, False), # partial attr overlap
+ (Dog("Bodhi", 6, "floppy"), False, True, False), # no attr overlap
+ # type mismatches
+ (Cat("Maisey", 7), False, False, True), # attr equality
+ (Cat("Piper", 1, "doglike"), False, False, False),
+ ("Good girl, Maisey", False, False, False),
+ ({"name": "Maisey", "age": 7}, False, False, False),
+ (1231, False, False, False),
+ (11.21, False, False, False),
+ ([], False, False, False),
+ (True, False, False, False),
+ ],
+)
+def test_object_described_by(
+ test_obj,
+ type_and_attrs_result,
+ type_only_result,
+ attrs_only_result,
+ ObjectDescribedBy, # noqa: N803
+):
+
+ assert (
+ test_obj == ObjectDescribedBy(type=Dog, attrs={"name": "Maisey", "age": 7})
+ ) is type_and_attrs_result
+
+ assert (test_obj == ObjectDescribedBy(type=Dog)) is type_only_result
+
+ assert (
+ test_obj == ObjectDescribedBy(attrs={"name": "Maisey", "age": 7})
+ ) is attrs_only_result
From e6a2c914eee8946cc6236084af511d961cec52cc Mon Sep 17 00:00:00 2001
From: Marti Raudsepp
Date: Tue, 27 Oct 2020 17:00:50 +0200
Subject: [PATCH 0072/2327] Fix mypy hinting of toplevel sentry_sdk module
(#892)
Mypy does not support runtime-calculated __all__, so duplicate symbols
from sentry_sdk.api.__all__ to top-level __init__.py.
Tested with mypy 0.790.
---
sentry_sdk/__init__.py | 19 +++++++++++++++++--
sentry_sdk/api.py | 1 +
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/sentry_sdk/__init__.py b/sentry_sdk/__init__.py
index b211a6c754..ab5123ec64 100644
--- a/sentry_sdk/__init__.py
+++ b/sentry_sdk/__init__.py
@@ -4,11 +4,10 @@
from sentry_sdk.client import Client
from sentry_sdk.api import * # noqa
-from sentry_sdk.api import __all__ as api_all
from sentry_sdk.consts import VERSION # noqa
-__all__ = api_all + [ # noqa
+__all__ = [ # noqa
"Hub",
"Scope",
"Client",
@@ -16,6 +15,22 @@
"HttpTransport",
"init",
"integrations",
+ # From sentry_sdk.api
+ "capture_event",
+ "capture_message",
+ "capture_exception",
+ "add_breadcrumb",
+ "configure_scope",
+ "push_scope",
+ "flush",
+ "last_event_id",
+ "start_span",
+ "start_transaction",
+ "set_tag",
+ "set_context",
+ "set_extra",
+ "set_user",
+ "set_level",
]
# Initialize the debug support after everything is loaded
diff --git a/sentry_sdk/api.py b/sentry_sdk/api.py
index ea2a98cf5a..658777ec79 100644
--- a/sentry_sdk/api.py
+++ b/sentry_sdk/api.py
@@ -27,6 +27,7 @@ def overload(x):
return x
+# When changing this, update __all__ in __init__.py too
__all__ = [
"capture_event",
"capture_message",
From 7d2f2dc8a190121ad701e7598aec3d57549a2d2e Mon Sep 17 00:00:00 2001
From: Christian Clauss
Date: Tue, 27 Oct 2020 16:02:15 +0100
Subject: [PATCH 0073/2327] Travis CI now supports Python 3.9 (#894)
---
.travis.yml | 10 ++++------
tox.ini | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 5bf138a656..71abfc2027 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ python:
- "3.6"
- "3.7"
- "3.8"
- - "3.9-dev"
+ - "3.9"
env:
- SENTRY_PYTHON_TEST_POSTGRES_USER=postgres SENTRY_PYTHON_TEST_POSTGRES_NAME=travis_ci_test
@@ -31,21 +31,19 @@ branches:
- /^release\/.+$/
jobs:
- allow_failures:
- - python: "3.9-dev"
include:
- name: Linting
- python: "3.8"
+ python: "3.9"
install:
- pip install tox
script: tox -e linters
- - python: "3.8"
+ - python: "3.9"
name: Distribution packages
install: []
script: make travis-upload-dist
- - python: "3.8"
+ - python: "3.9"
name: Build documentation
install: []
script: make travis-upload-docs
diff --git a/tox.ini b/tox.ini
index a29ba612fd..98bfaf9a4d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -277,7 +277,7 @@ basepython =
# some random Python 3 binary, but then you get guaranteed mismatches with
# CI. Other tools such as mypy and black have options that pin the Python
# version.
- linters: python3.8
+ linters: python3.9
pypy: pypy
commands =
From 881b8e129fcf560871302fb0903bde58ce44348e Mon Sep 17 00:00:00 2001
From: Alex Hall
Date: Wed, 28 Oct 2020 14:07:56 +0200
Subject: [PATCH 0074/2327] Use asttokens less to account for nodes that don't
get position information (#897)
---
sentry_sdk/integrations/pure_eval.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/sentry_sdk/integrations/pure_eval.py b/sentry_sdk/integrations/pure_eval.py
index ef250dd3b2..9d3fe66822 100644
--- a/sentry_sdk/integrations/pure_eval.py
+++ b/sentry_sdk/integrations/pure_eval.py
@@ -104,23 +104,29 @@ def pure_eval_frame(frame):
expressions = evaluator.interesting_expressions_grouped(scope)
def closeness(expression):
- # type: (Tuple[List[Any], Any]) -> int
+ # type: (Tuple[List[Any], Any]) -> Tuple[int, int]
# Prioritise expressions with a node closer to the statement executed
# without being after that statement
# A higher return value is better - the expression will appear
# earlier in the list of values and is less likely to be trimmed
nodes, _value = expression
+
+ def start(n):
+ # type: (ast.expr) -> Tuple[int, int]
+ return (n.lineno, n.col_offset)
+
nodes_before_stmt = [
- node for node in nodes if node.first_token.startpos < stmt.last_token.endpos
+ node for node in nodes if start(node) < stmt.last_token.end
]
if nodes_before_stmt:
# The position of the last node before or in the statement
- return max(node.first_token.startpos for node in nodes_before_stmt)
+ return max(start(node) for node in nodes_before_stmt)
else:
# The position of the first node after the statement
# Negative means it's always lower priority than nodes that come before
# Less negative means closer to the statement and higher priority
- return -min(node.first_token.startpos for node in nodes)
+ lineno, col_offset = min(start(node) for node in nodes)
+ return (-lineno, -col_offset)
# This adds the first_token and last_token attributes to nodes
atok = source.asttokens()
From ba1e55009822a8dc8e231158254ea207bf3a5bab Mon Sep 17 00:00:00 2001
From: Vladimir Kochnev
Date: Thu, 29 Oct 2020 15:35:10 +0000
Subject: [PATCH 0075/2327] Boto3 integration (#896)
This is the integration for boto3 library for recording
AWS requests as spans.
Another suggestion is to enable it by default in aws_lambda integration
since boto3 package is pre-installed on every lambda.
---
sentry_sdk/integrations/__init__.py | 1 +
sentry_sdk/integrations/boto3.py | 121 +++++++++++++++++++++++++++
tests/integrations/boto3/__init__.py | 10 +++
tests/integrations/boto3/aws_mock.py | 33 ++++++++
tests/integrations/boto3/s3_list.xml | 2 +
tests/integrations/boto3/test_s3.py | 85 +++++++++++++++++++
tox.ini | 7 ++
7 files changed, 259 insertions(+)
create mode 100644 sentry_sdk/integrations/boto3.py
create mode 100644 tests/integrations/boto3/__init__.py
create mode 100644 tests/integrations/boto3/aws_mock.py
create mode 100644 tests/integrations/boto3/s3_list.xml
create mode 100644 tests/integrations/boto3/test_s3.py
diff --git a/sentry_sdk/integrations/__init__.py b/sentry_sdk/integrations/__init__.py
index 3f0548ab63..777c363e14 100644
--- a/sentry_sdk/integrations/__init__.py
+++ b/sentry_sdk/integrations/__init__.py
@@ -62,6 +62,7 @@ def iter_default_integrations(with_auto_enabling_integrations):
"sentry_sdk.integrations.aiohttp.AioHttpIntegration",
"sentry_sdk.integrations.tornado.TornadoIntegration",
"sentry_sdk.integrations.sqlalchemy.SqlalchemyIntegration",
+ "sentry_sdk.integrations.boto3.Boto3Integration",
)
diff --git a/sentry_sdk/integrations/boto3.py b/sentry_sdk/integrations/boto3.py
new file mode 100644
index 0000000000..573a6248bd
--- /dev/null
+++ b/sentry_sdk/integrations/boto3.py
@@ -0,0 +1,121 @@
+from __future__ import absolute_import
+
+from sentry_sdk import Hub
+from sentry_sdk.integrations import Integration, DidNotEnable
+from sentry_sdk.tracing import Span
+
+from sentry_sdk._functools import partial
+from sentry_sdk._types import MYPY
+
+if MYPY:
+ from typing import Any
+ from typing import Dict
+ from typing import Optional
+ from typing import Type
+
+try:
+ from botocore.client import BaseClient # type: ignore
+ from botocore.response import StreamingBody # type: ignore
+ from botocore.awsrequest import AWSRequest # type: ignore
+except ImportError:
+ raise DidNotEnable("botocore is not installed")
+
+
+class Boto3Integration(Integration):
+ identifier = "boto3"
+
+ @staticmethod
+ def setup_once():
+ # type: () -> None
+ orig_init = BaseClient.__init__
+
+ def sentry_patched_init(self, *args, **kwargs):
+ # type: (Type[BaseClient], *Any, **Any) -> None
+ orig_init(self, *args, **kwargs)
+ meta = self.meta
+ service_id = meta.service_model.service_id.hyphenize()
+ meta.events.register(
+ "request-created",
+ partial(_sentry_request_created, service_id=service_id),
+ )
+ meta.events.register("after-call", _sentry_after_call)
+ meta.events.register("after-call-error", _sentry_after_call_error)
+
+ BaseClient.__init__ = sentry_patched_init
+
+
+def _sentry_request_created(service_id, request, operation_name, **kwargs):
+ # type: (str, AWSRequest, str, **Any) -> None
+ hub = Hub.current
+ if hub.get_integration(Boto3Integration) is None:
+ return
+
+ description = "aws.%s.%s" % (service_id, operation_name)
+ span = hub.start_span(
+ hub=hub,
+ op="aws.request",
+ description=description,
+ )
+ span.set_tag("aws.service_id", service_id)
+ span.set_tag("aws.operation_name", operation_name)
+ span.set_data("aws.request.url", request.url)
+
+ # We do it in order for subsequent http calls/retries be
+ # attached to this span.
+ span.__enter__()
+
+ # request.context is an open-ended data-structure
+ # where we can add anything useful in request life cycle.
+ request.context["_sentrysdk_span"] = span
+
+
+def _sentry_after_call(context, parsed, **kwargs):
+ # type: (Dict[str, Any], Dict[str, Any], **Any) -> None
+ span = context.pop("_sentrysdk_span", None) # type: Optional[Span]
+
+ # Span could be absent if the integration is disabled.
+ if span is None:
+ return
+ span.__exit__(None, None, None)
+
+ body = parsed.get("Body")
+ if not isinstance(body, StreamingBody):
+ return
+
+ streaming_span = span.start_child(
+ op="aws.request.stream",
+ description=span.description,
+ )
+
+ orig_read = body.read
+ orig_close = body.close
+
+ def sentry_streaming_body_read(*args, **kwargs):
+ # type: (*Any, **Any) -> bytes
+ try:
+ ret = orig_read(*args, **kwargs)
+ if not ret:
+ streaming_span.finish()
+ return ret
+ except Exception:
+ streaming_span.finish()
+ raise
+
+ body.read = sentry_streaming_body_read
+
+ def sentry_streaming_body_close(*args, **kwargs):
+ # type: (*Any, **Any) -> None
+ streaming_span.finish()
+ orig_close(*args, **kwargs)
+
+ body.close = sentry_streaming_body_close
+
+
+def _sentry_after_call_error(context, exception, **kwargs):
+ # type: (Dict[str, Any], Type[BaseException], **Any) -> None
+ span = context.pop("_sentrysdk_span", None) # type: Optional[Span]
+
+ # Span could be absent if the integration is disabled.
+ if span is None:
+ return
+ span.__exit__(type(exception), exception, None)
diff --git a/tests/integrations/boto3/__init__.py b/tests/integrations/boto3/__init__.py
new file mode 100644
index 0000000000..09738c40c7
--- /dev/null
+++ b/tests/integrations/boto3/__init__.py
@@ -0,0 +1,10 @@
+import pytest
+import os
+
+pytest.importorskip("boto3")
+xml_fixture_path = os.path.dirname(os.path.abspath(__file__))
+
+
+def read_fixture(name):
+ with open(os.path.join(xml_fixture_path, name), "rb") as f:
+ return f.read()
diff --git a/tests/integrations/boto3/aws_mock.py b/tests/integrations/boto3/aws_mock.py
new file mode 100644
index 0000000000..84ff23f466
--- /dev/null
+++ b/tests/integrations/boto3/aws_mock.py
@@ -0,0 +1,33 @@
+from io import BytesIO
+from botocore.awsrequest import AWSResponse
+
+
+class Body(BytesIO):
+ def stream(self, **kwargs):
+ contents = self.read()
+ while contents:
+ yield contents
+ contents = self.read()
+
+
+class MockResponse(object):
+ def __init__(self, client, status_code, headers, body):
+ self._client = client
+ self._status_code = status_code
+ self._headers = headers
+ self._body = body
+
+ def __enter__(self):
+ self._client.meta.events.register("before-send", self)
+ return self
+
+ def __exit__(self, exc_type, exc_value, traceback):
+ self._client.meta.events.unregister("before-send", self)
+
+ def __call__(self, request, **kwargs):
+ return AWSResponse(
+ request.url,
+ self._status_code,
+ self._headers,
+ Body(self._body),
+ )
diff --git a/tests/integrations/boto3/s3_list.xml b/tests/integrations/boto3/s3_list.xml
new file mode 100644
index 0000000000..10d5b16340
--- /dev/null
+++ b/tests/integrations/boto3/s3_list.xml
@@ -0,0 +1,2 @@
+
+marshalls-furious-bucket1000urlfalsefoo.txt2020-10-24T00:13:39.000Z"a895ba674b4abd01b5d67cfd7074b827"2064537bef397f7e536914d1ff1bbdb105ed90bcfd06269456bf4a06c6e2e54564daf7STANDARDbar.txt2020-10-02T15:15:20.000Z"a895ba674b4abd01b5d67cfd7074b827"2064537bef397f7e536914d1ff1bbdb105ed90bcfd06269456bf4a06c6e2e54564daf7STANDARD
diff --git a/tests/integrations/boto3/test_s3.py b/tests/integrations/boto3/test_s3.py
new file mode 100644
index 0000000000..67376b55d4
--- /dev/null
+++ b/tests/integrations/boto3/test_s3.py
@@ -0,0 +1,85 @@
+from sentry_sdk import Hub
+from sentry_sdk.integrations.boto3 import Boto3Integration
+from tests.integrations.boto3.aws_mock import MockResponse
+from tests.integrations.boto3 import read_fixture
+
+import boto3
+
+session = boto3.Session(
+ aws_access_key_id="-",
+ aws_secret_access_key="-",
+)
+
+
+def test_basic(sentry_init, capture_events):
+ sentry_init(traces_sample_rate=1.0, integrations=[Boto3Integration()])
+ events = capture_events()
+
+ s3 = session.resource("s3")
+ with Hub.current.start_transaction() as transaction, MockResponse(
+ s3.meta.client, 200, {}, read_fixture("s3_list.xml")
+ ):
+ bucket = s3.Bucket("bucket")
+ items = [obj for obj in bucket.objects.all()]
+ assert len(items) == 2
+ assert items[0].key == "foo.txt"
+ assert items[1].key == "bar.txt"
+ transaction.finish()
+
+ (event,) = events
+ assert event["type"] == "transaction"
+ assert len(event["spans"]) == 1
+ (span,) = event["spans"]
+ assert span["op"] == "aws.request"
+ assert span["description"] == "aws.s3.ListObjects"
+
+
+def test_streaming(sentry_init, capture_events):
+ sentry_init(traces_sample_rate=1.0, integrations=[Boto3Integration()])
+ events = capture_events()
+
+ s3 = session.resource("s3")
+ with Hub.current.start_transaction() as transaction, MockResponse(
+ s3.meta.client, 200, {}, b"hello"
+ ):
+ obj = s3.Bucket("bucket").Object("foo.pdf")
+ body = obj.get()["Body"]
+ assert body.read(1) == b"h"
+ assert body.read(2) == b"el"
+ assert body.read(3) == b"lo"
+ assert body.read(1) == b""
+ transaction.finish()
+
+ (event,) = events
+ assert event["type"] == "transaction"
+ assert len(event["spans"]) == 2
+ span1 = event["spans"][0]
+ assert span1["op"] == "aws.request"
+ assert span1["description"] == "aws.s3.GetObject"
+ span2 = event["spans"][1]
+ assert span2["op"] == "aws.request.stream"
+ assert span2["description"] == "aws.s3.GetObject"
+ assert span2["parent_span_id"] == span1["span_id"]
+
+
+def test_streaming_close(sentry_init, capture_events):
+ sentry_init(traces_sample_rate=1.0, integrations=[Boto3Integration()])
+ events = capture_events()
+
+ s3 = session.resource("s3")
+ with Hub.current.start_transaction() as transaction, MockResponse(
+ s3.meta.client, 200, {}, b"hello"
+ ):
+ obj = s3.Bucket("bucket").Object("foo.pdf")
+ body = obj.get()["Body"]
+ assert body.read(1) == b"h"
+ body.close() # close partially-read stream
+ transaction.finish()
+
+ (event,) = events
+ assert event["type"] == "transaction"
+ assert len(event["spans"]) == 2
+ span1 = event["spans"][0]
+ assert span1["op"] == "aws.request"
+ span2 = event["spans"][1]
+ assert span2["op"] == "aws.request.stream"
diff --git a/tox.ini b/tox.ini
index 98bfaf9a4d..4260c546cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -81,6 +81,8 @@ envlist =
{py3.6,py3.7,py3.8}-chalice-{1.16,1.17,1.18,1.19,1.20}
+ {py2.7,py3.6,py3.7,py3.8}-boto3-{1.14,1.15,1.16}
+
[testenv]
deps =
# if you change test-requirements.txt and your change is not being reflected
@@ -224,6 +226,10 @@ deps =
chalice-1.20: chalice>=1.20.0,<1.21.0
chalice: pytest-chalice==0.0.5
+ boto3-1.14: boto3>=1.14,<1.15
+ boto3-1.15: boto3>=1.15,<1.16
+ boto3-1.16: boto3>=1.16,<1.17
+
setenv =
PYTHONDONTWRITEBYTECODE=1
TESTPATH=tests
@@ -249,6 +255,7 @@ setenv =
spark: TESTPATH=tests/integrations/spark
pure_eval: TESTPATH=tests/integrations/pure_eval
chalice: TESTPATH=tests/integrations/chalice
+ boto3: TESTPATH=tests/integrations/boto3
COVERAGE_FILE=.coverage-{envname}
passenv =
From 617c516d7261854cdfff1cec84dbfe81390a9c14 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Fri, 30 Oct 2020 07:05:48 -0700
Subject: [PATCH 0076/2327] feat(tracing): Add aiohttp request object to
sampling context (#888)
---
sentry_sdk/integrations/aiohttp.py | 5 +--
tests/integrations/aiohttp/test_aiohttp.py | 38 ++++++++++++++++++++++
2 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py
index a9c82544a0..2d8eaedfab 100644
--- a/sentry_sdk/integrations/aiohttp.py
+++ b/sentry_sdk/integrations/aiohttp.py
@@ -106,8 +106,9 @@ async def sentry_app_handle(self, request, *args, **kwargs):
# URL resolver did not find a route or died trying.
name="generic AIOHTTP request",
)
-
- with hub.start_transaction(transaction):
+ with hub.start_transaction(
+ transaction, custom_sampling_context={"aiohttp_request": request}
+ ):
try:
response = await old_handle(self, request)
except HTTPException as e:
diff --git a/tests/integrations/aiohttp/test_aiohttp.py b/tests/integrations/aiohttp/test_aiohttp.py
index 05f235e12a..5c590bcdfa 100644
--- a/tests/integrations/aiohttp/test_aiohttp.py
+++ b/tests/integrations/aiohttp/test_aiohttp.py
@@ -5,9 +5,15 @@
import pytest
from aiohttp import web
from aiohttp.client import ServerDisconnectedError
+from aiohttp.web_request import Request
from sentry_sdk.integrations.aiohttp import AioHttpIntegration
+try:
+ from unittest import mock # python 3.3 and above
+except ImportError:
+ import mock # python < 3.3
+
async def test_basic(sentry_init, aiohttp_client, loop, capture_events):
sentry_init(integrations=[AioHttpIntegration()])
@@ -223,3 +229,35 @@ async def hello(request):
assert event["type"] == "transaction"
assert event["transaction"] == expected_transaction
+
+
+async def test_traces_sampler_gets_request_object_in_sampling_context(
+ sentry_init,
+ aiohttp_client,
+ DictionaryContaining, # noqa:N803
+ ObjectDescribedBy, # noqa:N803
+):
+ traces_sampler = mock.Mock()
+ sentry_init(
+ integrations=[AioHttpIntegration()],
+ traces_sampler=traces_sampler,
+ )
+
+ async def kangaroo_handler(request):
+ return web.Response(text="dogs are great")
+
+ app = web.Application()
+ app.router.add_get("/tricks/kangaroo", kangaroo_handler)
+
+ client = await aiohttp_client(app)
+ await client.get("/tricks/kangaroo")
+
+ traces_sampler.assert_any_call(
+ DictionaryContaining(
+ {
+ "aiohttp_request": ObjectDescribedBy(
+ type=Request, attrs={"method": "GET", "path": "/tricks/kangaroo"}
+ )
+ }
+ )
+ )
From 377f71aaedb0166395a0130a4da615c1ed8fddca Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Mon, 2 Nov 2020 03:04:52 -0800
Subject: [PATCH 0077/2327] fix(dev): Pin `channels` for django tests (#903)
---
tox.ini | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tox.ini b/tox.ini
index 4260c546cc..578582c069 100644
--- a/tox.ini
+++ b/tox.ini
@@ -91,7 +91,10 @@ deps =
-r test-requirements.txt
django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: djangorestframework>=3.0.0,<4.0.0
- {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: channels>2
+
+ ; TODO: right now channels 3 is crashing tests/integrations/django/asgi/test_asgi.py
+ ; see https://github.com/django/channels/issues/1549
+ {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: channels>2,<3
{py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: pytest-asyncio==0.10.0
{py2.7,py3.7,py3.8,py3.9}-django-{1.11,2.2,3.0,3.1,dev}: psycopg2-binary
From 5dfd8bda5fe7c6d545c0585a47c6e738ac6eee0c Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 2 Nov 2020 19:45:58 +0100
Subject: [PATCH 0078/2327] fix: Correct types on set_context (#902)
---
sentry_sdk/api.py | 2 +-
sentry_sdk/scope.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sentry_sdk/api.py b/sentry_sdk/api.py
index 658777ec79..29bd8988db 100644
--- a/sentry_sdk/api.py
+++ b/sentry_sdk/api.py
@@ -159,7 +159,7 @@ def set_tag(key, value):
@scopemethod # noqa
def set_context(key, value):
- # type: (str, Any) -> None
+ # type: (str, Dict[str, Any]) -> None
return Hub.current.scope.set_context(key, value)
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
index 3aaca430a1..f471cda3d4 100644
--- a/sentry_sdk/scope.py
+++ b/sentry_sdk/scope.py
@@ -232,7 +232,7 @@ def remove_tag(
def set_context(
self,
key, # type: str
- value, # type: Any
+ value, # type: Dict[str, Any]
):
# type: (...) -> None
"""Binds a context at a certain key to a specific value."""
From e6bd271ab56235e723571c526ba1fc25d2cc0988 Mon Sep 17 00:00:00 2001
From: Christian Clauss
Date: Mon, 2 Nov 2020 20:12:55 +0100
Subject: [PATCH 0079/2327] Replace PyPI page with README.md (#833)
Co-authored-by: Markus Unterwaditzer
---
README.md | 4 ++--
setup.py | 12 +++++++++++-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index add454fde2..559de37da3 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,8 @@ raise ValueError() # Will also create an event.
# Contributing to the SDK
-Please refer to [CONTRIBUTING.md](./CONTRIBUTING.md).
+Please refer to [CONTRIBUTING.md](https://github.com/getsentry/sentry-python/blob/master/CONTRIBUTING.md).
# License
-Licensed under the BSD license, see [`LICENSE`](./LICENSE)
+Licensed under the BSD license, see [`LICENSE`](https://github.com/getsentry/sentry-python/blob/master/LICENSE)
diff --git a/setup.py b/setup.py
index bcfe73152b..795f327df8 100644
--- a/setup.py
+++ b/setup.py
@@ -8,8 +8,17 @@
`_ to find out more.
"""
+import os
from setuptools import setup, find_packages
+here = os.path.abspath(os.path.dirname(__file__))
+
+
+def get_file_text(file_name):
+ with open(os.path.join(here, file_name)) as in_file:
+ return in_file.read()
+
+
setup(
name="sentry-sdk",
version="0.19.1",
@@ -21,7 +30,8 @@
"Changelog": "https://github.com/getsentry/sentry-python/blob/master/CHANGES.md",
},
description="Python client for Sentry (https://sentry.io)",
- long_description=__doc__,
+ long_description=get_file_text("README.md"),
+ long_description_content_type='text/markdown',
packages=find_packages(exclude=("tests", "tests.*")),
# PEP 561
package_data={"sentry_sdk": ["py.typed"]},
From 37ab6501d76aafc8810ac6e379f913912244e113 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 2 Nov 2020 20:13:20 +0100
Subject: [PATCH 0080/2327] fix: Handle exc_info=0 (#905)
Co-authored-by: sentry-bot
---
sentry_sdk/integrations/logging.py | 7 ++++++-
tests/integrations/logging/test_logging.py | 7 +++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
index 1683e6602d..d0b91a8ac5 100644
--- a/sentry_sdk/integrations/logging.py
+++ b/sentry_sdk/integrations/logging.py
@@ -183,7 +183,12 @@ def _emit(self, record):
client_options = hub.client.options
# exc_info might be None or (None, None, None)
- if record.exc_info is not None and record.exc_info[0] is not None:
+ #
+ # exc_info may also be any falsy value due to Python stdlib being
+ # liberal with what it receives and Celery's billiard being "liberal"
+ # with what it sends. See
+ # https://github.com/getsentry/sentry-python/issues/904
+ if record.exc_info and record.exc_info[0] is not None:
event, hint = event_from_exception(
record.exc_info,
client_options=client_options,
diff --git a/tests/integrations/logging/test_logging.py b/tests/integrations/logging/test_logging.py
index 3c12fa047a..e994027907 100644
--- a/tests/integrations/logging/test_logging.py
+++ b/tests/integrations/logging/test_logging.py
@@ -30,12 +30,15 @@ def test_logging_works_with_many_loggers(sentry_init, capture_events, logger):
@pytest.mark.parametrize("integrations", [None, [], [LoggingIntegration()]])
-def test_logging_defaults(integrations, sentry_init, capture_events):
+@pytest.mark.parametrize(
+ "kwargs", [{"exc_info": None}, {}, {"exc_info": 0}, {"exc_info": False}]
+)
+def test_logging_defaults(integrations, sentry_init, capture_events, kwargs):
sentry_init(integrations=integrations)
events = capture_events()
logger.info("bread")
- logger.critical("LOL")
+ logger.critical("LOL", **kwargs)
(event,) = events
assert event["level"] == "fatal"
From 220a6a6e1ae60f411c68f13fa57031daed6e582b Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 2 Nov 2020 22:13:49 +0100
Subject: [PATCH 0081/2327] doc: Changelog for 0.19.2
---
CHANGES.md | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index a7425b7fb9..6ab44e445f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,7 +29,15 @@ A major release `N` implies the previous release `N-1` will no longer receive up
## 0.19.2
-* Added support for automatic release and environment configuration for some common situations.
+* Add `traces_sampler` option.
+* The SDK now attempts to infer a default release from various environment
+ variables and the current git repo.
+* Fix a crash with async views in Django 3.1.
+* Fix a bug where complex URL patterns in Django would create malformed transaction names.
+* Add options for transaction styling in AIOHTTP.
+* Add basic attachment support (documentation tbd).
+* fix a crash in the `pure_eval` integration.
+* Integration for creating spans from `boto3`.
## 0.19.1
From 0984956378a6df094b2cdbac4a2ae8e20bfcf316 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 2 Nov 2020 22:13:59 +0100
Subject: [PATCH 0082/2327] release: 0.19.2
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index ab839fd91c..a87e4724bc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.19.1"
+release = "0.19.2"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 3075d320df..d4c12a354f 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -96,7 +96,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.19.1"
+VERSION = "0.19.2"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 795f327df8..bc90d4d806 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="0.19.1",
+ version="0.19.2",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 6f1aa1ff8046a17af71158ac0e4302deb098a44c Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Mon, 2 Nov 2020 14:32:33 -0800
Subject: [PATCH 0083/2327] feat(tracing): Add more sampling context for asgi,
celery, rq, and wsgi (#906)
---
sentry_sdk/integrations/asgi.py | 4 +-
sentry_sdk/integrations/celery.py | 13 ++-
sentry_sdk/integrations/rq.py | 4 +-
sentry_sdk/integrations/wsgi.py | 4 +-
tests/integrations/asgi/test_asgi.py | 49 +++++++++++
tests/integrations/celery/test_celery.py | 28 ++++++
tests/integrations/rq/test_rq.py | 106 +++++++++++++++++++++++
tests/integrations/wsgi/test_wsgi.py | 92 ++++++++++++++++++++
8 files changed, 296 insertions(+), 4 deletions(-)
diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py
index 7a0d0bd339..6bd1c146a0 100644
--- a/sentry_sdk/integrations/asgi.py
+++ b/sentry_sdk/integrations/asgi.py
@@ -139,7 +139,9 @@ async def _run_app(self, scope, callback):
transaction.name = _DEFAULT_TRANSACTION_NAME
transaction.set_tag("asgi.type", ty)
- with hub.start_transaction(transaction):
+ with hub.start_transaction(
+ transaction, custom_sampling_context={"asgi_scope": scope}
+ ):
# XXX: Would be cool to have correct span status, but we
# would have to wrap send(). That is a bit hard to do with
# the current abstraction over ASGI 2/3.
diff --git a/sentry_sdk/integrations/celery.py b/sentry_sdk/integrations/celery.py
index 2b51fe1f00..49b572d795 100644
--- a/sentry_sdk/integrations/celery.py
+++ b/sentry_sdk/integrations/celery.py
@@ -159,7 +159,18 @@ def _inner(*args, **kwargs):
if transaction is None:
return f(*args, **kwargs)
- with hub.start_transaction(transaction):
+ with hub.start_transaction(
+ transaction,
+ custom_sampling_context={
+ "celery_job": {
+ "task": task.name,
+ # for some reason, args[1] is a list if non-empty but a
+ # tuple if empty
+ "args": list(args[1]),
+ "kwargs": args[2],
+ }
+ },
+ ):
return f(*args, **kwargs)
return _inner # type: ignore
diff --git a/sentry_sdk/integrations/rq.py b/sentry_sdk/integrations/rq.py
index fa583c8bdc..1af4b0babd 100644
--- a/sentry_sdk/integrations/rq.py
+++ b/sentry_sdk/integrations/rq.py
@@ -70,7 +70,9 @@ def sentry_patched_perform_job(self, job, *args, **kwargs):
with capture_internal_exceptions():
transaction.name = job.func_name
- with hub.start_transaction(transaction):
+ with hub.start_transaction(
+ transaction, custom_sampling_context={"rq_job": job}
+ ):
rv = old_perform_job(self, job, *args, **kwargs)
if self.is_horse:
diff --git a/sentry_sdk/integrations/wsgi.py b/sentry_sdk/integrations/wsgi.py
index ee359c7925..13b960a713 100644
--- a/sentry_sdk/integrations/wsgi.py
+++ b/sentry_sdk/integrations/wsgi.py
@@ -117,7 +117,9 @@ def __call__(self, environ, start_response):
environ, op="http.server", name="generic WSGI request"
)
- with hub.start_transaction(transaction):
+ with hub.start_transaction(
+ transaction, custom_sampling_context={"wsgi_environ": environ}
+ ):
try:
rv = self.app(
environ,
diff --git a/tests/integrations/asgi/test_asgi.py b/tests/integrations/asgi/test_asgi.py
index 521c7c8302..b698f619e1 100644
--- a/tests/integrations/asgi/test_asgi.py
+++ b/tests/integrations/asgi/test_asgi.py
@@ -8,6 +8,11 @@
from starlette.testclient import TestClient
from starlette.websockets import WebSocket
+try:
+ from unittest import mock # python 3.3 and above
+except ImportError:
+ import mock # python < 3.3
+
@pytest.fixture
def app():
@@ -202,3 +207,47 @@ def handler(*args, **kwargs):
(exception,) = event["exception"]["values"]
assert exception["type"] == "ValueError"
assert exception["value"] == "oh no"
+
+
+def test_transaction(app, sentry_init, capture_events):
+ sentry_init(traces_sample_rate=1.0)
+ events = capture_events()
+
+ @app.route("/tricks/kangaroo")
+ def kangaroo_handler(request):
+ return PlainTextResponse("dogs are great")
+
+ client = TestClient(app)
+ client.get("/tricks/kangaroo")
+
+ event = events[0]
+ assert event["type"] == "transaction"
+ assert (
+ event["transaction"]
+ == "tests.integrations.asgi.test_asgi.test_transaction..kangaroo_handler"
+ )
+
+
+def test_traces_sampler_gets_scope_in_sampling_context(
+ app, sentry_init, DictionaryContaining # noqa: N803
+):
+ traces_sampler = mock.Mock()
+ sentry_init(traces_sampler=traces_sampler)
+
+ @app.route("/tricks/kangaroo")
+ def kangaroo_handler(request):
+ return PlainTextResponse("dogs are great")
+
+ client = TestClient(app)
+ client.get("/tricks/kangaroo")
+
+ traces_sampler.assert_any_call(
+ DictionaryContaining(
+ {
+ # starlette just uses a dictionary to hold the scope
+ "asgi_scope": DictionaryContaining(
+ {"method": "GET", "path": "/tricks/kangaroo"}
+ )
+ }
+ )
+ )
diff --git a/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py
index 32b3021b1a..a405e53fd9 100644
--- a/tests/integrations/celery/test_celery.py
+++ b/tests/integrations/celery/test_celery.py
@@ -11,6 +11,11 @@
from celery import Celery, VERSION
from celery.bin import worker
+try:
+ from unittest import mock # python 3.3 and above
+except ImportError:
+ import mock # python < 3.3
+
@pytest.fixture
def connect_signal(request):
@@ -379,3 +384,26 @@ def dummy_task(self, x, y):
assert dummy_task.apply(kwargs={"x": 1, "y": 1}).wait() == 1
assert celery_invocation(dummy_task, 1, 1)[0].wait() == 1
+
+
+def test_traces_sampler_gets_task_info_in_sampling_context(
+ init_celery, celery_invocation, DictionaryContaining # noqa:N803
+):
+ traces_sampler = mock.Mock()
+ celery = init_celery(traces_sampler=traces_sampler)
+
+ @celery.task(name="dog_walk")
+ def walk_dogs(x, y):
+ dogs, route = x
+ num_loops = y
+ return dogs, route, num_loops
+
+ _, args_kwargs = celery_invocation(
+ walk_dogs, [["Maisey", "Charlie", "Bodhi", "Cory"], "Dog park round trip"], 1
+ )
+
+ traces_sampler.assert_any_call(
+ # depending on the iteration of celery_invocation, the data might be
+ # passed as args or as kwargs, so make this generic
+ DictionaryContaining({"celery_job": dict(task="dog_walk", **args_kwargs)})
+ )
diff --git a/tests/integrations/rq/test_rq.py b/tests/integrations/rq/test_rq.py
index b98b6be7c3..ee3e5f51fa 100644
--- a/tests/integrations/rq/test_rq.py
+++ b/tests/integrations/rq/test_rq.py
@@ -5,6 +5,11 @@
from fakeredis import FakeStrictRedis
import rq
+try:
+ from unittest import mock # python 3.3 and above
+except ImportError:
+ import mock # python < 3.3
+
@pytest.fixture(autouse=True)
def _patch_rq_get_server_version(monkeypatch):
@@ -28,6 +33,14 @@ def crashing_job(foo):
1 / 0
+def chew_up_shoes(dog, human, shoes):
+ raise Exception("{}!! Why did you eat {}'s {}??".format(dog, human, shoes))
+
+
+def do_trick(dog, trick):
+ return "{}, can you {}? Good dog!".format(dog, trick)
+
+
def test_basic(sentry_init, capture_events):
sentry_init(integrations=[RqIntegration()])
events = capture_events()
@@ -71,3 +84,96 @@ def test_transport_shutdown(sentry_init, capture_events_forksafe):
(exception,) = event["exception"]["values"]
assert exception["type"] == "ZeroDivisionError"
+
+
+def test_transaction_with_error(
+ sentry_init, capture_events, DictionaryContaining # noqa:N803
+):
+
+ sentry_init(integrations=[RqIntegration()], traces_sample_rate=1.0)
+ events = capture_events()
+
+ queue = rq.Queue(connection=FakeStrictRedis())
+ worker = rq.SimpleWorker([queue], connection=queue.connection)
+
+ queue.enqueue(chew_up_shoes, "Charlie", "Katie", shoes="flip-flops")
+ worker.work(burst=True)
+
+ error_event, envelope = events
+
+ assert error_event["transaction"] == "tests.integrations.rq.test_rq.chew_up_shoes"
+ assert error_event["contexts"]["trace"]["op"] == "rq.task"
+ assert error_event["exception"]["values"][0]["type"] == "Exception"
+ assert (
+ error_event["exception"]["values"][0]["value"]
+ == "Charlie!! Why did you eat Katie's flip-flops??"
+ )
+
+ assert envelope["type"] == "transaction"
+ assert envelope["contexts"]["trace"] == error_event["contexts"]["trace"]
+ assert envelope["transaction"] == error_event["transaction"]
+ assert envelope["extra"]["rq-job"] == DictionaryContaining(
+ {
+ "args": ["Charlie", "Katie"],
+ "kwargs": {"shoes": "flip-flops"},
+ "func": "tests.integrations.rq.test_rq.chew_up_shoes",
+ "description": "tests.integrations.rq.test_rq.chew_up_shoes('Charlie', 'Katie', shoes='flip-flops')",
+ }
+ )
+
+
+def test_transaction_no_error(
+ sentry_init, capture_events, DictionaryContaining # noqa:N803
+):
+ sentry_init(integrations=[RqIntegration()], traces_sample_rate=1.0)
+ events = capture_events()
+
+ queue = rq.Queue(connection=FakeStrictRedis())
+ worker = rq.SimpleWorker([queue], connection=queue.connection)
+
+ queue.enqueue(do_trick, "Maisey", trick="kangaroo")
+ worker.work(burst=True)
+
+ envelope = events[0]
+
+ assert envelope["type"] == "transaction"
+ assert envelope["contexts"]["trace"]["op"] == "rq.task"
+ assert envelope["transaction"] == "tests.integrations.rq.test_rq.do_trick"
+ assert envelope["extra"]["rq-job"] == DictionaryContaining(
+ {
+ "args": ["Maisey"],
+ "kwargs": {"trick": "kangaroo"},
+ "func": "tests.integrations.rq.test_rq.do_trick",
+ "description": "tests.integrations.rq.test_rq.do_trick('Maisey', trick='kangaroo')",
+ }
+ )
+
+
+def test_traces_sampler_gets_correct_values_in_sampling_context(
+ sentry_init, DictionaryContaining, ObjectDescribedBy # noqa:N803
+):
+ traces_sampler = mock.Mock(return_value=True)
+ sentry_init(integrations=[RqIntegration()], traces_sampler=traces_sampler)
+
+ queue = rq.Queue(connection=FakeStrictRedis())
+ worker = rq.SimpleWorker([queue], connection=queue.connection)
+
+ queue.enqueue(do_trick, "Bodhi", trick="roll over")
+ worker.work(burst=True)
+
+ traces_sampler.assert_any_call(
+ DictionaryContaining(
+ {
+ "rq_job": ObjectDescribedBy(
+ type=rq.job.Job,
+ attrs={
+ "description": "tests.integrations.rq.test_rq.do_trick('Bodhi', trick='roll over')",
+ "result": "Bodhi, can you roll over? Good dog!",
+ "func_name": "tests.integrations.rq.test_rq.do_trick",
+ "args": ("Bodhi",),
+ "kwargs": {"trick": "roll over"},
+ },
+ ),
+ }
+ )
+ )
diff --git a/tests/integrations/wsgi/test_wsgi.py b/tests/integrations/wsgi/test_wsgi.py
index 67bfe055d1..1f9613997a 100644
--- a/tests/integrations/wsgi/test_wsgi.py
+++ b/tests/integrations/wsgi/test_wsgi.py
@@ -3,6 +3,11 @@
from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
+try:
+ from unittest import mock # python 3.3 and above
+except ImportError:
+ import mock # python < 3.3
+
@pytest.fixture
def crashing_app():
@@ -109,3 +114,90 @@ def test_keyboard_interrupt_is_captured(sentry_init, capture_events):
assert exc["type"] == "KeyboardInterrupt"
assert exc["value"] == ""
assert event["level"] == "error"
+
+
+def test_transaction_with_error(
+ sentry_init, crashing_app, capture_events, DictionaryContaining # noqa:N803
+):
+ def dogpark(environ, start_response):
+ raise Exception("Fetch aborted. The ball was not returned.")
+
+ sentry_init(send_default_pii=True, traces_sample_rate=1.0)
+ app = SentryWsgiMiddleware(dogpark)
+ client = Client(app)
+ events = capture_events()
+
+ with pytest.raises(Exception):
+ client.get("http://dogs.are.great/sit/stay/rollover/")
+
+ error_event, envelope = events
+
+ assert error_event["transaction"] == "generic WSGI request"
+ assert error_event["contexts"]["trace"]["op"] == "http.server"
+ assert error_event["exception"]["values"][0]["type"] == "Exception"
+ assert (
+ error_event["exception"]["values"][0]["value"]
+ == "Fetch aborted. The ball was not returned."
+ )
+
+ assert envelope["type"] == "transaction"
+
+ # event trace context is a subset of envelope trace context
+ assert envelope["contexts"]["trace"] == DictionaryContaining(
+ error_event["contexts"]["trace"]
+ )
+ assert envelope["contexts"]["trace"]["status"] == "internal_error"
+ assert envelope["transaction"] == error_event["transaction"]
+ assert envelope["request"] == error_event["request"]
+
+
+def test_transaction_no_error(
+ sentry_init, capture_events, DictionaryContaining # noqa:N803
+):
+ def dogpark(environ, start_response):
+ start_response("200 OK", [])
+ return ["Go get the ball! Good dog!"]
+
+ sentry_init(send_default_pii=True, traces_sample_rate=1.0)
+ app = SentryWsgiMiddleware(dogpark)
+ client = Client(app)
+ events = capture_events()
+
+ client.get("/dogs/are/great/")
+
+ envelope = events[0]
+
+ assert envelope["type"] == "transaction"
+ assert envelope["transaction"] == "generic WSGI request"
+ assert envelope["contexts"]["trace"]["op"] == "http.server"
+ assert envelope["request"] == DictionaryContaining(
+ {"method": "GET", "url": "http://localhost/dogs/are/great/"}
+ )
+
+
+def test_traces_sampler_gets_correct_values_in_sampling_context(
+ sentry_init, DictionaryContaining, ObjectDescribedBy # noqa:N803
+):
+ def app(environ, start_response):
+ start_response("200 OK", [])
+ return ["Go get the ball! Good dog!"]
+
+ traces_sampler = mock.Mock(return_value=True)
+ sentry_init(send_default_pii=True, traces_sampler=traces_sampler)
+ app = SentryWsgiMiddleware(app)
+ client = Client(app)
+
+ client.get("/dogs/are/great/")
+
+ traces_sampler.assert_any_call(
+ DictionaryContaining(
+ {
+ "wsgi_environ": DictionaryContaining(
+ {
+ "PATH_INFO": "/dogs/are/great/",
+ "REQUEST_METHOD": "GET",
+ },
+ ),
+ }
+ )
+ )
From 549b7df3707cb41edf88390a75132434d3ed8c01 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Tue, 3 Nov 2020 07:24:47 -0800
Subject: [PATCH 0084/2327] fix(breadcrumbs): Make all auto-generated
breadcrumbs follow spec (#884)
---
examples/tracing/events | 2 +-
sentry_sdk/integrations/logging.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/tracing/events b/examples/tracing/events
index f68ae2b8c2..4e486f79a4 100644
--- a/examples/tracing/events
+++ b/examples/tracing/events
@@ -6,5 +6,5 @@
{"start_timestamp": "2019-06-14T14:01:40Z", "transaction": "wait", "server_name": "apfeltasche.local", "extra": {"sys.argv": ["/Users/untitaker/projects/sentry-python/.venv/bin/flask", "run", "--reload"]}, "contexts": {"trace": {"parent_span_id": "bce14471e0e9654d", "trace_id": "a0fa8803753e40fd8124b21eeb2986b5", "span_id": "bf5be759039ede9a"}}, "timestamp": "2019-06-14T14:01:40Z", "modules": {"more-itertools": "5.0.0", "six": "1.12.0", "funcsigs": "1.0.2", "vine": "1.2.0", "tqdm": "4.31.1", "configparser": "3.7.4", "py-cpuinfo": "5.0.0", "pygments": "2.3.1", "attrs": "19.1.0", "pip": "19.0.3", "blinker": "1.4", "parso": "0.4.0", "django": "1.11.20", "click": "7.0", "requests-toolbelt": "0.9.1", "virtualenv": "16.4.3", "autoflake": "1.3", "tox": "3.7.0", "statistics": "1.0.3.5", "rq": "1.0", "flask": "1.0.2", "pkginfo": "1.5.0.1", "py": "1.8.0", "redis": "3.2.1", "celery": "4.2.1", "docutils": "0.14", "jedi": "0.13.3", "pytest": "4.4.1", "kombu": "4.4.0", "werkzeug": "0.14.1", "webencodings": "0.5.1", "toml": "0.10.0", "itsdangerous": "1.1.0", "certifi": "2019.3.9", "readme-renderer": "24.0", "wheel": "0.33.1", "pathlib2": "2.3.3", "python": "2.7.15", "urllib3": "1.24.1", "sentry-sdk": "0.9.0", "twine": "1.13.0", "pytest-benchmark": "3.2.2", "markupsafe": "1.1.1", "billiard": "3.5.0.5", "jinja2": "2.10", "coverage": "4.5.3", "bleach": "3.1.0", "pluggy": "0.9.0", "atomicwrites": "1.3.0", "filelock": "3.0.10", "pyflakes": "2.1.1", "pytz": "2018.9", "futures": "3.2.0", "pytest-cov": "2.7.1", "backports.functools-lru-cache": "1.5", "wsgiref": "0.1.2", "python-jsonrpc-server": "0.1.2", "python-language-server": "0.26.1", "future": "0.17.1", "chardet": "3.0.4", "amqp": "2.4.2", "setuptools": "40.8.0", "requests": "2.21.0", "idna": "2.8", "scandir": "1.10.0"}, "request": {"url": "http://127.0.0.1:5000/wait/sentry-python-tracing-example-result:aGVsbG8gd29ybGQK", "query_string": "", "method": "GET", "env": {"SERVER_NAME": "127.0.0.1", "SERVER_PORT": "5000"}, "headers": {"Accept-Language": "en-US,en;q=0.5", "Accept-Encoding": "gzip, deflate", "Host": "127.0.0.1:5000", "Accept": "*/*", "Sentry-Trace": "00-a0fa8803753e40fd8124b21eeb2986b5-bce14471e0e9654d-00", "Connection": "keep-alive", "Referer": "http://127.0.0.1:5000/", "Pragma": "no-cache", "Cache-Control": "no-cache", "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:67.0) Gecko/20100101 Firefox/67.0"}}, "event_id": "e8c17b0cbe2045758aaffc2f11672fab", "platform": "python", "spans": [], "breadcrumbs": [], "type": "transaction", "sdk": {"version": "0.9.0", "name": "sentry.python", "packages": [{"version": "0.9.0", "name": "pypi:sentry-sdk"}], "integrations": ["argv", "atexit", "dedupe", "excepthook", "flask", "logging", "modules", "rq", "stdlib", "threading"]}}
{"start_timestamp": "2019-06-14T14:01:40Z", "transaction": "wait", "server_name": "apfeltasche.local", "extra": {"sys.argv": ["/Users/untitaker/projects/sentry-python/.venv/bin/flask", "run", "--reload"]}, "contexts": {"trace": {"parent_span_id": "bce14471e0e9654d", "trace_id": "a0fa8803753e40fd8124b21eeb2986b5", "span_id": "b2d56249f7fdf327"}}, "timestamp": "2019-06-14T14:01:40Z", "modules": {"more-itertools": "5.0.0", "six": "1.12.0", "funcsigs": "1.0.2", "vine": "1.2.0", "tqdm": "4.31.1", "configparser": "3.7.4", "py-cpuinfo": "5.0.0", "pygments": "2.3.1", "attrs": "19.1.0", "pip": "19.0.3", "blinker": "1.4", "parso": "0.4.0", "django": "1.11.20", "click": "7.0", "requests-toolbelt": "0.9.1", "virtualenv": "16.4.3", "autoflake": "1.3", "tox": "3.7.0", "statistics": "1.0.3.5", "rq": "1.0", "flask": "1.0.2", "pkginfo": "1.5.0.1", "py": "1.8.0", "redis": "3.2.1", "celery": "4.2.1", "docutils": "0.14", "jedi": "0.13.3", "pytest": "4.4.1", "kombu": "4.4.0", "werkzeug": "0.14.1", "webencodings": "0.5.1", "toml": "0.10.0", "itsdangerous": "1.1.0", "certifi": "2019.3.9", "readme-renderer": "24.0", "wheel": "0.33.1", "pathlib2": "2.3.3", "python": "2.7.15", "urllib3": "1.24.1", "sentry-sdk": "0.9.0", "twine": "1.13.0", "pytest-benchmark": "3.2.2", "markupsafe": "1.1.1", "billiard": "3.5.0.5", "jinja2": "2.10", "coverage": "4.5.3", "bleach": "3.1.0", "pluggy": "0.9.0", "atomicwrites": "1.3.0", "filelock": "3.0.10", "pyflakes": "2.1.1", "pytz": "2018.9", "futures": "3.2.0", "pytest-cov": "2.7.1", "backports.functools-lru-cache": "1.5", "wsgiref": "0.1.2", "python-jsonrpc-server": "0.1.2", "python-language-server": "0.26.1", "future": "0.17.1", "chardet": "3.0.4", "amqp": "2.4.2", "setuptools": "40.8.0", "requests": "2.21.0", "idna": "2.8", "scandir": "1.10.0"}, "request": {"url": "http://127.0.0.1:5000/wait/sentry-python-tracing-example-result:aGVsbG8gd29ybGQK", "query_string": "", "method": "GET", "env": {"SERVER_NAME": "127.0.0.1", "SERVER_PORT": "5000"}, "headers": {"Accept-Language": "en-US,en;q=0.5", "Accept-Encoding": "gzip, deflate", "Host": "127.0.0.1:5000", "Accept": "*/*", "Sentry-Trace": "00-a0fa8803753e40fd8124b21eeb2986b5-bce14471e0e9654d-00", "Connection": "keep-alive", "Referer": "http://127.0.0.1:5000/", "Pragma": "no-cache", "Cache-Control": "no-cache", "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:67.0) Gecko/20100101 Firefox/67.0"}}, "event_id": "6577f8056383427d85df5b33bf9ccc2c", "platform": "python", "spans": [], "breadcrumbs": [], "type": "transaction", "sdk": {"version": "0.9.0", "name": "sentry.python", "packages": [{"version": "0.9.0", "name": "pypi:sentry-sdk"}], "integrations": ["argv", "atexit", "dedupe", "excepthook", "flask", "logging", "modules", "rq", "stdlib", "threading"]}}
{"start_timestamp": "2019-06-14T14:01:41Z", "transaction": "wait", "server_name": "apfeltasche.local", "extra": {"sys.argv": ["/Users/untitaker/projects/sentry-python/.venv/bin/flask", "run", "--reload"]}, "contexts": {"trace": {"parent_span_id": "bce14471e0e9654d", "trace_id": "a0fa8803753e40fd8124b21eeb2986b5", "span_id": "ac62ff8ae1b2eda6"}}, "timestamp": "2019-06-14T14:01:41Z", "modules": {"more-itertools": "5.0.0", "six": "1.12.0", "funcsigs": "1.0.2", "vine": "1.2.0", "tqdm": "4.31.1", "configparser": "3.7.4", "py-cpuinfo": "5.0.0", "pygments": "2.3.1", "attrs": "19.1.0", "pip": "19.0.3", "blinker": "1.4", "parso": "0.4.0", "django": "1.11.20", "click": "7.0", "requests-toolbelt": "0.9.1", "virtualenv": "16.4.3", "autoflake": "1.3", "tox": "3.7.0", "statistics": "1.0.3.5", "rq": "1.0", "flask": "1.0.2", "pkginfo": "1.5.0.1", "py": "1.8.0", "redis": "3.2.1", "celery": "4.2.1", "docutils": "0.14", "jedi": "0.13.3", "pytest": "4.4.1", "kombu": "4.4.0", "werkzeug": "0.14.1", "webencodings": "0.5.1", "toml": "0.10.0", "itsdangerous": "1.1.0", "certifi": "2019.3.9", "readme-renderer": "24.0", "wheel": "0.33.1", "pathlib2": "2.3.3", "python": "2.7.15", "urllib3": "1.24.1", "sentry-sdk": "0.9.0", "twine": "1.13.0", "pytest-benchmark": "3.2.2", "markupsafe": "1.1.1", "billiard": "3.5.0.5", "jinja2": "2.10", "coverage": "4.5.3", "bleach": "3.1.0", "pluggy": "0.9.0", "atomicwrites": "1.3.0", "filelock": "3.0.10", "pyflakes": "2.1.1", "pytz": "2018.9", "futures": "3.2.0", "pytest-cov": "2.7.1", "backports.functools-lru-cache": "1.5", "wsgiref": "0.1.2", "python-jsonrpc-server": "0.1.2", "python-language-server": "0.26.1", "future": "0.17.1", "chardet": "3.0.4", "amqp": "2.4.2", "setuptools": "40.8.0", "requests": "2.21.0", "idna": "2.8", "scandir": "1.10.0"}, "request": {"url": "http://127.0.0.1:5000/wait/sentry-python-tracing-example-result:aGVsbG8gd29ybGQK", "query_string": "", "method": "GET", "env": {"SERVER_NAME": "127.0.0.1", "SERVER_PORT": "5000"}, "headers": {"Accept-Language": "en-US,en;q=0.5", "Accept-Encoding": "gzip, deflate", "Host": "127.0.0.1:5000", "Accept": "*/*", "Sentry-Trace": "00-a0fa8803753e40fd8124b21eeb2986b5-bce14471e0e9654d-00", "Connection": "keep-alive", "Referer": "http://127.0.0.1:5000/", "Pragma": "no-cache", "Cache-Control": "no-cache", "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:67.0) Gecko/20100101 Firefox/67.0"}}, "event_id": "c03dfbab8a8145eeaa0d1a1adfcfcaa5", "platform": "python", "spans": [], "breadcrumbs": [], "type": "transaction", "sdk": {"version": "0.9.0", "name": "sentry.python", "packages": [{"version": "0.9.0", "name": "pypi:sentry-sdk"}], "integrations": ["argv", "atexit", "dedupe", "excepthook", "flask", "logging", "modules", "rq", "stdlib", "threading"]}}
-{"start_timestamp": "2019-06-14T14:01:40Z", "transaction": "tracing.decode_base64", "server_name": "apfeltasche.local", "extra": {"sys.argv": ["/Users/untitaker/projects/sentry-python/.venv/bin/flask", "worker"], "rq-job": {"kwargs": {"redis_key": "sentry-python-tracing-example-result:aGVsbG8gd29ybGQK", "encoded": "aGVsbG8gd29ybGQK"}, "args": [], "description": "tracing.decode_base64(encoded=u'aGVsbG8gd29ybGQK', redis_key='sentry-python-tracing-example-result:aGVsbG8gd29ybGQK')", "func": "tracing.decode_base64", "job_id": "fabff810-3dbb-45d3-987e-86395790dfa9"}}, "contexts": {"trace": {"parent_span_id": "946edde6ee421874", "trace_id": "a0fa8803753e40fd8124b21eeb2986b5", "span_id": "9c2a6db8c79068a2"}}, "timestamp": "2019-06-14T14:01:41Z", "modules": {"more-itertools": "5.0.0", "six": "1.12.0", "funcsigs": "1.0.2", "vine": "1.2.0", "tqdm": "4.31.1", "configparser": "3.7.4", "py-cpuinfo": "5.0.0", "pygments": "2.3.1", "attrs": "19.1.0", "pip": "19.0.3", "blinker": "1.4", "parso": "0.4.0", "django": "1.11.20", "click": "7.0", "requests-toolbelt": "0.9.1", "virtualenv": "16.4.3", "autoflake": "1.3", "tox": "3.7.0", "statistics": "1.0.3.5", "rq": "1.0", "flask": "1.0.2", "pkginfo": "1.5.0.1", "py": "1.8.0", "redis": "3.2.1", "celery": "4.2.1", "docutils": "0.14", "jedi": "0.13.3", "pytest": "4.4.1", "kombu": "4.4.0", "werkzeug": "0.14.1", "webencodings": "0.5.1", "toml": "0.10.0", "itsdangerous": "1.1.0", "certifi": "2019.3.9", "readme-renderer": "24.0", "wheel": "0.33.1", "pathlib2": "2.3.3", "python": "2.7.15", "urllib3": "1.24.1", "sentry-sdk": "0.9.0", "twine": "1.13.0", "pytest-benchmark": "3.2.2", "markupsafe": "1.1.1", "billiard": "3.5.0.5", "jinja2": "2.10", "coverage": "4.5.3", "bleach": "3.1.0", "pluggy": "0.9.0", "atomicwrites": "1.3.0", "filelock": "3.0.10", "pyflakes": "2.1.1", "pytz": "2018.9", "futures": "3.2.0", "pytest-cov": "2.7.1", "backports.functools-lru-cache": "1.5", "wsgiref": "0.1.2", "python-jsonrpc-server": "0.1.2", "python-language-server": "0.26.1", "future": "0.17.1", "chardet": "3.0.4", "amqp": "2.4.2", "setuptools": "40.8.0", "requests": "2.21.0", "idna": "2.8", "scandir": "1.10.0"}, "event_id": "2975518984734ef49d2f75db4e928ddc", "platform": "python", "spans": [{"start_timestamp": "2019-06-14T14:01:41Z", "same_process_as_parent": true, "description": "http://httpbin.org/base64/aGVsbG8gd29ybGQK GET", "tags": {"http.status_code": 200, "error": false}, "timestamp": "2019-06-14T14:01:41Z", "parent_span_id": "9c2a6db8c79068a2", "trace_id": "a0fa8803753e40fd8124b21eeb2986b5", "op": "http", "data": {"url": "http://httpbin.org/base64/aGVsbG8gd29ybGQK", "status_code": 200, "reason": "OK", "method": "GET"}, "span_id": "8c931f4740435fb8"}], "breadcrumbs": [{"category": "httplib", "data": {"url": "http://httpbin.org/base64/aGVsbG8gd29ybGQK", "status_code": 200, "reason": "OK", "method": "GET"}, "type": "http", "timestamp": "2019-06-14T12:01:41Z"}, {"category": "rq.worker", "ty": "log", "timestamp": "2019-06-14T14:01:41Z", "level": "info", "data": {"asctime": "14:01:41"}, "message": "\u001b[32mdefault\u001b[39;49;00m: \u001b[34mJob OK\u001b[39;49;00m (fabff810-3dbb-45d3-987e-86395790dfa9)", "type": "default"}, {"category": "rq.worker", "ty": "log", "timestamp": "2019-06-14T14:01:41Z", "level": "info", "data": {"asctime": "14:01:41"}, "message": "Result is kept for 500 seconds", "type": "default"}], "type": "transaction", "sdk": {"version": "0.9.0", "name": "sentry.python", "packages": [{"version": "0.9.0", "name": "pypi:sentry-sdk"}], "integrations": ["argv", "atexit", "dedupe", "excepthook", "flask", "logging", "modules", "rq", "stdlib", "threading"]}}
+{"start_timestamp": "2019-06-14T14:01:40Z", "transaction": "tracing.decode_base64", "server_name": "apfeltasche.local", "extra": {"sys.argv": ["/Users/untitaker/projects/sentry-python/.venv/bin/flask", "worker"], "rq-job": {"kwargs": {"redis_key": "sentry-python-tracing-example-result:aGVsbG8gd29ybGQK", "encoded": "aGVsbG8gd29ybGQK"}, "args": [], "description": "tracing.decode_base64(encoded=u'aGVsbG8gd29ybGQK', redis_key='sentry-python-tracing-example-result:aGVsbG8gd29ybGQK')", "func": "tracing.decode_base64", "job_id": "fabff810-3dbb-45d3-987e-86395790dfa9"}}, "contexts": {"trace": {"parent_span_id": "946edde6ee421874", "trace_id": "a0fa8803753e40fd8124b21eeb2986b5", "span_id": "9c2a6db8c79068a2"}}, "timestamp": "2019-06-14T14:01:41Z", "modules": {"more-itertools": "5.0.0", "six": "1.12.0", "funcsigs": "1.0.2", "vine": "1.2.0", "tqdm": "4.31.1", "configparser": "3.7.4", "py-cpuinfo": "5.0.0", "pygments": "2.3.1", "attrs": "19.1.0", "pip": "19.0.3", "blinker": "1.4", "parso": "0.4.0", "django": "1.11.20", "click": "7.0", "requests-toolbelt": "0.9.1", "virtualenv": "16.4.3", "autoflake": "1.3", "tox": "3.7.0", "statistics": "1.0.3.5", "rq": "1.0", "flask": "1.0.2", "pkginfo": "1.5.0.1", "py": "1.8.0", "redis": "3.2.1", "celery": "4.2.1", "docutils": "0.14", "jedi": "0.13.3", "pytest": "4.4.1", "kombu": "4.4.0", "werkzeug": "0.14.1", "webencodings": "0.5.1", "toml": "0.10.0", "itsdangerous": "1.1.0", "certifi": "2019.3.9", "readme-renderer": "24.0", "wheel": "0.33.1", "pathlib2": "2.3.3", "python": "2.7.15", "urllib3": "1.24.1", "sentry-sdk": "0.9.0", "twine": "1.13.0", "pytest-benchmark": "3.2.2", "markupsafe": "1.1.1", "billiard": "3.5.0.5", "jinja2": "2.10", "coverage": "4.5.3", "bleach": "3.1.0", "pluggy": "0.9.0", "atomicwrites": "1.3.0", "filelock": "3.0.10", "pyflakes": "2.1.1", "pytz": "2018.9", "futures": "3.2.0", "pytest-cov": "2.7.1", "backports.functools-lru-cache": "1.5", "wsgiref": "0.1.2", "python-jsonrpc-server": "0.1.2", "python-language-server": "0.26.1", "future": "0.17.1", "chardet": "3.0.4", "amqp": "2.4.2", "setuptools": "40.8.0", "requests": "2.21.0", "idna": "2.8", "scandir": "1.10.0"}, "event_id": "2975518984734ef49d2f75db4e928ddc", "platform": "python", "spans": [{"start_timestamp": "2019-06-14T14:01:41Z", "same_process_as_parent": true, "description": "http://httpbin.org/base64/aGVsbG8gd29ybGQK GET", "tags": {"http.status_code": 200, "error": false}, "timestamp": "2019-06-14T14:01:41Z", "parent_span_id": "9c2a6db8c79068a2", "trace_id": "a0fa8803753e40fd8124b21eeb2986b5", "op": "http", "data": {"url": "http://httpbin.org/base64/aGVsbG8gd29ybGQK", "status_code": 200, "reason": "OK", "method": "GET"}, "span_id": "8c931f4740435fb8"}], "breadcrumbs": [{"category": "httplib", "data": {"url": "http://httpbin.org/base64/aGVsbG8gd29ybGQK", "status_code": 200, "reason": "OK", "method": "GET"}, "type": "http", "timestamp": "2019-06-14T12:01:41Z"}, {"category": "rq.worker", "type": "log", "timestamp": "2019-06-14T14:01:41Z", "level": "info", "data": {"asctime": "14:01:41"}, "message": "\u001b[32mdefault\u001b[39;49;00m: \u001b[34mJob OK\u001b[39;49;00m (fabff810-3dbb-45d3-987e-86395790dfa9)", "type": "default"}, {"category": "rq.worker", "type": "log", "timestamp": "2019-06-14T14:01:41Z", "level": "info", "data": {"asctime": "14:01:41"}, "message": "Result is kept for 500 seconds", "type": "default"}], "type": "transaction", "sdk": {"version": "0.9.0", "name": "sentry.python", "packages": [{"version": "0.9.0", "name": "pypi:sentry-sdk"}], "integrations": ["argv", "atexit", "dedupe", "excepthook", "flask", "logging", "modules", "rq", "stdlib", "threading"]}}
{"start_timestamp": "2019-06-14T14:01:41Z", "transaction": "wait", "server_name": "apfeltasche.local", "extra": {"sys.argv": ["/Users/untitaker/projects/sentry-python/.venv/bin/flask", "run", "--reload"]}, "contexts": {"trace": {"parent_span_id": "bce14471e0e9654d", "trace_id": "a0fa8803753e40fd8124b21eeb2986b5", "span_id": "9d91c6558b2e4c06"}}, "timestamp": "2019-06-14T14:01:41Z", "modules": {"more-itertools": "5.0.0", "six": "1.12.0", "funcsigs": "1.0.2", "vine": "1.2.0", "tqdm": "4.31.1", "configparser": "3.7.4", "py-cpuinfo": "5.0.0", "pygments": "2.3.1", "attrs": "19.1.0", "pip": "19.0.3", "blinker": "1.4", "parso": "0.4.0", "django": "1.11.20", "click": "7.0", "requests-toolbelt": "0.9.1", "virtualenv": "16.4.3", "autoflake": "1.3", "tox": "3.7.0", "statistics": "1.0.3.5", "rq": "1.0", "flask": "1.0.2", "pkginfo": "1.5.0.1", "py": "1.8.0", "redis": "3.2.1", "celery": "4.2.1", "docutils": "0.14", "jedi": "0.13.3", "pytest": "4.4.1", "kombu": "4.4.0", "werkzeug": "0.14.1", "webencodings": "0.5.1", "toml": "0.10.0", "itsdangerous": "1.1.0", "certifi": "2019.3.9", "readme-renderer": "24.0", "wheel": "0.33.1", "pathlib2": "2.3.3", "python": "2.7.15", "urllib3": "1.24.1", "sentry-sdk": "0.9.0", "twine": "1.13.0", "pytest-benchmark": "3.2.2", "markupsafe": "1.1.1", "billiard": "3.5.0.5", "jinja2": "2.10", "coverage": "4.5.3", "bleach": "3.1.0", "pluggy": "0.9.0", "atomicwrites": "1.3.0", "filelock": "3.0.10", "pyflakes": "2.1.1", "pytz": "2018.9", "futures": "3.2.0", "pytest-cov": "2.7.1", "backports.functools-lru-cache": "1.5", "wsgiref": "0.1.2", "python-jsonrpc-server": "0.1.2", "python-language-server": "0.26.1", "future": "0.17.1", "chardet": "3.0.4", "amqp": "2.4.2", "setuptools": "40.8.0", "requests": "2.21.0", "idna": "2.8", "scandir": "1.10.0"}, "request": {"url": "http://127.0.0.1:5000/wait/sentry-python-tracing-example-result:aGVsbG8gd29ybGQK", "query_string": "", "method": "GET", "env": {"SERVER_NAME": "127.0.0.1", "SERVER_PORT": "5000"}, "headers": {"Accept-Language": "en-US,en;q=0.5", "Accept-Encoding": "gzip, deflate", "Host": "127.0.0.1:5000", "Accept": "*/*", "Sentry-Trace": "00-a0fa8803753e40fd8124b21eeb2986b5-bce14471e0e9654d-00", "Connection": "keep-alive", "Referer": "http://127.0.0.1:5000/", "Pragma": "no-cache", "Cache-Control": "no-cache", "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:67.0) Gecko/20100101 Firefox/67.0"}}, "event_id": "339cfc84adf0405986514c808afb0f68", "platform": "python", "spans": [], "breadcrumbs": [], "type": "transaction", "sdk": {"version": "0.9.0", "name": "sentry.python", "packages": [{"version": "0.9.0", "name": "pypi:sentry-sdk"}], "integrations": ["argv", "atexit", "dedupe", "excepthook", "flask", "logging", "modules", "rq", "stdlib", "threading"]}}
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
index d0b91a8ac5..138a85317d 100644
--- a/sentry_sdk/integrations/logging.py
+++ b/sentry_sdk/integrations/logging.py
@@ -104,7 +104,7 @@ def _can_record(record):
def _breadcrumb_from_record(record):
# type: (LogRecord) -> Dict[str, Any]
return {
- "ty": "log",
+ "type": "log",
"level": _logging_to_event_level(record.levelname),
"category": record.name,
"message": record.message,
From 7fe9e06676ff3748f052c5f2dc0980655382415a Mon Sep 17 00:00:00 2001
From: Luke Pomfrey
Date: Mon, 9 Nov 2020 08:36:45 +0000
Subject: [PATCH 0085/2327] Fix patching of AsgiHandler in Django Channels >=
3.0 (#912)
---
sentry_sdk/integrations/django/asgi.py | 28 +++++++++++++++++---------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/sentry_sdk/integrations/django/asgi.py b/sentry_sdk/integrations/django/asgi.py
index 3c690fb6a1..50d7b67723 100644
--- a/sentry_sdk/integrations/django/asgi.py
+++ b/sentry_sdk/integrations/django/asgi.py
@@ -53,22 +53,30 @@ async def sentry_patched_get_response_async(self, request):
def patch_channels_asgi_handler_impl(cls):
# type: (Any) -> None
+ import channels # type: ignore
from sentry_sdk.integrations.django import DjangoIntegration
- old_app = cls.__call__
+ if channels.__version__ < "3.0.0":
- async def sentry_patched_asgi_handler(self, receive, send):
- # type: (Any, Any, Any) -> Any
- if Hub.current.get_integration(DjangoIntegration) is None:
- return await old_app(self, receive, send)
+ old_app = cls.__call__
- middleware = SentryAsgiMiddleware(
- lambda _scope: old_app.__get__(self, cls), unsafe_context_data=True
- )
+ async def sentry_patched_asgi_handler(self, receive, send):
+ # type: (Any, Any, Any) -> Any
+ if Hub.current.get_integration(DjangoIntegration) is None:
+ return await old_app(self, receive, send)
- return await middleware(self.scope)(receive, send)
+ middleware = SentryAsgiMiddleware(
+ lambda _scope: old_app.__get__(self, cls), unsafe_context_data=True
+ )
- cls.__call__ = sentry_patched_asgi_handler
+ return await middleware(self.scope)(receive, send)
+
+ cls.__call__ = sentry_patched_asgi_handler
+
+ else:
+ # The ASGI handler in Channels >= 3 has the same signature as
+ # the Django handler.
+ patch_django_asgi_handler_impl(cls)
def wrap_async_view(hub, callback):
From 0661bcea11a9854e5ae0a01b7837f16372174f8a Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Tue, 10 Nov 2020 12:58:18 -0800
Subject: [PATCH 0086/2327] fix(aws): Don't crash if `event` isn't a single
dict (#915)
Per https://docs.aws.amazon.com/lambda/latest/dg/python-handler.html, the `event` argument passed to the lambda function handler can be any jsonifiable type - string, int, list, etc - rather than just the dictionary we've previously assumed it to be. (This is particularly relevant for batch requests, which come in as a list of event dictionaries.)
When faced with such an `event`, our current integration crashes, because it tries to run `.get()` on it. This fixes that, by introducing the following behavior:
- If `event` is a list, tag the transaction as a batch and with the batch size.
- If `event` is a list, take the first entry as representative for the purposes of grabbing request data.
- If `event` (or the representative) isn't a dictionary, handle it gracefully and move on without request data.
---
sentry_sdk/integrations/aws_lambda.py | 75 +++++++---
tests/integrations/aws_lambda/test_aws.py | 166 ++++++++++++++++++++--
2 files changed, 208 insertions(+), 33 deletions(-)
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
index e206eded60..cb7dc38b14 100644
--- a/sentry_sdk/integrations/aws_lambda.py
+++ b/sentry_sdk/integrations/aws_lambda.py
@@ -51,12 +51,12 @@ def sentry_init_error(*args, **kwargs):
exc_info = sys.exc_info()
if exc_info and all(exc_info):
- event, hint = event_from_exception(
+ sentry_event, hint = event_from_exception(
exc_info,
client_options=client.options,
mechanism={"type": "aws_lambda", "handled": False},
)
- hub.capture_event(event, hint=hint)
+ hub.capture_event(sentry_event, hint=hint)
return init_error(*args, **kwargs)
@@ -65,12 +65,36 @@ def sentry_init_error(*args, **kwargs):
def _wrap_handler(handler):
# type: (F) -> F
- def sentry_handler(event, context, *args, **kwargs):
+ def sentry_handler(aws_event, context, *args, **kwargs):
# type: (Any, Any, *Any, **Any) -> Any
+
+ # Per https://docs.aws.amazon.com/lambda/latest/dg/python-handler.html,
+ # `event` here is *likely* a dictionary, but also might be a number of
+ # other types (str, int, float, None).
+ #
+ # In some cases, it is a list (if the user is batch-invoking their
+ # function, for example), in which case we'll use the first entry as a
+ # representative from which to try pulling request data. (Presumably it
+ # will be the same for all events in the list, since they're all hitting
+ # the lambda in the same request.)
+
+ if isinstance(aws_event, list):
+ request_data = aws_event[0]
+ batch_size = len(aws_event)
+ else:
+ request_data = aws_event
+ batch_size = 1
+
+ if not isinstance(request_data, dict):
+ # If we're not dealing with a dictionary, we won't be able to get
+ # headers, path, http method, etc in any case, so it's fine that
+ # this is empty
+ request_data = {}
+
hub = Hub.current
integration = hub.get_integration(AwsLambdaIntegration)
if integration is None:
- return handler(event, context, *args, **kwargs)
+ return handler(aws_event, context, *args, **kwargs)
# If an integration is there, a client has to be there.
client = hub.client # type: Any
@@ -80,9 +104,14 @@ def sentry_handler(event, context, *args, **kwargs):
with capture_internal_exceptions():
scope.clear_breadcrumbs()
scope.add_event_processor(
- _make_request_event_processor(event, context, configured_time)
+ _make_request_event_processor(
+ request_data, context, configured_time
+ )
)
scope.set_tag("aws_region", context.invoked_function_arn.split(":")[3])
+ if batch_size > 1:
+ scope.set_tag("batch_request", True)
+ scope.set_tag("batch_size", batch_size)
timeout_thread = None
# Starting the Timeout thread only if the configured time is greater than Timeout warning
@@ -103,21 +132,21 @@ def sentry_handler(event, context, *args, **kwargs):
# Starting the thread to raise timeout warning exception
timeout_thread.start()
- headers = event.get("headers", {})
+ headers = request_data.get("headers", {})
transaction = Transaction.continue_from_headers(
headers, op="serverless.function", name=context.function_name
)
with hub.start_transaction(transaction):
try:
- return handler(event, context, *args, **kwargs)
+ return handler(aws_event, context, *args, **kwargs)
except Exception:
exc_info = sys.exc_info()
- event, hint = event_from_exception(
+ sentry_event, hint = event_from_exception(
exc_info,
client_options=client.options,
mechanism={"type": "aws_lambda", "handled": False},
)
- hub.capture_event(event, hint=hint)
+ hub.capture_event(sentry_event, hint=hint)
reraise(*exc_info)
finally:
if timeout_thread:
@@ -255,12 +284,12 @@ def _make_request_event_processor(aws_event, aws_context, configured_timeout):
# type: (Any, Any, Any) -> EventProcessor
start_time = datetime.utcnow()
- def event_processor(event, hint, start_time=start_time):
+ def event_processor(sentry_event, hint, start_time=start_time):
# type: (Event, Hint, datetime) -> Optional[Event]
remaining_time_in_milis = aws_context.get_remaining_time_in_millis()
exec_duration = configured_timeout - remaining_time_in_milis
- extra = event.setdefault("extra", {})
+ extra = sentry_event.setdefault("extra", {})
extra["lambda"] = {
"function_name": aws_context.function_name,
"function_version": aws_context.function_version,
@@ -276,7 +305,7 @@ def event_processor(event, hint, start_time=start_time):
"log_stream": aws_context.log_stream_name,
}
- request = event.get("request", {})
+ request = sentry_event.get("request", {})
if "httpMethod" in aws_event:
request["method"] = aws_event["httpMethod"]
@@ -290,7 +319,7 @@ def event_processor(event, hint, start_time=start_time):
request["headers"] = _filter_headers(aws_event["headers"])
if _should_send_default_pii():
- user_info = event.setdefault("user", {})
+ user_info = sentry_event.setdefault("user", {})
id = aws_event.get("identity", {}).get("userArn")
if id is not None:
@@ -308,31 +337,31 @@ def event_processor(event, hint, start_time=start_time):
# event. Meaning every body is unstructured to us.
request["data"] = AnnotatedValue("", {"rem": [["!raw", "x", 0, 0]]})
- event["request"] = request
+ sentry_event["request"] = request
- return event
+ return sentry_event
return event_processor
-def _get_url(event, context):
+def _get_url(aws_event, aws_context):
# type: (Any, Any) -> str
- path = event.get("path", None)
- headers = event.get("headers", {})
+ path = aws_event.get("path", None)
+ headers = aws_event.get("headers", {})
host = headers.get("Host", None)
proto = headers.get("X-Forwarded-Proto", None)
if proto and host and path:
return "{}://{}{}".format(proto, host, path)
- return "awslambda:///{}".format(context.function_name)
+ return "awslambda:///{}".format(aws_context.function_name)
-def _get_cloudwatch_logs_url(context, start_time):
+def _get_cloudwatch_logs_url(aws_context, start_time):
# type: (Any, datetime) -> str
"""
Generates a CloudWatchLogs console URL based on the context object
Arguments:
- context {Any} -- context from lambda handler
+ aws_context {Any} -- context from lambda handler
Returns:
str -- AWS Console URL to logs.
@@ -345,8 +374,8 @@ def _get_cloudwatch_logs_url(context, start_time):
";start={start_time};end={end_time}"
).format(
region=environ.get("AWS_REGION"),
- log_group=context.log_group_name,
- log_stream=context.log_stream_name,
+ log_group=aws_context.log_group_name,
+ log_stream=aws_context.log_stream_name,
start_time=(start_time - timedelta(seconds=1)).strftime(formatstring),
end_time=(datetime.utcnow() + timedelta(seconds=2)).strftime(formatstring),
)
diff --git a/tests/integrations/aws_lambda/test_aws.py b/tests/integrations/aws_lambda/test_aws.py
index 38fdef87ca..41585387b1 100644
--- a/tests/integrations/aws_lambda/test_aws.py
+++ b/tests/integrations/aws_lambda/test_aws.py
@@ -35,21 +35,37 @@
from sentry_sdk.transport import HttpTransport
def event_processor(event):
- # AWS Lambda truncates the log output to 4kb. If you only need a
- # subsection of the event, override this function in your test
- # to print less to logs.
- return event
+ # AWS Lambda truncates the log output to 4kb, which is small enough to miss
+ # parts of even a single error-event/transaction-envelope pair if considered
+ # in full, so only grab the data we need.
+
+ event_data = {}
+ event_data["contexts"] = {}
+ event_data["contexts"]["trace"] = event.get("contexts", {}).get("trace")
+ event_data["exception"] = event.get("exception")
+ event_data["extra"] = event.get("extra")
+ event_data["level"] = event.get("level")
+ event_data["request"] = event.get("request")
+ event_data["tags"] = event.get("tags")
+ event_data["transaction"] = event.get("transaction")
+
+ return event_data
def envelope_processor(envelope):
+ # AWS Lambda truncates the log output to 4kb, which is small enough to miss
+ # parts of even a single error-event/transaction-envelope pair if considered
+ # in full, so only grab the data we need.
+
(item,) = envelope.items
envelope_json = json.loads(item.get_bytes())
envelope_data = {}
- envelope_data[\"contexts\"] = {}
- envelope_data[\"type\"] = envelope_json[\"type\"]
- envelope_data[\"transaction\"] = envelope_json[\"transaction\"]
- envelope_data[\"contexts\"][\"trace\"] = envelope_json[\"contexts\"][\"trace\"]
- envelope_data[\"request\"] = envelope_json[\"request\"]
+ envelope_data["contexts"] = {}
+ envelope_data["type"] = envelope_json["type"]
+ envelope_data["transaction"] = envelope_json["transaction"]
+ envelope_data["contexts"]["trace"] = envelope_json["contexts"]["trace"]
+ envelope_data["request"] = envelope_json["request"]
+ envelope_data["tags"] = envelope_json["tags"]
return envelope_data
@@ -107,10 +123,15 @@ def inner(code, payload, timeout=30, syntax_check=True):
syntax_check=syntax_check,
)
+ # for better debugging
+ response["LogResult"] = base64.b64decode(response["LogResult"]).splitlines()
+ response["Payload"] = response["Payload"].read()
+ del response["ResponseMetadata"]
+
events = []
envelopes = []
- for line in base64.b64decode(response["LogResult"]).splitlines():
+ for line in response["LogResult"]:
print("AWS:", line)
if line.startswith(b"EVENT: "):
line = line[len(b"EVENT: ") :]
@@ -362,3 +383,128 @@ def test_handler(event, context):
assert envelope["contexts"]["trace"]["op"] == "serverless.function"
assert envelope["transaction"].startswith("test_function_")
assert envelope["transaction"] in envelope["request"]["url"]
+
+
+@pytest.mark.parametrize(
+ "aws_event, has_request_data, batch_size",
+ [
+ (b"1231", False, 1),
+ (b"11.21", False, 1),
+ (b'"Good dog!"', False, 1),
+ (b"true", False, 1),
+ (
+ b"""
+ [
+ {"good dog": "Maisey"},
+ {"good dog": "Charlie"},
+ {"good dog": "Cory"},
+ {"good dog": "Bodhi"}
+ ]
+ """,
+ False,
+ 4,
+ ),
+ (
+ b"""
+ [
+ {
+ "headers": {
+ "Host": "dogs.are.great",
+ "X-Forwarded-Proto": "http"
+ },
+ "httpMethod": "GET",
+ "path": "/tricks/kangaroo",
+ "queryStringParameters": {
+ "completed_successfully": "true",
+ "treat_provided": "true",
+ "treat_type": "cheese"
+ },
+ "dog": "Maisey"
+ },
+ {
+ "headers": {
+ "Host": "dogs.are.great",
+ "X-Forwarded-Proto": "http"
+ },
+ "httpMethod": "GET",
+ "path": "/tricks/kangaroo",
+ "queryStringParameters": {
+ "completed_successfully": "true",
+ "treat_provided": "true",
+ "treat_type": "cheese"
+ },
+ "dog": "Charlie"
+ }
+ ]
+ """,
+ True,
+ 2,
+ ),
+ ],
+)
+def test_non_dict_event(
+ run_lambda_function,
+ aws_event,
+ has_request_data,
+ batch_size,
+ DictionaryContaining, # noqa:N803
+):
+ envelopes, events, response = run_lambda_function(
+ LAMBDA_PRELUDE
+ + dedent(
+ """
+ init_sdk(traces_sample_rate=1.0)
+
+ def test_handler(event, context):
+ raise Exception("More treats, please!")
+ """
+ ),
+ aws_event,
+ )
+
+ assert response["FunctionError"] == "Unhandled"
+
+ error_event = events[0]
+ assert error_event["level"] == "error"
+ assert error_event["contexts"]["trace"]["op"] == "serverless.function"
+
+ function_name = error_event["extra"]["lambda"]["function_name"]
+ assert function_name.startswith("test_function_")
+ assert error_event["transaction"] == function_name
+
+ exception = error_event["exception"]["values"][0]
+ assert exception["type"] == "Exception"
+ assert exception["value"] == "More treats, please!"
+ assert exception["mechanism"]["type"] == "aws_lambda"
+
+ envelope = envelopes[0]
+ assert envelope["type"] == "transaction"
+ assert envelope["contexts"]["trace"] == DictionaryContaining(
+ error_event["contexts"]["trace"]
+ )
+ assert envelope["contexts"]["trace"]["status"] == "internal_error"
+ assert envelope["transaction"] == error_event["transaction"]
+ assert envelope["request"]["url"] == error_event["request"]["url"]
+
+ if has_request_data:
+ request_data = {
+ "headers": {"Host": "dogs.are.great", "X-Forwarded-Proto": "http"},
+ "method": "GET",
+ "url": "http://dogs.are.great/tricks/kangaroo",
+ "query_string": {
+ "completed_successfully": "true",
+ "treat_provided": "true",
+ "treat_type": "cheese",
+ },
+ }
+ else:
+ request_data = {"url": "awslambda:///{}".format(function_name)}
+
+ assert error_event["request"] == request_data
+ assert envelope["request"] == request_data
+
+ if batch_size > 1:
+ assert error_event["tags"]["batch_size"] == batch_size
+ assert error_event["tags"]["batch_request"] is True
+ assert envelope["tags"]["batch_size"] == batch_size
+ assert envelope["tags"]["batch_request"] is True
From a7ef7c05df6669593b168581c9e5d616cb0a1af5 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Tue, 10 Nov 2020 15:36:04 -0800
Subject: [PATCH 0087/2327] feat(tracing): Add sampling context from AWS and
GCP (#916)
---
sentry_sdk/_compat.py | 1 -
sentry_sdk/integrations/aws_lambda.py | 66 ++++++++-----
sentry_sdk/integrations/gcp.py | 34 +++++--
tests/conftest.py | 86 +++++++++++++----
tests/integrations/aws_lambda/client.py | 19 +++-
tests/integrations/aws_lambda/test_aws.py | 108 ++++++++++++++++++++-
tests/integrations/gcp/test_gcp.py | 110 ++++++++++++++++++++--
7 files changed, 359 insertions(+), 65 deletions(-)
diff --git a/sentry_sdk/_compat.py b/sentry_sdk/_compat.py
index b7f79c1f48..49a55392a7 100644
--- a/sentry_sdk/_compat.py
+++ b/sentry_sdk/_compat.py
@@ -7,7 +7,6 @@
from typing import Tuple
from typing import Any
from typing import Type
-
from typing import TypeVar
T = TypeVar("T")
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
index cb7dc38b14..335c08eee7 100644
--- a/sentry_sdk/integrations/aws_lambda.py
+++ b/sentry_sdk/integrations/aws_lambda.py
@@ -65,7 +65,7 @@ def sentry_init_error(*args, **kwargs):
def _wrap_handler(handler):
# type: (F) -> F
- def sentry_handler(aws_event, context, *args, **kwargs):
+ def sentry_handler(aws_event, aws_context, *args, **kwargs):
# type: (Any, Any, *Any, **Any) -> Any
# Per https://docs.aws.amazon.com/lambda/latest/dg/python-handler.html,
@@ -94,21 +94,23 @@ def sentry_handler(aws_event, context, *args, **kwargs):
hub = Hub.current
integration = hub.get_integration(AwsLambdaIntegration)
if integration is None:
- return handler(aws_event, context, *args, **kwargs)
+ return handler(aws_event, aws_context, *args, **kwargs)
# If an integration is there, a client has to be there.
client = hub.client # type: Any
- configured_time = context.get_remaining_time_in_millis()
+ configured_time = aws_context.get_remaining_time_in_millis()
with hub.push_scope() as scope:
with capture_internal_exceptions():
scope.clear_breadcrumbs()
scope.add_event_processor(
_make_request_event_processor(
- request_data, context, configured_time
+ request_data, aws_context, configured_time
)
)
- scope.set_tag("aws_region", context.invoked_function_arn.split(":")[3])
+ scope.set_tag(
+ "aws_region", aws_context.invoked_function_arn.split(":")[3]
+ )
if batch_size > 1:
scope.set_tag("batch_request", True)
scope.set_tag("batch_size", batch_size)
@@ -134,11 +136,17 @@ def sentry_handler(aws_event, context, *args, **kwargs):
headers = request_data.get("headers", {})
transaction = Transaction.continue_from_headers(
- headers, op="serverless.function", name=context.function_name
+ headers, op="serverless.function", name=aws_context.function_name
)
- with hub.start_transaction(transaction):
+ with hub.start_transaction(
+ transaction,
+ custom_sampling_context={
+ "aws_event": aws_event,
+ "aws_context": aws_context,
+ },
+ ):
try:
- return handler(aws_event, context, *args, **kwargs)
+ return handler(aws_event, aws_context, *args, **kwargs)
except Exception:
exc_info = sys.exc_info()
sentry_event, hint = event_from_exception(
@@ -177,23 +185,8 @@ def __init__(self, timeout_warning=False):
def setup_once():
# type: () -> None
- # Python 2.7: Everything is in `__main__`.
- #
- # Python 3.7: If the bootstrap module is *already imported*, it is the
- # one we actually want to use (no idea what's in __main__)
- #
- # On Python 3.8 bootstrap is also importable, but will be the same file
- # as __main__ imported under a different name:
- #
- # sys.modules['__main__'].__file__ == sys.modules['bootstrap'].__file__
- # sys.modules['__main__'] is not sys.modules['bootstrap']
- #
- # Such a setup would then make all monkeypatches useless.
- if "bootstrap" in sys.modules:
- lambda_bootstrap = sys.modules["bootstrap"] # type: Any
- elif "__main__" in sys.modules:
- lambda_bootstrap = sys.modules["__main__"]
- else:
+ lambda_bootstrap = get_lambda_bootstrap()
+ if not lambda_bootstrap:
logger.warning(
"Not running in AWS Lambda environment, "
"AwsLambdaIntegration disabled (could not find bootstrap module)"
@@ -280,6 +273,29 @@ def inner(*args, **kwargs):
)
+def get_lambda_bootstrap():
+ # type: () -> Optional[Any]
+
+ # Python 2.7: Everything is in `__main__`.
+ #
+ # Python 3.7: If the bootstrap module is *already imported*, it is the
+ # one we actually want to use (no idea what's in __main__)
+ #
+ # On Python 3.8 bootstrap is also importable, but will be the same file
+ # as __main__ imported under a different name:
+ #
+ # sys.modules['__main__'].__file__ == sys.modules['bootstrap'].__file__
+ # sys.modules['__main__'] is not sys.modules['bootstrap']
+ #
+ # Such a setup would then make all monkeypatches useless.
+ if "bootstrap" in sys.modules:
+ return sys.modules["bootstrap"]
+ elif "__main__" in sys.modules:
+ return sys.modules["__main__"]
+ else:
+ return None
+
+
def _make_request_event_processor(aws_event, aws_context, configured_timeout):
# type: (Any, Any, Any) -> EventProcessor
start_time = datetime.utcnow()
diff --git a/sentry_sdk/integrations/gcp.py b/sentry_sdk/integrations/gcp.py
index 4f5d69bd65..e92422d8b9 100644
--- a/sentry_sdk/integrations/gcp.py
+++ b/sentry_sdk/integrations/gcp.py
@@ -34,13 +34,13 @@
def _wrap_func(func):
# type: (F) -> F
- def sentry_func(functionhandler, event, *args, **kwargs):
+ def sentry_func(functionhandler, gcp_event, *args, **kwargs):
# type: (Any, Any, *Any, **Any) -> Any
hub = Hub.current
integration = hub.get_integration(GcpIntegration)
if integration is None:
- return func(functionhandler, event, *args, **kwargs)
+ return func(functionhandler, gcp_event, *args, **kwargs)
# If an integration is there, a client has to be there.
client = hub.client # type: Any
@@ -50,7 +50,7 @@ def sentry_func(functionhandler, event, *args, **kwargs):
logger.debug(
"The configured timeout could not be fetched from Cloud Functions configuration."
)
- return func(functionhandler, event, *args, **kwargs)
+ return func(functionhandler, gcp_event, *args, **kwargs)
configured_time = int(configured_time)
@@ -60,7 +60,9 @@ def sentry_func(functionhandler, event, *args, **kwargs):
with capture_internal_exceptions():
scope.clear_breadcrumbs()
scope.add_event_processor(
- _make_request_event_processor(event, configured_time, initial_time)
+ _make_request_event_processor(
+ gcp_event, configured_time, initial_time
+ )
)
scope.set_tag("gcp_region", environ.get("FUNCTION_REGION"))
timeout_thread = None
@@ -76,22 +78,34 @@ def sentry_func(functionhandler, event, *args, **kwargs):
timeout_thread.start()
headers = {}
- if hasattr(event, "headers"):
- headers = event.headers
+ if hasattr(gcp_event, "headers"):
+ headers = gcp_event.headers
transaction = Transaction.continue_from_headers(
headers, op="serverless.function", name=environ.get("FUNCTION_NAME", "")
)
- with hub.start_transaction(transaction):
+ sampling_context = {
+ "gcp_env": {
+ "function_name": environ.get("FUNCTION_NAME"),
+ "function_entry_point": environ.get("ENTRY_POINT"),
+ "function_identity": environ.get("FUNCTION_IDENTITY"),
+ "function_region": environ.get("FUNCTION_REGION"),
+ "function_project": environ.get("GCP_PROJECT"),
+ },
+ "gcp_event": gcp_event,
+ }
+ with hub.start_transaction(
+ transaction, custom_sampling_context=sampling_context
+ ):
try:
- return func(functionhandler, event, *args, **kwargs)
+ return func(functionhandler, gcp_event, *args, **kwargs)
except Exception:
exc_info = sys.exc_info()
- event, hint = event_from_exception(
+ sentry_event, hint = event_from_exception(
exc_info,
client_options=client.options,
mechanism={"type": "gcp", "handled": False},
)
- hub.capture_event(event, hint=hint)
+ hub.capture_event(sentry_event, hint=hint)
reraise(*exc_info)
finally:
if timeout_thread:
diff --git a/tests/conftest.py b/tests/conftest.py
index 6c53e502ef..35631bcd70 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -355,8 +355,14 @@ class StringContaining(object):
def __init__(self, substring):
self.substring = substring
+ try:
+ # unicode only exists in python 2
+ self.valid_types = (str, unicode) # noqa
+ except NameError:
+ self.valid_types = (str,)
+
def __eq__(self, test_string):
- if not isinstance(test_string, str):
+ if not isinstance(test_string, self.valid_types):
return False
if len(self.substring) > len(test_string):
@@ -364,9 +370,45 @@ def __eq__(self, test_string):
return self.substring in test_string
+ def __ne__(self, test_string):
+ return not self.__eq__(test_string)
+
return StringContaining
+def _safe_is_equal(x, y):
+ """
+ Compares two values, preferring to use the first's __eq__ method if it
+ exists and is implemented.
+
+ Accounts for py2/py3 differences (like ints in py2 not having a __eq__
+ method), as well as the incomparability of certain types exposed by using
+ raw __eq__ () rather than ==.
+ """
+
+ # Prefer using __eq__ directly to ensure that examples like
+ #
+ # maisey = Dog()
+ # maisey.name = "Maisey the Dog"
+ # maisey == ObjectDescribedBy(attrs={"name": StringContaining("Maisey")})
+ #
+ # evaluate to True (in other words, examples where the values in self.attrs
+ # might also have custom __eq__ methods; this makes sure those methods get
+ # used if possible)
+ try:
+ is_equal = x.__eq__(y)
+ except AttributeError:
+ is_equal = NotImplemented
+
+ # this can happen on its own, too (i.e. without an AttributeError being
+ # thrown), which is why this is separate from the except block above
+ if is_equal == NotImplemented:
+ # using == smoothes out weird variations exposed by raw __eq__
+ return x == y
+
+ return is_equal
+
+
@pytest.fixture(name="DictionaryContaining")
def dictionary_containing_matcher():
"""
@@ -397,13 +439,19 @@ def __eq__(self, test_dict):
if len(self.subdict) > len(test_dict):
return False
- # Have to test self == other (rather than vice-versa) in case
- # any of the values in self.subdict is another matcher with a custom
- # __eq__ method (in LHS == RHS, LHS's __eq__ is tried before RHS's).
- # In other words, this order is important so that examples like
- # {"dogs": "are great"} == DictionaryContaining({"dogs": StringContaining("great")})
- # evaluate to True
- return all(self.subdict[key] == test_dict.get(key) for key in self.subdict)
+ for key, value in self.subdict.items():
+ try:
+ test_value = test_dict[key]
+ except KeyError: # missing key
+ return False
+
+ if not _safe_is_equal(value, test_value):
+ return False
+
+ return True
+
+ def __ne__(self, test_dict):
+ return not self.__eq__(test_dict)
return DictionaryContaining
@@ -442,19 +490,19 @@ def __eq__(self, test_obj):
if not isinstance(test_obj, self.type):
return False
- # all checks here done with getattr rather than comparing to
- # __dict__ because __dict__ isn't guaranteed to exist
if self.attrs:
- # attributes must exist AND values must match
- try:
- if any(
- getattr(test_obj, attr_name) != attr_value
- for attr_name, attr_value in self.attrs.items()
- ):
- return False # wrong attribute value
- except AttributeError: # missing attribute
- return False
+ for attr_name, attr_value in self.attrs.items():
+ try:
+ test_value = getattr(test_obj, attr_name)
+ except AttributeError: # missing attribute
+ return False
+
+ if not _safe_is_equal(attr_value, test_value):
+ return False
return True
+ def __ne__(self, test_obj):
+ return not self.__eq__(test_obj)
+
return ObjectDescribedBy
diff --git a/tests/integrations/aws_lambda/client.py b/tests/integrations/aws_lambda/client.py
index 12b59ca60a..17181c54ee 100644
--- a/tests/integrations/aws_lambda/client.py
+++ b/tests/integrations/aws_lambda/client.py
@@ -49,6 +49,13 @@ def run_lambda_function(
**subprocess_kwargs
)
+ subprocess.check_call(
+ "pip install mock==3.0.0 funcsigs -t .",
+ cwd=tmpdir,
+ shell=True,
+ **subprocess_kwargs
+ )
+
# https://docs.aws.amazon.com/lambda/latest/dg/lambda-python-how-to-create-deployment-package.html
subprocess.check_call(
"pip install ../*.tar.gz -t .", cwd=tmpdir, shell=True, **subprocess_kwargs
@@ -69,9 +76,19 @@ def run_lambda_function(
)
@add_finalizer
- def delete_function():
+ def clean_up():
client.delete_function(FunctionName=fn_name)
+ # this closes the web socket so we don't get a
+ # ResourceWarning: unclosed
+ # warning on every test
+ # based on https://github.com/boto/botocore/pull/1810
+ # (if that's ever merged, this can just become client.close())
+ session = client._endpoint.http_session
+ managers = [session._manager] + list(session._proxy_managers.values())
+ for manager in managers:
+ manager.clear()
+
response = client.invoke(
FunctionName=fn_name,
InvocationType="RequestResponse",
diff --git a/tests/integrations/aws_lambda/test_aws.py b/tests/integrations/aws_lambda/test_aws.py
index 41585387b1..332e5e8ce2 100644
--- a/tests/integrations/aws_lambda/test_aws.py
+++ b/tests/integrations/aws_lambda/test_aws.py
@@ -27,7 +27,7 @@
LAMBDA_PRELUDE = """
from __future__ import print_function
-from sentry_sdk.integrations.aws_lambda import AwsLambdaIntegration
+from sentry_sdk.integrations.aws_lambda import AwsLambdaIntegration, get_lambda_bootstrap
import sentry_sdk
import json
import time
@@ -69,6 +69,7 @@ def envelope_processor(envelope):
return envelope_data
+
class TestTransport(HttpTransport):
def _send_event(self, event):
event = event_processor(event)
@@ -82,6 +83,7 @@ def _send_envelope(self, envelope):
envelope = envelope_processor(envelope)
print("\\nENVELOPE: {}\\n".format(json.dumps(envelope)))
+
def init_sdk(timeout_warning=False, **extra_init_args):
sentry_sdk.init(
dsn="https://123abc@example.com/123",
@@ -125,7 +127,7 @@ def inner(code, payload, timeout=30, syntax_check=True):
# for better debugging
response["LogResult"] = base64.b64decode(response["LogResult"]).splitlines()
- response["Payload"] = response["Payload"].read()
+ response["Payload"] = json.loads(response["Payload"].read().decode("utf-8"))
del response["ResponseMetadata"]
events = []
@@ -508,3 +510,105 @@ def test_handler(event, context):
assert error_event["tags"]["batch_request"] is True
assert envelope["tags"]["batch_size"] == batch_size
assert envelope["tags"]["batch_request"] is True
+
+
+def test_traces_sampler_gets_correct_values_in_sampling_context(
+ run_lambda_function,
+ DictionaryContaining, # noqa:N803
+ ObjectDescribedBy, # noqa:N803
+ StringContaining, # noqa:N803
+):
+ # TODO: This whole thing is a little hacky, specifically around the need to
+ # get `conftest.py` code into the AWS runtime, which is why there's both
+ # `inspect.getsource` and a copy of `_safe_is_equal` included directly in
+ # the code below. Ideas which have been discussed to fix this:
+
+ # - Include the test suite as a module installed in the package which is
+ # shot up to AWS
+ # - In client.py, copy `conftest.py` (or wherever the necessary code lives)
+ # from the test suite into the main SDK directory so it gets included as
+ # "part of the SDK"
+
+ # It's also worth noting why it's necessary to run the assertions in the AWS
+ # runtime rather than asserting on side effects the way we do with events
+ # and envelopes. The reasons are two-fold:
+
+ # - We're testing against the `LambdaContext` class, which only exists in
+ # the AWS runtime
+ # - If we were to transmit call args data they way we transmit event and
+ # envelope data (through JSON), we'd quickly run into the problem that all
+ # sorts of stuff isn't serializable by `json.dumps` out of the box, up to
+ # and including `datetime` objects (so anything with a timestamp is
+ # automatically out)
+
+ # Perhaps these challenges can be solved in a cleaner and more systematic
+ # way if we ever decide to refactor the entire AWS testing apparatus.
+
+ import inspect
+
+ envelopes, events, response = run_lambda_function(
+ LAMBDA_PRELUDE
+ + dedent(inspect.getsource(StringContaining))
+ + dedent(inspect.getsource(DictionaryContaining))
+ + dedent(inspect.getsource(ObjectDescribedBy))
+ + dedent(
+ """
+ try:
+ from unittest import mock # python 3.3 and above
+ except ImportError:
+ import mock # python < 3.3
+
+ def _safe_is_equal(x, y):
+ # copied from conftest.py - see docstring and comments there
+ try:
+ is_equal = x.__eq__(y)
+ except AttributeError:
+ is_equal = NotImplemented
+
+ if is_equal == NotImplemented:
+ # using == smoothes out weird variations exposed by raw __eq__
+ return x == y
+
+ return is_equal
+
+ def test_handler(event, context):
+ # this runs after the transaction has started, which means we
+ # can make assertions about traces_sampler
+ try:
+ traces_sampler.assert_any_call(
+ DictionaryContaining(
+ {
+ "aws_event": DictionaryContaining({
+ "httpMethod": "GET",
+ "path": "/sit/stay/rollover",
+ "headers": {"Host": "dogs.are.great", "X-Forwarded-Proto": "http"},
+ }),
+ "aws_context": ObjectDescribedBy(
+ type=get_lambda_bootstrap().LambdaContext,
+ attrs={
+ 'function_name': StringContaining("test_function"),
+ 'function_version': '$LATEST',
+ }
+ )
+ }
+ )
+ )
+ except AssertionError:
+ # catch the error and return it because the error itself will
+ # get swallowed by the SDK as an "internal exception"
+ return {"AssertionError raised": True,}
+
+ return {"AssertionError raised": False,}
+
+
+ traces_sampler = mock.Mock(return_value=True)
+
+ init_sdk(
+ traces_sampler=traces_sampler,
+ )
+ """
+ ),
+ b'{"httpMethod": "GET", "path": "/sit/stay/rollover", "headers": {"Host": "dogs.are.great", "X-Forwarded-Proto": "http"}}',
+ )
+
+ assert response["Payload"]["AssertionError raised"] is False
diff --git a/tests/integrations/gcp/test_gcp.py b/tests/integrations/gcp/test_gcp.py
index fa234a0da3..debcf8386f 100644
--- a/tests/integrations/gcp/test_gcp.py
+++ b/tests/integrations/gcp/test_gcp.py
@@ -30,9 +30,19 @@
os.environ["FUNCTION_REGION"] = "us-central1"
os.environ["GCP_PROJECT"] = "serverless_project"
+def log_return_value(func):
+ def inner(*args, **kwargs):
+ rv = func(*args, **kwargs)
+
+ print("\\nRETURN VALUE: {}\\n".format(json.dumps(rv)))
+
+ return rv
+
+ return inner
+
gcp_functions.worker_v1 = Mock()
gcp_functions.worker_v1.FunctionHandler = Mock()
-gcp_functions.worker_v1.FunctionHandler.invoke_user_function = cloud_function
+gcp_functions.worker_v1.FunctionHandler.invoke_user_function = log_return_value(cloud_function)
import sentry_sdk
@@ -64,6 +74,7 @@ def _send_envelope(self, envelope):
envelope = envelope_processor(envelope)
print("\\nENVELOPE: {}\\n".format(envelope.decode(\"utf-8\")))
+
def init_sdk(timeout_warning=False, **extra_init_args):
sentry_sdk.init(
dsn="https://123abc@example.com/123",
@@ -82,6 +93,7 @@ def inner(code, subprocess_kwargs=()):
event = []
envelope = []
+ return_value = None
# STEP : Create a zip of cloud function
@@ -112,6 +124,8 @@ def inner(code, subprocess_kwargs=()):
stream = os.popen("python {}/main.py".format(tmpdir))
stream_data = stream.read()
+ stream.close()
+
for line in stream_data.splitlines():
print("GCP:", line)
if line.startswith("EVENT: "):
@@ -120,16 +134,19 @@ def inner(code, subprocess_kwargs=()):
elif line.startswith("ENVELOPE: "):
line = line[len("ENVELOPE: ") :]
envelope = json.loads(line)
+ elif line.startswith("RETURN VALUE: "):
+ line = line[len("RETURN VALUE: ") :]
+ return_value = json.loads(line)
else:
continue
- return envelope, event
+ return envelope, event, return_value
return inner
def test_handled_exception(run_cloud_function):
- envelope, event = run_cloud_function(
+ envelope, event, return_value = run_cloud_function(
dedent(
"""
functionhandler = None
@@ -155,7 +172,7 @@ def cloud_function(functionhandler, event):
def test_unhandled_exception(run_cloud_function):
- envelope, event = run_cloud_function(
+ envelope, event, return_value = run_cloud_function(
dedent(
"""
functionhandler = None
@@ -182,7 +199,7 @@ def cloud_function(functionhandler, event):
def test_timeout_error(run_cloud_function):
- envelope, event = run_cloud_function(
+ envelope, event, return_value = run_cloud_function(
dedent(
"""
functionhandler = None
@@ -212,7 +229,7 @@ def cloud_function(functionhandler, event):
def test_performance_no_error(run_cloud_function):
- envelope, event = run_cloud_function(
+ envelope, event, return_value = run_cloud_function(
dedent(
"""
functionhandler = None
@@ -237,7 +254,7 @@ def cloud_function(functionhandler, event):
def test_performance_error(run_cloud_function):
- envelope, event = run_cloud_function(
+ envelope, event, return_value = run_cloud_function(
dedent(
"""
functionhandler = None
@@ -265,3 +282,82 @@ def cloud_function(functionhandler, event):
assert exception["type"] == "Exception"
assert exception["value"] == "something went wrong"
assert exception["mechanism"] == {"type": "gcp", "handled": False}
+
+
+def test_traces_sampler_gets_correct_values_in_sampling_context(
+ run_cloud_function, DictionaryContaining # noqa:N803
+):
+ # TODO: There are some decent sized hacks below. For more context, see the
+ # long comment in the test of the same name in the AWS integration. The
+ # situations there and here aren't identical, but they're similar enough
+ # that solving one would probably solve both.
+
+ import inspect
+
+ envelopes, events, return_value = run_cloud_function(
+ dedent(
+ """
+ functionhandler = None
+ event = {
+ "type": "chase",
+ "chasers": ["Maisey", "Charlie"],
+ "num_squirrels": 2,
+ }
+ def cloud_function(functionhandler, event):
+ # this runs after the transaction has started, which means we
+ # can make assertions about traces_sampler
+ try:
+ traces_sampler.assert_any_call(
+ DictionaryContaining({
+ "gcp_env": DictionaryContaining({
+ "function_name": "chase_into_tree",
+ "function_region": "dogpark",
+ "function_project": "SquirrelChasing",
+ }),
+ "gcp_event": {
+ "type": "chase",
+ "chasers": ["Maisey", "Charlie"],
+ "num_squirrels": 2,
+ },
+ })
+ )
+ except AssertionError:
+ # catch the error and return it because the error itself will
+ # get swallowed by the SDK as an "internal exception"
+ return {"AssertionError raised": True,}
+
+ return {"AssertionError raised": False,}
+ """
+ )
+ + FUNCTIONS_PRELUDE
+ + dedent(inspect.getsource(DictionaryContaining))
+ + dedent(
+ """
+ os.environ["FUNCTION_NAME"] = "chase_into_tree"
+ os.environ["FUNCTION_REGION"] = "dogpark"
+ os.environ["GCP_PROJECT"] = "SquirrelChasing"
+
+ def _safe_is_equal(x, y):
+ # copied from conftest.py - see docstring and comments there
+ try:
+ is_equal = x.__eq__(y)
+ except AttributeError:
+ is_equal = NotImplemented
+
+ if is_equal == NotImplemented:
+ return x == y
+
+ return is_equal
+
+ traces_sampler = Mock(return_value=True)
+
+ init_sdk(
+ traces_sampler=traces_sampler,
+ )
+
+ gcp_functions.worker_v1.FunctionHandler.invoke_user_function(functionhandler, event)
+ """
+ )
+ )
+
+ assert return_value["AssertionError raised"] is False
From cc08a6bed116e09db41c712c20ab63eb0a839e41 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Wed, 11 Nov 2020 09:05:14 -0800
Subject: [PATCH 0088/2327] doc: Changelog for 0.19.3
(Also some auto-formatting)
---
CHANGES.md | 572 ++++++++++++++++++++++++-----------------------------
1 file changed, 256 insertions(+), 316 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 6ab44e445f..a22e51f4b1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,18 +4,11 @@
This project follows [semver](https://semver.org/), with three additions:
-* Semver says that major version `0` can include breaking changes at any time.
- Still, it is common practice to assume that only `0.x` releases (minor
- versions) can contain breaking changes while `0.x.y` releases (patch
- versions) are used for backwards-compatible changes (bugfixes and features).
- This project also follows that practice.
+- Semver says that major version `0` can include breaking changes at any time. Still, it is common practice to assume that only `0.x` releases (minor versions) can contain breaking changes while `0.x.y` releases (patch versions) are used for backwards-compatible changes (bugfixes and features). This project also follows that practice.
-* All undocumented APIs are considered internal. They are not part of this
- contract.
+- All undocumented APIs are considered internal. They are not part of this contract.
-* Certain features (e.g. integrations) may be explicitly called out as
- "experimental" or "unstable" in the documentation. They come with their own
- versioning policy described in the documentation.
+- Certain features (e.g. integrations) may be explicitly called out as "experimental" or "unstable" in the documentation. They come with their own versioning policy described in the documentation.
We recommend to pin your version requirements against `0.x.*` or `0.x.y`.
Either one of the following is fine:
@@ -27,596 +20,543 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 0.19.3
+
+- Automatically pass integration-relevant data to `traces_sampler` for AWS, AIOHTTP, ASGI, Bottle, Celery, Django, Falcon, GCP, Pyrammid, Tryton, RQ, and WSGI integrations
+- Fix a bug where the AWS integration would crash if event was anything besides a dictionary
+- Fix the Django integrations's ASGI handler for Channels 3.0. Thanks Luke Pomfrey!
+
## 0.19.2
-* Add `traces_sampler` option.
-* The SDK now attempts to infer a default release from various environment
- variables and the current git repo.
-* Fix a crash with async views in Django 3.1.
-* Fix a bug where complex URL patterns in Django would create malformed transaction names.
-* Add options for transaction styling in AIOHTTP.
-* Add basic attachment support (documentation tbd).
-* fix a crash in the `pure_eval` integration.
-* Integration for creating spans from `boto3`.
+- Add `traces_sampler` option.
+- The SDK now attempts to infer a default release from various environment variables and the current git repo.
+- Fix a crash with async views in Django 3.1.
+- Fix a bug where complex URL patterns in Django would create malformed transaction names.
+- Add options for transaction styling in AIOHTTP.
+- Add basic attachment support (documentation tbd).
+- fix a crash in the `pure_eval` integration.
+- Integration for creating spans from `boto3`.
## 0.19.1
-* Fix dependency check for `blinker` fixes #858
-* Fix incorrect timeout warnings in AWS Lambda and GCP integrations #854
+- Fix dependency check for `blinker` fixes #858
+- Fix incorrect timeout warnings in AWS Lambda and GCP integrations #854
## 0.19.0
-* Removed `_experiments.auto_enabling_integrations` in favor of just `auto_enabling_integrations` which is now enabled by default.
+- Removed `_experiments.auto_enabling_integrations` in favor of just `auto_enabling_integrations` which is now enabled by default.
## 0.18.0
-* **Breaking change**: The `no_proxy` environment variable is now honored when inferring proxy settings from the system. Thanks Xavier Fernandez!
-* Added Performance/Tracing support for AWS and GCP functions.
-* Fix an issue with Django instrumentation where the SDK modified `resolver_match.callback` and broke user code.
+- **Breaking change**: The `no_proxy` environment variable is now honored when inferring proxy settings from the system. Thanks Xavier Fernandez!
+- Added Performance/Tracing support for AWS and GCP functions.
+- Fix an issue with Django instrumentation where the SDK modified `resolver_match.callback` and broke user code.
## 0.17.8
-* Fix yet another bug with disjoint traces in Celery.
-* Added support for Chalice 1.20. Thanks again to the folks at Cuenca MX!
+- Fix yet another bug with disjoint traces in Celery.
+- Added support for Chalice 1.20. Thanks again to the folks at Cuenca MX!
## 0.17.7
-* Internal: Change data category for transaction envelopes.
-* Fix a bug under Celery 4.2+ that may have caused disjoint traces or missing transactions.
+- Internal: Change data category for transaction envelopes.
+- Fix a bug under Celery 4.2+ that may have caused disjoint traces or missing transactions.
## 0.17.6
-* Support for Flask 0.10 (only relaxing version check)
+- Support for Flask 0.10 (only relaxing version check)
## 0.17.5
-* Work around an issue in the Python stdlib that makes the entire process deadlock during garbage collection if events are sent from a `__del__` implementation.
-* Add possibility to wrap ASGI application twice in middleware to enable split up of request scope data and exception catching.
+- Work around an issue in the Python stdlib that makes the entire process deadlock during garbage collection if events are sent from a `__del__` implementation.
+- Add possibility to wrap ASGI application twice in middleware to enable split up of request scope data and exception catching.
## 0.17.4
-* New integration for the Chalice web framework for AWS Lambda. Thanks to the folks at Cuenca MX!
+- New integration for the Chalice web framework for AWS Lambda. Thanks to the folks at Cuenca MX!
## 0.17.3
-* Fix an issue with the `pure_eval` integration in interaction with trimming where `pure_eval` would create a lot of useless local variables that then drown out the useful ones in trimming.
+- Fix an issue with the `pure_eval` integration in interaction with trimming where `pure_eval` would create a lot of useless local variables that then drown out the useful ones in trimming.
## 0.17.2
-* Fix timezone bugs in GCP integration.
+- Fix timezone bugs in GCP integration.
## 0.17.1
-* Fix timezone bugs in AWS Lambda integration.
-* Fix crash on GCP integration because of missing parameter `timeout_warning`.
+- Fix timezone bugs in AWS Lambda integration.
+- Fix crash on GCP integration because of missing parameter `timeout_warning`.
## 0.17.0
-* Fix a bug where class-based callables used as Django views (without using
- Django's regular class-based views) would not have `csrf_exempt` applied.
-* New integration for Google Cloud Functions.
-* Fix a bug where a recently released version of `urllib3` would cause the SDK
- to enter an infinite loop on networking and SSL errors.
-* **Breaking change**: Remove the `traceparent_v2` option. The option has been
- ignored since 0.16.3, just remove it from your code.
+- Fix a bug where class-based callables used as Django views (without using Django's regular class-based views) would not have `csrf_exempt` applied.
+- New integration for Google Cloud Functions.
+- Fix a bug where a recently released version of `urllib3` would cause the SDK to enter an infinite loop on networking and SSL errors.
+- **Breaking change**: Remove the `traceparent_v2` option. The option has been ignored since 0.16.3, just remove it from your code.
## 0.16.5
-* Fix a bug that caused Django apps to crash if the view didn't have a `__name__` attribute.
+- Fix a bug that caused Django apps to crash if the view didn't have a `__name__` attribute.
## 0.16.4
-* Add experiment to avoid trunchating span descriptions. Initialize with
- `init(_experiments={"smart_transaction_trimming": True})`.
-* Add a span around the Django view in transactions to distinguish its
- operations from middleware operations.
+- Add experiment to avoid trunchating span descriptions. Initialize with `init(_experiments={"smart_transaction_trimming": True})`.
+- Add a span around the Django view in transactions to distinguish its operations from middleware operations.
## 0.16.3
-* Fix AWS Lambda support for Python 3.8.
-* The AWS Lambda integration now captures initialization/import errors for Python 3.
-* The AWS Lambda integration now supports an option to warn about functions likely to time out.
-* Testing for RQ 1.5
-* Flip default of `traceparent_v2`. This change should have zero impact. The flag will be removed in 0.17.
-* Fix compatibility bug with Django 3.1.
+- Fix AWS Lambda support for Python 3.8.
+- The AWS Lambda integration now captures initialization/import errors for Python 3.
+- The AWS Lambda integration now supports an option to warn about functions likely to time out.
+- Testing for RQ 1.5
+- Flip default of `traceparent_v2`. This change should have zero impact. The flag will be removed in 0.17.
+- Fix compatibility bug with Django 3.1.
## 0.16.2
-* New (optional) integrations for richer stacktraces: `pure_eval` for
- additional variables, `executing` for better function names.
+- New (optional) integrations for richer stacktraces: `pure_eval` for additional variables, `executing` for better function names.
## 0.16.1
-* Flask integration: Fix a bug that prevented custom tags from being attached to transactions.
+- Flask integration: Fix a bug that prevented custom tags from being attached to transactions.
## 0.16.0
-* Redis integration: add tags for more commands
-* Redis integration: Patch rediscluster package if installed.
-* Session tracking: A session is no longer considered crashed if there has been a fatal log message (only unhandled exceptions count).
-* **Breaking change**: Revamping of the tracing API.
-* **Breaking change**: `before_send` is no longer called for transactions.
+- Redis integration: add tags for more commands
+- Redis integration: Patch rediscluster package if installed.
+- Session tracking: A session is no longer considered crashed if there has been a fatal log message (only unhandled exceptions count).
+- **Breaking change**: Revamping of the tracing API.
+- **Breaking change**: `before_send` is no longer called for transactions.
## 0.15.1
-* Fix fatal crash in Pyramid integration on 404.
+- Fix fatal crash in Pyramid integration on 404.
## 0.15.0
-* **Breaking change:** The ASGI middleware will now raise an exception if contextvars are not available, like it is already the case for other asyncio integrations.
-* Contextvars are now used in more circumstances following a bugfix release of `gevent`. This will fix a few instances of wrong request data being attached to events while using an asyncio-based web framework.
-* APM: Fix a bug in the SQLAlchemy integration where a span was left open if the database transaction had to be rolled back. This could have led to deeply nested span trees under that db query span.
-* Fix a bug in the Pyramid integration where the transaction name could not be overridden at all.
-* Fix a broken type annotation on `capture_exception`.
-* Basic support for Django 3.1. More work is required for async middlewares to be instrumented properly for APM.
+- **Breaking change:** The ASGI middleware will now raise an exception if contextvars are not available, like it is already the case for other asyncio integrations.
+- Contextvars are now used in more circumstances following a bugfix release of `gevent`. This will fix a few instances of wrong request data being attached to events while using an asyncio-based web framework.
+- APM: Fix a bug in the SQLAlchemy integration where a span was left open if the database transaction had to be rolled back. This could have led to deeply nested span trees under that db query span.
+- Fix a bug in the Pyramid integration where the transaction name could not be overridden at all.
+- Fix a broken type annotation on `capture_exception`.
+- Basic support for Django 3.1. More work is required for async middlewares to be instrumented properly for APM.
## 0.14.4
-* Fix bugs in transport rate limit enforcement for specific data categories.
- The bug should not have affected anybody because we do not yet emit rate
- limits for specific event types/data categories.
-* Fix a bug in `capture_event` where it would crash if given additional kwargs.
- Thanks to Tatiana Vasilevskaya!
-* Fix a bug where contextvars from the request handler were inaccessible in
- AIOHTTP error handlers.
-* Fix a bug where the Celery integration would crash if newrelic instrumented Celery as well.
-
+- Fix bugs in transport rate limit enforcement for specific data categories. The bug should not have affected anybody because we do not yet emit rate limits for specific event types/data categories.
+- Fix a bug in `capture_event` where it would crash if given additional kwargs. Thanks to Tatiana Vasilevskaya!
+- Fix a bug where contextvars from the request handler were inaccessible in AIOHTTP error handlers.
+- Fix a bug where the Celery integration would crash if newrelic instrumented Celery as well.
## 0.14.3
-* Attempt to use a monotonic clock to measure span durations in Performance/APM.
-* Avoid overwriting explicitly set user data in web framework integrations.
-* Allow to pass keyword arguments to `capture_event` instead of configuring the scope.
-* Feature development for session tracking.
+- Attempt to use a monotonic clock to measure span durations in Performance/APM.
+- Avoid overwriting explicitly set user data in web framework integrations.
+- Allow to pass keyword arguments to `capture_event` instead of configuring the scope.
+- Feature development for session tracking.
## 0.14.2
-* Fix a crash in Django Channels instrumentation when SDK is reinitialized.
-* More contextual data for AWS Lambda (cloudwatch logs link).
+- Fix a crash in Django Channels instrumentation when SDK is reinitialized.
+- More contextual data for AWS Lambda (cloudwatch logs link).
## 0.14.1
-* Fix a crash in the Django integration when used in combination with Django Rest Framework's test utilities for request.
-* Fix high memory consumption when sending a lot of errors in the same process. Particularly noticeable in async environments.
+- Fix a crash in the Django integration when used in combination with Django Rest Framework's test utilities for request.
+- Fix high memory consumption when sending a lot of errors in the same process. Particularly noticeable in async environments.
## 0.14.0
-* Show ASGI request data in Django 3.0
-* New integration for the Trytond ERP framework. Thanks n1ngu!
+- Show ASGI request data in Django 3.0
+- New integration for the Trytond ERP framework. Thanks n1ngu!
## 0.13.5
-* Fix trace continuation bugs in APM.
-* No longer report `asyncio.CancelledError` as part of AIOHTTP integration.
+- Fix trace continuation bugs in APM.
+- No longer report `asyncio.CancelledError` as part of AIOHTTP integration.
## 0.13.4
-* Fix package classifiers to mark this package as supporting Python 3.8. The SDK supported 3.8 before though.
-* Update schema sent for transaction events (transaction status).
-* Fix a bug where `None` inside request data was skipped/omitted.
+- Fix package classifiers to mark this package as supporting Python 3.8. The SDK supported 3.8 before though.
+- Update schema sent for transaction events (transaction status).
+- Fix a bug where `None` inside request data was skipped/omitted.
## 0.13.3
-* Fix an issue with the ASGI middleware that would cause Uvicorn to infer the wrong ASGI versions and call the wrapped application with the wrong argument count.
-* Do not ignore the `tornado.application` logger.
-* The Redis integration now instruments Redis blaster for breadcrumbs and transaction spans.
+- Fix an issue with the ASGI middleware that would cause Uvicorn to infer the wrong ASGI versions and call the wrapped application with the wrong argument count.
+- Do not ignore the `tornado.application` logger.
+- The Redis integration now instruments Redis blaster for breadcrumbs and transaction spans.
## 0.13.2
-* Fix a bug in APM that would cause wrong durations to be displayed on non-UTC servers.
+- Fix a bug in APM that would cause wrong durations to be displayed on non-UTC servers.
## 0.13.1
-* Add new global functions for setting scope/context data.
-* Fix a bug that would make Django 1.11+ apps crash when using function-based middleware.
+- Add new global functions for setting scope/context data.
+- Fix a bug that would make Django 1.11+ apps crash when using function-based middleware.
## 0.13.0
-* Remove an old deprecation warning (behavior itself already changed since a long time).
-* The AIOHTTP integration now attaches the request body to crash reports. Thanks to Vitali Rebkavets!
-* Add an experimental PySpark integration.
-* First release to be tested under Python 3.8. No code changes were necessary though, so previous releases also might have worked.
+- Remove an old deprecation warning (behavior itself already changed since a long time).
+- The AIOHTTP integration now attaches the request body to crash reports. Thanks to Vitali Rebkavets!
+- Add an experimental PySpark integration.
+- First release to be tested under Python 3.8. No code changes were necessary though, so previous releases also might have worked.
## 0.12.3
-* Various performance improvements to event sending.
-* Avoid crashes when scope or hub is racy.
-* Revert a change that broke applications using gevent and channels (in the same virtualenv, but different processes).
-* Fix a bug that made the SDK crash on unicode in SQL.
+- Various performance improvements to event sending.
+- Avoid crashes when scope or hub is racy.
+- Revert a change that broke applications using gevent and channels (in the same virtualenv, but different processes).
+- Fix a bug that made the SDK crash on unicode in SQL.
## 0.12.2
-* Fix a crash with ASGI (Django Channels) when the ASGI request type is neither HTTP nor Websockets.
+- Fix a crash with ASGI (Django Channels) when the ASGI request type is neither HTTP nor Websockets.
## 0.12.1
-* Temporarily remove sending of SQL parameters (as part of breadcrumbs or spans for APM) to Sentry to avoid memory consumption issues.
+- Temporarily remove sending of SQL parameters (as part of breadcrumbs or spans for APM) to Sentry to avoid memory consumption issues.
## 0.12.0
-* Sentry now has a [Discord server](https://discord.gg/cWnMQeA)! Join the server to get involved into SDK development and ask questions.
-* Fix a bug where the response object for httplib (or requests) was held onto for an unnecessarily long amount of time.
-* APM: Add spans for more methods on `subprocess.Popen` objects.
-* APM: Add spans for Django middlewares.
-* APM: Add spans for ASGI requests.
-* Automatically inject the ASGI middleware for Django Channels 2.0. This will **break your Channels 2.0 application if it is running on Python 3.5 or 3.6** (while previously it would "only" leak a lot of memory for each ASGI request). **Install `aiocontextvars` from PyPI to make it work again.**
+- Sentry now has a [Discord server](https://discord.gg/cWnMQeA)! Join the server to get involved into SDK development and ask questions.
+- Fix a bug where the response object for httplib (or requests) was held onto for an unnecessarily long amount of time.
+- APM: Add spans for more methods on `subprocess.Popen` objects.
+- APM: Add spans for Django middlewares.
+- APM: Add spans for ASGI requests.
+- Automatically inject the ASGI middleware for Django Channels 2.0. This will **break your Channels 2.0 application if it is running on Python 3.5 or 3.6** (while previously it would "only" leak a lot of memory for each ASGI request). **Install `aiocontextvars` from PyPI to make it work again.**
## 0.11.2
-* Fix a bug where the SDK would throw an exception on shutdown when running under eventlet.
-* Add missing data to Redis breadcrumbs.
+- Fix a bug where the SDK would throw an exception on shutdown when running under eventlet.
+- Add missing data to Redis breadcrumbs.
## 0.11.1
-* Remove a faulty assertion (observed in environment with Django Channels and ASGI).
+- Remove a faulty assertion (observed in environment with Django Channels and ASGI).
## 0.11.0
-* Fix type hints for the logging integration. Thanks Steven Dignam!
-* Fix an issue where scope/context data would leak in applications that use `gevent` with its threading monkeypatch. The fix is to avoid usage of contextvars in such environments. Thanks Ran Benita!
-* Fix a reference cycle in the `ThreadingIntegration` that led to exceptions on interpreter shutdown. Thanks Guang Tian Li!
-* Fix a series of bugs in the stdlib integration that broke usage of `subprocess`.
-* More instrumentation for APM.
-* New integration for SQLAlchemy (creates breadcrumbs from queries).
-* New (experimental) integration for Apache Beam.
-* Fix a bug in the `LoggingIntegration` that would send breadcrumbs timestamps in the wrong timezone.
-* The `AiohttpIntegration` now sets the event's transaction name.
-* Fix a bug that caused infinite recursion when serializing local variables that logged errors or otherwise created Sentry events.
+- Fix type hints for the logging integration. Thanks Steven Dignam!
+- Fix an issue where scope/context data would leak in applications that use `gevent` with its threading monkeypatch. The fix is to avoid usage of contextvars in such environments. Thanks Ran Benita!
+- Fix a reference cycle in the `ThreadingIntegration` that led to exceptions on interpreter shutdown. Thanks Guang Tian Li!
+- Fix a series of bugs in the stdlib integration that broke usage of `subprocess`.
+- More instrumentation for APM.
+- New integration for SQLAlchemy (creates breadcrumbs from queries).
+- New (experimental) integration for Apache Beam.
+- Fix a bug in the `LoggingIntegration` that would send breadcrumbs timestamps in the wrong timezone.
+- The `AiohttpIntegration` now sets the event's transaction name.
+- Fix a bug that caused infinite recursion when serializing local variables that logged errors or otherwise created Sentry events.
## 0.10.2
-* Fix a bug where a log record with non-strings as `extra` keys would make the SDK crash.
-* Added ASGI integration for better hub propagation, request data for your events and capturing uncaught exceptions. Using this middleware explicitly in your code will also fix a few issues with Django Channels.
-* Fix a bug where `celery-once` was deadlocking when used in combination with the celery integration.
-* Fix a memory leak in the new tracing feature when it is not enabled.
+- Fix a bug where a log record with non-strings as `extra` keys would make the SDK crash.
+- Added ASGI integration for better hub propagation, request data for your events and capturing uncaught exceptions. Using this middleware explicitly in your code will also fix a few issues with Django Channels.
+- Fix a bug where `celery-once` was deadlocking when used in combination with the celery integration.
+- Fix a memory leak in the new tracing feature when it is not enabled.
## 0.10.1
-* Fix bug where the SDK would yield a deprecation warning about
- `collections.abc` vs `collections`.
-* Fix bug in stdlib integration that would cause spawned subprocesses to not
- inherit the environment variables from the parent process.
+- Fix bug where the SDK would yield a deprecation warning about `collections.abc` vs `collections`.
+- Fix bug in stdlib integration that would cause spawned subprocesses to not inherit the environment variables from the parent process.
## 0.10.0
-* Massive refactor in preparation to tracing. There are no intentional breaking
- changes, but there is a risk of breakage (hence the minor version bump). Two
- new client options `traces_sample_rate` and `traceparent_v2` have been added.
- Do not change the defaults in production, they will bring your application
- down or at least fill your Sentry project up with nonsense events.
+- Massive refactor in preparation to tracing. There are no intentional breaking changes, but there is a risk of breakage (hence the minor version bump). Two new client options `traces_sample_rate` and `traceparent_v2` have been added. Do not change the defaults in production, they will bring your application down or at least fill your Sentry project up with nonsense events.
## 0.9.5
-* Do not use ``getargspec`` on Python 3 to evade deprecation
- warning.
+- Do not use `getargspec` on Python 3 to evade deprecation warning.
## 0.9.4
-* Revert a change in 0.9.3 that prevented passing a ``unicode``
- string as DSN to ``init()``.
+- Revert a change in 0.9.3 that prevented passing a `unicode` string as DSN to `init()`.
## 0.9.3
-* Add type hints for ``init()``.
-* Include user agent header when sending events.
+- Add type hints for `init()`.
+- Include user agent header when sending events.
## 0.9.2
-* Fix a bug in the Django integration that would prevent the user
- from initializing the SDK at the top of `settings.py`.
+- Fix a bug in the Django integration that would prevent the user from initializing the SDK at the top of `settings.py`.
- This bug was introduced in 0.9.1 for all Django versions, but has been there
- for much longer for Django 1.6 in particular.
+ This bug was introduced in 0.9.1 for all Django versions, but has been there for much longer for Django 1.6 in particular.
## 0.9.1
-* Fix a bug on Python 3.7 where gunicorn with gevent would cause the SDK to
- leak event data between requests.
-* Fix a bug where the GNU backtrace integration would not parse certain frames.
-* Fix a bug where the SDK would not pick up request bodies for Django Rest
- Framework based apps.
-* Remove a few more headers containing sensitive data per default.
-* Various improvements to type hints. Thanks Ran Benita!
-* Add a event hint to access the log record from `before_send`.
-* Fix a bug that would ignore `__tracebackhide__`. Thanks Matt Millican!
-* Fix distribution information for mypy support (add `py.typed` file). Thanks
- Ran Benita!
+- Fix a bug on Python 3.7 where gunicorn with gevent would cause the SDK to leak event data between requests.
+- Fix a bug where the GNU backtrace integration would not parse certain frames.
+- Fix a bug where the SDK would not pick up request bodies for Django Rest Framework based apps.
+- Remove a few more headers containing sensitive data per default.
+- Various improvements to type hints. Thanks Ran Benita!
+- Add a event hint to access the log record from `before_send`.
+- Fix a bug that would ignore `__tracebackhide__`. Thanks Matt Millican!
+- Fix distribution information for mypy support (add `py.typed` file). Thanks Ran Benita!
## 0.9.0
-* The SDK now captures `SystemExit` and other `BaseException`s when coming from
- within a WSGI app (Flask, Django, ...)
-* Pyramid: No longer report an exception if there exists an exception view for
- it.
+- The SDK now captures `SystemExit` and other `BaseException`s when coming from within a WSGI app (Flask, Django, ...)
+- Pyramid: No longer report an exception if there exists an exception view for it.
## 0.8.1
-* Fix infinite recursion bug in Celery integration.
+- Fix infinite recursion bug in Celery integration.
## 0.8.0
-* Add the always_run option in excepthook integration.
-* Fix performance issues when attaching large data to events. This is not
- really intended to be a breaking change, but this release does include a
- rewrite of a larger chunk of code, therefore the minor version bump.
+- Add the always_run option in excepthook integration.
+- Fix performance issues when attaching large data to events. This is not really intended to be a breaking change, but this release does include a rewrite of a larger chunk of code, therefore the minor version bump.
## 0.7.14
-* Fix crash when using Celery integration (`TypeError` when using
- `apply_async`).
+- Fix crash when using Celery integration (`TypeError` when using `apply_async`).
## 0.7.13
-* Fix a bug where `Ignore` raised in a Celery task would be reported to Sentry.
-* Add experimental support for tracing PoC.
+- Fix a bug where `Ignore` raised in a Celery task would be reported to Sentry.
+- Add experimental support for tracing PoC.
## 0.7.12
-* Read from `X-Real-IP` for user IP address.
-* Fix a bug that would not apply in-app rules for attached callstacks.
-* It's now possible to disable automatic proxy support by passing
- `http_proxy=""`. Thanks Marco Neumann!
+- Read from `X-Real-IP` for user IP address.
+- Fix a bug that would not apply in-app rules for attached callstacks.
+- It's now possible to disable automatic proxy support by passing `http_proxy=""`. Thanks Marco Neumann!
## 0.7.11
-* Fix a bug that would send `errno` in an invalid format to the server.
-* Fix import-time crash when running Python with `-O` flag.
-* Fix a bug that would prevent the logging integration from attaching `extra`
- keys called `data`.
-* Fix order in which exception chains are reported to match Raven behavior.
-* New integration for the Falcon web framework. Thanks to Jacob Magnusson!
+- Fix a bug that would send `errno` in an invalid format to the server.
+- Fix import-time crash when running Python with `-O` flag.
+- Fix a bug that would prevent the logging integration from attaching `extra` keys called `data`.
+- Fix order in which exception chains are reported to match Raven behavior.
+- New integration for the Falcon web framework. Thanks to Jacob Magnusson!
## 0.7.10
-* Add more event trimming.
-* Log Sentry's response body in debug mode.
-* Fix a few bad typehints causing issues in IDEs.
-* Fix a bug in the Bottle integration that would report HTTP exceptions (e.g.
- redirects) as errors.
-* Fix a bug that would prevent use of `in_app_exclude` without
- setting `in_app_include`.
-* Fix a bug where request bodies of Django Rest Framework apps were not captured.
-* Suppress errors during SQL breadcrumb capturing in Django
- integration. Also change order in which formatting strategies
- are tried.
+- Add more event trimming.
+- Log Sentry's response body in debug mode.
+- Fix a few bad typehints causing issues in IDEs.
+- Fix a bug in the Bottle integration that would report HTTP exceptions (e.g. redirects) as errors.
+- Fix a bug that would prevent use of `in_app_exclude` without setting `in_app_include`.
+- Fix a bug where request bodies of Django Rest Framework apps were not captured.
+- Suppress errors during SQL breadcrumb capturing in Django integration. Also change order in which formatting strategies are tried.
## 0.7.9
-* New integration for the Bottle web framework. Thanks to Stepan Henek!
-* Self-protect against broken mapping implementations and other broken reprs
- instead of dropping all local vars from a stacktrace. Thanks to Marco
- Neumann!
+- New integration for the Bottle web framework. Thanks to Stepan Henek!
+- Self-protect against broken mapping implementations and other broken reprs instead of dropping all local vars from a stacktrace. Thanks to Marco Neumann!
## 0.7.8
-* Add support for Sanic versions 18 and 19.
-* Fix a bug that causes an SDK crash when using composed SQL from psycopg2.
+- Add support for Sanic versions 18 and 19.
+- Fix a bug that causes an SDK crash when using composed SQL from psycopg2.
## 0.7.7
-* Fix a bug that would not capture request bodies if they were empty JSON
- arrays, objects or strings.
-* New GNU backtrace integration parses stacktraces from exception messages and
- appends them to existing stacktrace.
-* Capture Tornado formdata.
-* Support Python 3.6 in Sanic and AIOHTTP integration.
-* Clear breadcrumbs before starting a new request.
-* Fix a bug in the Celery integration that would drop pending events during
- worker shutdown (particularly an issue when running with `max_tasks_per_child
- = 1`)
-* Fix a bug with `repr`ing locals whose `__repr__` simultaneously changes the
- WSGI environment or other data that we're also trying to serialize at the
- same time.
+- Fix a bug that would not capture request bodies if they were empty JSON arrays, objects or strings.
+- New GNU backtrace integration parses stacktraces from exception messages and appends them to existing stacktrace.
+- Capture Tornado formdata.
+- Support Python 3.6 in Sanic and AIOHTTP integration.
+- Clear breadcrumbs before starting a new request.
+- Fix a bug in the Celery integration that would drop pending events during worker shutdown (particularly an issue when running with `max_tasks_per_child = 1`)
+- Fix a bug with `repr`ing locals whose `__repr__` simultaneously changes the WSGI environment or other data that we're also trying to serialize at the same time.
## 0.7.6
-* Fix a bug where artificial frames for Django templates would not be marked as
- in-app and would always appear as the innermost frame. Implement a heuristic
- to show template frame closer to `render` or `parse` invocation.
+- Fix a bug where artificial frames for Django templates would not be marked as in-app and would always appear as the innermost frame. Implement a heuristic to show template frame closer to `render` or `parse` invocation.
## 0.7.5
-* Fix bug into Tornado integration that would send broken cookies to the server.
-* Fix a bug in the logging integration that would ignore the client
- option `with_locals`.
+- Fix bug into Tornado integration that would send broken cookies to the server.
+- Fix a bug in the logging integration that would ignore the client option `with_locals`.
## 0.7.4
-* Read release and environment from process environment like the Raven SDK
- does. The keys are called `SENTRY_RELEASE` and `SENTRY_ENVIRONMENT`.
-* Fix a bug in the `serverless` integration where it would not push a new scope
- for each function call (leaking tags and other things across calls).
-* Experimental support for type hints.
+- Read release and environment from process environment like the Raven SDK does. The keys are called `SENTRY_RELEASE` and `SENTRY_ENVIRONMENT`.
+- Fix a bug in the `serverless` integration where it would not push a new scope for each function call (leaking tags and other things across calls).
+- Experimental support for type hints.
## 0.7.3
-* Fix crash in AIOHTTP integration when integration was set up but disabled.
-* Flask integration now adds usernames, email addresses based on the protocol
- Flask-User defines on top of Flask-Login.
-* New threading integration catches exceptions from crashing threads.
-* New method `flush` on hubs and clients. New global `flush` function.
-* Add decorator for serverless functions to fix common problems in those
- environments.
-* Fix a bug in the logging integration where using explicit handlers required
- enabling the integration.
+- Fix crash in AIOHTTP integration when integration was set up but disabled.
+- Flask integration now adds usernames, email addresses based on the protocol Flask-User defines on top of Flask-Login.
+- New threading integration catches exceptions from crashing threads.
+- New method `flush` on hubs and clients. New global `flush` function.
+- Add decorator for serverless functions to fix common problems in those environments.
+- Fix a bug in the logging integration where using explicit handlers required enabling the integration.
## 0.7.2
-* Fix `celery.exceptions.Retry` spamming in Celery integration.
+- Fix `celery.exceptions.Retry` spamming in Celery integration.
## 0.7.1
-* Fix `UnboundLocalError` crash in Celery integration.
+- Fix `UnboundLocalError` crash in Celery integration.
## 0.7.0
-* Properly display chained exceptions (PEP-3134).
-* Rewrite celery integration to monkeypatch instead of using signals due to
- bugs in Celery 3's signal handling. The Celery scope is also now available in
- prerun and postrun signals.
-* Fix Tornado integration to work with Tornado 6.
-* Do not evaluate Django `QuerySet` when trying to capture local variables.
- Also an internal hook was added to overwrite `repr` for local vars.
+- Properly display chained exceptions (PEP-3134).
+- Rewrite celery integration to monkeypatch instead of using signals due to bugs in Celery 3's signal handling. The Celery scope is also now available in prerun and postrun signals.
+- Fix Tornado integration to work with Tornado 6.
+- Do not evaluate Django `QuerySet` when trying to capture local variables. Also an internal hook was added to overwrite `repr` for local vars.
## 0.6.9
-* Second attempt at fixing the bug that was supposed to be fixed in 0.6.8.
+- Second attempt at fixing the bug that was supposed to be fixed in 0.6.8.
> No longer access arbitrary sequences in local vars due to possible side effects.
## 0.6.8
-* No longer access arbitrary sequences in local vars due to possible side effects.
+- No longer access arbitrary sequences in local vars due to possible side effects.
## 0.6.7
-* Sourcecode Django templates is now displayed in stackframes like Jinja templates in Flask already were.
-* Updates to AWS Lambda integration for changes Amazon did to their Python 3.7 runtime.
-* Fix a bug in the AIOHTTP integration that would report 300s and other HTTP status codes as errors.
-* Fix a bug where a crashing `before_send` would crash the SDK and app.
-* Fix a bug where cyclic references in e.g. local variables or `extra` data would crash the SDK.
+- Sourcecode Django templates is now displayed in stackframes like Jinja templates in Flask already were.
+- Updates to AWS Lambda integration for changes Amazon did to their Python 3.7 runtime.
+- Fix a bug in the AIOHTTP integration that would report 300s and other HTTP status codes as errors.
+- Fix a bug where a crashing `before_send` would crash the SDK and app.
+- Fix a bug where cyclic references in e.g. local variables or `extra` data would crash the SDK.
## 0.6.6
-* Un-break API of internal `Auth` object that we use in Sentry itself.
+- Un-break API of internal `Auth` object that we use in Sentry itself.
## 0.6.5
-* Capture WSGI request data eagerly to save memory and avoid issues with uWSGI.
-* Ability to use subpaths in DSN.
-* Ignore `django.request` logger.
+- Capture WSGI request data eagerly to save memory and avoid issues with uWSGI.
+- Ability to use subpaths in DSN.
+- Ignore `django.request` logger.
## 0.6.4
-* Fix bug that would lead to an `AssertionError: stack must have at least one layer`, at least in testsuites for Flask apps.
+- Fix bug that would lead to an `AssertionError: stack must have at least one layer`, at least in testsuites for Flask apps.
## 0.6.3
-* New integration for Tornado
-* Fix request data in Django, Flask and other WSGI frameworks leaking between events.
-* Fix infinite recursion when sending more events in `before_send`.
+- New integration for Tornado
+- Fix request data in Django, Flask and other WSGI frameworks leaking between events.
+- Fix infinite recursion when sending more events in `before_send`.
## 0.6.2
-* Fix crash in AWS Lambda integration when using Zappa. This only silences the error, the underlying bug is still in Zappa.
+- Fix crash in AWS Lambda integration when using Zappa. This only silences the error, the underlying bug is still in Zappa.
## 0.6.1
-* New integration for aiohttp-server.
-* Fix crash when reading hostname in broken WSGI environments.
+- New integration for aiohttp-server.
+- Fix crash when reading hostname in broken WSGI environments.
## 0.6.0
-* Fix bug where a 429 without Retry-After would not be honored.
-* Fix bug where proxy setting would not fall back to `http_proxy` for HTTPs traffic.
-* A WSGI middleware is now available for catching errors and adding context about the current request to them.
-* Using `logging.debug("test", exc_info=True)` will now attach the current stacktrace if no `sys.exc_info` is available.
-* The Python 3.7 runtime for AWS Lambda is now supported.
-* Fix a bug that would drop an event or parts of it when it contained bytes that were not UTF-8 encoded.
-* Logging an exception will no longer add the exception as breadcrumb to the exception's own event.
+- Fix bug where a 429 without Retry-After would not be honored.
+- Fix bug where proxy setting would not fall back to `http_proxy` for HTTPs traffic.
+- A WSGI middleware is now available for catching errors and adding context about the current request to them.
+- Using `logging.debug("test", exc_info=True)` will now attach the current stacktrace if no `sys.exc_info` is available.
+- The Python 3.7 runtime for AWS Lambda is now supported.
+- Fix a bug that would drop an event or parts of it when it contained bytes that were not UTF-8 encoded.
+- Logging an exception will no longer add the exception as breadcrumb to the exception's own event.
## 0.5.5
-* New client option `ca_certs`.
-* Fix crash with Django and psycopg2.
+- New client option `ca_certs`.
+- Fix crash with Django and psycopg2.
## 0.5.4
-* Fix deprecation warning in relation to the `collections` stdlib module.
-* Fix bug that would crash Django and Flask when streaming responses are failing halfway through.
+- Fix deprecation warning in relation to the `collections` stdlib module.
+- Fix bug that would crash Django and Flask when streaming responses are failing halfway through.
## 0.5.3
-* Fix bug where using `push_scope` with a callback would not pop the scope.
-* Fix crash when initializing the SDK in `push_scope`.
-* Fix bug where IP addresses were sent when `send_default_pii=False`.
+- Fix bug where using `push_scope` with a callback would not pop the scope.
+- Fix crash when initializing the SDK in `push_scope`.
+- Fix bug where IP addresses were sent when `send_default_pii=False`.
## 0.5.2
-* Fix bug where events sent through the RQ integration were sometimes lost.
-* Remove a deprecation warning about usage of `logger.warn`.
-* Fix bug where large frame local variables would lead to the event being rejected by Sentry.
+- Fix bug where events sent through the RQ integration were sometimes lost.
+- Remove a deprecation warning about usage of `logger.warn`.
+- Fix bug where large frame local variables would lead to the event being rejected by Sentry.
## 0.5.1
-* Integration for Redis Queue (RQ)
+- Integration for Redis Queue (RQ)
## 0.5.0
-* Fix a bug that would omit several debug logs during SDK initialization.
-* Fix issue that sent a event key `""` Sentry wouldn't understand.
-* **Breaking change:** The `level` and `event_level` options in the logging integration now work separately from each other.
-* Fix a bug in the Sanic integration that would report the exception behind any HTTP error code.
-* Fix a bug that would spam breadcrumbs in the Celery integration. Ignore logger `celery.worker.job`.
-* Additional attributes on log records are now put into `extra`.
-* Integration for Pyramid.
-* `sys.argv` is put into extra automatically.
+- Fix a bug that would omit several debug logs during SDK initialization.
+- Fix issue that sent a event key `""` Sentry wouldn't understand.
+- **Breaking change:** The `level` and `event_level` options in the logging integration now work separately from each other.
+- Fix a bug in the Sanic integration that would report the exception behind any HTTP error code.
+- Fix a bug that would spam breadcrumbs in the Celery integration. Ignore logger `celery.worker.job`.
+- Additional attributes on log records are now put into `extra`.
+- Integration for Pyramid.
+- `sys.argv` is put into extra automatically.
## 0.4.3
-* Fix a bug that would leak WSGI responses.
+- Fix a bug that would leak WSGI responses.
## 0.4.2
-* Fix a bug in the Sanic integration that would leak data between requests.
-* Fix a bug that would hide all debug logging happening inside of the built-in transport.
-* Fix a bug that would report errors for typos in Django's shell.
+- Fix a bug in the Sanic integration that would leak data between requests.
+- Fix a bug that would hide all debug logging happening inside of the built-in transport.
+- Fix a bug that would report errors for typos in Django's shell.
## 0.4.1
-* Fix bug that would only show filenames in stacktraces but not the parent
- directories.
+- Fix bug that would only show filenames in stacktraces but not the parent directories.
## 0.4.0
-* Changed how integrations are initialized. Integrations are now
- configured and enabled per-client.
+- Changed how integrations are initialized. Integrations are now configured and enabled per-client.
## 0.3.11
-* Fix issue with certain deployment tools and the AWS Lambda integration.
+- Fix issue with certain deployment tools and the AWS Lambda integration.
## 0.3.10
-* Set transactions for Django like in Raven. Which transaction behavior is used
- can be configured.
-* Fix a bug which would omit frame local variables from stacktraces in Celery.
-* New option: `attach_stacktrace`
+- Set transactions for Django like in Raven. Which transaction behavior is used can be configured.
+- Fix a bug which would omit frame local variables from stacktraces in Celery.
+- New option: `attach_stacktrace`
## 0.3.9
-* Bugfixes for AWS Lambda integration: Using Zappa did not catch any exceptions.
+- Bugfixes for AWS Lambda integration: Using Zappa did not catch any exceptions.
## 0.3.8
-* Nicer log level for internal errors.
+- Nicer log level for internal errors.
## 0.3.7
-* Remove `repos` configuration option. There was never a way to make use of
- this feature.
-* Fix a bug in `last_event_id`.
-* Add Django SQL queries to breadcrumbs.
-* Django integration won't set user attributes if they were already set.
-* Report correct SDK version to Sentry.
+- Remove `repos` configuration option. There was never a way to make use of this feature.
+- Fix a bug in `last_event_id`.
+- Add Django SQL queries to breadcrumbs.
+- Django integration won't set user attributes if they were already set.
+- Report correct SDK version to Sentry.
## 0.3.6
-* Integration for Sanic
+- Integration for Sanic
## 0.3.5
-* Integration for AWS Lambda
-* Fix mojibake when encoding local variable values
+- Integration for AWS Lambda
+- Fix mojibake when encoding local variable values
## 0.3.4
-* Performance improvement when storing breadcrumbs
+- Performance improvement when storing breadcrumbs
## 0.3.3
-* Fix crash when breadcrumbs had to be trunchated
+- Fix crash when breadcrumbs had to be trunchated
## 0.3.2
-* Fixed an issue where some paths where not properly sent as absolute paths
+- Fixed an issue where some paths where not properly sent as absolute paths
From fae6d62abd761184adc11b21f90b213dcb1814d5 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Thu, 12 Nov 2020 10:11:02 -0800
Subject: [PATCH 0089/2327] fix CI
---
CHANGES.md | 2 +-
tox.ini | 43 +++++++++++++++++++++++++++++++++++++++++--
2 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index a22e51f4b1..5c34bdd82b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,7 +22,7 @@ A major release `N` implies the previous release `N-1` will no longer receive up
## 0.19.3
-- Automatically pass integration-relevant data to `traces_sampler` for AWS, AIOHTTP, ASGI, Bottle, Celery, Django, Falcon, GCP, Pyrammid, Tryton, RQ, and WSGI integrations
+- Automatically pass integration-relevant data to `traces_sampler` for AWS, AIOHTTP, ASGI, Bottle, Celery, Django, Falcon, Flask, GCP, Pyramid, Tryton, RQ, and WSGI integrations
- Fix a bug where the AWS integration would crash if event was anything besides a dictionary
- Fix the Django integrations's ASGI handler for Channels 3.0. Thanks Luke Pomfrey!
diff --git a/tox.ini b/tox.ini
index 578582c069..f5d745b40c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,9 @@ envlist =
{pypy,py2.7,py3.4,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12,1.0}
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-1.1
- {py3.6,py3.7,py3.8,py3.9}-flask-dev
+
+ # TODO: see note in [testenv:flask-dev] below
+ ; {py3.6,py3.7,py3.8,py3.9}-flask-dev
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-bottle-0.12
@@ -132,7 +134,10 @@ deps =
flask-0.12: Flask>=0.12,<0.13
flask-1.0: Flask>=1.0,<1.1
flask-1.1: Flask>=1.1,<1.2
- flask-dev: git+https://github.com/pallets/flask.git#egg=flask
+
+ # TODO: see note in [testenv:flask-dev] below
+ ; flask-dev: git+https://github.com/pallets/flask.git#egg=flask
+ ; flask-dev: git+https://github.com/pallets/werkzeug.git#egg=werkzeug
bottle-0.12: bottle>=0.12,<0.13
bottle-dev: git+https://github.com/bottlepy/bottle#egg=bottle
@@ -293,6 +298,40 @@ basepython =
commands =
py.test {env:TESTPATH} {posargs}
+
+# TODO: This is broken out as a separate env so as to be able to override the
+# werkzeug version. (You can't do it just by letting one version be specifed in
+# a requirements file and specifying a different version in one testenv, see
+# https://github.com/tox-dev/tox/issues/1390.) The issue is that as of 11/11/20,
+# flask-dev has made a change which werkzeug then had to compensate for in
+# https://github.com/pallets/werkzeug/pull/1960. Since we've got werkzeug
+# pinned at 0.15.5 in test-requirements.txt, we don't get this fix.
+
+# At some point, we probably want to revisit this, since the list copied from
+# test-requirements.txt could easily get stale.
+[testenv:flask-dev]
+deps =
+ git+https://github.com/pallets/flask.git#egg=flask
+ git+https://github.com/pallets/werkzeug.git#egg=werkzeug
+
+ # everything below this point is from test-requirements.txt (minus, of
+ # course, werkzeug)
+ pytest==3.7.3
+ pytest-forked==1.1.3
+ tox==3.7.0
+ pytest-localserver==0.5.0
+ pytest-cov==2.8.1
+ jsonschema==3.2.0
+ pyrsistent==0.16.0 # TODO(py3): 0.17.0 requires python3, see https://github.com/tobgu/pyrsistent/issues/205
+ mock # for testing under python < 3.3
+
+ gevent
+ eventlet
+
+ newrelic
+ executing
+ asttokens
+
[testenv:linters]
commands =
flake8 tests examples sentry_sdk
From dc59cc51c030f2128d026b4ed89b5037cc4adbc7 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Thu, 12 Nov 2020 10:21:58 -0800
Subject: [PATCH 0090/2327] release: 0.19.3
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index a87e4724bc..5807bef2a2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.19.2"
+release = "0.19.3"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index d4c12a354f..f8e3441b83 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -96,7 +96,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.19.2"
+VERSION = "0.19.3"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index bc90d4d806..b665a56859 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="0.19.2",
+ version="0.19.3",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From c6b6f2086b58ffc674df5c25a600b8a615079fb5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Nov 2020 07:55:28 +0000
Subject: [PATCH 0091/2327] build(deps): bump checkouts/data-schemas from
`b20959c` to `d4d35d6`
Bumps [checkouts/data-schemas](https://github.com/getsentry/sentry-data-schemas) from `b20959c` to `d4d35d6`.
- [Release notes](https://github.com/getsentry/sentry-data-schemas/releases)
- [Commits](https://github.com/getsentry/sentry-data-schemas/compare/b20959cbb66ddde11224be5f5eb3b90286140826...d4d35d640687861fb40c13862629b5d42f4c8533)
Signed-off-by: dependabot-preview[bot]
---
checkouts/data-schemas | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/checkouts/data-schemas b/checkouts/data-schemas
index b20959cbb6..d4d35d6406 160000
--- a/checkouts/data-schemas
+++ b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit b20959cbb66ddde11224be5f5eb3b90286140826
+Subproject commit d4d35d640687861fb40c13862629b5d42f4c8533
From 5a41127ef2b34daf798d7028761ccf9ce2f0d94d Mon Sep 17 00:00:00 2001
From: Vladimir Kochnev
Date: Thu, 19 Nov 2020 10:09:57 +0000
Subject: [PATCH 0092/2327] Check botocore version when activating integration
(#921)
Co-authored-by: Markus Unterwaditzer
---
sentry_sdk/integrations/boto3.py | 9 +++++++++
tox.ini | 7 ++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/sentry_sdk/integrations/boto3.py b/sentry_sdk/integrations/boto3.py
index 573a6248bd..e65f5a754b 100644
--- a/sentry_sdk/integrations/boto3.py
+++ b/sentry_sdk/integrations/boto3.py
@@ -14,6 +14,7 @@
from typing import Type
try:
+ from botocore import __version__ as BOTOCORE_VERSION # type: ignore
from botocore.client import BaseClient # type: ignore
from botocore.response import StreamingBody # type: ignore
from botocore.awsrequest import AWSRequest # type: ignore
@@ -27,6 +28,14 @@ class Boto3Integration(Integration):
@staticmethod
def setup_once():
# type: () -> None
+ try:
+ version = tuple(map(int, BOTOCORE_VERSION.split(".")[:3]))
+ except (ValueError, TypeError):
+ raise DidNotEnable(
+ "Unparsable botocore version: {}".format(BOTOCORE_VERSION)
+ )
+ if version < (1, 12):
+ raise DidNotEnable("Botocore 1.12 or newer is required.")
orig_init = BaseClient.__init__
def sentry_patched_init(self, *args, **kwargs):
diff --git a/tox.ini b/tox.ini
index f5d745b40c..8c32a88fcd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -83,7 +83,7 @@ envlist =
{py3.6,py3.7,py3.8}-chalice-{1.16,1.17,1.18,1.19,1.20}
- {py2.7,py3.6,py3.7,py3.8}-boto3-{1.14,1.15,1.16}
+ {py2.7,py3.6,py3.7,py3.8}-boto3-{1.9,1.10,1.11,1.12,1.13,1.14,1.15,1.16}
[testenv]
deps =
@@ -234,6 +234,11 @@ deps =
chalice-1.20: chalice>=1.20.0,<1.21.0
chalice: pytest-chalice==0.0.5
+ boto3-1.9: boto3>=1.9,<1.10
+ boto3-1.10: boto3>=1.10,<1.11
+ boto3-1.11: boto3>=1.11,<1.12
+ boto3-1.12: boto3>=1.12,<1.13
+ boto3-1.13: boto3>=1.13,<1.14
boto3-1.14: boto3>=1.14,<1.15
boto3-1.15: boto3>=1.15,<1.16
boto3-1.16: boto3>=1.16,<1.17
From 4681eba93a83a061c022ab30e334bad3f35aef7d Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Thu, 19 Nov 2020 14:21:11 +0100
Subject: [PATCH 0093/2327] fix: Remove duplicate data from sampling context
(#919)
Co-authored-by: Katie Byers
---
sentry_sdk/tracing.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 060394619c..5e8a21e027 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -558,7 +558,6 @@ def to_json(self):
rv["name"] = self.name
rv["sampled"] = self.sampled
- rv["parent_sampled"] = self.parent_sampled
return rv
From 7c3fe4693598f116f49b5e77a9caf7f97590925c Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Thu, 19 Nov 2020 14:36:41 +0100
Subject: [PATCH 0094/2327] chore: Attempt to fix sanic build
---
tox.ini | 1 +
1 file changed, 1 insertion(+)
diff --git a/tox.ini b/tox.ini
index 8c32a88fcd..cedf7f5bf0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -150,6 +150,7 @@ deps =
sanic-19: sanic>=19.0,<20.0
{py3.5,py3.6}-sanic: aiocontextvars==0.2.1
sanic: aiohttp
+ py3.5-sanic: ujson<4
beam-2.12: apache-beam>=2.12.0, <2.13.0
beam-2.13: apache-beam>=2.13.0, <2.14.0
From 3ca451f9bfcde0fb3542b792b378b3b04c953ab0 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Thu, 19 Nov 2020 15:16:47 +0100
Subject: [PATCH 0095/2327] doc: Changelog for 0.19.4
---
CHANGES.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 5c34bdd82b..033c1eea6b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,10 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 0.19.4
+
+- Fix a bug that would make applications crash if an old version of `boto3` was installed.
+
## 0.19.3
- Automatically pass integration-relevant data to `traces_sampler` for AWS, AIOHTTP, ASGI, Bottle, Celery, Django, Falcon, Flask, GCP, Pyramid, Tryton, RQ, and WSGI integrations
From 67a34a26c26787576e6cbd6ec631f41aa0c0ac26 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Thu, 19 Nov 2020 15:16:58 +0100
Subject: [PATCH 0096/2327] release: 0.19.4
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 5807bef2a2..b42f2a974b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.19.3"
+release = "0.19.4"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index f8e3441b83..59185c579a 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -96,7 +96,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.19.3"
+VERSION = "0.19.4"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index b665a56859..59aef3600c 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="0.19.3",
+ version="0.19.4",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 72eba9ee068f947c08e4d4310182e0bfa80972ab Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Nov 2020 07:14:16 +0000
Subject: [PATCH 0097/2327] build(deps): bump flake8-bugbear from 20.1.4 to
20.11.1
Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 20.1.4 to 20.11.1.
- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases)
- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/20.1.4...20.11.1)
Signed-off-by: dependabot-preview[bot]
---
linter-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linter-requirements.txt b/linter-requirements.txt
index 0bcf11e3b3..d24876f42f 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -2,5 +2,5 @@ black==20.8b1
flake8==3.8.4
flake8-import-order==0.18.1
mypy==0.782
-flake8-bugbear==20.1.4
+flake8-bugbear==20.11.1
pep8-naming==0.11.1
From 4c08988eda9bb410afa3a4fa743cc4ea806f9902 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Nov 2020 07:29:19 +0000
Subject: [PATCH 0098/2327] build(deps): bump checkouts/data-schemas from
`d4d35d6` to `76c6870`
Bumps [checkouts/data-schemas](https://github.com/getsentry/sentry-data-schemas) from `d4d35d6` to `76c6870`.
- [Release notes](https://github.com/getsentry/sentry-data-schemas/releases)
- [Commits](https://github.com/getsentry/sentry-data-schemas/compare/d4d35d640687861fb40c13862629b5d42f4c8533...76c6870d4b81e9c7a3a983cf4f591aeecb579521)
Signed-off-by: dependabot-preview[bot]
---
checkouts/data-schemas | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/checkouts/data-schemas b/checkouts/data-schemas
index d4d35d6406..76c6870d4b 160000
--- a/checkouts/data-schemas
+++ b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit d4d35d640687861fb40c13862629b5d42f4c8533
+Subproject commit 76c6870d4b81e9c7a3a983cf4f591aeecb579521
From 7dad958edb3d4be9872c65ca41d47f79caec17a5 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Wed, 2 Dec 2020 15:49:58 +0100
Subject: [PATCH 0099/2327] fix runtox.sh for GNU implementation of tr
---
scripts/runtox.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/runtox.sh b/scripts/runtox.sh
index d1c0ea31a4..e473ebe507 100755
--- a/scripts/runtox.sh
+++ b/scripts/runtox.sh
@@ -23,4 +23,4 @@ elif [ -n "$AZURE_PYTHON_VERSION" ]; then
fi
fi
-exec $TOXPATH -e $($TOXPATH -l | grep "$searchstring" | tr '\n' ',') -- "${@:2}"
+exec $TOXPATH -e $($TOXPATH -l | grep "$searchstring" | tr $'\n' ',') -- "${@:2}"
From c277ed5d1170a7d58fe3482173d391ae799fdc0a Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Wed, 9 Dec 2020 11:05:43 +0100
Subject: [PATCH 0100/2327] feat: Expose transport queue size to options and
bump queue size (#942)
Co-authored-by: Markus Unterwaditzer
---
sentry_sdk/consts.py | 7 +++++--
sentry_sdk/transport.py | 4 ++--
sentry_sdk/worker.py | 9 +++++++--
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 59185c579a..70cd800a42 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -1,6 +1,8 @@
from sentry_sdk._types import MYPY
if MYPY:
+ import sentry_sdk
+
from typing import Optional
from typing import Callable
from typing import Union
@@ -11,7 +13,6 @@
from typing import Sequence
from typing_extensions import TypedDict
- from sentry_sdk.transport import Transport
from sentry_sdk.integrations import Integration
from sentry_sdk._types import (
@@ -36,6 +37,7 @@
total=False,
)
+DEFAULT_QUEUE_SIZE = 100
DEFAULT_MAX_BREADCRUMBS = 100
@@ -56,7 +58,8 @@ def __init__(
in_app_exclude=[], # type: List[str] # noqa: B006
default_integrations=True, # type: bool
dist=None, # type: Optional[str]
- transport=None, # type: Optional[Union[Transport, Type[Transport], Callable[[Event], None]]]
+ transport=None, # type: Optional[Union[sentry_sdk.transport.Transport, Type[sentry_sdk.transport.Transport], Callable[[Event], None]]]
+ transport_queue_size=DEFAULT_QUEUE_SIZE, # type: int
sample_rate=1.0, # type: float
send_default_pii=False, # type: bool
http_proxy=None, # type: Optional[str]
diff --git a/sentry_sdk/transport.py b/sentry_sdk/transport.py
index 47d9ff6e35..5fdfdfbdc1 100644
--- a/sentry_sdk/transport.py
+++ b/sentry_sdk/transport.py
@@ -126,11 +126,11 @@ def __init__(
Transport.__init__(self, options)
assert self.parsed_dsn is not None
- self._worker = BackgroundWorker()
+ self.options = options
+ self._worker = BackgroundWorker(queue_size=options["transport_queue_size"])
self._auth = self.parsed_dsn.to_auth("sentry.python/%s" % VERSION)
self._disabled_until = {} # type: Dict[DataCategory, datetime]
self._retry = urllib3.util.Retry()
- self.options = options
self._pool = self._make_pool(
self.parsed_dsn,
diff --git a/sentry_sdk/worker.py b/sentry_sdk/worker.py
index 8550f1081c..b528509cf6 100644
--- a/sentry_sdk/worker.py
+++ b/sentry_sdk/worker.py
@@ -5,6 +5,7 @@
from sentry_sdk._compat import check_thread_support
from sentry_sdk._queue import Queue, Full
from sentry_sdk.utils import logger
+from sentry_sdk.consts import DEFAULT_QUEUE_SIZE
from sentry_sdk._types import MYPY
@@ -18,7 +19,7 @@
class BackgroundWorker(object):
- def __init__(self, queue_size=30):
+ def __init__(self, queue_size=DEFAULT_QUEUE_SIZE):
# type: (int) -> None
check_thread_support()
self._queue = Queue(queue_size) # type: Queue
@@ -110,7 +111,11 @@ def submit(self, callback):
try:
self._queue.put_nowait(callback)
except Full:
- logger.debug("background worker queue full, dropping event")
+ self.on_full_queue(callback)
+
+ def on_full_queue(self, callback):
+ # type: (Optional[Any]) -> None
+ logger.debug("background worker queue full, dropping event")
def _target(self):
# type: () -> None
From 1d75da5203bdfaa47e920f5d749b85abff5f07f7 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Wed, 9 Dec 2020 22:41:16 +0100
Subject: [PATCH 0101/2327] fix: Fix sample decision propagation via headers
(#948)
---
sentry_sdk/tracing.py | 25 ++++++++-----------------
setup.py | 4 ++--
tests/tracing/test_integration_tests.py | 11 +++++++----
3 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 5e8a21e027..73531894ef 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -583,22 +583,23 @@ def _set_initial_sampling_decision(self, sampling_context):
decision, `traces_sample_rate` will be used.
"""
+ # if the user has forced a sampling decision by passing a `sampled`
+ # value when starting the transaction, go with that
+ if self.sampled is not None:
+ return
+
hub = self.hub or sentry_sdk.Hub.current
client = hub.client
- options = (client and client.options) or {}
transaction_description = "{op}transaction <{name}>".format(
op=("<" + self.op + "> " if self.op else ""), name=self.name
)
- # nothing to do if there's no client or if tracing is disabled
- if not client or not has_tracing_enabled(options):
+ # nothing to do if there's no client
+ if not client:
self.sampled = False
return
- # if the user has forced a sampling decision by passing a `sampled`
- # value when starting the transaction, go with that
- if self.sampled is not None:
- return
+ options = client.options
# we would have bailed already if neither `traces_sampler` nor
# `traces_sample_rate` were defined, so one of these should work; prefer
@@ -662,16 +663,6 @@ def _set_initial_sampling_decision(self, sampling_context):
)
-def has_tracing_enabled(options):
- # type: (Dict[str, Any]) -> bool
- """
- Returns True if either traces_sample_rate or traces_sampler is
- non-zero/defined, False otherwise.
- """
-
- return bool(options.get("traces_sample_rate") or options.get("traces_sampler"))
-
-
def _is_valid_sample_rate(rate):
# type: (Any) -> bool
"""
diff --git a/setup.py b/setup.py
index 59aef3600c..074a80eebb 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ def get_file_text(file_name):
with open(os.path.join(here, file_name)) as in_file:
return in_file.read()
-
+
setup(
name="sentry-sdk",
version="0.19.4",
@@ -31,7 +31,7 @@ def get_file_text(file_name):
},
description="Python client for Sentry (https://sentry.io)",
long_description=get_file_text("README.md"),
- long_description_content_type='text/markdown',
+ long_description_content_type="text/markdown",
packages=find_packages(exclude=("tests", "tests.*")),
# PEP 561
package_data={"sentry_sdk": ["py.typed"]},
diff --git a/tests/tracing/test_integration_tests.py b/tests/tracing/test_integration_tests.py
index 298f460d59..c4c316be96 100644
--- a/tests/tracing/test_integration_tests.py
+++ b/tests/tracing/test_integration_tests.py
@@ -47,12 +47,15 @@ def test_basic(sentry_init, capture_events, sample_rate):
@pytest.mark.parametrize("sampled", [True, False, None])
-def test_continue_from_headers(sentry_init, capture_events, sampled):
- sentry_init(traces_sample_rate=1.0)
+@pytest.mark.parametrize(
+ "sample_rate", [0.0, 1.0]
+) # ensure sampling decision is actually passed along via headers
+def test_continue_from_headers(sentry_init, capture_events, sampled, sample_rate):
+ sentry_init(traces_sample_rate=sample_rate)
events = capture_events()
# make a parent transaction (normally this would be in a different service)
- with start_transaction(name="hi"):
+ with start_transaction(name="hi", sampled=True if sample_rate == 0 else None):
with start_span() as old_span:
old_span.sampled = sampled
headers = dict(Hub.current.iter_trace_propagation_headers())
@@ -84,7 +87,7 @@ def test_continue_from_headers(sentry_init, capture_events, sampled):
scope.transaction = "ho"
capture_message("hello")
- if sampled is False:
+ if sampled is False or (sample_rate == 0 and sampled is None):
trace1, message = events
assert trace1["transaction"] == "hi"
From 6fc2287c6f5280e5adf76bb7a66f05f7c8d18882 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Wed, 9 Dec 2020 23:09:29 +0100
Subject: [PATCH 0102/2327] fix: Make traces_sample_rate non-nullable again
---
sentry_sdk/consts.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 70cd800a42..1a2316d911 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -72,7 +72,7 @@ def __init__(
attach_stacktrace=False, # type: bool
ca_certs=None, # type: Optional[str]
propagate_traces=True, # type: bool
- traces_sample_rate=None, # type: Optional[float]
+ traces_sample_rate=0.0, # type: float
traces_sampler=None, # type: Optional[TracesSampler]
auto_enabling_integrations=True, # type: bool
_experiments={}, # type: Experiments # noqa: B006
From 0932f9fb1f562c69a013294cedf67400a3741ecb Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Thu, 10 Dec 2020 10:34:29 +0100
Subject: [PATCH 0103/2327] doc: Changelog for 0.19.5
---
CHANGES.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 033c1eea6b..ee2c487e7d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,6 +20,11 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 0.19.5
+
+- Fix two regressions added in 0.19.2 with regard to sampling behavior when reading the sampling decision from headers.
+- Increase internal transport queue size and make it configurable.
+
## 0.19.4
- Fix a bug that would make applications crash if an old version of `boto3` was installed.
From 02b72f91199dac9b0d74b3968fd9c68f60b99b72 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Thu, 10 Dec 2020 10:34:39 +0100
Subject: [PATCH 0104/2327] release: 0.19.5
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index b42f2a974b..ca873d28f8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.19.4"
+release = "0.19.5"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 1a2316d911..a58ac37afd 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -99,7 +99,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.19.4"
+VERSION = "0.19.5"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 074a80eebb..105a3c71c5 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="0.19.4",
+ version="0.19.5",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From edf5ec6126ebc7ec0cc90f6ee24391ea6dc2d5e3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 21 Dec 2020 07:34:55 +0000
Subject: [PATCH 0105/2327] build(deps): bump sphinx from 3.0.4 to 3.4.0
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 3.0.4 to 3.4.0.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/3.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v3.0.4...v3.4.0)
Signed-off-by: dependabot-preview[bot]
---
docs-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs-requirements.txt b/docs-requirements.txt
index 6cf3245d61..41a2048e90 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx==3.0.4
+sphinx==3.4.0
sphinx-rtd-theme
sphinx-autodoc-typehints[type_comments]>=1.8.0
typing-extensions
From e3549b36d6c0cc3da6d9e6082168c61988a76279 Mon Sep 17 00:00:00 2001
From: asellappenIBM <31274494+asellappen@users.noreply.github.com>
Date: Mon, 21 Dec 2020 21:01:44 +0530
Subject: [PATCH 0106/2327] Adding Power support(ppc64le) with ci and testing
to the project for architecture independent (#955)
---
.travis.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 71abfc2027..19c4311391 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,6 +48,12 @@ jobs:
install: []
script: make travis-upload-docs
+ - python: "3.9"
+ arch: ppc64le
+ dist: bionic
+
+before_install:
+ - sudo apt-get install zip
before_script:
- psql -c 'create database travis_ci_test;' -U postgres
- psql -c 'create database test_travis_ci_test;' -U postgres
From c3592915a9a4ae36c557a2b24e349b80577297f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Riel?=
Date: Mon, 4 Jan 2021 07:01:28 -0500
Subject: [PATCH 0107/2327] fix: Fix header extraction for AWS
Lambda/ApiGateway (#945)
Co-authored-by: Markus Unterwaditzer
---
sentry_sdk/integrations/aws_lambda.py | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
index 335c08eee7..6cb42a9790 100644
--- a/sentry_sdk/integrations/aws_lambda.py
+++ b/sentry_sdk/integrations/aws_lambda.py
@@ -134,7 +134,10 @@ def sentry_handler(aws_event, aws_context, *args, **kwargs):
# Starting the thread to raise timeout warning exception
timeout_thread.start()
- headers = request_data.get("headers", {})
+ headers = request_data.get("headers")
+ # AWS Service may set an explicit `{headers: None}`, we can't rely on `.get()`'s default.
+ if headers is None:
+ headers = {}
transaction = Transaction.continue_from_headers(
headers, op="serverless.function", name=aws_context.function_name
)
@@ -337,11 +340,15 @@ def event_processor(sentry_event, hint, start_time=start_time):
if _should_send_default_pii():
user_info = sentry_event.setdefault("user", {})
- id = aws_event.get("identity", {}).get("userArn")
+ identity = aws_event.get("identity")
+ if identity is None:
+ identity = {}
+
+ id = identity.get("userArn")
if id is not None:
user_info.setdefault("id", id)
- ip = aws_event.get("identity", {}).get("sourceIp")
+ ip = identity.get("sourceIp")
if ip is not None:
user_info.setdefault("ip_address", ip)
@@ -363,7 +370,11 @@ def event_processor(sentry_event, hint, start_time=start_time):
def _get_url(aws_event, aws_context):
# type: (Any, Any) -> str
path = aws_event.get("path", None)
- headers = aws_event.get("headers", {})
+
+ headers = aws_event.get("headers")
+ if headers is None:
+ headers = {}
+
host = headers.get("Host", None)
proto = headers.get("X-Forwarded-Proto", None)
if proto and host and path:
From 38b983e490ad4bda8db7a80ee52cfb65c398a45c Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Thu, 7 Jan 2021 21:13:05 +0100
Subject: [PATCH 0108/2327] fix(ci): unpin pytest, stop testing eventlet (#965)
* fix(ci): Unpin pytest, stop testing eventlet
* eventlet is broken all the time in newer Python versions
* Channels 3.0 needs some adjustments.
* unpin pytest to satisfy conflicts between Python 3.9 and Python 2.7 environments
* install pytest-django for old django too
* downgrade pytest for old flask
* fix flask 1.11 error
* revert flask-dev hack, new pip resolver has landed
* fix django
* fix trytond
* drop trytond on py3.4
* remove broken assertion
* fix remaining issues
* fix: Formatting
* fix linters
* fix channels condition
* remove py3.6-flask-dev because its failing
Co-authored-by: sentry-bot
---
sentry_sdk/integrations/flask.py | 8 ++-
test-requirements.txt | 5 +-
tests/conftest.py | 16 ++++-
tests/integrations/django/myapp/routing.py | 9 ++-
tests/utils/test_general.py | 1 -
tox.ini | 74 +++++-----------------
6 files changed, 46 insertions(+), 67 deletions(-)
diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py
index fe630ea50a..2d0883ab8a 100644
--- a/sentry_sdk/integrations/flask.py
+++ b/sentry_sdk/integrations/flask.py
@@ -14,7 +14,6 @@
from sentry_sdk.integrations.wsgi import _ScopedResponse
from typing import Any
from typing import Dict
- from werkzeug.datastructures import ImmutableTypeConversionDict
from werkzeug.datastructures import ImmutableMultiDict
from werkzeug.datastructures import FileStorage
from typing import Union
@@ -127,8 +126,11 @@ def env(self):
return self.request.environ
def cookies(self):
- # type: () -> ImmutableTypeConversionDict[Any, Any]
- return self.request.cookies
+ # type: () -> Dict[Any, Any]
+ return {
+ k: v[0] if isinstance(v, list) and len(v) == 1 else v
+ for k, v in self.request.cookies.items()
+ }
def raw_data(self):
# type: () -> bytes
diff --git a/test-requirements.txt b/test-requirements.txt
index 3ba7e1a44c..1289b7a38d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,7 @@
-pytest==3.7.3
+pytest
pytest-forked==1.1.3
tox==3.7.0
-Werkzeug==0.15.5
+Werkzeug
pytest-localserver==0.5.0
pytest-cov==2.8.1
jsonschema==3.2.0
@@ -9,7 +9,6 @@ pyrsistent==0.16.0 # TODO(py3): 0.17.0 requires python3, see https://github.com/
mock # for testing under python < 3.3
gevent
-eventlet
newrelic
executing
diff --git a/tests/conftest.py b/tests/conftest.py
index 35631bcd70..6bef63e5ab 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -4,8 +4,15 @@
import pytest
import jsonschema
-import gevent
-import eventlet
+try:
+ import gevent
+except ImportError:
+ gevent = None
+
+try:
+ import eventlet
+except ImportError:
+ eventlet = None
import sentry_sdk
from sentry_sdk._compat import reraise, string_types, iteritems
@@ -284,6 +291,9 @@ def read_flush(self):
)
def maybe_monkeypatched_threading(request):
if request.param == "eventlet":
+ if eventlet is None:
+ pytest.skip("no eventlet installed")
+
try:
eventlet.monkey_patch()
except AttributeError as e:
@@ -293,6 +303,8 @@ def maybe_monkeypatched_threading(request):
else:
raise
elif request.param == "gevent":
+ if gevent is None:
+ pytest.skip("no gevent installed")
try:
gevent.monkey.patch_all()
except Exception as e:
diff --git a/tests/integrations/django/myapp/routing.py b/tests/integrations/django/myapp/routing.py
index 796d3d7d56..b5755549ec 100644
--- a/tests/integrations/django/myapp/routing.py
+++ b/tests/integrations/django/myapp/routing.py
@@ -1,4 +1,11 @@
+import channels
+
from channels.http import AsgiHandler
from channels.routing import ProtocolTypeRouter
-application = ProtocolTypeRouter({"http": AsgiHandler})
+if channels.__version__ < "3.0.0":
+ channels_handler = AsgiHandler
+else:
+ channels_handler = AsgiHandler()
+
+application = ProtocolTypeRouter({"http": channels_handler})
diff --git a/tests/utils/test_general.py b/tests/utils/test_general.py
index 9a194fa8c8..370a6327ff 100644
--- a/tests/utils/test_general.py
+++ b/tests/utils/test_general.py
@@ -76,7 +76,6 @@ def test_filename():
assert x("bogus", "bogus") == "bogus"
assert x("os", os.__file__) == "os.py"
- assert x("pytest", pytest.__file__) == "pytest.py"
import sentry_sdk.utils
diff --git a/tox.ini b/tox.ini
index cedf7f5bf0..7dba50dadf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,8 +29,7 @@ envlist =
{pypy,py2.7,py3.4,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12,1.0}
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-1.1
- # TODO: see note in [testenv:flask-dev] below
- ; {py3.6,py3.7,py3.8,py3.9}-flask-dev
+ {py3.7,py3.8,py3.9}-flask-dev
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-bottle-0.12
@@ -64,8 +63,7 @@ envlist =
{py3.7,py3.8,py3.9}-tornado-{5,6}
- {py3.4,py3.5,py3.6,py3.7,py3.8,py3.9}-trytond-{4.6,4.8,5.0}
- {py3.5,py3.6,py3.7,py3.8,py3.9}-trytond-{5.2}
+ {py3.5,py3.6,py3.7,py3.8,py3.9}-trytond-{4.6,5.0,5.2}
{py3.6,py3.7,py3.8,py3.9}-trytond-{5.4}
{py2.7,py3.8,py3.9}-requests
@@ -94,25 +92,13 @@ deps =
django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: djangorestframework>=3.0.0,<4.0.0
- ; TODO: right now channels 3 is crashing tests/integrations/django/asgi/test_asgi.py
- ; see https://github.com/django/channels/issues/1549
- {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: channels>2,<3
- {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: pytest-asyncio==0.10.0
+ {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: channels>2
+ {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: pytest-asyncio
{py2.7,py3.7,py3.8,py3.9}-django-{1.11,2.2,3.0,3.1,dev}: psycopg2-binary
- django-{1.6,1.7,1.8}: pytest-django<3.0
-
- ; TODO: once we upgrade pytest to at least 5.4, we can split it like this:
- ; django-{1.9,1.10,1.11,2.0,2.1}: pytest-django<4.0
- ; django-{2.2,3.0,3.1}: pytest-django>=4.0
-
- ; (note that py3.9, on which we recently began testing, only got official
- ; support in pytest-django >=4.0, so we probablly want to upgrade the whole
- ; kit and kaboodle at some point soon)
-
- ; see https://pytest-django.readthedocs.io/en/latest/changelog.html#v4-0-0-2020-10-16
- django-{1.9,1.10,1.11,2.0,2.1,2.2,3.0,3.1}: pytest-django<4.0
-
+ django-{1.6,1.7}: pytest-django<3.0
+ django-{1.8,1.9,1.10,1.11,2.0,2.1}: pytest-django<4.0
+ django-{2.2,3.0,3.1}: pytest-django>=4.0
django-dev: git+https://github.com/pytest-dev/pytest-django#egg=pytest-django
django-1.6: Django>=1.6,<1.7
@@ -135,9 +121,8 @@ deps =
flask-1.0: Flask>=1.0,<1.1
flask-1.1: Flask>=1.1,<1.2
- # TODO: see note in [testenv:flask-dev] below
- ; flask-dev: git+https://github.com/pallets/flask.git#egg=flask
- ; flask-dev: git+https://github.com/pallets/werkzeug.git#egg=werkzeug
+ flask-dev: git+https://github.com/pallets/flask.git#egg=flask
+ flask-dev: git+https://github.com/pallets/werkzeug.git#egg=werkzeug
bottle-0.12: bottle>=0.12,<0.13
bottle-dev: git+https://github.com/bottlepy/bottle#egg=bottle
@@ -207,9 +192,10 @@ deps =
trytond-5.4: trytond>=5.4,<5.5
trytond-5.2: trytond>=5.2,<5.3
trytond-5.0: trytond>=5.0,<5.1
- trytond-4.8: trytond>=4.8,<4.9
trytond-4.6: trytond>=4.6,<4.7
+ trytond-4.8: werkzeug<1.0
+
redis: fakeredis
rediscluster-1: redis-py-cluster>=1.0.0,<2.0.0
@@ -302,41 +288,15 @@ basepython =
pypy: pypy
commands =
- py.test {env:TESTPATH} {posargs}
+ django-{1.6,1.7}: pip install pytest<4
+ ; https://github.com/pytest-dev/pytest/issues/5532
+ {py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12}: pip install pytest<5
-# TODO: This is broken out as a separate env so as to be able to override the
-# werkzeug version. (You can't do it just by letting one version be specifed in
-# a requirements file and specifying a different version in one testenv, see
-# https://github.com/tox-dev/tox/issues/1390.) The issue is that as of 11/11/20,
-# flask-dev has made a change which werkzeug then had to compensate for in
-# https://github.com/pallets/werkzeug/pull/1960. Since we've got werkzeug
-# pinned at 0.15.5 in test-requirements.txt, we don't get this fix.
+ ; trytond tries to import werkzeug.contrib
+ trytond-5.0: pip install werkzeug<1.0
-# At some point, we probably want to revisit this, since the list copied from
-# test-requirements.txt could easily get stale.
-[testenv:flask-dev]
-deps =
- git+https://github.com/pallets/flask.git#egg=flask
- git+https://github.com/pallets/werkzeug.git#egg=werkzeug
-
- # everything below this point is from test-requirements.txt (minus, of
- # course, werkzeug)
- pytest==3.7.3
- pytest-forked==1.1.3
- tox==3.7.0
- pytest-localserver==0.5.0
- pytest-cov==2.8.1
- jsonschema==3.2.0
- pyrsistent==0.16.0 # TODO(py3): 0.17.0 requires python3, see https://github.com/tobgu/pyrsistent/issues/205
- mock # for testing under python < 3.3
-
- gevent
- eventlet
-
- newrelic
- executing
- asttokens
+ py.test {env:TESTPATH} {posargs}
[testenv:linters]
commands =
From 64e781de35a7c22cf1697a3a826e82b51a0fba2d Mon Sep 17 00:00:00 2001
From: Billy Vong
Date: Thu, 7 Jan 2021 13:04:42 -0800
Subject: [PATCH 0109/2327] build(ci): Remove TravisCI (#962)
Remove Travis in favor of GHA. Remove zeus as well.
Co-authored-by: Jan Michael Auer
---
.craft.yml | 10 +-
.github/workflows/ci.yml | 140 ++++++++++++++++++++
.github/workflows/release.yml | 45 +++++++
.travis.yml | 81 -----------
Makefile | 15 ---
scripts/bump-version.sh | 5 +
scripts/runtox.sh | 7 +-
tests/integrations/django/myapp/settings.py | 1 +
tox.ini | 1 +
9 files changed, 205 insertions(+), 100 deletions(-)
create mode 100644 .github/workflows/ci.yml
create mode 100644 .github/workflows/release.yml
delete mode 100644 .travis.yml
diff --git a/.craft.yml b/.craft.yml
index 6da0897b36..5fc2b5f27c 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -1,9 +1,10 @@
---
-minVersion: '0.5.1'
+minVersion: "0.14.0"
github:
owner: getsentry
repo: sentry-python
-targets:
+
+targets:
- name: pypi
- name: github
- name: gh-pages
@@ -14,3 +15,8 @@ targets:
changelog: CHANGES.md
changelogPolicy: simple
+
+statusProvider:
+ name: github
+artifactProvider:
+ name: github
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000000..8da4ec9ef3
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,140 @@
+name: ci
+
+on:
+ push:
+ branches:
+ - master
+ - release/**
+
+ pull_request:
+
+jobs:
+ dist:
+ name: distribution packages
+ timeout-minutes: 10
+ runs-on: ubuntu-16.04
+
+ if: "startsWith(github.ref, 'refs/heads/release/')"
+
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-node@v1
+ - uses: actions/setup-python@v2
+ with:
+ python-version: 3.9
+
+ - run: |
+ pip install virtualenv
+ make dist
+
+ - uses: actions/upload-artifact@v2
+ with:
+ name: ${{ github.sha }}
+ path: dist/*
+
+ docs:
+ timeout-minutes: 10
+ name: build documentation
+ runs-on: ubuntu-16.04
+
+ if: "startsWith(github.ref, 'refs/heads/release/')"
+
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-node@v1
+ - uses: actions/setup-python@v2
+ with:
+ python-version: 3.9
+
+ - run: |
+ pip install virtualenv
+ make apidocs
+ cd docs/_build && zip -r gh-pages ./
+
+ - uses: actions/upload-artifact@v2
+ with:
+ name: ${{ github.sha }}
+ path: docs/_build/gh-pages.zip
+
+ lint:
+ timeout-minutes: 10
+ runs-on: ubuntu-16.04
+
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-python@v2
+ with:
+ python-version: 3.9
+
+ - run: |
+ pip install tox
+ tox -e linters
+
+ test:
+ continue-on-error: true
+ timeout-minutes: 35
+ runs-on: ubuntu-18.04
+ strategy:
+ matrix:
+ python-version:
+ ["2.7", "pypy-2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9"]
+
+ services:
+ # Label used to access the service container
+ redis:
+ # Docker Hub image
+ image: redis
+ # Set health checks to wait until redis has started
+ options: >-
+ --health-cmd "redis-cli ping"
+ --health-interval 10s
+ --health-timeout 5s
+ --health-retries 5
+ ports:
+ # Maps port 6379 on service container to the host
+ - 6379:6379
+
+ postgres:
+ image: postgres
+ env:
+ POSTGRES_PASSWORD: sentry
+ # Set health checks to wait until postgres has started
+ options: >-
+ --health-cmd pg_isready
+ --health-interval 10s
+ --health-timeout 5s
+ --health-retries 5
+ # Maps tcp port 5432 on service container to the host
+ ports:
+ - 5432:5432
+
+ env:
+ SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
+ SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
+ SENTRY_PYTHON_TEST_POSTGRES_NAME: ci_test
+
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-node@v1
+ - uses: actions/setup-python@v2
+ with:
+ python-version: ${{ matrix.python-version }}
+
+ - name: setup
+ env:
+ PGHOST: localhost
+ PGPASSWORD: sentry
+ run: |
+ psql -c 'create database travis_ci_test;' -U postgres
+ psql -c 'create database test_travis_ci_test;' -U postgres
+ pip install codecov tox
+
+ - name: run tests
+ env:
+ CI_PYTHON_VERSION: ${{ matrix.python-version }}
+ run: |
+ coverage erase
+ ./scripts/runtox.sh '' --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+ coverage combine .coverage*
+ coverage xml -i
+ codecov --file coverage.xml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000000..8d8c7f5176
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,45 @@
+name: Release
+
+on:
+ workflow_dispatch:
+ inputs:
+ version:
+ description: Version to release
+ required: true
+ force:
+ description: Force a release even when there are release-blockers (optional)
+ required: false
+
+jobs:
+ release:
+ runs-on: ubuntu-latest
+ name: "Release a new version"
+ steps:
+ - name: Prepare release
+ uses: getsentry/action-prepare-release@33507ed
+ with:
+ version: ${{ github.event.inputs.version }}
+ force: ${{ github.event.inputs.force }}
+
+ - uses: actions/checkout@v2
+ with:
+ token: ${{ secrets.GH_RELEASE_PAT }}
+ fetch-depth: 0
+
+ - name: Craft Prepare
+ run: npx @sentry/craft prepare --no-input "${{ env.RELEASE_VERSION }}"
+ env:
+ GITHUB_API_TOKEN: ${{ github.token }}
+
+ - name: Request publish
+ if: success()
+ uses: actions/github-script@v3
+ with:
+ github-token: ${{ secrets.GH_RELEASE_PAT }}
+ script: |
+ const repoInfo = context.repo;
+ await github.issues.create({
+ owner: repoInfo.owner,
+ repo: 'publish',
+ title: `publish: ${repoInfo.repo}@${process.env.RELEASE_VERSION}`,
+ });
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 19c4311391..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-os: linux
-
-dist: xenial
-
-services:
- - postgresql
- - redis-server
-
-language: python
-
-python:
- - "2.7"
- - "pypy"
- - "3.4"
- - "3.5"
- - "3.6"
- - "3.7"
- - "3.8"
- - "3.9"
-
-env:
- - SENTRY_PYTHON_TEST_POSTGRES_USER=postgres SENTRY_PYTHON_TEST_POSTGRES_NAME=travis_ci_test
-
-cache:
- pip: true
- cargo: true
-
-branches:
- only:
- - master
- - /^release\/.+$/
-
-jobs:
- include:
- - name: Linting
- python: "3.9"
- install:
- - pip install tox
- script: tox -e linters
-
- - python: "3.9"
- name: Distribution packages
- install: []
- script: make travis-upload-dist
-
- - python: "3.9"
- name: Build documentation
- install: []
- script: make travis-upload-docs
-
- - python: "3.9"
- arch: ppc64le
- dist: bionic
-
-before_install:
- - sudo apt-get install zip
-before_script:
- - psql -c 'create database travis_ci_test;' -U postgres
- - psql -c 'create database test_travis_ci_test;' -U postgres
-
-install:
- - pip install codecov tox
- - make install-zeus-cli
-
-script:
- - coverage erase
- - ./scripts/runtox.sh '' --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
- - coverage combine .coverage*
- - coverage xml -i
- - codecov --file coverage.xml
- - '[[ -z "$ZEUS_API_TOKEN" ]] || zeus upload -t "application/x-cobertura+xml" coverage.xml'
-
-notifications:
- webhooks:
- urls:
- - https://zeus.ci/hooks/7ebb3060-90d8-11e8-aa04-0a580a282e07/public/provider/travis/webhook
- on_success: always
- on_failure: always
- on_start: always
- on_cancel: always
- on_error: always
diff --git a/Makefile b/Makefile
index d5dd833951..29c2886671 100644
--- a/Makefile
+++ b/Makefile
@@ -58,18 +58,3 @@ apidocs-hotfix: apidocs
@$(VENV_PATH)/bin/pip install ghp-import
@$(VENV_PATH)/bin/ghp-import -pf docs/_build
.PHONY: apidocs-hotfix
-
-install-zeus-cli:
- npm install -g @zeus-ci/cli
-.PHONY: install-zeus-cli
-
-travis-upload-docs: apidocs install-zeus-cli
- cd docs/_build && zip -r gh-pages ./
- zeus upload -t "application/zip+docs" docs/_build/gh-pages.zip \
- || [[ ! "$(TRAVIS_BRANCH)" =~ ^release/ ]]
-.PHONY: travis-upload-docs
-
-travis-upload-dist: dist install-zeus-cli
- zeus upload -t "application/zip+wheel" dist/* \
- || [[ ! "$(TRAVIS_BRANCH)" =~ ^release/ ]]
-.PHONY: travis-upload-dist
diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
index d04836940f..74546f5d9f 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -1,6 +1,11 @@
#!/bin/bash
set -eux
+if [ "$(uname -s)" != "Linux" ]; then
+ echo "Please use the GitHub Action."
+ exit 1
+fi
+
SCRIPT_DIR="$( dirname "$0" )"
cd $SCRIPT_DIR/..
diff --git a/scripts/runtox.sh b/scripts/runtox.sh
index e473ebe507..01f29c7dd1 100755
--- a/scripts/runtox.sh
+++ b/scripts/runtox.sh
@@ -14,8 +14,11 @@ fi
if [ -n "$1" ]; then
searchstring="$1"
-elif [ -n "$TRAVIS_PYTHON_VERSION" ]; then
- searchstring="$(echo py$TRAVIS_PYTHON_VERSION | sed -e 's/pypypy/pypy/g' -e 's/-dev//g')"
+elif [ -n "$CI_PYTHON_VERSION" ]; then
+ searchstring="$(echo py$CI_PYTHON_VERSION | sed -e 's/pypypy/pypy/g' -e 's/-dev//g')"
+ if [ "$searchstring" = "pypy-2.7" ]; then
+ searchstring=pypy
+ fi
elif [ -n "$AZURE_PYTHON_VERSION" ]; then
searchstring="$(echo py$AZURE_PYTHON_VERSION | sed -e 's/pypypy/pypy/g' -e 's/-dev//g')"
if [ "$searchstring" = pypy2 ]; then
diff --git a/tests/integrations/django/myapp/settings.py b/tests/integrations/django/myapp/settings.py
index adbf5d94fa..bea1c35bf4 100644
--- a/tests/integrations/django/myapp/settings.py
+++ b/tests/integrations/django/myapp/settings.py
@@ -125,6 +125,7 @@ def middleware(request):
"ENGINE": "django.db.backends.postgresql_psycopg2",
"NAME": os.environ["SENTRY_PYTHON_TEST_POSTGRES_NAME"],
"USER": os.environ["SENTRY_PYTHON_TEST_POSTGRES_USER"],
+ "PASSWORD": os.environ["SENTRY_PYTHON_TEST_POSTGRES_PASSWORD"],
"HOST": "localhost",
"PORT": 5432,
}
diff --git a/tox.ini b/tox.ini
index 7dba50dadf..dbd5761318 100644
--- a/tox.ini
+++ b/tox.ini
@@ -263,6 +263,7 @@ passenv =
SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY
SENTRY_PYTHON_TEST_AWS_IAM_ROLE
SENTRY_PYTHON_TEST_POSTGRES_USER
+ SENTRY_PYTHON_TEST_POSTGRES_PASSWORD
SENTRY_PYTHON_TEST_POSTGRES_NAME
usedevelop = True
extras =
From 55b8a64826be08ec03c74c78b9ceb0215e860276 Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Mon, 11 Jan 2021 10:48:30 +0100
Subject: [PATCH 0110/2327] Use full git sha as release name (#960)
This fixes #908
---
sentry_sdk/utils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index d39b0c1e40..f7bddcec3f 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -64,7 +64,7 @@ def get_default_release():
try:
release = (
subprocess.Popen(
- ["git", "rev-parse", "--short", "HEAD"],
+ ["git", "rev-parse", "HEAD"],
stdout=subprocess.PIPE,
stderr=null,
stdin=null,
From b7816b0cc100a47082922b8dd3e058134ad75d7c Mon Sep 17 00:00:00 2001
From: Marti Raudsepp
Date: Mon, 11 Jan 2021 11:50:53 +0200
Subject: [PATCH 0111/2327] Fix multiple **kwargs type hints (#967)
A **kwargs argument should be hinted as `T`, instead of `Dict[str, T]`.
The dict wrapping is already implied by the type system.
See: https://mypy.readthedocs.io/en/stable/getting_started.html?highlight=kwargs#more-function-signatures
---
sentry_sdk/api.py | 6 +++---
sentry_sdk/hub.py | 6 +++---
sentry_sdk/integrations/chalice.py | 3 ++-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/sentry_sdk/api.py b/sentry_sdk/api.py
index 29bd8988db..c0301073df 100644
--- a/sentry_sdk/api.py
+++ b/sentry_sdk/api.py
@@ -70,7 +70,7 @@ def capture_event(
event, # type: Event
hint=None, # type: Optional[Hint]
scope=None, # type: Optional[Any]
- **scope_args # type: Dict[str, Any]
+ **scope_args # type: Any
):
# type: (...) -> Optional[str]
return Hub.current.capture_event(event, hint, scope=scope, **scope_args)
@@ -81,7 +81,7 @@ def capture_message(
message, # type: str
level=None, # type: Optional[str]
scope=None, # type: Optional[Any]
- **scope_args # type: Dict[str, Any]
+ **scope_args # type: Any
):
# type: (...) -> Optional[str]
return Hub.current.capture_message(message, level, scope=scope, **scope_args)
@@ -91,7 +91,7 @@ def capture_message(
def capture_exception(
error=None, # type: Optional[Union[BaseException, ExcInfo]]
scope=None, # type: Optional[Any]
- **scope_args # type: Dict[str, Any]
+ **scope_args # type: Any
):
# type: (...) -> Optional[str]
return Hub.current.capture_exception(error, scope=scope, **scope_args)
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
index 52937e477f..1d8883970b 100644
--- a/sentry_sdk/hub.py
+++ b/sentry_sdk/hub.py
@@ -311,7 +311,7 @@ def capture_event(
event, # type: Event
hint=None, # type: Optional[Hint]
scope=None, # type: Optional[Any]
- **scope_args # type: Dict[str, Any]
+ **scope_args # type: Any
):
# type: (...) -> Optional[str]
"""Captures an event. Alias of :py:meth:`sentry_sdk.Client.capture_event`."""
@@ -329,7 +329,7 @@ def capture_message(
message, # type: str
level=None, # type: Optional[str]
scope=None, # type: Optional[Any]
- **scope_args # type: Dict[str, Any]
+ **scope_args # type: Any
):
# type: (...) -> Optional[str]
"""Captures a message. The message is just a string. If no level
@@ -349,7 +349,7 @@ def capture_exception(
self,
error=None, # type: Optional[Union[BaseException, ExcInfo]]
scope=None, # type: Optional[Any]
- **scope_args # type: Dict[str, Any]
+ **scope_args # type: Any
):
# type: (...) -> Optional[str]
"""Captures an exception.
diff --git a/sentry_sdk/integrations/chalice.py b/sentry_sdk/integrations/chalice.py
index e7d2777b53..109862bd90 100644
--- a/sentry_sdk/integrations/chalice.py
+++ b/sentry_sdk/integrations/chalice.py
@@ -17,6 +17,7 @@
if MYPY:
from typing import Any
+ from typing import Dict
from typing import TypeVar
from typing import Callable
@@ -110,7 +111,7 @@ def setup_once():
)
def sentry_event_response(app, view_function, function_args):
- # type: (Any, F, **Any) -> Any
+ # type: (Any, F, Dict[str, Any]) -> Any
wrapped_view_function = _get_view_function_response(
app, view_function, function_args
)
From dbd7ce89b24df83380900895307642138a74d27a Mon Sep 17 00:00:00 2001
From: Narbonne
Date: Tue, 12 Jan 2021 15:32:52 +0100
Subject: [PATCH 0112/2327] feat: Django rendering monkey patching (#957)
Co-authored-by: Christophe Narbonne
---
sentry_sdk/integrations/django/__init__.py | 6 ++-
sentry_sdk/integrations/django/templates.py | 46 +++++++++++++++++++
.../django/myapp/templates/user_name.html | 1 +
tests/integrations/django/myapp/urls.py | 2 +
tests/integrations/django/myapp/views.py | 11 +++++
tests/integrations/django/test_basic.py | 19 ++++++++
6 files changed, 84 insertions(+), 1 deletion(-)
create mode 100644 tests/integrations/django/myapp/templates/user_name.html
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index 008dc386bb..3ef21a55ca 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -37,7 +37,10 @@
from sentry_sdk.integrations.django.transactions import LEGACY_RESOLVER
-from sentry_sdk.integrations.django.templates import get_template_frame_from_exception
+from sentry_sdk.integrations.django.templates import (
+ get_template_frame_from_exception,
+ patch_templates,
+)
from sentry_sdk.integrations.django.middleware import patch_django_middlewares
from sentry_sdk.integrations.django.views import patch_views
@@ -201,6 +204,7 @@ def _django_queryset_repr(value, hint):
_patch_channels()
patch_django_middlewares()
patch_views()
+ patch_templates()
_DRF_PATCHED = False
diff --git a/sentry_sdk/integrations/django/templates.py b/sentry_sdk/integrations/django/templates.py
index 2285644909..3f805f36c2 100644
--- a/sentry_sdk/integrations/django/templates.py
+++ b/sentry_sdk/integrations/django/templates.py
@@ -1,5 +1,7 @@
from django.template import TemplateSyntaxError
+from django import VERSION as DJANGO_VERSION
+from sentry_sdk import _functools, Hub
from sentry_sdk._types import MYPY
if MYPY:
@@ -40,6 +42,50 @@ def get_template_frame_from_exception(exc_value):
return None
+def patch_templates():
+ # type: () -> None
+ from django.template.response import SimpleTemplateResponse
+ from sentry_sdk.integrations.django import DjangoIntegration
+
+ real_rendered_content = SimpleTemplateResponse.rendered_content
+
+ @property # type: ignore
+ def rendered_content(self):
+ # type: (SimpleTemplateResponse) -> str
+ hub = Hub.current
+ if hub.get_integration(DjangoIntegration) is None:
+ return real_rendered_content.fget(self)
+
+ with hub.start_span(
+ op="django.template.render", description=self.template_name
+ ) as span:
+ span.set_data("context", self.context_data)
+ return real_rendered_content.fget(self)
+
+ SimpleTemplateResponse.rendered_content = rendered_content
+
+ if DJANGO_VERSION < (1, 7):
+ return
+ import django.shortcuts
+
+ real_render = django.shortcuts.render
+
+ @_functools.wraps(real_render)
+ def render(request, template_name, context=None, *args, **kwargs):
+ # type: (django.http.HttpRequest, str, Optional[Dict[str, Any]], *Any, **Any) -> django.http.HttpResponse
+ hub = Hub.current
+ if hub.get_integration(DjangoIntegration) is None:
+ return real_render(request, template_name, context, *args, **kwargs)
+
+ with hub.start_span(
+ op="django.template.render", description=template_name
+ ) as span:
+ span.set_data("context", context)
+ return real_render(request, template_name, context, *args, **kwargs)
+
+ django.shortcuts.render = render
+
+
def _get_template_frame_from_debug(debug):
# type: (Dict[str, Any]) -> Dict[str, Any]
if debug is None:
diff --git a/tests/integrations/django/myapp/templates/user_name.html b/tests/integrations/django/myapp/templates/user_name.html
new file mode 100644
index 0000000000..970107349f
--- /dev/null
+++ b/tests/integrations/django/myapp/templates/user_name.html
@@ -0,0 +1 @@
+{{ request.user }}: {{ user_age }}
diff --git a/tests/integrations/django/myapp/urls.py b/tests/integrations/django/myapp/urls.py
index 5131d8674f..9427499dcf 100644
--- a/tests/integrations/django/myapp/urls.py
+++ b/tests/integrations/django/myapp/urls.py
@@ -45,6 +45,8 @@ def path(path, *args, **kwargs):
),
path("post-echo", views.post_echo, name="post_echo"),
path("template-exc", views.template_exc, name="template_exc"),
+ path("template-test", views.template_test, name="template_test"),
+ path("template-test2", views.template_test2, name="template_test2"),
path(
"permission-denied-exc",
views.permission_denied_exc,
diff --git a/tests/integrations/django/myapp/views.py b/tests/integrations/django/myapp/views.py
index 1c78837ee4..b6d9766d3a 100644
--- a/tests/integrations/django/myapp/views.py
+++ b/tests/integrations/django/myapp/views.py
@@ -4,6 +4,7 @@
from django.core.exceptions import PermissionDenied
from django.http import HttpResponse, HttpResponseNotFound, HttpResponseServerError
from django.shortcuts import render
+from django.template.response import TemplateResponse
from django.utils.decorators import method_decorator
from django.views.decorators.csrf import csrf_exempt
from django.views.generic import ListView
@@ -114,6 +115,16 @@ def template_exc(request, *args, **kwargs):
return render(request, "error.html")
+@csrf_exempt
+def template_test(request, *args, **kwargs):
+ return render(request, "user_name.html", {"user_age": 20})
+
+
+@csrf_exempt
+def template_test2(request, *args, **kwargs):
+ return TemplateResponse(request, "user_name.html", {"user_age": 25})
+
+
@csrf_exempt
def permission_denied_exc(*args, **kwargs):
raise PermissionDenied("bye")
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index c42ab3d9e4..e094d23a72 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -518,6 +518,25 @@ def test_does_not_capture_403(sentry_init, client, capture_events, endpoint):
assert not events
+def test_render_spans(sentry_init, client, capture_events, render_span_tree):
+ sentry_init(
+ integrations=[DjangoIntegration()],
+ traces_sample_rate=1.0,
+ )
+ views_urls = [reverse("template_test2")]
+ if DJANGO_VERSION >= (1, 7):
+ views_urls.append(reverse("template_test"))
+
+ for url in views_urls:
+ events = capture_events()
+ _content, status, _headers = client.get(url)
+ transaction = events[0]
+ assert (
+ '- op="django.template.render": description="user_name.html"'
+ in render_span_tree(transaction)
+ )
+
+
def test_middleware_spans(sentry_init, client, capture_events, render_span_tree):
sentry_init(
integrations=[DjangoIntegration()],
From de54b4f99bf9bf746d75f48f2a63a27a2cd6eec2 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Thu, 14 Jan 2021 12:35:53 +0100
Subject: [PATCH 0113/2327] fix: Fix hypothesis test (#978)
---
tests/test_serializer.py | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
index 7794c37db5..35cbdfb96b 100644
--- a/tests/test_serializer.py
+++ b/tests/test_serializer.py
@@ -11,15 +11,21 @@
pass
else:
- @given(binary=st.binary(min_size=1))
- def test_bytes_serialization_decode_many(binary, message_normalizer):
- result = message_normalizer(binary, should_repr_strings=False)
- assert result == binary.decode("utf-8", "replace")
-
- @given(binary=st.binary(min_size=1))
- def test_bytes_serialization_repr_many(binary, message_normalizer):
- result = message_normalizer(binary, should_repr_strings=True)
- assert result == repr(binary)
+ def test_bytes_serialization_decode_many(message_normalizer):
+ @given(binary=st.binary(min_size=1))
+ def inner(binary):
+ result = message_normalizer(binary, should_repr_strings=False)
+ assert result == binary.decode("utf-8", "replace")
+
+ inner()
+
+ def test_bytes_serialization_repr_many(message_normalizer):
+ @given(binary=st.binary(min_size=1))
+ def inner(binary):
+ result = message_normalizer(binary, should_repr_strings=True)
+ assert result == repr(binary)
+
+ inner()
@pytest.fixture
From abf2bc35e0a4917c93cfc1cf594083d2eb2cd755 Mon Sep 17 00:00:00 2001
From: Adam Sussman <52808623+adam-olema@users.noreply.github.com>
Date: Mon, 18 Jan 2021 00:06:48 -0800
Subject: [PATCH 0114/2327] AWS Lambda integration fails to detect the
aws-lambda-ric 1.0 bootstrap (#976)
---
sentry_sdk/integrations/aws_lambda.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
index 6cb42a9790..d4892121ba 100644
--- a/sentry_sdk/integrations/aws_lambda.py
+++ b/sentry_sdk/integrations/aws_lambda.py
@@ -290,10 +290,16 @@ def get_lambda_bootstrap():
# sys.modules['__main__'].__file__ == sys.modules['bootstrap'].__file__
# sys.modules['__main__'] is not sys.modules['bootstrap']
#
+ # On container builds using the `aws-lambda-python-runtime-interface-client`
+ # (awslamdaric) module, bootstrap is located in sys.modules['__main__'].bootstrap
+ #
# Such a setup would then make all monkeypatches useless.
if "bootstrap" in sys.modules:
return sys.modules["bootstrap"]
elif "__main__" in sys.modules:
+ if hasattr(sys.modules["__main__"], "bootstrap"):
+ # awslambdaric python module in container builds
+ return sys.modules["__main__"].bootstrap # type: ignore
return sys.modules["__main__"]
else:
return None
From 2af3274de22ee00b5254cc6700cc26ddc06dbb66 Mon Sep 17 00:00:00 2001
From: Adam Sussman <52808623+adam-olema@users.noreply.github.com>
Date: Mon, 18 Jan 2021 00:07:36 -0800
Subject: [PATCH 0115/2327] Fix unbound local crash on handling aws lambda
exception (#977)
---
sentry_sdk/integrations/aws_lambda.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
index d4892121ba..7f823dc04e 100644
--- a/sentry_sdk/integrations/aws_lambda.py
+++ b/sentry_sdk/integrations/aws_lambda.py
@@ -101,6 +101,7 @@ def sentry_handler(aws_event, aws_context, *args, **kwargs):
configured_time = aws_context.get_remaining_time_in_millis()
with hub.push_scope() as scope:
+ timeout_thread = None
with capture_internal_exceptions():
scope.clear_breadcrumbs()
scope.add_event_processor(
@@ -115,7 +116,6 @@ def sentry_handler(aws_event, aws_context, *args, **kwargs):
scope.set_tag("batch_request", True)
scope.set_tag("batch_size", batch_size)
- timeout_thread = None
# Starting the Timeout thread only if the configured time is greater than Timeout warning
# buffer and timeout_warning parameter is set True.
if (
From e559525a7b13ec530b2c30d012629352b1f38e20 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Tue, 19 Jan 2021 07:39:56 -0800
Subject: [PATCH 0116/2327] fix(environment): Remove release condition on
default (#980)
---
sentry_sdk/client.py | 3 +--
sentry_sdk/utils.py | 12 ------------
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 19dd4ab33d..c59aa8f72e 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -13,7 +13,6 @@
format_timestamp,
get_type_name,
get_default_release,
- get_default_environment,
handle_in_app,
logger,
)
@@ -67,7 +66,7 @@ def _get_options(*args, **kwargs):
rv["release"] = get_default_release()
if rv["environment"] is None:
- rv["environment"] = get_default_environment(rv["release"])
+ rv["environment"] = os.environ.get("SENTRY_ENVIRONMENT") or "production"
if rv["server_name"] is None and hasattr(socket, "gethostname"):
rv["server_name"] = socket.gethostname()
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index f7bddcec3f..323e4ceffa 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -92,18 +92,6 @@ def get_default_release():
return None
-def get_default_environment(
- release=None, # type: Optional[str]
-):
- # type: (...) -> Optional[str]
- rv = os.environ.get("SENTRY_ENVIRONMENT")
- if rv:
- return rv
- if release is not None:
- return "production"
- return None
-
-
class CaptureInternalException(object):
__slots__ = ()
From 34da1ac0debf3ed1df669887ed7cb9c3a44ad83b Mon Sep 17 00:00:00 2001
From: Mohsin Mumtaz
Date: Thu, 21 Jan 2021 17:42:59 +0530
Subject: [PATCH 0117/2327] Make pytest run instruction clear in contribution
guide (#981)
Co-authored-by: Mohsin Mumtaz
Co-authored-by: Markus Unterwaditzer
---
CONTRIBUTING.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cad2c48a8a..b77024f8f8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,7 +21,8 @@ for you. Run `make` or `make help` to list commands.
Of course you can always run the underlying commands yourself, which is
particularly useful when wanting to provide arguments to `pytest` to run
specific tests. If you want to do that, we expect you to know your way around
-Python development, and you can run the following to get started with `pytest`:
+Python development. To get started, clone the SDK repository, cd into it, set
+up a virtualenv and run:
# This is "advanced mode". Use `make help` if you have no clue what's
# happening here!
From 4f8facc6b9d1458e2af153cd6f5b365aba108c0f Mon Sep 17 00:00:00 2001
From: Eric de Vries
Date: Thu, 21 Jan 2021 13:14:25 +0100
Subject: [PATCH 0118/2327] Decode headers before creating transaction (#984)
Co-authored-by: Eric
---
sentry_sdk/integrations/asgi.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py
index 6bd1c146a0..cfe8c6f8d1 100644
--- a/sentry_sdk/integrations/asgi.py
+++ b/sentry_sdk/integrations/asgi.py
@@ -130,7 +130,7 @@ async def _run_app(self, scope, callback):
if ty in ("http", "websocket"):
transaction = Transaction.continue_from_headers(
- dict(scope["headers"]),
+ self._get_headers(scope),
op="{}.server".format(ty),
)
else:
From 0be96f0275e8ab7cc6f05c49d9b150bb376c35ca Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Mon, 25 Jan 2021 14:00:00 -0800
Subject: [PATCH 0119/2327] fix(ci): Fix `py3.5-celery` and `*-django-dev`
(#990)
Reacting to upstream changes in our dependencies
---
test-requirements.txt | 1 -
tests/integrations/django/test_transactions.py | 16 +++++++++-------
tox.ini | 3 +++
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/test-requirements.txt b/test-requirements.txt
index 1289b7a38d..3f95d90ed3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,6 +10,5 @@ mock # for testing under python < 3.3
gevent
-newrelic
executing
asttokens
diff --git a/tests/integrations/django/test_transactions.py b/tests/integrations/django/test_transactions.py
index 799eaa4e89..a87dc621a9 100644
--- a/tests/integrations/django/test_transactions.py
+++ b/tests/integrations/django/test_transactions.py
@@ -3,20 +3,22 @@
import pytest
import django
-try:
+if django.VERSION >= (2, 0):
+ # TODO: once we stop supporting django < 2, use the real name of this
+ # function (re_path)
+ from django.urls import re_path as url
+ from django.conf.urls import include
+else:
from django.conf.urls import url, include
-except ImportError:
- # for Django version less than 1.4
- from django.conf.urls.defaults import url, include # NOQA
-
-from sentry_sdk.integrations.django.transactions import RavenResolver
-
if django.VERSION < (1, 9):
included_url_conf = (url(r"^foo/bar/(?P[\w]+)", lambda x: ""),), "", ""
else:
included_url_conf = ((url(r"^foo/bar/(?P[\w]+)", lambda x: ""),), "")
+from sentry_sdk.integrations.django.transactions import RavenResolver
+
+
example_url_conf = (
url(r"^api/(?P[\w_-]+)/store/$", lambda x: ""),
url(r"^api/(?P(v1|v2))/author/$", lambda x: ""),
diff --git a/tox.ini b/tox.ini
index dbd5761318..8411b157c8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -152,6 +152,9 @@ deps =
celery-4.4: Celery>=4.4,<4.5,!=4.4.4
celery-5.0: Celery>=5.0,<5.1
+ py3.5-celery: newrelic<6.0.0
+ {pypy,py2.7,py3.6,py3.7,py3.8,py3.9}-celery: newrelic
+
requests: requests>=2.0
aws_lambda: boto3
From 2df9e1a230f1294b4fc319cb65838dcd6bb2e75c Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Mon, 1 Feb 2021 06:35:01 -0800
Subject: [PATCH 0120/2327] ref(tracing): Restore ability to have tracing
disabled (#991)
This partially reverts
https://github.com/getsentry/sentry-python/pull/948
and
https://github.com/getsentry/sentry-python/commit/6fc2287c6f5280e5adf76bb7a66f05f7c8d18882,
to restore the ability to disable tracing, which allows it to truly be opt-in as per the spec, which is detailed here:
https://develop.sentry.dev/sdk/performance/#sdk-configuration).
Note that this does not change the behavior that PR was made to reinstate - the model wherein the front end makes sampling decisions, the backend has `traces_sample_rate` set to `0`, and the result is that the backend samples according to the front end decision when there is one, but otherwise does not send transactions.
---
sentry_sdk/consts.py | 2 +-
sentry_sdk/tracing.py | 28 ++++++++++++++++++++--------
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index a58ac37afd..f40d2c24a6 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -72,7 +72,7 @@ def __init__(
attach_stacktrace=False, # type: bool
ca_certs=None, # type: Optional[str]
propagate_traces=True, # type: bool
- traces_sample_rate=0.0, # type: float
+ traces_sample_rate=None, # type: Optional[float]
traces_sampler=None, # type: Optional[TracesSampler]
auto_enabling_integrations=True, # type: bool
_experiments={}, # type: Experiments # noqa: B006
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 73531894ef..21269d68df 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -583,23 +583,22 @@ def _set_initial_sampling_decision(self, sampling_context):
decision, `traces_sample_rate` will be used.
"""
- # if the user has forced a sampling decision by passing a `sampled`
- # value when starting the transaction, go with that
- if self.sampled is not None:
- return
-
hub = self.hub or sentry_sdk.Hub.current
client = hub.client
+ options = (client and client.options) or {}
transaction_description = "{op}transaction <{name}>".format(
op=("<" + self.op + "> " if self.op else ""), name=self.name
)
- # nothing to do if there's no client
- if not client:
+ # nothing to do if there's no client or if tracing is disabled
+ if not client or not has_tracing_enabled(options):
self.sampled = False
return
- options = client.options
+ # if the user has forced a sampling decision by passing a `sampled`
+ # value when starting the transaction, go with that
+ if self.sampled is not None:
+ return
# we would have bailed already if neither `traces_sampler` nor
# `traces_sample_rate` were defined, so one of these should work; prefer
@@ -663,6 +662,19 @@ def _set_initial_sampling_decision(self, sampling_context):
)
+def has_tracing_enabled(options):
+ # type: (Dict[str, Any]) -> bool
+ """
+ Returns True if either traces_sample_rate or traces_sampler is
+ non-zero/defined, False otherwise.
+ """
+
+ return bool(
+ options.get("traces_sample_rate") is not None
+ or options.get("traces_sampler") is not None
+ )
+
+
def _is_valid_sample_rate(rate):
# type: (Any) -> bool
"""
From 123f7af869a3f505ddf3b4c9e82bb3cb3671dd1a Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Wed, 3 Feb 2021 16:16:43 +0100
Subject: [PATCH 0121/2327] fix(django) - Fix Django async views not behaving
asyncronuously (#992)
* Refactored middlware span creation logic for middleware functions
* Added async instrumentation for django middlewares
* Added conditional that checks if async
* fix: Formatting
* Inherit from MiddlewareMixin for async behavior
* Refactored __call__ to be like __acall__ for better readability
* fix: Formatting
* Removed baseclass MiddlewareMixin for unecpected behavior
* fix: Formatting
* Added async_capable attribute to SentryWrappingMiddleware
* Added types to function signatures
* Refactored py3 logic to asgi module for py2 compat
* fix: Formatting
* Fixed function signature error
* fix: Formatting
* Refactored code to support both versions prior to Django 3.1 and after
* fix: Formatting
* Refactor middleware arg from asgi mixin factory
* fix: Formatting
* Added Types and documentation
* fix: Formatting
* Fixed py2 asgi mixin signature
* Added my_async_viewto myapp.views
* Added test to ensure concurrent behaviour in both ASGI and Django Channels
* Added urlpattern for my_async_view
* fix: Formatting
* Added test that ensures Performance timing spans are done correctly for async views
* Removed print statement
* Modified async_route_check function
* Added check for forwarding the async calls
* fix: Formatting
* Fixed django compat asgi_application import issue
* Fixed type import issues
* Linting changes
* fix: Formatting
* Fixed failing test by adding safeguard for middleware invocation for older django versions
* Removed unused import
* Removed redundant ASGI_APP global variable
* Added better documentation and modified method name for asgi middleware mixin factory
* Removed concurrency test for channels
* fix: Formatting
* Fixed typing and lint issues
Co-authored-by: sentry-bot
---
sentry_sdk/integrations/django/asgi.py | 52 ++++++++++++
sentry_sdk/integrations/django/middleware.py | 83 +++++++++++++++-----
tests/integrations/django/asgi/test_asgi.py | 77 ++++++++++++++++++
tests/integrations/django/myapp/urls.py | 3 +
tests/integrations/django/myapp/views.py | 8 ++
5 files changed, 202 insertions(+), 21 deletions(-)
diff --git a/sentry_sdk/integrations/django/asgi.py b/sentry_sdk/integrations/django/asgi.py
index 50d7b67723..b533a33e47 100644
--- a/sentry_sdk/integrations/django/asgi.py
+++ b/sentry_sdk/integrations/django/asgi.py
@@ -6,6 +6,8 @@
`django.core.handlers.asgi`.
"""
+import asyncio
+
from sentry_sdk import Hub, _functools
from sentry_sdk._types import MYPY
@@ -14,6 +16,7 @@
if MYPY:
from typing import Any
from typing import Union
+ from typing import Callable
from django.http.response import HttpResponse
@@ -91,3 +94,52 @@ async def sentry_wrapped_callback(request, *args, **kwargs):
return await callback(request, *args, **kwargs)
return sentry_wrapped_callback
+
+
+def _asgi_middleware_mixin_factory(_check_middleware_span):
+ # type: (Callable[..., Any]) -> Any
+ """
+ Mixin class factory that generates a middleware mixin for handling requests
+ in async mode.
+ """
+
+ class SentryASGIMixin:
+ def __init__(self, get_response):
+ # type: (Callable[..., Any]) -> None
+ self.get_response = get_response
+ self._acall_method = None
+ self._async_check()
+
+ def _async_check(self):
+ # type: () -> None
+ """
+ If get_response is a coroutine function, turns us into async mode so
+ a thread is not consumed during a whole request.
+ Taken from django.utils.deprecation::MiddlewareMixin._async_check
+ """
+ if asyncio.iscoroutinefunction(self.get_response):
+ self._is_coroutine = asyncio.coroutines._is_coroutine # type: ignore
+
+ def async_route_check(self):
+ # type: () -> bool
+ """
+ Function that checks if we are in async mode,
+ and if we are forwards the handling of requests to __acall__
+ """
+ return asyncio.iscoroutinefunction(self.get_response)
+
+ async def __acall__(self, *args, **kwargs):
+ # type: (*Any, **Any) -> Any
+ f = self._acall_method
+ if f is None:
+ self._acall_method = f = self._inner.__acall__ # type: ignore
+
+ middleware_span = _check_middleware_span(old_method=f)
+
+ if middleware_span is None:
+ return await f(*args, **kwargs)
+
+ with middleware_span:
+ return await f(*args, **kwargs)
+
+ return SentryASGIMixin
diff --git a/sentry_sdk/integrations/django/middleware.py b/sentry_sdk/integrations/django/middleware.py
index 88d89592d8..e6a1ca5bd9 100644
--- a/sentry_sdk/integrations/django/middleware.py
+++ b/sentry_sdk/integrations/django/middleware.py
@@ -16,8 +16,11 @@
if MYPY:
from typing import Any
from typing import Callable
+ from typing import Optional
from typing import TypeVar
+ from sentry_sdk.tracing import Span
+
F = TypeVar("F", bound=Callable[..., Any])
_import_string_should_wrap_middleware = ContextVar(
@@ -30,6 +33,12 @@
import_string_name = "import_string"
+if DJANGO_VERSION < (3, 1):
+ _asgi_middleware_mixin_factory = lambda _: object
+else:
+ from .asgi import _asgi_middleware_mixin_factory
+
+
def patch_django_middlewares():
# type: () -> None
from django.core.handlers import base
@@ -64,29 +73,40 @@ def _wrap_middleware(middleware, middleware_name):
# type: (Any, str) -> Any
from sentry_sdk.integrations.django import DjangoIntegration
+ def _check_middleware_span(old_method):
+ # type: (Callable[..., Any]) -> Optional[Span]
+ hub = Hub.current
+ integration = hub.get_integration(DjangoIntegration)
+ if integration is None or not integration.middleware_spans:
+ return None
+
+ function_name = transaction_from_function(old_method)
+
+ description = middleware_name
+ function_basename = getattr(old_method, "__name__", None)
+ if function_basename:
+ description = "{}.{}".format(description, function_basename)
+
+ middleware_span = hub.start_span(
+ op="django.middleware", description=description
+ )
+ middleware_span.set_tag("django.function_name", function_name)
+ middleware_span.set_tag("django.middleware_name", middleware_name)
+
+ return middleware_span
+
def _get_wrapped_method(old_method):
# type: (F) -> F
with capture_internal_exceptions():
def sentry_wrapped_method(*args, **kwargs):
# type: (*Any, **Any) -> Any
- hub = Hub.current
- integration = hub.get_integration(DjangoIntegration)
- if integration is None or not integration.middleware_spans:
- return old_method(*args, **kwargs)
-
- function_name = transaction_from_function(old_method)
+ middleware_span = _check_middleware_span(old_method)
- description = middleware_name
- function_basename = getattr(old_method, "__name__", None)
- if function_basename:
- description = "{}.{}".format(description, function_basename)
+ if middleware_span is None:
+ return old_method(*args, **kwargs)
- with hub.start_span(
- op="django.middleware", description=description
- ) as span:
- span.set_tag("django.function_name", function_name)
- span.set_tag("django.middleware_name", middleware_name)
+ with middleware_span:
return old_method(*args, **kwargs)
try:
@@ -102,11 +122,22 @@ def sentry_wrapped_method(*args, **kwargs):
return old_method
- class SentryWrappingMiddleware(object):
- def __init__(self, *args, **kwargs):
- # type: (*Any, **Any) -> None
- self._inner = middleware(*args, **kwargs)
+ class SentryWrappingMiddleware(
+ _asgi_middleware_mixin_factory(_check_middleware_span) # type: ignore
+ ):
+
+ async_capable = getattr(middleware, "async_capable", False)
+
+ def __init__(self, get_response=None, *args, **kwargs):
+ # type: (Optional[Callable[..., Any]], *Any, **Any) -> None
+ if get_response:
+ self._inner = middleware(get_response, *args, **kwargs)
+ else:
+ self._inner = middleware(*args, **kwargs)
+ self.get_response = get_response
self._call_method = None
+ if self.async_capable:
+ super(SentryWrappingMiddleware, self).__init__(get_response)
# We need correct behavior for `hasattr()`, which we can only determine
# when we have an instance of the middleware we're wrapping.
@@ -128,10 +159,20 @@ def __getattr__(self, method_name):
def __call__(self, *args, **kwargs):
# type: (*Any, **Any) -> Any
+ if hasattr(self, "async_route_check") and self.async_route_check():
+ return self.__acall__(*args, **kwargs)
+
f = self._call_method
if f is None:
- self._call_method = f = _get_wrapped_method(self._inner.__call__)
- return f(*args, **kwargs)
+ self._call_method = f = self._inner.__call__
+
+ middleware_span = _check_middleware_span(old_method=f)
+
+ if middleware_span is None:
+ return f(*args, **kwargs)
+
+ with middleware_span:
+ return f(*args, **kwargs)
if hasattr(middleware, "__name__"):
SentryWrappingMiddleware.__name__ = middleware.__name__
diff --git a/tests/integrations/django/asgi/test_asgi.py b/tests/integrations/django/asgi/test_asgi.py
index 6eea32caa7..920918415d 100644
--- a/tests/integrations/django/asgi/test_asgi.py
+++ b/tests/integrations/django/asgi/test_asgi.py
@@ -68,3 +68,80 @@ async def test_async_views(sentry_init, capture_events, application):
"query_string": None,
"url": "/async_message",
}
+
+
+@pytest.mark.asyncio
+@pytest.mark.skipif(
+ django.VERSION < (3, 1), reason="async views have been introduced in Django 3.1"
+)
+async def test_async_views_concurrent_execution(sentry_init, capture_events, settings):
+ import asyncio
+ import time
+
+ settings.MIDDLEWARE = []
+ asgi_application.load_middleware(is_async=True)
+
+ sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
+
+ comm = HttpCommunicator(asgi_application, "GET", "/my_async_view")
+ comm2 = HttpCommunicator(asgi_application, "GET", "/my_async_view")
+
+ loop = asyncio.get_event_loop()
+
+ start = time.time()
+
+ r1 = loop.create_task(comm.get_response(timeout=5))
+ r2 = loop.create_task(comm2.get_response(timeout=5))
+
+ (resp1, resp2), _ = await asyncio.wait({r1, r2})
+
+ end = time.time()
+
+ assert resp1.result()["status"] == 200
+ assert resp2.result()["status"] == 200
+
+ assert end - start < 1.5
+
+
+@pytest.mark.asyncio
+@pytest.mark.skipif(
+ django.VERSION < (3, 1), reason="async views have been introduced in Django 3.1"
+)
+async def test_async_middleware_spans(
+ sentry_init, render_span_tree, capture_events, settings
+):
+ settings.MIDDLEWARE = [
+ "django.contrib.sessions.middleware.SessionMiddleware",
+ "django.contrib.auth.middleware.AuthenticationMiddleware",
+ "django.middleware.csrf.CsrfViewMiddleware",
+ "tests.integrations.django.myapp.settings.TestMiddleware",
+ ]
+ asgi_application.load_middleware(is_async=True)
+
+ sentry_init(
+ integrations=[DjangoIntegration(middleware_spans=True)],
+ traces_sample_rate=1.0,
+ _experiments={"record_sql_params": True},
+ )
+
+ events = capture_events()
+
+ comm = HttpCommunicator(asgi_application, "GET", "/async_message")
+ response = await comm.get_response()
+ assert response["status"] == 200
+
+ await comm.wait()
+
+ message, transaction = events
+
+ assert (
+ render_span_tree(transaction)
+ == """\
+- op="http.server": description=null
+ - op="django.middleware": description="django.contrib.sessions.middleware.SessionMiddleware.__acall__"
+ - op="django.middleware": description="django.contrib.auth.middleware.AuthenticationMiddleware.__acall__"
+ - op="django.middleware": description="django.middleware.csrf.CsrfViewMiddleware.__acall__"
+ - op="django.middleware": description="tests.integrations.django.myapp.settings.TestMiddleware.__acall__"
+ - op="django.middleware": description="django.middleware.csrf.CsrfViewMiddleware.process_view"
+ - op="django.view": description="async_message\""""
+ )
diff --git a/tests/integrations/django/myapp/urls.py b/tests/integrations/django/myapp/urls.py
index 9427499dcf..23698830c2 100644
--- a/tests/integrations/django/myapp/urls.py
+++ b/tests/integrations/django/myapp/urls.py
@@ -63,6 +63,9 @@ def path(path, *args, **kwargs):
if views.async_message is not None:
urlpatterns.append(path("async_message", views.async_message, name="async_message"))
+if views.my_async_view is not None:
+ urlpatterns.append(path("my_async_view", views.my_async_view, name="my_async_view"))
+
# rest framework
try:
urlpatterns.append(
diff --git a/tests/integrations/django/myapp/views.py b/tests/integrations/django/myapp/views.py
index b6d9766d3a..4bd05f8bbb 100644
--- a/tests/integrations/django/myapp/views.py
+++ b/tests/integrations/django/myapp/views.py
@@ -141,5 +141,13 @@ def csrf_hello_not_exempt(*args, **kwargs):
sentry_sdk.capture_message("hi")
return HttpResponse("ok")"""
)
+
+ exec(
+ """async def my_async_view(request):
+ import asyncio
+ await asyncio.sleep(1)
+ return HttpResponse('Hello World')"""
+ )
else:
async_message = None
+ my_async_view = None
From 7ba60bda29d671bbef79ae5646fb062c898efc6a Mon Sep 17 00:00:00 2001
From: Arpad Borsos
Date: Wed, 3 Feb 2021 21:44:49 +0100
Subject: [PATCH 0122/2327] feat: Support pre-aggregated sessions (#985)
This changes the SessionFlusher to pre-aggregate sessions according to https://develop.sentry.dev/sdk/sessions/#session-aggregates-payload instead of sending individual session updates.
Co-authored-by: Armin Ronacher
---
sentry_sdk/client.py | 28 ++---
sentry_sdk/envelope.py | 8 +-
sentry_sdk/hub.py | 5 +-
sentry_sdk/scope.py | 2 +-
sentry_sdk/session.py | 172 ++++++++++++++++++++++++++++++
sentry_sdk/sessions.py | 235 ++++++++++++++---------------------------
tests/test_envelope.py | 2 +-
tests/test_sessions.py | 53 ++++++++++
8 files changed, 326 insertions(+), 179 deletions(-)
create mode 100644 sentry_sdk/session.py
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index c59aa8f72e..7368b1055a 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -2,7 +2,6 @@
import uuid
import random
from datetime import datetime
-from itertools import islice
import socket
from sentry_sdk._compat import string_types, text_type, iteritems
@@ -30,12 +29,11 @@
from typing import Any
from typing import Callable
from typing import Dict
- from typing import List
from typing import Optional
from sentry_sdk.scope import Scope
from sentry_sdk._types import Event, Hint
- from sentry_sdk.sessions import Session
+ from sentry_sdk.session import Session
_client_init_debug = ContextVar("client_init_debug")
@@ -99,24 +97,20 @@ def _init_impl(self):
# type: () -> None
old_debug = _client_init_debug.get(False)
- def _send_sessions(sessions):
- # type: (List[Any]) -> None
- transport = self.transport
- if not transport or not sessions:
- return
- sessions_iter = iter(sessions)
- while True:
- envelope = Envelope()
- for session in islice(sessions_iter, 100):
- envelope.add_session(session)
- if not envelope.items:
- break
- transport.capture_envelope(envelope)
+ def _capture_envelope(envelope):
+ # type: (Envelope) -> None
+ if self.transport is not None:
+ self.transport.capture_envelope(envelope)
try:
_client_init_debug.set(self.options["debug"])
self.transport = make_transport(self.options)
- self.session_flusher = SessionFlusher(flush_func=_send_sessions)
+ session_mode = self.options["_experiments"].get(
+ "session_mode", "application"
+ )
+ self.session_flusher = SessionFlusher(
+ capture_func=_capture_envelope, session_mode=session_mode
+ )
request_bodies = ("always", "never", "small", "medium")
if self.options["request_bodies"] not in request_bodies:
diff --git a/sentry_sdk/envelope.py b/sentry_sdk/envelope.py
index 119abf810f..5645eb8a12 100644
--- a/sentry_sdk/envelope.py
+++ b/sentry_sdk/envelope.py
@@ -4,7 +4,7 @@
from sentry_sdk._compat import text_type
from sentry_sdk._types import MYPY
-from sentry_sdk.sessions import Session
+from sentry_sdk.session import Session
from sentry_sdk.utils import json_dumps, capture_internal_exceptions
if MYPY:
@@ -62,6 +62,12 @@ def add_session(
session = session.to_json()
self.add_item(Item(payload=PayloadRef(json=session), type="session"))
+ def add_sessions(
+ self, sessions # type: Any
+ ):
+ # type: (...) -> None
+ self.add_item(Item(payload=PayloadRef(json=sessions), type="sessions"))
+
def add_item(
self, item # type: Item
):
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
index 1d8883970b..8afa4938a2 100644
--- a/sentry_sdk/hub.py
+++ b/sentry_sdk/hub.py
@@ -8,7 +8,7 @@
from sentry_sdk.scope import Scope
from sentry_sdk.client import Client
from sentry_sdk.tracing import Span, Transaction
-from sentry_sdk.sessions import Session
+from sentry_sdk.session import Session
from sentry_sdk.utils import (
exc_info_from_error,
event_from_exception,
@@ -639,11 +639,12 @@ def end_session(self):
"""Ends the current session if there is one."""
client, scope = self._stack[-1]
session = scope._session
+ self.scope._session = None
+
if session is not None:
session.close()
if client is not None:
client.capture_session(session)
- self.scope._session = None
def stop_auto_session_tracking(self):
# type: (...) -> None
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
index f471cda3d4..b8e8901c5b 100644
--- a/sentry_sdk/scope.py
+++ b/sentry_sdk/scope.py
@@ -28,7 +28,7 @@
)
from sentry_sdk.tracing import Span
- from sentry_sdk.sessions import Session
+ from sentry_sdk.session import Session
F = TypeVar("F", bound=Callable[..., Any])
T = TypeVar("T")
diff --git a/sentry_sdk/session.py b/sentry_sdk/session.py
new file mode 100644
index 0000000000..d22c0e70be
--- /dev/null
+++ b/sentry_sdk/session.py
@@ -0,0 +1,172 @@
+import uuid
+from datetime import datetime
+
+from sentry_sdk._types import MYPY
+from sentry_sdk.utils import format_timestamp
+
+if MYPY:
+ from typing import Optional
+ from typing import Union
+ from typing import Any
+ from typing import Dict
+
+ from sentry_sdk._types import SessionStatus
+
+
+def _minute_trunc(ts):
+ # type: (datetime) -> datetime
+ return ts.replace(second=0, microsecond=0)
+
+
+def _make_uuid(
+ val, # type: Union[str, uuid.UUID]
+):
+ # type: (...) -> uuid.UUID
+ if isinstance(val, uuid.UUID):
+ return val
+ return uuid.UUID(val)
+
+
+class Session(object):
+ def __init__(
+ self,
+ sid=None, # type: Optional[Union[str, uuid.UUID]]
+ did=None, # type: Optional[str]
+ timestamp=None, # type: Optional[datetime]
+ started=None, # type: Optional[datetime]
+ duration=None, # type: Optional[float]
+ status=None, # type: Optional[SessionStatus]
+ release=None, # type: Optional[str]
+ environment=None, # type: Optional[str]
+ user_agent=None, # type: Optional[str]
+ ip_address=None, # type: Optional[str]
+ errors=None, # type: Optional[int]
+ user=None, # type: Optional[Any]
+ ):
+ # type: (...) -> None
+ if sid is None:
+ sid = uuid.uuid4()
+ if started is None:
+ started = datetime.utcnow()
+ if status is None:
+ status = "ok"
+ self.status = status
+ self.did = None # type: Optional[str]
+ self.started = started
+ self.release = None # type: Optional[str]
+ self.environment = None # type: Optional[str]
+ self.duration = None # type: Optional[float]
+ self.user_agent = None # type: Optional[str]
+ self.ip_address = None # type: Optional[str]
+ self.errors = 0
+
+ self.update(
+ sid=sid,
+ did=did,
+ timestamp=timestamp,
+ duration=duration,
+ release=release,
+ environment=environment,
+ user_agent=user_agent,
+ ip_address=ip_address,
+ errors=errors,
+ user=user,
+ )
+
+ @property
+ def truncated_started(self):
+ # type: (...) -> datetime
+ return _minute_trunc(self.started)
+
+ def update(
+ self,
+ sid=None, # type: Optional[Union[str, uuid.UUID]]
+ did=None, # type: Optional[str]
+ timestamp=None, # type: Optional[datetime]
+ started=None, # type: Optional[datetime]
+ duration=None, # type: Optional[float]
+ status=None, # type: Optional[SessionStatus]
+ release=None, # type: Optional[str]
+ environment=None, # type: Optional[str]
+ user_agent=None, # type: Optional[str]
+ ip_address=None, # type: Optional[str]
+ errors=None, # type: Optional[int]
+ user=None, # type: Optional[Any]
+ ):
+ # type: (...) -> None
+ # If a user is supplied we pull some data form it
+ if user:
+ if ip_address is None:
+ ip_address = user.get("ip_address")
+ if did is None:
+ did = user.get("id") or user.get("email") or user.get("username")
+
+ if sid is not None:
+ self.sid = _make_uuid(sid)
+ if did is not None:
+ self.did = str(did)
+ if timestamp is None:
+ timestamp = datetime.utcnow()
+ self.timestamp = timestamp
+ if started is not None:
+ self.started = started
+ if duration is not None:
+ self.duration = duration
+ if release is not None:
+ self.release = release
+ if environment is not None:
+ self.environment = environment
+ if ip_address is not None:
+ self.ip_address = ip_address
+ if user_agent is not None:
+ self.user_agent = user_agent
+ if errors is not None:
+ self.errors = errors
+
+ if status is not None:
+ self.status = status
+
+ def close(
+ self, status=None # type: Optional[SessionStatus]
+ ):
+ # type: (...) -> Any
+ if status is None and self.status == "ok":
+ status = "exited"
+ if status is not None:
+ self.update(status=status)
+
+ def get_json_attrs(
+ self, with_user_info=True # type: Optional[bool]
+ ):
+ # type: (...) -> Any
+ attrs = {}
+ if self.release is not None:
+ attrs["release"] = self.release
+ if self.environment is not None:
+ attrs["environment"] = self.environment
+ if with_user_info:
+ if self.ip_address is not None:
+ attrs["ip_address"] = self.ip_address
+ if self.user_agent is not None:
+ attrs["user_agent"] = self.user_agent
+ return attrs
+
+ def to_json(self):
+ # type: (...) -> Any
+ rv = {
+ "sid": str(self.sid),
+ "init": True,
+ "started": format_timestamp(self.started),
+ "timestamp": format_timestamp(self.timestamp),
+ "status": self.status,
+ } # type: Dict[str, Any]
+ if self.errors:
+ rv["errors"] = self.errors
+ if self.did is not None:
+ rv["did"] = self.did
+ if self.duration is not None:
+ rv["duration"] = self.duration
+ attrs = self.get_json_attrs()
+ if attrs:
+ rv["attrs"] = attrs
+ return rv
diff --git a/sentry_sdk/sessions.py b/sentry_sdk/sessions.py
index b8ef201e2a..a8321685d0 100644
--- a/sentry_sdk/sessions.py
+++ b/sentry_sdk/sessions.py
@@ -1,24 +1,22 @@
import os
-import uuid
import time
-from datetime import datetime
from threading import Thread, Lock
from contextlib import contextmanager
+import sentry_sdk
+from sentry_sdk.envelope import Envelope
+from sentry_sdk.session import Session
from sentry_sdk._types import MYPY
from sentry_sdk.utils import format_timestamp
if MYPY:
- import sentry_sdk
-
+ from typing import Callable
from typing import Optional
- from typing import Union
from typing import Any
from typing import Dict
+ from typing import List
from typing import Generator
- from sentry_sdk._types import SessionStatus
-
def is_auto_session_tracking_enabled(hub=None):
# type: (Optional[sentry_sdk.Hub]) -> bool
@@ -48,38 +46,60 @@ def auto_session_tracking(hub=None):
hub.end_session()
-def _make_uuid(
- val, # type: Union[str, uuid.UUID]
-):
- # type: (...) -> uuid.UUID
- if isinstance(val, uuid.UUID):
- return val
- return uuid.UUID(val)
+TERMINAL_SESSION_STATES = ("exited", "abnormal", "crashed")
+MAX_ENVELOPE_ITEMS = 100
-TERMINAL_SESSION_STATES = ("exited", "abnormal", "crashed")
+def make_aggregate_envelope(aggregate_states, attrs):
+ # type: (Any, Any) -> Any
+ return {"attrs": dict(attrs), "aggregates": list(aggregate_states.values())}
class SessionFlusher(object):
def __init__(
self,
- flush_func, # type: Any
- flush_interval=10, # type: int
+ capture_func, # type: Callable[[Envelope], None]
+ session_mode, # type: str
+ flush_interval=60, # type: int
):
# type: (...) -> None
- self.flush_func = flush_func
+ self.capture_func = capture_func
+ self.session_mode = session_mode
self.flush_interval = flush_interval
- self.pending = {} # type: Dict[str, Any]
+ self.pending_sessions = [] # type: List[Any]
+ self.pending_aggregates = {} # type: Dict[Any, Any]
self._thread = None # type: Optional[Thread]
self._thread_lock = Lock()
+ self._aggregate_lock = Lock()
self._thread_for_pid = None # type: Optional[int]
self._running = True
def flush(self):
# type: (...) -> None
- pending = self.pending
- self.pending = {}
- self.flush_func(list(pending.values()))
+ pending_sessions = self.pending_sessions
+ self.pending_sessions = []
+
+ with self._aggregate_lock:
+ pending_aggregates = self.pending_aggregates
+ self.pending_aggregates = {}
+
+ envelope = Envelope()
+ for session in pending_sessions:
+ if len(envelope.items) == MAX_ENVELOPE_ITEMS:
+ self.capture_func(envelope)
+ envelope = Envelope()
+
+ envelope.add_session(session)
+
+ for (attrs, states) in pending_aggregates.items():
+ if len(envelope.items) == MAX_ENVELOPE_ITEMS:
+ self.capture_func(envelope)
+ envelope = Envelope()
+
+ envelope.add_sessions(make_aggregate_envelope(states, attrs))
+
+ if len(envelope.items) > 0:
+ self.capture_func(envelope)
def _ensure_running(self):
# type: (...) -> None
@@ -93,7 +113,7 @@ def _thread():
# type: (...) -> None
while self._running:
time.sleep(self.flush_interval)
- if self.pending and self._running:
+ if self._running:
self.flush()
thread = Thread(target=_thread)
@@ -103,11 +123,45 @@ def _thread():
self._thread_for_pid = os.getpid()
return None
+ def add_aggregate_session(
+ self, session # type: Session
+ ):
+ # type: (...) -> None
+ # NOTE on `session.did`:
+ # the protocol can deal with buckets that have a distinct-id, however
+ # in practice we expect the python SDK to have an extremely high cardinality
+ # here, effectively making aggregation useless, therefore we do not
+ # aggregate per-did.
+
+ # For this part we can get away with using the global interpreter lock
+ with self._aggregate_lock:
+ attrs = session.get_json_attrs(with_user_info=False)
+ primary_key = tuple(sorted(attrs.items()))
+ secondary_key = session.truncated_started # (, session.did)
+ states = self.pending_aggregates.setdefault(primary_key, {})
+ state = states.setdefault(secondary_key, {})
+
+ if "started" not in state:
+ state["started"] = format_timestamp(session.truncated_started)
+ # if session.did is not None:
+ # state["did"] = session.did
+ if session.status == "crashed":
+ state["crashed"] = state.get("crashed", 0) + 1
+ elif session.status == "abnormal":
+ state["abnormal"] = state.get("abnormal", 0) + 1
+ elif session.errors > 0:
+ state["errored"] = state.get("errored", 0) + 1
+ else:
+ state["exited"] = state.get("exited", 0) + 1
+
def add_session(
self, session # type: Session
):
# type: (...) -> None
- self.pending[session.sid.hex] = session.to_json()
+ if self.session_mode == "request":
+ self.add_aggregate_session(session)
+ else:
+ self.pending_sessions.append(session.to_json())
self._ensure_running()
def kill(self):
@@ -117,136 +171,3 @@ def kill(self):
def __del__(self):
# type: (...) -> None
self.kill()
-
-
-class Session(object):
- def __init__(
- self,
- sid=None, # type: Optional[Union[str, uuid.UUID]]
- did=None, # type: Optional[str]
- timestamp=None, # type: Optional[datetime]
- started=None, # type: Optional[datetime]
- duration=None, # type: Optional[float]
- status=None, # type: Optional[SessionStatus]
- release=None, # type: Optional[str]
- environment=None, # type: Optional[str]
- user_agent=None, # type: Optional[str]
- ip_address=None, # type: Optional[str]
- errors=None, # type: Optional[int]
- user=None, # type: Optional[Any]
- ):
- # type: (...) -> None
- if sid is None:
- sid = uuid.uuid4()
- if started is None:
- started = datetime.utcnow()
- if status is None:
- status = "ok"
- self.status = status
- self.did = None # type: Optional[str]
- self.started = started
- self.release = None # type: Optional[str]
- self.environment = None # type: Optional[str]
- self.duration = None # type: Optional[float]
- self.user_agent = None # type: Optional[str]
- self.ip_address = None # type: Optional[str]
- self.errors = 0
-
- self.update(
- sid=sid,
- did=did,
- timestamp=timestamp,
- duration=duration,
- release=release,
- environment=environment,
- user_agent=user_agent,
- ip_address=ip_address,
- errors=errors,
- user=user,
- )
-
- def update(
- self,
- sid=None, # type: Optional[Union[str, uuid.UUID]]
- did=None, # type: Optional[str]
- timestamp=None, # type: Optional[datetime]
- started=None, # type: Optional[datetime]
- duration=None, # type: Optional[float]
- status=None, # type: Optional[SessionStatus]
- release=None, # type: Optional[str]
- environment=None, # type: Optional[str]
- user_agent=None, # type: Optional[str]
- ip_address=None, # type: Optional[str]
- errors=None, # type: Optional[int]
- user=None, # type: Optional[Any]
- ):
- # type: (...) -> None
- # If a user is supplied we pull some data form it
- if user:
- if ip_address is None:
- ip_address = user.get("ip_address")
- if did is None:
- did = user.get("id") or user.get("email") or user.get("username")
-
- if sid is not None:
- self.sid = _make_uuid(sid)
- if did is not None:
- self.did = str(did)
- if timestamp is None:
- timestamp = datetime.utcnow()
- self.timestamp = timestamp
- if started is not None:
- self.started = started
- if duration is not None:
- self.duration = duration
- if release is not None:
- self.release = release
- if environment is not None:
- self.environment = environment
- if ip_address is not None:
- self.ip_address = ip_address
- if user_agent is not None:
- self.user_agent = user_agent
- if errors is not None:
- self.errors = errors
-
- if status is not None:
- self.status = status
-
- def close(
- self, status=None # type: Optional[SessionStatus]
- ):
- # type: (...) -> Any
- if status is None and self.status == "ok":
- status = "exited"
- if status is not None:
- self.update(status=status)
-
- def to_json(self):
- # type: (...) -> Any
- rv = {
- "sid": str(self.sid),
- "init": True,
- "started": format_timestamp(self.started),
- "timestamp": format_timestamp(self.timestamp),
- "status": self.status,
- } # type: Dict[str, Any]
- if self.errors:
- rv["errors"] = self.errors
- if self.did is not None:
- rv["did"] = self.did
- if self.duration is not None:
- rv["duration"] = self.duration
-
- attrs = {}
- if self.release is not None:
- attrs["release"] = self.release
- if self.environment is not None:
- attrs["environment"] = self.environment
- if self.ip_address is not None:
- attrs["ip_address"] = self.ip_address
- if self.user_agent is not None:
- attrs["user_agent"] = self.user_agent
- if attrs:
- rv["attrs"] = attrs
- return rv
diff --git a/tests/test_envelope.py b/tests/test_envelope.py
index 96c33f0c99..e795e9d93c 100644
--- a/tests/test_envelope.py
+++ b/tests/test_envelope.py
@@ -1,5 +1,5 @@
from sentry_sdk.envelope import Envelope
-from sentry_sdk.sessions import Session
+from sentry_sdk.session import Session
def generate_transaction_item():
diff --git a/tests/test_sessions.py b/tests/test_sessions.py
index dfe9ee1dc6..6c84f029dd 100644
--- a/tests/test_sessions.py
+++ b/tests/test_sessions.py
@@ -1,4 +1,13 @@
+import sentry_sdk
+
from sentry_sdk import Hub
+from sentry_sdk.sessions import auto_session_tracking
+
+
+def sorted_aggregates(item):
+ aggregates = item["aggregates"]
+ aggregates.sort(key=lambda item: (item["started"], item.get("did", "")))
+ return aggregates
def test_basic(sentry_init, capture_envelopes):
@@ -24,11 +33,55 @@ def test_basic(sentry_init, capture_envelopes):
assert len(sess.items) == 1
sess_event = sess.items[0].payload.json
+ assert sess_event["attrs"] == {
+ "release": "fun-release",
+ "environment": "not-fun-env",
+ }
assert sess_event["did"] == "42"
assert sess_event["init"]
assert sess_event["status"] == "exited"
assert sess_event["errors"] == 1
+
+
+def test_aggregates(sentry_init, capture_envelopes):
+ sentry_init(
+ release="fun-release",
+ environment="not-fun-env",
+ _experiments={"auto_session_tracking": True, "session_mode": "request"},
+ )
+ envelopes = capture_envelopes()
+
+ hub = Hub.current
+
+ with auto_session_tracking():
+ with sentry_sdk.push_scope():
+ try:
+ with sentry_sdk.configure_scope() as scope:
+ scope.set_user({"id": "42"})
+ raise Exception("all is wrong")
+ except Exception:
+ sentry_sdk.capture_exception()
+
+ with auto_session_tracking():
+ pass
+
+ hub.start_session()
+ hub.end_session()
+
+ sentry_sdk.flush()
+
+ assert len(envelopes) == 2
+ assert envelopes[0].get_event() is not None
+
+ sess = envelopes[1]
+ assert len(sess.items) == 1
+ sess_event = sess.items[0].payload.json
assert sess_event["attrs"] == {
"release": "fun-release",
"environment": "not-fun-env",
}
+
+ aggregates = sorted_aggregates(sess_event)
+ assert len(aggregates) == 1
+ assert aggregates[0]["exited"] == 2
+ assert aggregates[0]["errored"] == 1
From abc240019ef3f5e3b75eaaf40e9e7a1ea10e624f Mon Sep 17 00:00:00 2001
From: iker barriocanal <32816711+iker-barriocanal@users.noreply.github.com>
Date: Wed, 10 Feb 2021 10:38:00 +0100
Subject: [PATCH 0123/2327] feat: Build dist ZIP for AWS Lambda layers (#1001)
---
.github/workflows/ci.yml | 2 +-
Makefile | 5 +++
scripts/build-awslambda-layer.py | 71 ++++++++++++++++++++++++++++++++
3 files changed, 77 insertions(+), 1 deletion(-)
create mode 100644 scripts/build-awslambda-layer.py
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8da4ec9ef3..29c3860499 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
- run: |
pip install virtualenv
- make dist
+ make aws-lambda-layer-build
- uses: actions/upload-artifact@v2
with:
diff --git a/Makefile b/Makefile
index 29c2886671..4fac8eca5a 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ help:
@echo "make test: Run basic tests (not testing most integrations)"
@echo "make test-all: Run ALL tests (slow, closest to CI)"
@echo "make format: Run code formatters (destructive)"
+ @echo "make aws-lambda-layer-build: Build serverless ZIP dist package"
@echo
@echo "Also make sure to read ./CONTRIBUTING.md"
@false
@@ -58,3 +59,7 @@ apidocs-hotfix: apidocs
@$(VENV_PATH)/bin/pip install ghp-import
@$(VENV_PATH)/bin/ghp-import -pf docs/_build
.PHONY: apidocs-hotfix
+
+aws-lambda-layer-build: dist
+ $(VENV_PATH)/bin/python -m scripts.build-awslambda-layer
+.PHONY: aws-lambda-layer-build
diff --git a/scripts/build-awslambda-layer.py b/scripts/build-awslambda-layer.py
new file mode 100644
index 0000000000..7cbfb1cb5f
--- /dev/null
+++ b/scripts/build-awslambda-layer.py
@@ -0,0 +1,71 @@
+import os
+import subprocess
+import tempfile
+import shutil
+from sentry_sdk.consts import VERSION as SDK_VERSION
+
+
+DIST_DIRNAME = "dist"
+DIST_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", DIST_DIRNAME))
+DEST_ZIP_FILENAME = f"sentry-python-serverless-{SDK_VERSION}.zip"
+WHEELS_FILEPATH = os.path.join(
+ DIST_DIRNAME, f"sentry_sdk-{SDK_VERSION}-py2.py3-none-any.whl"
+)
+
+# Top directory in the ZIP file. Placing the Sentry package in `/python` avoids
+# creating a directory for a specific version. For more information, see
+# https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html#configuration-layers-path
+PACKAGE_PARENT_DIRECTORY = "python"
+
+
+class PackageBuilder:
+ def __init__(self, base_dir) -> None:
+ self.base_dir = base_dir
+ self.packages_dir = self.get_relative_path_of(PACKAGE_PARENT_DIRECTORY)
+
+ def make_directories(self):
+ os.makedirs(self.packages_dir)
+
+ def install_python_binaries(self):
+ subprocess.run(
+ [
+ "pip",
+ "install",
+ "--no-cache-dir", # Disables the cache -> always accesses PyPI
+ "-q", # Quiet
+ WHEELS_FILEPATH, # Copied to the target directory before installation
+ "-t", # Target directory flag
+ self.packages_dir,
+ ],
+ check=True,
+ )
+
+ def zip(self, filename):
+ subprocess.run(
+ [
+ "zip",
+ "-q", # Quiet
+ "-x", # Exclude files
+ "**/__pycache__/*", # Files to be excluded
+ "-r", # Recurse paths
+ filename, # Output filename
+ PACKAGE_PARENT_DIRECTORY, # Files to be zipped
+ ],
+ cwd=self.base_dir,
+ check=True, # Raises CalledProcessError if exit status is non-zero
+ )
+
+ def get_relative_path_of(self, subfile):
+ return os.path.join(self.base_dir, subfile)
+
+
+def build_packaged_zip():
+ with tempfile.TemporaryDirectory() as tmp_dir:
+ package_builder = PackageBuilder(tmp_dir)
+ package_builder.make_directories()
+ package_builder.install_python_binaries()
+ package_builder.zip(DEST_ZIP_FILENAME)
+ shutil.copy(package_builder.get_relative_path_of(DEST_ZIP_FILENAME), DIST_DIR)
+
+
+build_packaged_zip()
From 477fbe71b5c8152c3d0f8a702444ac1d567c21c8 Mon Sep 17 00:00:00 2001
From: iker barriocanal <32816711+iker-barriocanal@users.noreply.github.com>
Date: Wed, 10 Feb 2021 15:27:13 +0100
Subject: [PATCH 0124/2327] fix: Remove Python3.7 from django-dev (#1005)
---
tox.ini | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/tox.ini b/tox.ini
index 8411b157c8..a1bb57e586 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,8 @@ envlist =
{pypy,py2.7,py3.5}-django-{1.8,1.9,1.10}
{pypy,py2.7}-django-{1.8,1.9,1.10,1.11}
{py3.5,py3.6,py3.7}-django-{2.0,2.1}
- {py3.7,py3.8,py3.9}-django-{2.2,3.0,3.1,dev}
+ {py3.7,py3.8,py3.9}-django-{2.2,3.0,3.1}
+ {py3.8,py3.9}-django-dev
{pypy,py2.7,py3.4,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12,1.0}
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-1.1
@@ -92,9 +93,12 @@ deps =
django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: djangorestframework>=3.0.0,<4.0.0
- {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: channels>2
- {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: pytest-asyncio
- {py2.7,py3.7,py3.8,py3.9}-django-{1.11,2.2,3.0,3.1,dev}: psycopg2-binary
+ {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1}: channels>2
+ {py3.8,py3.9}-django-dev: channels>2
+ {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1}: pytest-asyncio
+ {py3.8,py3.9}-django-dev: pytest-asyncio
+ {py2.7,py3.7,py3.8,py3.9}-django-{1.11,2.2,3.0,3.1}: psycopg2-binary
+ {py2.7,py3.8,py3.9}-django-dev: psycopg2-binary
django-{1.6,1.7}: pytest-django<3.0
django-{1.8,1.9,1.10,1.11,2.0,2.1}: pytest-django<4.0
From 9a7843893a354390960450b01ac8f919c9d8bfff Mon Sep 17 00:00:00 2001
From: iker barriocanal <32816711+iker-barriocanal@users.noreply.github.com>
Date: Thu, 11 Feb 2021 10:36:56 +0100
Subject: [PATCH 0125/2327] ci: Run `dist` job always when CI is run (#1006)
---
.github/workflows/ci.yml | 2 --
Makefile | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 29c3860499..83d57a294a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,8 +14,6 @@ jobs:
timeout-minutes: 10
runs-on: ubuntu-16.04
- if: "startsWith(github.ref, 'refs/heads/release/')"
-
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
diff --git a/Makefile b/Makefile
index 4fac8eca5a..3db2d9318b 100644
--- a/Makefile
+++ b/Makefile
@@ -61,5 +61,7 @@ apidocs-hotfix: apidocs
.PHONY: apidocs-hotfix
aws-lambda-layer-build: dist
+ $(VENV_PATH)/bin/pip install urllib3
+ $(VENV_PATH)/bin/pip install certifi
$(VENV_PATH)/bin/python -m scripts.build-awslambda-layer
.PHONY: aws-lambda-layer-build
From 49de7ddc9ad90bd0fddd151ae39aa1984e5235b1 Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Thu, 11 Feb 2021 12:49:02 +0100
Subject: [PATCH 0126/2327] Release 0.20.0 (#1008)
* Changes for release 1.0.0
* Apply suggestions from code review
Co-authored-by: Daniel Griesser
* Update CHANGELOG.md
Co-authored-by: Rodolfo Carvalho
* Added code review comment in regards to fix change
* Updated CHANGELOG.md
* Fixed typo and added prefix Breaking change
* Updated Changelog
* Removed changes in regards to autosession tracking enabled by default
* Removed wrong description message
* Reverted Versioning policy
* Changed to version 0.20.0
Co-authored-by: Daniel Griesser
Co-authored-by: Rodolfo Carvalho
---
.craft.yml | 2 +-
CHANGES.md => CHANGELOG.md | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
rename CHANGES.md => CHANGELOG.md (96%)
diff --git a/.craft.yml b/.craft.yml
index 5fc2b5f27c..d357d1a75c 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -13,7 +13,7 @@ targets:
config:
canonical: pypi:sentry-sdk
-changelog: CHANGES.md
+changelog: CHANGELOG.md
changelogPolicy: simple
statusProvider:
diff --git a/CHANGES.md b/CHANGELOG.md
similarity index 96%
rename from CHANGES.md
rename to CHANGELOG.md
index ee2c487e7d..e8c51dde71 100644
--- a/CHANGES.md
+++ b/CHANGELOG.md
@@ -20,6 +20,20 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 0.20.0
+
+- Fix for header extraction for AWS lambda/API extraction
+- Fix multiple **kwargs type hints # 967
+- Fix that corrects AWS lambda integration failure to detect the aws-lambda-ric 1.0 bootstrap #976
+- Fix AWSLambda integration: variable "timeout_thread" referenced before assignment #977
+- Use full git sha as release name #960
+- **BREAKING CHANGE**: The default environment is now production, not based on release
+- Django integration now creates transaction spans for template rendering
+- Fix headers not parsed correctly in ASGI middleware, Decode headers before creating transaction #984
+- Restored ability to have tracing disabled #991
+- Fix Django async views not behaving asynchronously
+- Performance improvement: supported pre-aggregated sessions
+
## 0.19.5
- Fix two regressions added in 0.19.2 with regard to sampling behavior when reading the sampling decision from headers.
From 51031bbfc034fa2dd629620ef6a41c1847900156 Mon Sep 17 00:00:00 2001
From: iker barriocanal <32816711+iker-barriocanal@users.noreply.github.com>
Date: Thu, 11 Feb 2021 13:41:07 +0100
Subject: [PATCH 0127/2327] feat: Add `aws-lambda-layer` craft target (#1009)
---
.craft.yml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/.craft.yml b/.craft.yml
index d357d1a75c..b455575623 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -12,6 +12,22 @@ targets:
type: sdk
config:
canonical: pypi:sentry-sdk
+ - name: aws-lambda-layer
+ includeNames: /^sentry-python-serverless-\d+(\.\d+)*\.zip$/
+ layerName: SentryPythonServerlessSDK
+ compatibleRuntimes:
+ - name: python
+ versions:
+ # The number of versions must be, at most, the maximum number of
+ # runtimes AWS Lambda permits for a layer.
+ # On the other hand, AWS Lambda does not support every Python runtime.
+ # The supported runtimes are available in the following link:
+ # https://docs.aws.amazon.com/lambda/latest/dg/lambda-python.html
+ - python2.7
+ - python3.6
+ - python3.7
+ - python3.8
+ license: MIT
changelog: CHANGELOG.md
changelogPolicy: simple
From 2dbb72a7e7b8a67f8d5e2afbdd50433c1c575017 Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya
Date: Thu, 11 Feb 2021 16:35:21 +0300
Subject: [PATCH 0128/2327] ci(release): Update release to use v1.1 of action
(#1011)
Addresses @HazAT's comment here: https://sentry.slack.com/archives/C01C205FUAE/p1613045701031000
---
.github/workflows/release.yml | 27 +++++----------------------
1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8d8c7f5176..9e59d221ae 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,31 +15,14 @@ jobs:
runs-on: ubuntu-latest
name: "Release a new version"
steps:
- - name: Prepare release
- uses: getsentry/action-prepare-release@33507ed
- with:
- version: ${{ github.event.inputs.version }}
- force: ${{ github.event.inputs.force }}
-
- uses: actions/checkout@v2
with:
token: ${{ secrets.GH_RELEASE_PAT }}
fetch-depth: 0
-
- - name: Craft Prepare
- run: npx @sentry/craft prepare --no-input "${{ env.RELEASE_VERSION }}"
+ - name: Prepare release
+ uses: getsentry/action-prepare-release@v1.1
env:
- GITHUB_API_TOKEN: ${{ github.token }}
-
- - name: Request publish
- if: success()
- uses: actions/github-script@v3
+ GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
with:
- github-token: ${{ secrets.GH_RELEASE_PAT }}
- script: |
- const repoInfo = context.repo;
- await github.issues.create({
- owner: repoInfo.owner,
- repo: 'publish',
- title: `publish: ${repoInfo.repo}@${process.env.RELEASE_VERSION}`,
- });
+ version: ${{ github.event.inputs.version }}
+ force: ${{ github.event.inputs.force }}
From 358c4ec268c7b687fc40397a34aad6d19c308014 Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Thu, 11 Feb 2021 14:08:44 +0000
Subject: [PATCH 0129/2327] release: 0.20.0
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index ca873d28f8..5a9f5b671e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.19.5"
+release = "0.20.0"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index f40d2c24a6..1b1d0f8366 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -99,7 +99,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.19.5"
+VERSION = "0.20.0"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 105a3c71c5..f31f2c55b8 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="0.19.5",
+ version="0.20.0",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 989e01dbd424f8255ff2ab510f6b7519324518c2 Mon Sep 17 00:00:00 2001
From: iker barriocanal <32816711+iker-barriocanal@users.noreply.github.com>
Date: Thu, 11 Feb 2021 15:25:55 +0100
Subject: [PATCH 0130/2327] ref: Change serverless dist destination path to
`/dist-serverless` (#1012)
---
.github/workflows/ci.yml | 4 +++-
.gitignore | 1 +
scripts/build-awslambda-layer.py | 9 +++++++--
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 83d57a294a..3c54f5fac2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,9 @@ jobs:
- uses: actions/upload-artifact@v2
with:
name: ${{ github.sha }}
- path: dist/*
+ path: |
+ dist/*
+ dist-serverless/*
docs:
timeout-minutes: 10
diff --git a/.gitignore b/.gitignore
index 14a355c3c2..e23931921e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ pip-log.txt
*.egg-info
/build
/dist
+/dist-serverless
.cache
.idea
.eggs
diff --git a/scripts/build-awslambda-layer.py b/scripts/build-awslambda-layer.py
index 7cbfb1cb5f..5e9dbb66c9 100644
--- a/scripts/build-awslambda-layer.py
+++ b/scripts/build-awslambda-layer.py
@@ -6,7 +6,10 @@
DIST_DIRNAME = "dist"
-DIST_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", DIST_DIRNAME))
+DEST_REL_PATH = "dist-serverless"
+DEST_ABS_PATH = os.path.abspath(
+ os.path.join(os.path.dirname(__file__), "..", DEST_REL_PATH)
+)
DEST_ZIP_FILENAME = f"sentry-python-serverless-{SDK_VERSION}.zip"
WHEELS_FILEPATH = os.path.join(
DIST_DIRNAME, f"sentry_sdk-{SDK_VERSION}-py2.py3-none-any.whl"
@@ -65,7 +68,9 @@ def build_packaged_zip():
package_builder.make_directories()
package_builder.install_python_binaries()
package_builder.zip(DEST_ZIP_FILENAME)
- shutil.copy(package_builder.get_relative_path_of(DEST_ZIP_FILENAME), DIST_DIR)
+ shutil.copy(
+ package_builder.get_relative_path_of(DEST_ZIP_FILENAME), DEST_ABS_PATH
+ )
build_packaged_zip()
From 9ef4c58e5bb525b8096f55a7437dc442b7b3c508 Mon Sep 17 00:00:00 2001
From: Christian Clauss
Date: Fri, 12 Feb 2021 12:46:55 +0100
Subject: [PATCH 0131/2327] setup.py: Add Py39 and fix broken link to changelog
(#1013)
---
setup.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index f31f2c55b8..9e8968cb56 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ def get_file_text(file_name):
url="https://github.com/getsentry/sentry-python",
project_urls={
"Documentation": "https://docs.sentry.io/platforms/python/",
- "Changelog": "https://github.com/getsentry/sentry-python/blob/master/CHANGES.md",
+ "Changelog": "https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md",
},
description="Python client for Sentry (https://sentry.io)",
long_description=get_file_text("README.md"),
@@ -69,6 +69,7 @@ def get_file_text(file_name):
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
+ "Programming Language :: Python :: 3.9",
"Topic :: Software Development :: Libraries :: Python Modules",
],
)
From 5b0b19635351aac4c12151ee2a956b22571922b7 Mon Sep 17 00:00:00 2001
From: Michael K
Date: Fri, 12 Feb 2021 11:49:21 +0000
Subject: [PATCH 0132/2327] Fix link to changelog (#1010)
Renamed in getsentry/sentry-python#1008
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b77024f8f8..427d4ad4e4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -40,7 +40,7 @@ must have `twine` installed globally.
The usual release process goes like this:
-1. Go through git log and write new entry into `CHANGES.md`, commit to master
+1. Go through git log and write new entry into `CHANGELOG.md`, commit to master
2. `craft p a.b.c`
3. `craft pp a.b.c`
From 1457c4a32e077f78ab2587a1e188f64df85fe067 Mon Sep 17 00:00:00 2001
From: iker barriocanal <32816711+iker-barriocanal@users.noreply.github.com>
Date: Fri, 12 Feb 2021 13:06:26 +0100
Subject: [PATCH 0133/2327] fix: Create dist directory if it does not exist
(#1015)
---
scripts/build-awslambda-layer.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts/build-awslambda-layer.py b/scripts/build-awslambda-layer.py
index 5e9dbb66c9..dba3ca6e4d 100644
--- a/scripts/build-awslambda-layer.py
+++ b/scripts/build-awslambda-layer.py
@@ -68,6 +68,8 @@ def build_packaged_zip():
package_builder.make_directories()
package_builder.install_python_binaries()
package_builder.zip(DEST_ZIP_FILENAME)
+ if not os.path.exists(DEST_REL_PATH):
+ os.makedirs(DEST_REL_PATH)
shutil.copy(
package_builder.get_relative_path_of(DEST_ZIP_FILENAME), DEST_ABS_PATH
)
From 70089c1032c82d2fde04d601468c01daa0a204a7 Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Fri, 12 Feb 2021 14:20:01 +0100
Subject: [PATCH 0134/2327] fix(django): Fix middleware issue not handling
async middleware functions (#1016)
* Added a test middleware function
* Added test that ensures __acall__ handles middleware functions correctly not only classes
* Added logic that handles the case where a middleware is a function rather a class
* fix: Formatting
* FIxing Mypy type errors
Co-authored-by: sentry-bot
---
sentry_sdk/integrations/django/asgi.py | 8 +++-
tests/integrations/django/asgi/test_asgi.py | 37 +++++++++++++++++++
tests/integrations/django/myapp/middleware.py | 19 ++++++++++
3 files changed, 63 insertions(+), 1 deletion(-)
create mode 100644 tests/integrations/django/myapp/middleware.py
diff --git a/sentry_sdk/integrations/django/asgi.py b/sentry_sdk/integrations/django/asgi.py
index b533a33e47..79916e94fb 100644
--- a/sentry_sdk/integrations/django/asgi.py
+++ b/sentry_sdk/integrations/django/asgi.py
@@ -104,6 +104,9 @@ def _asgi_middleware_mixin_factory(_check_middleware_span):
"""
class SentryASGIMixin:
+ if MYPY:
+ _inner = None
+
def __init__(self, get_response):
# type: (Callable[..., Any]) -> None
self.get_response = get_response
@@ -132,7 +135,10 @@ async def __acall__(self, *args, **kwargs):
# type: (*Any, **Any) -> Any
f = self._acall_method
if f is None:
- self._acall_method = f = self._inner.__acall__ # type: ignore
+ if hasattr(self._inner, "__acall__"):
+ self._acall_method = f = self._inner.__acall__ # type: ignore
+ else:
+ self._acall_method = f = self._inner
middleware_span = _check_middleware_span(old_method=f)
diff --git a/tests/integrations/django/asgi/test_asgi.py b/tests/integrations/django/asgi/test_asgi.py
index 920918415d..0e6dd4f9ff 100644
--- a/tests/integrations/django/asgi/test_asgi.py
+++ b/tests/integrations/django/asgi/test_asgi.py
@@ -103,6 +103,43 @@ async def test_async_views_concurrent_execution(sentry_init, capture_events, set
assert end - start < 1.5
+@pytest.mark.asyncio
+@pytest.mark.skipif(
+ django.VERSION < (3, 1), reason="async views have been introduced in Django 3.1"
+)
+async def test_async_middleware_that_is_function_concurrent_execution(
+ sentry_init, capture_events, settings
+):
+ import asyncio
+ import time
+
+ settings.MIDDLEWARE = [
+ "tests.integrations.django.myapp.middleware.simple_middleware"
+ ]
+ asgi_application.load_middleware(is_async=True)
+
+ sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
+
+ comm = HttpCommunicator(asgi_application, "GET", "/my_async_view")
+ comm2 = HttpCommunicator(asgi_application, "GET", "/my_async_view")
+
+ loop = asyncio.get_event_loop()
+
+ start = time.time()
+
+ r1 = loop.create_task(comm.get_response(timeout=5))
+ r2 = loop.create_task(comm2.get_response(timeout=5))
+
+ (resp1, resp2), _ = await asyncio.wait({r1, r2})
+
+ end = time.time()
+
+ assert resp1.result()["status"] == 200
+ assert resp2.result()["status"] == 200
+
+ assert end - start < 1.5
+
+
@pytest.mark.asyncio
@pytest.mark.skipif(
django.VERSION < (3, 1), reason="async views have been introduced in Django 3.1"
diff --git a/tests/integrations/django/myapp/middleware.py b/tests/integrations/django/myapp/middleware.py
new file mode 100644
index 0000000000..b4c1145390
--- /dev/null
+++ b/tests/integrations/django/myapp/middleware.py
@@ -0,0 +1,19 @@
+import asyncio
+from django.utils.decorators import sync_and_async_middleware
+
+
+@sync_and_async_middleware
+def simple_middleware(get_response):
+ if asyncio.iscoroutinefunction(get_response):
+
+ async def middleware(request):
+ response = await get_response(request)
+ return response
+
+ else:
+
+ def middleware(request):
+ response = get_response(request)
+ return response
+
+ return middleware
From da175e3024065f0b6e9e8c2bec9342e928d41b00 Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Fri, 12 Feb 2021 15:52:09 +0100
Subject: [PATCH 0135/2327] Added change log release for 0.20.1 (#1017)
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8c51dde71..93a7c9d872 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,10 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 0.20.1
+
+- Fix for error that occurs with Async Middlewares when the middleware is a function rather than a class
+
## 0.20.0
- Fix for header extraction for AWS lambda/API extraction
From be4fa3173c721201c3eba3b5b0d3b04099fc43a9 Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Fri, 12 Feb 2021 14:54:00 +0000
Subject: [PATCH 0136/2327] release: 0.20.1
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 5a9f5b671e..de771604d0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.20.0"
+release = "0.20.1"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 1b1d0f8366..9f39d1817b 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -99,7 +99,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.20.0"
+VERSION = "0.20.1"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 9e8968cb56..8eaa9f1bb4 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="0.20.0",
+ version="0.20.1",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 89f7b158e1922540a7f38112a26f4c54004d126b Mon Sep 17 00:00:00 2001
From: iker barriocanal <32816711+iker-barriocanal@users.noreply.github.com>
Date: Fri, 12 Feb 2021 17:56:36 +0100
Subject: [PATCH 0137/2327] fix(release): Include in PyPI artifact filter for
Craft (#1019)
---
.craft.yml | 1 +
scripts/build-awslambda-layer.py | 11 +++++------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.craft.yml b/.craft.yml
index b455575623..5237c9debe 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -6,6 +6,7 @@ github:
targets:
- name: pypi
+ includeNames: /^sentry[_\-]sdk.*$/
- name: github
- name: gh-pages
- name: registry
diff --git a/scripts/build-awslambda-layer.py b/scripts/build-awslambda-layer.py
index dba3ca6e4d..d76d70d890 100644
--- a/scripts/build-awslambda-layer.py
+++ b/scripts/build-awslambda-layer.py
@@ -5,14 +5,13 @@
from sentry_sdk.consts import VERSION as SDK_VERSION
-DIST_DIRNAME = "dist"
-DEST_REL_PATH = "dist-serverless"
+DIST_REL_PATH = "dist"
DEST_ABS_PATH = os.path.abspath(
- os.path.join(os.path.dirname(__file__), "..", DEST_REL_PATH)
+ os.path.join(os.path.dirname(__file__), "..", DIST_REL_PATH)
)
DEST_ZIP_FILENAME = f"sentry-python-serverless-{SDK_VERSION}.zip"
WHEELS_FILEPATH = os.path.join(
- DIST_DIRNAME, f"sentry_sdk-{SDK_VERSION}-py2.py3-none-any.whl"
+ DIST_REL_PATH, f"sentry_sdk-{SDK_VERSION}-py2.py3-none-any.whl"
)
# Top directory in the ZIP file. Placing the Sentry package in `/python` avoids
@@ -68,8 +67,8 @@ def build_packaged_zip():
package_builder.make_directories()
package_builder.install_python_binaries()
package_builder.zip(DEST_ZIP_FILENAME)
- if not os.path.exists(DEST_REL_PATH):
- os.makedirs(DEST_REL_PATH)
+ if not os.path.exists(DIST_REL_PATH):
+ os.makedirs(DIST_REL_PATH)
shutil.copy(
package_builder.get_relative_path_of(DEST_ZIP_FILENAME), DEST_ABS_PATH
)
From 1af1101fac55059b237e22d0b3b09d2e17e389a6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 15 Feb 2021 07:36:38 +0000
Subject: [PATCH 0138/2327] build(deps): bump sphinx from 3.4.0 to 3.5.0
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/3.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v3.4.0...v3.5.0)
Signed-off-by: dependabot-preview[bot]
---
docs-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs-requirements.txt b/docs-requirements.txt
index 41a2048e90..2326b63899 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx==3.4.0
+sphinx==3.5.0
sphinx-rtd-theme
sphinx-autodoc-typehints[type_comments]>=1.8.0
typing-extensions
From fb9a0cf83a614784d6fb2bcdf7bd4e8a51fe9870 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 15 Feb 2021 07:45:21 +0000
Subject: [PATCH 0139/2327] build(deps): bump checkouts/data-schemas from
`76c6870` to `71cd4c1`
Bumps [checkouts/data-schemas](https://github.com/getsentry/sentry-data-schemas) from `76c6870` to `71cd4c1`.
- [Release notes](https://github.com/getsentry/sentry-data-schemas/releases)
- [Commits](https://github.com/getsentry/sentry-data-schemas/compare/76c6870d4b81e9c7a3a983cf4f591aeecb579521...71cd4c1713ef350b7a1ae1819d79ad21fee6eb7e)
Signed-off-by: dependabot-preview[bot]
---
checkouts/data-schemas | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/checkouts/data-schemas b/checkouts/data-schemas
index 76c6870d4b..71cd4c1713 160000
--- a/checkouts/data-schemas
+++ b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit 76c6870d4b81e9c7a3a983cf4f591aeecb579521
+Subproject commit 71cd4c1713ef350b7a1ae1819d79ad21fee6eb7e
From e8dbf36ab0abaa9b07d58857d04ccd5dd67ffedf Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Mon, 15 Feb 2021 13:43:53 +0100
Subject: [PATCH 0140/2327] Added changelog entry for 0.20.2 (#1023)
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93a7c9d872..fd06b22dd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,10 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 0.20.2
+
+- Fix incorrect regex in craft to include wheel file in pypi release
+
## 0.20.1
- Fix for error that occurs with Async Middlewares when the middleware is a function rather than a class
From a65d5e91ea1f6b500fadbe1fa6ce0d0f231650c9 Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Mon, 15 Feb 2021 12:45:54 +0000
Subject: [PATCH 0141/2327] release: 0.20.2
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index de771604d0..ffa6afbdd6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.20.1"
+release = "0.20.2"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 9f39d1817b..26ef19c454 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -99,7 +99,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.20.1"
+VERSION = "0.20.2"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 8eaa9f1bb4..e6bbe72284 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="0.20.1",
+ version="0.20.2",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 25125b5a924b71333c3e0abaa72bebb59e5ff13b Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Wed, 17 Feb 2021 13:37:59 +0100
Subject: [PATCH 0142/2327] feat(serverless): Python Serverless nocode
instrumentation (#1004)
* Moved logic from aws_lambda.py to aws_lambda.__init__
* Added init function that revokes original handler
* Added documentation
* fix: Formatting
* Added test definition for serverless no code instrumentation
* TODO comments
* Refactored AWSLambda Layer script and fixed missing dir bug
* Removed redunant line
* Organized import
* Moved build-aws-layer script to integrations/aws_lambda
* Added check if path fails
* Renamed script to have underscore rather than dashes
* Fixed naming change for calling script
* Tests to ensure lambda check does not fail existing tests
* Added dest abs path as an arg
* Testing init script
* Modifying tests to accomodate addtion of layer
* Added test that ensures serverless auto instrumentation works as expected
* Removed redundant test arg from sentry_sdk init in serverless init
* Removed redundant todo statement
* Refactored layer and function creation into its own function
* Linting fixes
* Linting fixes
* Moved scripts from within sdk to scripts dir
* Updated documentation
* Pinned dependency to fix CI issue
Co-authored-by: sentry-bot
---
Makefile | 2 +-
scripts/build-awslambda-layer.py | 77 ---------------
scripts/build_awslambda_layer.py | 115 ++++++++++++++++++++++
scripts/init_serverless_sdk.py | 37 +++++++
tests/integrations/aws_lambda/client.py | 111 +++++++++++++++------
tests/integrations/aws_lambda/test_aws.py | 40 +++++++-
tox.ini | 1 +
7 files changed, 276 insertions(+), 107 deletions(-)
delete mode 100644 scripts/build-awslambda-layer.py
create mode 100644 scripts/build_awslambda_layer.py
create mode 100644 scripts/init_serverless_sdk.py
diff --git a/Makefile b/Makefile
index 3db2d9318b..577dd58740 100644
--- a/Makefile
+++ b/Makefile
@@ -63,5 +63,5 @@ apidocs-hotfix: apidocs
aws-lambda-layer-build: dist
$(VENV_PATH)/bin/pip install urllib3
$(VENV_PATH)/bin/pip install certifi
- $(VENV_PATH)/bin/python -m scripts.build-awslambda-layer
+ $(VENV_PATH)/bin/python -m scripts.build_awslambda_layer
.PHONY: aws-lambda-layer-build
diff --git a/scripts/build-awslambda-layer.py b/scripts/build-awslambda-layer.py
deleted file mode 100644
index d76d70d890..0000000000
--- a/scripts/build-awslambda-layer.py
+++ /dev/null
@@ -1,77 +0,0 @@
-import os
-import subprocess
-import tempfile
-import shutil
-from sentry_sdk.consts import VERSION as SDK_VERSION
-
-
-DIST_REL_PATH = "dist"
-DEST_ABS_PATH = os.path.abspath(
- os.path.join(os.path.dirname(__file__), "..", DIST_REL_PATH)
-)
-DEST_ZIP_FILENAME = f"sentry-python-serverless-{SDK_VERSION}.zip"
-WHEELS_FILEPATH = os.path.join(
- DIST_REL_PATH, f"sentry_sdk-{SDK_VERSION}-py2.py3-none-any.whl"
-)
-
-# Top directory in the ZIP file. Placing the Sentry package in `/python` avoids
-# creating a directory for a specific version. For more information, see
-# https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html#configuration-layers-path
-PACKAGE_PARENT_DIRECTORY = "python"
-
-
-class PackageBuilder:
- def __init__(self, base_dir) -> None:
- self.base_dir = base_dir
- self.packages_dir = self.get_relative_path_of(PACKAGE_PARENT_DIRECTORY)
-
- def make_directories(self):
- os.makedirs(self.packages_dir)
-
- def install_python_binaries(self):
- subprocess.run(
- [
- "pip",
- "install",
- "--no-cache-dir", # Disables the cache -> always accesses PyPI
- "-q", # Quiet
- WHEELS_FILEPATH, # Copied to the target directory before installation
- "-t", # Target directory flag
- self.packages_dir,
- ],
- check=True,
- )
-
- def zip(self, filename):
- subprocess.run(
- [
- "zip",
- "-q", # Quiet
- "-x", # Exclude files
- "**/__pycache__/*", # Files to be excluded
- "-r", # Recurse paths
- filename, # Output filename
- PACKAGE_PARENT_DIRECTORY, # Files to be zipped
- ],
- cwd=self.base_dir,
- check=True, # Raises CalledProcessError if exit status is non-zero
- )
-
- def get_relative_path_of(self, subfile):
- return os.path.join(self.base_dir, subfile)
-
-
-def build_packaged_zip():
- with tempfile.TemporaryDirectory() as tmp_dir:
- package_builder = PackageBuilder(tmp_dir)
- package_builder.make_directories()
- package_builder.install_python_binaries()
- package_builder.zip(DEST_ZIP_FILENAME)
- if not os.path.exists(DIST_REL_PATH):
- os.makedirs(DIST_REL_PATH)
- shutil.copy(
- package_builder.get_relative_path_of(DEST_ZIP_FILENAME), DEST_ABS_PATH
- )
-
-
-build_packaged_zip()
diff --git a/scripts/build_awslambda_layer.py b/scripts/build_awslambda_layer.py
new file mode 100644
index 0000000000..ae0ee185cc
--- /dev/null
+++ b/scripts/build_awslambda_layer.py
@@ -0,0 +1,115 @@
+import os
+import subprocess
+import tempfile
+import shutil
+
+from sentry_sdk.consts import VERSION as SDK_VERSION
+from sentry_sdk._types import MYPY
+
+if MYPY:
+ from typing import Union
+
+
+class PackageBuilder:
+ def __init__(
+ self,
+ base_dir, # type: str
+ pkg_parent_dir, # type: str
+ dist_rel_path, # type: str
+ ):
+ # type: (...) -> None
+ self.base_dir = base_dir
+ self.pkg_parent_dir = pkg_parent_dir
+ self.dist_rel_path = dist_rel_path
+ self.packages_dir = self.get_relative_path_of(pkg_parent_dir)
+
+ def make_directories(self):
+ # type: (...) -> None
+ os.makedirs(self.packages_dir)
+
+ def install_python_binaries(self):
+ # type: (...) -> None
+ wheels_filepath = os.path.join(
+ self.dist_rel_path, f"sentry_sdk-{SDK_VERSION}-py2.py3-none-any.whl"
+ )
+ subprocess.run(
+ [
+ "pip",
+ "install",
+ "--no-cache-dir", # Disables the cache -> always accesses PyPI
+ "-q", # Quiet
+ wheels_filepath, # Copied to the target directory before installation
+ "-t", # Target directory flag
+ self.packages_dir,
+ ],
+ check=True,
+ )
+
+ def create_init_serverless_sdk_package(self):
+ # type: (...) -> None
+ """
+ Method that creates the init_serverless_sdk pkg in the
+ sentry-python-serverless zip
+ """
+ serverless_sdk_path = f'{self.packages_dir}/sentry_sdk/' \
+ f'integrations/init_serverless_sdk'
+ if not os.path.exists(serverless_sdk_path):
+ os.makedirs(serverless_sdk_path)
+ shutil.copy('scripts/init_serverless_sdk.py',
+ f'{serverless_sdk_path}/__init__.py')
+
+ def zip(
+ self, filename # type: str
+ ):
+ # type: (...) -> None
+ subprocess.run(
+ [
+ "zip",
+ "-q", # Quiet
+ "-x", # Exclude files
+ "**/__pycache__/*", # Files to be excluded
+ "-r", # Recurse paths
+ filename, # Output filename
+ self.pkg_parent_dir, # Files to be zipped
+ ],
+ cwd=self.base_dir,
+ check=True, # Raises CalledProcessError if exit status is non-zero
+ )
+
+ def get_relative_path_of(
+ self, subfile # type: str
+ ):
+ # type: (...) -> str
+ return os.path.join(self.base_dir, subfile)
+
+
+# Ref to `pkg_parent_dir` Top directory in the ZIP file.
+# Placing the Sentry package in `/python` avoids
+# creating a directory for a specific version. For more information, see
+# https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html#configuration-layers-path
+def build_packaged_zip(
+ dist_rel_path="dist", # type: str
+ dest_zip_filename=f"sentry-python-serverless-{SDK_VERSION}.zip", # type: str
+ pkg_parent_dir="python", # type: str
+ dest_abs_path=None, # type: Union[str, None]
+):
+ # type: (...) -> None
+ if dest_abs_path is None:
+ dest_abs_path = os.path.abspath(
+ os.path.join(os.path.dirname(__file__), "..", dist_rel_path)
+ )
+ with tempfile.TemporaryDirectory() as tmp_dir:
+ package_builder = PackageBuilder(tmp_dir, pkg_parent_dir, dist_rel_path)
+ package_builder.make_directories()
+ package_builder.install_python_binaries()
+ package_builder.create_init_serverless_sdk_package()
+ package_builder.zip(dest_zip_filename)
+ if not os.path.exists(dist_rel_path):
+ os.makedirs(dist_rel_path)
+ shutil.copy(
+ package_builder.get_relative_path_of(dest_zip_filename), dest_abs_path
+ )
+
+
+if __name__ == "__main__":
+ build_packaged_zip()
diff --git a/scripts/init_serverless_sdk.py b/scripts/init_serverless_sdk.py
new file mode 100644
index 0000000000..13fd97a588
--- /dev/null
+++ b/scripts/init_serverless_sdk.py
@@ -0,0 +1,37 @@
+"""
+For manual instrumentation,
+The Handler function string of an aws lambda function should be added as an
+environment variable with a key of 'INITIAL_HANDLER' along with the 'DSN'
+Then the Handler function sstring should be replaced with
+'sentry_sdk.integrations.init_serverless_sdk.sentry_lambda_handler'
+"""
+import os
+
+import sentry_sdk
+from sentry_sdk._types import MYPY
+from sentry_sdk.integrations.aws_lambda import AwsLambdaIntegration
+
+if MYPY:
+ from typing import Any
+
+
+# Configure Sentry SDK
+sentry_sdk.init(
+ dsn=os.environ["DSN"],
+ integrations=[AwsLambdaIntegration(timeout_warning=True)],
+)
+
+
+def sentry_lambda_handler(event, context):
+ # type: (Any, Any) -> None
+ """
+ Handler function that invokes a lambda handler which path is defined in
+ environment vairables as "INITIAL_HANDLER"
+ """
+ try:
+ module_name, handler_name = os.environ["INITIAL_HANDLER"].rsplit(".", 1)
+ except ValueError:
+ raise ValueError("Incorrect AWS Handler path (Not a path)")
+ lambda_function = __import__(module_name)
+ lambda_handler = getattr(lambda_function, handler_name)
+ lambda_handler(event, context)
diff --git a/tests/integrations/aws_lambda/client.py b/tests/integrations/aws_lambda/client.py
index 17181c54ee..975766b3e6 100644
--- a/tests/integrations/aws_lambda/client.py
+++ b/tests/integrations/aws_lambda/client.py
@@ -17,6 +17,46 @@ def get_boto_client():
)
+def build_no_code_serverless_function_and_layer(
+ client, tmpdir, fn_name, runtime, timeout
+):
+ """
+ Util function that auto instruments the no code implementation of the python
+ sdk by creating a layer containing the Python-sdk, and then creating a func
+ that uses that layer
+ """
+ from scripts.build_awslambda_layer import (
+ build_packaged_zip,
+ )
+
+ build_packaged_zip(dest_abs_path=tmpdir, dest_zip_filename="serverless-ball.zip")
+
+ with open(os.path.join(tmpdir, "serverless-ball.zip"), "rb") as serverless_zip:
+ response = client.publish_layer_version(
+ LayerName="python-serverless-sdk-test",
+ Description="Created as part of testsuite for getsentry/sentry-python",
+ Content={"ZipFile": serverless_zip.read()},
+ )
+
+ with open(os.path.join(tmpdir, "ball.zip"), "rb") as zip:
+ client.create_function(
+ FunctionName=fn_name,
+ Runtime=runtime,
+ Timeout=timeout,
+ Environment={
+ "Variables": {
+ "INITIAL_HANDLER": "test_lambda.test_handler",
+ "DSN": "https://123abc@example.com/123",
+ }
+ },
+ Role=os.environ["SENTRY_PYTHON_TEST_AWS_IAM_ROLE"],
+ Handler="sentry_sdk.integrations.init_serverless_sdk.sentry_lambda_handler",
+ Layers=[response["LayerVersionArn"]],
+ Code={"ZipFile": zip.read()},
+ Description="Created as part of testsuite for getsentry/sentry-python",
+ )
+
+
def run_lambda_function(
client,
runtime,
@@ -25,6 +65,7 @@ def run_lambda_function(
add_finalizer,
syntax_check=True,
timeout=30,
+ layer=None,
subprocess_kwargs=(),
):
subprocess_kwargs = dict(subprocess_kwargs)
@@ -40,39 +81,53 @@ def run_lambda_function(
# such as chalice's)
subprocess.check_call([sys.executable, test_lambda_py])
- setup_cfg = os.path.join(tmpdir, "setup.cfg")
- with open(setup_cfg, "w") as f:
- f.write("[install]\nprefix=")
+ fn_name = "test_function_{}".format(uuid.uuid4())
- subprocess.check_call(
- [sys.executable, "setup.py", "sdist", "-d", os.path.join(tmpdir, "..")],
- **subprocess_kwargs
- )
+ if layer is None:
+ setup_cfg = os.path.join(tmpdir, "setup.cfg")
+ with open(setup_cfg, "w") as f:
+ f.write("[install]\nprefix=")
- subprocess.check_call(
- "pip install mock==3.0.0 funcsigs -t .",
- cwd=tmpdir,
- shell=True,
- **subprocess_kwargs
- )
+ subprocess.check_call(
+ [sys.executable, "setup.py", "sdist", "-d", os.path.join(tmpdir, "..")],
+ **subprocess_kwargs
+ )
- # https://docs.aws.amazon.com/lambda/latest/dg/lambda-python-how-to-create-deployment-package.html
- subprocess.check_call(
- "pip install ../*.tar.gz -t .", cwd=tmpdir, shell=True, **subprocess_kwargs
- )
- shutil.make_archive(os.path.join(tmpdir, "ball"), "zip", tmpdir)
+ subprocess.check_call(
+ "pip install mock==3.0.0 funcsigs -t .",
+ cwd=tmpdir,
+ shell=True,
+ **subprocess_kwargs
+ )
- fn_name = "test_function_{}".format(uuid.uuid4())
+ # https://docs.aws.amazon.com/lambda/latest/dg/lambda-python-how-to-create-deployment-package.html
+ subprocess.check_call(
+ "pip install ../*.tar.gz -t .",
+ cwd=tmpdir,
+ shell=True,
+ **subprocess_kwargs
+ )
- with open(os.path.join(tmpdir, "ball.zip"), "rb") as zip:
- client.create_function(
- FunctionName=fn_name,
- Runtime=runtime,
- Timeout=timeout,
- Role=os.environ["SENTRY_PYTHON_TEST_AWS_IAM_ROLE"],
- Handler="test_lambda.test_handler",
- Code={"ZipFile": zip.read()},
- Description="Created as part of testsuite for getsentry/sentry-python",
+ shutil.make_archive(os.path.join(tmpdir, "ball"), "zip", tmpdir)
+
+ with open(os.path.join(tmpdir, "ball.zip"), "rb") as zip:
+ client.create_function(
+ FunctionName=fn_name,
+ Runtime=runtime,
+ Timeout=timeout,
+ Role=os.environ["SENTRY_PYTHON_TEST_AWS_IAM_ROLE"],
+ Handler="test_lambda.test_handler",
+ Code={"ZipFile": zip.read()},
+ Description="Created as part of testsuite for getsentry/sentry-python",
+ )
+ else:
+ subprocess.run(
+ ["zip", "-q", "-x", "**/__pycache__/*", "-r", "ball.zip", "./"],
+ cwd=tmpdir,
+ check=True,
+ )
+ build_no_code_serverless_function_and_layer(
+ client, tmpdir, fn_name, runtime, timeout
)
@add_finalizer
diff --git a/tests/integrations/aws_lambda/test_aws.py b/tests/integrations/aws_lambda/test_aws.py
index 332e5e8ce2..36c212c08f 100644
--- a/tests/integrations/aws_lambda/test_aws.py
+++ b/tests/integrations/aws_lambda/test_aws.py
@@ -112,7 +112,7 @@ def lambda_runtime(request):
@pytest.fixture
def run_lambda_function(request, lambda_client, lambda_runtime):
- def inner(code, payload, timeout=30, syntax_check=True):
+ def inner(code, payload, timeout=30, syntax_check=True, layer=None):
from tests.integrations.aws_lambda.client import run_lambda_function
response = run_lambda_function(
@@ -123,6 +123,7 @@ def inner(code, payload, timeout=30, syntax_check=True):
add_finalizer=request.addfinalizer,
timeout=timeout,
syntax_check=syntax_check,
+ layer=layer,
)
# for better debugging
@@ -612,3 +613,40 @@ def test_handler(event, context):
)
assert response["Payload"]["AssertionError raised"] is False
+
+
+def test_serverless_no_code_instrumentation(run_lambda_function):
+ """
+ Test that ensures that just by adding a lambda layer containing the
+ python sdk, with no code changes sentry is able to capture errors
+ """
+
+ _, _, response = run_lambda_function(
+ dedent(
+ """
+ import sentry_sdk
+
+ def test_handler(event, context):
+ current_client = sentry_sdk.Hub.current.client
+
+ assert current_client is not None
+
+ assert len(current_client.options['integrations']) == 1
+ assert isinstance(current_client.options['integrations'][0],
+ sentry_sdk.integrations.aws_lambda.AwsLambdaIntegration)
+
+ raise Exception("something went wrong")
+ """
+ ),
+ b'{"foo": "bar"}',
+ layer=True,
+ )
+ assert response["FunctionError"] == "Unhandled"
+ assert response["StatusCode"] == 200
+
+ assert response["Payload"]["errorType"] != "AssertionError"
+
+ assert response["Payload"]["errorType"] == "Exception"
+ assert response["Payload"]["errorMessage"] == "something went wrong"
+
+ assert "sentry_handler" in response["LogResult"][3].decode("utf-8")
diff --git a/tox.ini b/tox.ini
index a1bb57e586..ee9a859a16 100644
--- a/tox.ini
+++ b/tox.ini
@@ -141,6 +141,7 @@ deps =
sanic: aiohttp
py3.5-sanic: ujson<4
+ py2.7-beam: rsa<=4.0
beam-2.12: apache-beam>=2.12.0, <2.13.0
beam-2.13: apache-beam>=2.13.0, <2.14.0
beam-master: git+https://github.com/apache/beam#egg=apache-beam&subdirectory=sdks/python
From 3be779a1a3b8e5ce3398c6b5fec29bd0b611fef8 Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Thu, 18 Feb 2021 14:00:22 +0100
Subject: [PATCH 0143/2327] Fix(serverless): Add "SENTRY_" prefix to env
variables in serverless init script + added traces_sample_rate (#1025)
* Added SENTRY_ prefix to serverless env variables and added traces sample rate env variable
* Linting reformat
---
scripts/init_serverless_sdk.py | 9 +++++----
tests/integrations/aws_lambda/client.py | 5 +++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/scripts/init_serverless_sdk.py b/scripts/init_serverless_sdk.py
index 13fd97a588..42107e4c27 100644
--- a/scripts/init_serverless_sdk.py
+++ b/scripts/init_serverless_sdk.py
@@ -1,7 +1,7 @@
"""
For manual instrumentation,
The Handler function string of an aws lambda function should be added as an
-environment variable with a key of 'INITIAL_HANDLER' along with the 'DSN'
+environment variable with a key of 'SENTRY_INITIAL_HANDLER' along with the 'DSN'
Then the Handler function sstring should be replaced with
'sentry_sdk.integrations.init_serverless_sdk.sentry_lambda_handler'
"""
@@ -17,8 +17,9 @@
# Configure Sentry SDK
sentry_sdk.init(
- dsn=os.environ["DSN"],
+ dsn=os.environ["SENTRY_DSN"],
integrations=[AwsLambdaIntegration(timeout_warning=True)],
+ traces_sample_rate=float(os.environ["SENTRY_TRACES_SAMPLE_RATE"])
)
@@ -26,10 +27,10 @@ def sentry_lambda_handler(event, context):
# type: (Any, Any) -> None
"""
Handler function that invokes a lambda handler which path is defined in
- environment vairables as "INITIAL_HANDLER"
+ environment vairables as "SENTRY_INITIAL_HANDLER"
"""
try:
- module_name, handler_name = os.environ["INITIAL_HANDLER"].rsplit(".", 1)
+ module_name, handler_name = os.environ["SENTRY_INITIAL_HANDLER"].rsplit(".", 1)
except ValueError:
raise ValueError("Incorrect AWS Handler path (Not a path)")
lambda_function = __import__(module_name)
diff --git a/tests/integrations/aws_lambda/client.py b/tests/integrations/aws_lambda/client.py
index 975766b3e6..8273b281c3 100644
--- a/tests/integrations/aws_lambda/client.py
+++ b/tests/integrations/aws_lambda/client.py
@@ -45,8 +45,9 @@ def build_no_code_serverless_function_and_layer(
Timeout=timeout,
Environment={
"Variables": {
- "INITIAL_HANDLER": "test_lambda.test_handler",
- "DSN": "https://123abc@example.com/123",
+ "SENTRY_INITIAL_HANDLER": "test_lambda.test_handler",
+ "SENTRY_DSN": "https://123abc@example.com/123",
+ "SENTRY_TRACES_SAMPLE_RATE": "1.0",
}
},
Role=os.environ["SENTRY_PYTHON_TEST_AWS_IAM_ROLE"],
From 8ae33b70989d2164de624e13cfbc164682df3e12 Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Thu, 18 Feb 2021 15:16:46 +0100
Subject: [PATCH 0144/2327] Added changes for release 0.20.3 (#1026)
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd06b22dd1..8ff74079bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,10 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 0.20.3
+
+- Added scripts to support auto instrumentation of no code AWS lambda Python functions
+
## 0.20.2
- Fix incorrect regex in craft to include wheel file in pypi release
From 6870ba1050b58321a58373c63ab2650fc8f17c06 Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Thu, 18 Feb 2021 14:19:20 +0000
Subject: [PATCH 0145/2327] release: 0.20.3
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index ffa6afbdd6..02f252108b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.20.2"
+release = "0.20.3"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 26ef19c454..b5578ee361 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -99,7 +99,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.20.2"
+VERSION = "0.20.3"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index e6bbe72284..495962fe89 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="0.20.2",
+ version="0.20.3",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From f2a3ad14b2fe4723282e1541caa13f9edbcccdab Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 22 Feb 2021 07:27:14 +0000
Subject: [PATCH 0146/2327] build(deps): bump sphinx from 3.5.0 to 3.5.1
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/3.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v3.5.0...v3.5.1)
Signed-off-by: dependabot-preview[bot]
---
docs-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs-requirements.txt b/docs-requirements.txt
index 2326b63899..55ca4e056b 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx==3.5.0
+sphinx==3.5.1
sphinx-rtd-theme
sphinx-autodoc-typehints[type_comments]>=1.8.0
typing-extensions
From 37105d981fb116c60df2ea3d1e58a87b9c65fc21 Mon Sep 17 00:00:00 2001
From: OutOfFocus4 <50265209+OutOfFocus4@users.noreply.github.com>
Date: Mon, 22 Feb 2021 05:56:36 -0500
Subject: [PATCH 0147/2327] Use path_info instead of path (#1029)
---
sentry_sdk/integrations/django/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index 3ef21a55ca..2b571f5e11 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -330,7 +330,7 @@ def _before_get_response(request):
resolve(request.path).func
)
elif integration.transaction_style == "url":
- scope.transaction = LEGACY_RESOLVER.resolve(request.path)
+ scope.transaction = LEGACY_RESOLVER.resolve(request.path_info)
except Exception:
pass
From 1279eeca6763e119d97da5da8318f48a04d3adef Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Mon, 22 Feb 2021 15:40:46 +0100
Subject: [PATCH 0148/2327] feat(release-health): Enable session tracking by
default (#994)
* Auto enabled auto session tracking
* Moved auto_session_tracking outof expeirmental features and added it by default
* fix: Formatting
* Fixed type error
* Removed auto_session_tracking from from Experiment type
* Removed redundant default
* Auto detection of session mode when auto_session_tracking is enabled
* fix: Formatting
* Added test that ensures session mode is flips from applicatoin to request in WSGI handler
* New line at end of file
* Linting fixes
* Added default for session_mode in auto_session_tracking
* Added defaults to session_mode to Session class
* Fixed failing test due to changes in WSGI handler tracking requests:
* Reordered param to the end
* fix: Formatting
* Modified flask test to match request mode sessions
* Removed redundant typing Union
Co-authored-by: sentry-bot
---
sentry_sdk/client.py | 8 ++---
sentry_sdk/consts.py | 2 +-
sentry_sdk/hub.py | 5 ++-
sentry_sdk/integrations/wsgi.py | 2 +-
sentry_sdk/session.py | 2 ++
sentry_sdk/sessions.py | 14 ++++-----
tests/integrations/flask/test_flask.py | 14 +++------
tests/integrations/wsgi/test_wsgi.py | 35 +++++++++++++++++++++
tests/test_sessions.py | 42 +++++++++++++++++++++++---
9 files changed, 94 insertions(+), 30 deletions(-)
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 7368b1055a..7687baa76f 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -105,12 +105,8 @@ def _capture_envelope(envelope):
try:
_client_init_debug.set(self.options["debug"])
self.transport = make_transport(self.options)
- session_mode = self.options["_experiments"].get(
- "session_mode", "application"
- )
- self.session_flusher = SessionFlusher(
- capture_func=_capture_envelope, session_mode=session_mode
- )
+
+ self.session_flusher = SessionFlusher(capture_func=_capture_envelope)
request_bodies = ("always", "never", "small", "medium")
if self.options["request_bodies"] not in request_bodies:
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index b5578ee361..c18f249fc1 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -31,7 +31,6 @@
{
"max_spans": Optional[int],
"record_sql_params": Optional[bool],
- "auto_session_tracking": Optional[bool],
"smart_transaction_trimming": Optional[bool],
},
total=False,
@@ -75,6 +74,7 @@ def __init__(
traces_sample_rate=None, # type: Optional[float]
traces_sampler=None, # type: Optional[TracesSampler]
auto_enabling_integrations=True, # type: bool
+ auto_session_tracking=True, # type: bool
_experiments={}, # type: Experiments # noqa: B006
):
# type: (...) -> None
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
index 8afa4938a2..2e378cb56d 100644
--- a/sentry_sdk/hub.py
+++ b/sentry_sdk/hub.py
@@ -623,7 +623,9 @@ def inner():
return inner()
- def start_session(self):
+ def start_session(
+ self, session_mode="application" # type: str
+ ):
# type: (...) -> None
"""Starts a new session."""
self.end_session()
@@ -632,6 +634,7 @@ def start_session(self):
release=client.options["release"] if client else None,
environment=client.options["environment"] if client else None,
user=scope._user,
+ session_mode=session_mode,
)
def end_session(self):
diff --git a/sentry_sdk/integrations/wsgi.py b/sentry_sdk/integrations/wsgi.py
index 13b960a713..2f63298ffa 100644
--- a/sentry_sdk/integrations/wsgi.py
+++ b/sentry_sdk/integrations/wsgi.py
@@ -103,7 +103,7 @@ def __call__(self, environ, start_response):
_wsgi_middleware_applied.set(True)
try:
hub = Hub(Hub.current)
- with auto_session_tracking(hub):
+ with auto_session_tracking(hub, session_mode="request"):
with hub:
with capture_internal_exceptions():
with hub.configure_scope() as scope:
diff --git a/sentry_sdk/session.py b/sentry_sdk/session.py
index d22c0e70be..98a8c72cbb 100644
--- a/sentry_sdk/session.py
+++ b/sentry_sdk/session.py
@@ -42,6 +42,7 @@ def __init__(
ip_address=None, # type: Optional[str]
errors=None, # type: Optional[int]
user=None, # type: Optional[Any]
+ session_mode="application", # type: str
):
# type: (...) -> None
if sid is None:
@@ -58,6 +59,7 @@ def __init__(
self.duration = None # type: Optional[float]
self.user_agent = None # type: Optional[str]
self.ip_address = None # type: Optional[str]
+ self.session_mode = session_mode # type: str
self.errors = 0
self.update(
diff --git a/sentry_sdk/sessions.py b/sentry_sdk/sessions.py
index a8321685d0..06ad880d0f 100644
--- a/sentry_sdk/sessions.py
+++ b/sentry_sdk/sessions.py
@@ -25,20 +25,20 @@ def is_auto_session_tracking_enabled(hub=None):
hub = sentry_sdk.Hub.current
should_track = hub.scope._force_auto_session_tracking
if should_track is None:
- exp = hub.client.options["_experiments"] if hub.client else {}
- should_track = exp.get("auto_session_tracking")
+ client_options = hub.client.options if hub.client else {}
+ should_track = client_options["auto_session_tracking"]
return should_track
@contextmanager
-def auto_session_tracking(hub=None):
- # type: (Optional[sentry_sdk.Hub]) -> Generator[None, None, None]
+def auto_session_tracking(hub=None, session_mode="application"):
+ # type: (Optional[sentry_sdk.Hub], str) -> Generator[None, None, None]
"""Starts and stops a session automatically around a block."""
if hub is None:
hub = sentry_sdk.Hub.current
should_track = is_auto_session_tracking_enabled(hub)
if should_track:
- hub.start_session()
+ hub.start_session(session_mode=session_mode)
try:
yield
finally:
@@ -59,12 +59,10 @@ class SessionFlusher(object):
def __init__(
self,
capture_func, # type: Callable[[Envelope], None]
- session_mode, # type: str
flush_interval=60, # type: int
):
# type: (...) -> None
self.capture_func = capture_func
- self.session_mode = session_mode
self.flush_interval = flush_interval
self.pending_sessions = [] # type: List[Any]
self.pending_aggregates = {} # type: Dict[Any, Any]
@@ -158,7 +156,7 @@ def add_session(
self, session # type: Session
):
# type: (...) -> None
- if self.session_mode == "request":
+ if session.session_mode == "request":
self.add_aggregate_session(session)
else:
self.pending_sessions.append(session.to_json())
diff --git a/tests/integrations/flask/test_flask.py b/tests/integrations/flask/test_flask.py
index 4d49015811..d155e74a98 100644
--- a/tests/integrations/flask/test_flask.py
+++ b/tests/integrations/flask/test_flask.py
@@ -247,9 +247,6 @@ def test_flask_session_tracking(sentry_init, capture_envelopes, app):
sentry_init(
integrations=[flask_sentry.FlaskIntegration()],
release="demo-release",
- _experiments=dict(
- auto_session_tracking=True,
- ),
)
@app.route("/")
@@ -276,16 +273,15 @@ def index():
first_event = first_event.get_event()
error_event = error_event.get_event()
session = session.items[0].payload.json
+ aggregates = session["aggregates"]
assert first_event["exception"]["values"][0]["type"] == "ValueError"
assert error_event["exception"]["values"][0]["type"] == "ZeroDivisionError"
- assert session["status"] == "crashed"
- assert session["did"] == "42"
- assert session["errors"] == 2
- assert session["init"]
+
+ assert len(aggregates) == 1
+ assert aggregates[0]["crashed"] == 1
+ assert aggregates[0]["started"]
assert session["attrs"]["release"] == "demo-release"
- assert session["attrs"]["ip_address"] == "1.2.3.4"
- assert session["attrs"]["user_agent"] == "blafasel/1.0"
@pytest.mark.parametrize("data", [{}, []], ids=["empty-dict", "empty-list"])
diff --git a/tests/integrations/wsgi/test_wsgi.py b/tests/integrations/wsgi/test_wsgi.py
index 1f9613997a..010d0688a8 100644
--- a/tests/integrations/wsgi/test_wsgi.py
+++ b/tests/integrations/wsgi/test_wsgi.py
@@ -1,6 +1,7 @@
from werkzeug.test import Client
import pytest
+import sentry_sdk
from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
try:
@@ -201,3 +202,37 @@ def app(environ, start_response):
}
)
)
+
+
+def test_session_mode_defaults_to_request_mode_in_wsgi_handler(
+ capture_envelopes, sentry_init
+):
+ """
+ Test that ensures that even though the default `session_mode` for
+ auto_session_tracking is `application`, that flips to `request` when we are
+ in the WSGI handler
+ """
+
+ def app(environ, start_response):
+ start_response("200 OK", [])
+ return ["Go get the ball! Good dog!"]
+
+ traces_sampler = mock.Mock(return_value=True)
+ sentry_init(send_default_pii=True, traces_sampler=traces_sampler)
+
+ app = SentryWsgiMiddleware(app)
+ envelopes = capture_envelopes()
+
+ client = Client(app)
+
+ client.get("/dogs/are/great/")
+
+ sentry_sdk.flush()
+
+ sess = envelopes[1]
+ assert len(sess.items) == 1
+ sess_event = sess.items[0].payload.json
+
+ aggregates = sess_event["aggregates"]
+ assert len(aggregates) == 1
+ assert aggregates[0]["exited"] == 1
diff --git a/tests/test_sessions.py b/tests/test_sessions.py
index 6c84f029dd..09b42b70a4 100644
--- a/tests/test_sessions.py
+++ b/tests/test_sessions.py
@@ -47,13 +47,12 @@ def test_aggregates(sentry_init, capture_envelopes):
sentry_init(
release="fun-release",
environment="not-fun-env",
- _experiments={"auto_session_tracking": True, "session_mode": "request"},
)
envelopes = capture_envelopes()
hub = Hub.current
- with auto_session_tracking():
+ with auto_session_tracking(session_mode="request"):
with sentry_sdk.push_scope():
try:
with sentry_sdk.configure_scope() as scope:
@@ -62,10 +61,10 @@ def test_aggregates(sentry_init, capture_envelopes):
except Exception:
sentry_sdk.capture_exception()
- with auto_session_tracking():
+ with auto_session_tracking(session_mode="request"):
pass
- hub.start_session()
+ hub.start_session(session_mode="request")
hub.end_session()
sentry_sdk.flush()
@@ -85,3 +84,38 @@ def test_aggregates(sentry_init, capture_envelopes):
assert len(aggregates) == 1
assert aggregates[0]["exited"] == 2
assert aggregates[0]["errored"] == 1
+
+
+def test_aggregates_explicitly_disabled_session_tracking_request_mode(
+ sentry_init, capture_envelopes
+):
+ sentry_init(
+ release="fun-release", environment="not-fun-env", auto_session_tracking=False
+ )
+ envelopes = capture_envelopes()
+
+ hub = Hub.current
+
+ with auto_session_tracking(session_mode="request"):
+ with sentry_sdk.push_scope():
+ try:
+ raise Exception("all is wrong")
+ except Exception:
+ sentry_sdk.capture_exception()
+
+ with auto_session_tracking(session_mode="request"):
+ pass
+
+ hub.start_session(session_mode="request")
+ hub.end_session()
+
+ sentry_sdk.flush()
+
+ sess = envelopes[1]
+ assert len(sess.items) == 1
+ sess_event = sess.items[0].payload.json
+
+ aggregates = sorted_aggregates(sess_event)
+ assert len(aggregates) == 1
+ assert aggregates[0]["exited"] == 1
+ assert "errored" not in aggregates[0]
From 51987c57157102bbd32e1e7b084c26f4dc475d86 Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Fri, 26 Feb 2021 18:17:36 -0800
Subject: [PATCH 0149/2327] fix(tracing): Get HTTP headers from span rather
than transaction if possible (#1035)
---
sentry_sdk/hub.py | 18 +++++----
sentry_sdk/integrations/celery.py | 4 +-
sentry_sdk/integrations/stdlib.py | 15 +++++---
tests/conftest.py | 10 ++++-
tests/integrations/stdlib/test_httplib.py | 39 +++++++++++++++++++-
tests/integrations/stdlib/test_subprocess.py | 7 +---
tests/tracing/test_integration_tests.py | 2 +-
7 files changed, 71 insertions(+), 24 deletions(-)
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
index 2e378cb56d..1bffd1a0db 100644
--- a/sentry_sdk/hub.py
+++ b/sentry_sdk/hub.py
@@ -682,15 +682,19 @@ def flush(
if client is not None:
return client.flush(timeout=timeout, callback=callback)
- def iter_trace_propagation_headers(self):
- # type: () -> Generator[Tuple[str, str], None, None]
- # TODO: Document
- client, scope = self._stack[-1]
- span = scope.span
-
- if span is None:
+ def iter_trace_propagation_headers(self, span=None):
+ # type: (Optional[Span]) -> Generator[Tuple[str, str], None, None]
+ """
+ Return HTTP headers which allow propagation of trace data. Data taken
+ from the span representing the request, if available, or the current
+ span on the scope if not.
+ """
+ span = span or self.scope.span
+ if not span:
return
+ client = self._stack[-1][0]
+
propagate_traces = client and client.options["propagate_traces"]
if not propagate_traces:
return
diff --git a/sentry_sdk/integrations/celery.py b/sentry_sdk/integrations/celery.py
index 49b572d795..9ba458a387 100644
--- a/sentry_sdk/integrations/celery.py
+++ b/sentry_sdk/integrations/celery.py
@@ -96,9 +96,9 @@ def apply_async(*args, **kwargs):
hub = Hub.current
integration = hub.get_integration(CeleryIntegration)
if integration is not None and integration.propagate_traces:
- with hub.start_span(op="celery.submit", description=args[0].name):
+ with hub.start_span(op="celery.submit", description=args[0].name) as span:
with capture_internal_exceptions():
- headers = dict(hub.iter_trace_propagation_headers())
+ headers = dict(hub.iter_trace_propagation_headers(span))
if headers:
# Note: kwargs can contain headers=None, so no setdefault!
diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py
index 56cece70ac..ac2ec103c7 100644
--- a/sentry_sdk/integrations/stdlib.py
+++ b/sentry_sdk/integrations/stdlib.py
@@ -85,7 +85,7 @@ def putrequest(self, method, url, *args, **kwargs):
rv = real_putrequest(self, method, url, *args, **kwargs)
- for key, value in hub.iter_trace_propagation_headers():
+ for key, value in hub.iter_trace_propagation_headers(span):
self.putheader(key, value)
self._sentrysdk_span = span
@@ -178,12 +178,15 @@ def sentry_patched_popen_init(self, *a, **kw):
env = None
- for k, v in hub.iter_trace_propagation_headers():
- if env is None:
- env = _init_argument(a, kw, "env", 10, lambda x: dict(x or os.environ))
- env["SUBPROCESS_" + k.upper().replace("-", "_")] = v
-
with hub.start_span(op="subprocess", description=description) as span:
+
+ for k, v in hub.iter_trace_propagation_headers(span):
+ if env is None:
+ env = _init_argument(
+ a, kw, "env", 10, lambda x: dict(x or os.environ)
+ )
+ env["SUBPROCESS_" + k.upper().replace("-", "_")] = v
+
if cwd:
span.set_data("subprocess.cwd", cwd)
diff --git a/tests/conftest.py b/tests/conftest.py
index 6bef63e5ab..1df4416f7f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -368,15 +368,21 @@ def __init__(self, substring):
self.substring = substring
try:
- # unicode only exists in python 2
+ # the `unicode` type only exists in python 2, so if this blows up,
+ # we must be in py3 and have the `bytes` type
self.valid_types = (str, unicode) # noqa
except NameError:
- self.valid_types = (str,)
+ self.valid_types = (str, bytes)
def __eq__(self, test_string):
if not isinstance(test_string, self.valid_types):
return False
+ # this is safe even in py2 because as of 2.6, `bytes` exists in py2
+ # as an alias for `str`
+ if isinstance(test_string, bytes):
+ test_string = test_string.decode()
+
if len(self.substring) > len(test_string):
return False
diff --git a/tests/integrations/stdlib/test_httplib.py b/tests/integrations/stdlib/test_httplib.py
index ed062761bb..cffe00b074 100644
--- a/tests/integrations/stdlib/test_httplib.py
+++ b/tests/integrations/stdlib/test_httplib.py
@@ -17,7 +17,12 @@
# py3
from http.client import HTTPSConnection
-from sentry_sdk import capture_message
+try:
+ from unittest import mock # python 3.3 and above
+except ImportError:
+ import mock # python < 3.3
+
+from sentry_sdk import capture_message, start_transaction
from sentry_sdk.integrations.stdlib import StdlibIntegration
@@ -110,3 +115,35 @@ def test_httplib_misuse(sentry_init, capture_events):
"status_code": 200,
"reason": "OK",
}
+
+
+def test_outgoing_trace_headers(
+ sentry_init, monkeypatch, StringContaining # noqa: N803
+):
+ # HTTPSConnection.send is passed a string containing (among other things)
+ # the headers on the request. Mock it so we can check the headers, and also
+ # so it doesn't try to actually talk to the internet.
+ mock_send = mock.Mock()
+ monkeypatch.setattr(HTTPSConnection, "send", mock_send)
+
+ sentry_init(traces_sample_rate=1.0)
+
+ with start_transaction(
+ name="/interactions/other-dogs/new-dog",
+ op="greeting.sniff",
+ trace_id="12312012123120121231201212312012",
+ ) as transaction:
+
+ HTTPSConnection("www.squirrelchasers.com").request("GET", "/top-chasers")
+
+ request_span = transaction._span_recorder.spans[-1]
+
+ expected_sentry_trace = (
+ "sentry-trace: {trace_id}-{parent_span_id}-{sampled}".format(
+ trace_id=transaction.trace_id,
+ parent_span_id=request_span.span_id,
+ sampled=1,
+ )
+ )
+
+ mock_send.assert_called_with(StringContaining(expected_sentry_trace))
diff --git a/tests/integrations/stdlib/test_subprocess.py b/tests/integrations/stdlib/test_subprocess.py
index 7605488155..31da043ac3 100644
--- a/tests/integrations/stdlib/test_subprocess.py
+++ b/tests/integrations/stdlib/test_subprocess.py
@@ -183,9 +183,6 @@ def test_subprocess_invalid_args(sentry_init):
sentry_init(integrations=[StdlibIntegration()])
with pytest.raises(TypeError) as excinfo:
- subprocess.Popen()
+ subprocess.Popen(1)
- if PY2:
- assert "__init__() takes at least 2 arguments (1 given)" in str(excinfo.value)
- else:
- assert "missing 1 required positional argument: 'args" in str(excinfo.value)
+ assert "'int' object is not iterable" in str(excinfo.value)
diff --git a/tests/tracing/test_integration_tests.py b/tests/tracing/test_integration_tests.py
index c4c316be96..b2ce2e3a18 100644
--- a/tests/tracing/test_integration_tests.py
+++ b/tests/tracing/test_integration_tests.py
@@ -58,7 +58,7 @@ def test_continue_from_headers(sentry_init, capture_events, sampled, sample_rate
with start_transaction(name="hi", sampled=True if sample_rate == 0 else None):
with start_span() as old_span:
old_span.sampled = sampled
- headers = dict(Hub.current.iter_trace_propagation_headers())
+ headers = dict(Hub.current.iter_trace_propagation_headers(old_span))
# test that the sampling decision is getting encoded in the header correctly
header = headers["sentry-trace"]
From ed7d722fdd086a1044d44bc28f2d29a91d87d8ca Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Tue, 2 Mar 2021 09:28:51 +0100
Subject: [PATCH 0150/2327] bug(flask): Transactions missing body (#1034)
* Add test that ensreus transaction includes body data even if no exception was raised
* Removed weakref to request that was being gc before it was passed to event_processor
* fix: Formatting
* Linting fixes
Co-authored-by: sentry-bot
---
sentry_sdk/integrations/flask.py | 11 +++------
tests/integrations/flask/test_flask.py | 33 ++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py
index 2d0883ab8a..f1856ed515 100644
--- a/sentry_sdk/integrations/flask.py
+++ b/sentry_sdk/integrations/flask.py
@@ -1,7 +1,5 @@
from __future__ import absolute_import
-import weakref
-
from sentry_sdk.hub import Hub, _should_send_default_pii
from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
from sentry_sdk.integrations import Integration, DidNotEnable
@@ -113,10 +111,7 @@ def _request_started(sender, **kwargs):
except Exception:
pass
- weak_request = weakref.ref(request)
- evt_processor = _make_request_event_processor(
- app, weak_request, integration # type: ignore
- )
+ evt_processor = _make_request_event_processor(app, request, integration)
scope.add_event_processor(evt_processor)
@@ -157,11 +152,11 @@ def size_of_file(self, file):
return file.content_length
-def _make_request_event_processor(app, weak_request, integration):
+def _make_request_event_processor(app, request, integration):
# type: (Flask, Callable[[], Request], FlaskIntegration) -> EventProcessor
+
def inner(event, hint):
# type: (Dict[str, Any], Dict[str, Any]) -> Dict[str, Any]
- request = weak_request()
# if the request is gone we are fine not logging the data from
# it. This might happen if the processor is pushed away to
diff --git a/tests/integrations/flask/test_flask.py b/tests/integrations/flask/test_flask.py
index d155e74a98..6c173e223d 100644
--- a/tests/integrations/flask/test_flask.py
+++ b/tests/integrations/flask/test_flask.py
@@ -332,6 +332,39 @@ def index():
assert len(event["request"]["data"]["foo"]) == 512
+def test_flask_formdata_request_appear_transaction_body(
+ sentry_init, capture_events, app
+):
+ """
+ Test that ensures that transaction request data contains body, even if no exception was raised
+ """
+ sentry_init(integrations=[flask_sentry.FlaskIntegration()], traces_sample_rate=1.0)
+
+ data = {"username": "sentry-user", "age": "26"}
+
+ @app.route("/", methods=["POST"])
+ def index():
+ assert request.form["username"] == data["username"]
+ assert request.form["age"] == data["age"]
+ assert not request.get_data()
+ assert not request.get_json()
+ set_tag("view", "yes")
+ capture_message("hi")
+ return "ok"
+
+ events = capture_events()
+
+ client = app.test_client()
+ response = client.post("/", data=data)
+ assert response.status_code == 200
+
+ event, transaction_event = events
+
+ assert "request" in transaction_event
+ assert "data" in transaction_event["request"]
+ assert transaction_event["request"]["data"] == data
+
+
@pytest.mark.parametrize("input_char", [u"a", b"a"])
def test_flask_too_large_raw_request(sentry_init, input_char, capture_events, app):
sentry_init(integrations=[flask_sentry.FlaskIntegration()], request_bodies="small")
From 3a0bd746390528b3e718b4fe491552865aad12c4 Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Tue, 2 Mar 2021 10:51:26 +0100
Subject: [PATCH 0151/2327] fix(django): Added SDK logic that honors the
`X-Forwarded-For` header (#1037)
* Passed django setting USE_X_FORWARDED_FOR to sentry wsgi middleware upon creation
* Linting changes
* Accessed settings attr correctly
* Added django tests for django setting of USE_X_FORWARDED_HOST and extracting the correct request url from it
* fix: Formatting
Co-authored-by: sentry-bot
---
sentry_sdk/integrations/django/__init__.py | 8 +++-
sentry_sdk/integrations/wsgi.py | 35 ++++++++++-------
tests/integrations/django/test_basic.py | 44 ++++++++++++++++++++++
3 files changed, 73 insertions(+), 14 deletions(-)
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index 2b571f5e11..40f6ab3011 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -120,7 +120,13 @@ def sentry_patched_wsgi_handler(self, environ, start_response):
bound_old_app = old_app.__get__(self, WSGIHandler)
- return SentryWsgiMiddleware(bound_old_app)(environ, start_response)
+ from django.conf import settings
+
+ use_x_forwarded_for = settings.USE_X_FORWARDED_HOST
+
+ return SentryWsgiMiddleware(bound_old_app, use_x_forwarded_for)(
+ environ, start_response
+ )
WSGIHandler.__call__ = sentry_patched_wsgi_handler
diff --git a/sentry_sdk/integrations/wsgi.py b/sentry_sdk/integrations/wsgi.py
index 2f63298ffa..4f274fa00c 100644
--- a/sentry_sdk/integrations/wsgi.py
+++ b/sentry_sdk/integrations/wsgi.py
@@ -54,10 +54,16 @@ def wsgi_decoding_dance(s, charset="utf-8", errors="replace"):
return s.encode("latin1").decode(charset, errors)
-def get_host(environ):
- # type: (Dict[str, str]) -> str
+def get_host(environ, use_x_forwarded_for=False):
+ # type: (Dict[str, str], bool) -> str
"""Return the host for the given WSGI environment. Yanked from Werkzeug."""
- if environ.get("HTTP_HOST"):
+ if use_x_forwarded_for and "HTTP_X_FORWARDED_HOST" in environ:
+ rv = environ["HTTP_X_FORWARDED_HOST"]
+ if environ["wsgi.url_scheme"] == "http" and rv.endswith(":80"):
+ rv = rv[:-3]
+ elif environ["wsgi.url_scheme"] == "https" and rv.endswith(":443"):
+ rv = rv[:-4]
+ elif environ.get("HTTP_HOST"):
rv = environ["HTTP_HOST"]
if environ["wsgi.url_scheme"] == "http" and rv.endswith(":80"):
rv = rv[:-3]
@@ -77,23 +83,24 @@ def get_host(environ):
return rv
-def get_request_url(environ):
- # type: (Dict[str, str]) -> str
+def get_request_url(environ, use_x_forwarded_for=False):
+ # type: (Dict[str, str], bool) -> str
"""Return the absolute URL without query string for the given WSGI
environment."""
return "%s://%s/%s" % (
environ.get("wsgi.url_scheme"),
- get_host(environ),
+ get_host(environ, use_x_forwarded_for),
wsgi_decoding_dance(environ.get("PATH_INFO") or "").lstrip("/"),
)
class SentryWsgiMiddleware(object):
- __slots__ = ("app",)
+ __slots__ = ("app", "use_x_forwarded_for")
- def __init__(self, app):
- # type: (Callable[[Dict[str, str], Callable[..., Any]], Any]) -> None
+ def __init__(self, app, use_x_forwarded_for=False):
+ # type: (Callable[[Dict[str, str], Callable[..., Any]], Any], bool) -> None
self.app = app
+ self.use_x_forwarded_for = use_x_forwarded_for
def __call__(self, environ, start_response):
# type: (Dict[str, str], Callable[..., Any]) -> _ScopedResponse
@@ -110,7 +117,9 @@ def __call__(self, environ, start_response):
scope.clear_breadcrumbs()
scope._name = "wsgi"
scope.add_event_processor(
- _make_wsgi_event_processor(environ)
+ _make_wsgi_event_processor(
+ environ, self.use_x_forwarded_for
+ )
)
transaction = Transaction.continue_from_environ(
@@ -269,8 +278,8 @@ def close(self):
reraise(*_capture_exception(self._hub))
-def _make_wsgi_event_processor(environ):
- # type: (Dict[str, str]) -> EventProcessor
+def _make_wsgi_event_processor(environ, use_x_forwarded_for):
+ # type: (Dict[str, str], bool) -> EventProcessor
# It's a bit unfortunate that we have to extract and parse the request data
# from the environ so eagerly, but there are a few good reasons for this.
#
@@ -284,7 +293,7 @@ def _make_wsgi_event_processor(environ):
# https://github.com/unbit/uwsgi/issues/1950
client_ip = get_client_ip(environ)
- request_url = get_request_url(environ)
+ request_url = get_request_url(environ, use_x_forwarded_for)
query_string = environ.get("QUERY_STRING")
method = environ.get("REQUEST_METHOD")
env = dict(_get_environ(environ))
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index e094d23a72..5a4d801374 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -40,6 +40,50 @@ def test_view_exceptions(sentry_init, client, capture_exceptions, capture_events
assert event["exception"]["values"][0]["mechanism"]["type"] == "django"
+def test_ensures_x_forwarded_header_is_honored_in_sdk_when_enabled_in_django(
+ sentry_init, client, capture_exceptions, capture_events
+):
+ """
+ Test that ensures if django settings.USE_X_FORWARDED_HOST is set to True
+ then the SDK sets the request url to the `HTTP_X_FORWARDED_FOR`
+ """
+ from django.conf import settings
+
+ settings.USE_X_FORWARDED_HOST = True
+
+ sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
+ exceptions = capture_exceptions()
+ events = capture_events()
+ client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
+
+ (error,) = exceptions
+ assert isinstance(error, ZeroDivisionError)
+
+ (event,) = events
+ assert event["request"]["url"] == "http://example.com/view-exc"
+
+ settings.USE_X_FORWARDED_HOST = False
+
+
+def test_ensures_x_forwarded_header_is_not_honored_when_unenabled_in_django(
+ sentry_init, client, capture_exceptions, capture_events
+):
+ """
+ Test that ensures if django settings.USE_X_FORWARDED_HOST is set to False
+ then the SDK sets the request url to the `HTTP_POST`
+ """
+ sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
+ exceptions = capture_exceptions()
+ events = capture_events()
+ client.get(reverse("view_exc"), headers={"X_FORWARDED_HOST": "example.com"})
+
+ (error,) = exceptions
+ assert isinstance(error, ZeroDivisionError)
+
+ (event,) = events
+ assert event["request"]["url"] == "http://localhost/view-exc"
+
+
def test_middleware_exceptions(sentry_init, client, capture_exceptions):
sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
exceptions = capture_exceptions()
From b9cdcd60c9f80d3bf652172f23c5f21059c9a71e Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Tue, 2 Mar 2021 11:02:51 +0100
Subject: [PATCH 0152/2327] Used settings fixture instead of importing django
settings (#1038)
---
tests/integrations/django/test_basic.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index 5a4d801374..186a7d3f11 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -41,14 +41,12 @@ def test_view_exceptions(sentry_init, client, capture_exceptions, capture_events
def test_ensures_x_forwarded_header_is_honored_in_sdk_when_enabled_in_django(
- sentry_init, client, capture_exceptions, capture_events
+ sentry_init, client, capture_exceptions, capture_events, settings
):
"""
Test that ensures if django settings.USE_X_FORWARDED_HOST is set to True
then the SDK sets the request url to the `HTTP_X_FORWARDED_FOR`
"""
- from django.conf import settings
-
settings.USE_X_FORWARDED_HOST = True
sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
@@ -62,8 +60,6 @@ def test_ensures_x_forwarded_header_is_honored_in_sdk_when_enabled_in_django(
(event,) = events
assert event["request"]["url"] == "http://example.com/view-exc"
- settings.USE_X_FORWARDED_HOST = False
-
def test_ensures_x_forwarded_header_is_not_honored_when_unenabled_in_django(
sentry_init, client, capture_exceptions, capture_events
From 68fb0b4c7e420df4cfa6239d256fc4d0a9e32ff1 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Wed, 3 Mar 2021 14:57:49 +0100
Subject: [PATCH 0153/2327] fix(worker): Log data-dropping events with error
(#1032)
Co-authored-by: sentry-bot
---
sentry_sdk/worker.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sentry_sdk/worker.py b/sentry_sdk/worker.py
index b528509cf6..a8e2fe1ce6 100644
--- a/sentry_sdk/worker.py
+++ b/sentry_sdk/worker.py
@@ -99,11 +99,14 @@ def _wait_flush(self, timeout, callback):
# type: (float, Optional[Any]) -> None
initial_timeout = min(0.1, timeout)
if not self._timed_queue_join(initial_timeout):
- pending = self._queue.qsize()
+ pending = self._queue.qsize() + 1
logger.debug("%d event(s) pending on flush", pending)
if callback is not None:
callback(pending, timeout)
- self._timed_queue_join(timeout - initial_timeout)
+
+ if not self._timed_queue_join(timeout - initial_timeout):
+ pending = self._queue.qsize() + 1
+ logger.error("flush timed out, dropped %s events", pending)
def submit(self, callback):
# type: (Callable[[], None]) -> None
@@ -115,7 +118,7 @@ def submit(self, callback):
def on_full_queue(self, callback):
# type: (Optional[Any]) -> None
- logger.debug("background worker queue full, dropping event")
+ logger.error("background worker queue full, dropping event")
def _target(self):
# type: () -> None
From b4ca43c0255d2569695af9819260807b09caa18a Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Wed, 3 Mar 2021 16:53:39 +0100
Subject: [PATCH 0154/2327] Release: 1.0.0 (#1039)
* Added Change log for major release 1.0.0
* Increased the timeout for tests in workflow
* Added entry to changelog in regards to worker fix
---
.github/workflows/ci.yml | 3 ++-
CHANGELOG.md | 11 +++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3c54f5fac2..b7df0771b8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -72,7 +72,7 @@ jobs:
test:
continue-on-error: true
- timeout-minutes: 35
+ timeout-minutes: 45
runs-on: ubuntu-18.04
strategy:
matrix:
@@ -132,6 +132,7 @@ jobs:
- name: run tests
env:
CI_PYTHON_VERSION: ${{ matrix.python-version }}
+ timeout-minutes: 45
run: |
coverage erase
./scripts/runtox.sh '' --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ff74079bb..a5046a922c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,17 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 1.0.0
+
+This release contains breaking changes
+
+- Feat: Moved `auto_session_tracking` experimental flag to a proper option and removed `session_mode`, hence enabling release health by default #994
+- Fixed Django transaction name by setting the name to `request.path_info` rather than `request.path`
+- Fix for tracing by getting HTTP headers from span rather than transaction when possible #1035
+- Fix for Flask transactions missing request body in non errored transactions #1034
+- Fix for honoring the `X-Forwarded-For` header #1037
+- Fix for worker that logs data dropping of events with level error #1032
+
## 0.20.3
- Added scripts to support auto instrumentation of no code AWS lambda Python functions
From 2e16934be5157198759a3b10ac3292c87f971b4a Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Wed, 3 Mar 2021 15:55:06 +0000
Subject: [PATCH 0155/2327] release: 1.0.0
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 02f252108b..5c15d80c4a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.20.3"
+release = "1.0.0"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index c18f249fc1..43a03364b6 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -99,7 +99,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "0.20.3"
+VERSION = "1.0.0"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 495962fe89..47806acaaf 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="0.20.3",
+ version="1.0.0",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From de1ceb8081a29c5e1a0ff01d8d7b7f6ae7b9dbfc Mon Sep 17 00:00:00 2001
From: Hynek Schlawack
Date: Thu, 4 Mar 2021 11:20:29 +0100
Subject: [PATCH 0156/2327] Get rid of setup.cfg by moving the only option to
setup.py (#1040)
---
setup.cfg | 2 --
setup.py | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
delete mode 100644 setup.cfg
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 2a9acf13da..0000000000
--- a/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[bdist_wheel]
-universal = 1
diff --git a/setup.py b/setup.py
index 47806acaaf..87e5286e71 100644
--- a/setup.py
+++ b/setup.py
@@ -72,4 +72,5 @@ def get_file_text(file_name):
"Programming Language :: Python :: 3.9",
"Topic :: Software Development :: Libraries :: Python Modules",
],
+ options={"bdist_wheel": {"universal": "1"}},
)
From dec29405a6bb65202fff3ac45325506269146d66 Mon Sep 17 00:00:00 2001
From: Bruno Garcia
Date: Fri, 5 Mar 2021 10:25:35 -0500
Subject: [PATCH 0157/2327] We're hiring
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index 559de37da3..ad215fe3e4 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
+_Bad software is everywhere, and we're tired of it. Sentry is on a mission to help developers write better software faster, so we can get back to enjoying technology. If you want to join us [**Check out our open positions**](https://sentry.io/careers/)_
+
# sentry-python - Sentry SDK for Python
[](https://travis-ci.com/getsentry/sentry-python)
From 860af86183fa94e13af94e8751efe2d8dfab1210 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 8 Mar 2021 07:34:18 +0000
Subject: [PATCH 0158/2327] build(deps): bump sphinx from 3.5.1 to 3.5.2
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/3.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v3.5.1...v3.5.2)
Signed-off-by: dependabot-preview[bot]
---
docs-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs-requirements.txt b/docs-requirements.txt
index 55ca4e056b..3aa6b4baec 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx==3.5.1
+sphinx==3.5.2
sphinx-rtd-theme
sphinx-autodoc-typehints[type_comments]>=1.8.0
typing-extensions
From 7a3c3dfbafdd5205ba42a7a8d3d2476f2b236ff7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 8 Mar 2021 07:34:48 +0000
Subject: [PATCH 0159/2327] build(deps): bump flake8-bugbear from 20.11.1 to
21.3.1
Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 20.11.1 to 21.3.1.
- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases)
- [Commits](https://github.com/PyCQA/flake8-bugbear/commits)
Signed-off-by: dependabot-preview[bot]
---
linter-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linter-requirements.txt b/linter-requirements.txt
index d24876f42f..3accdd5edb 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -2,5 +2,5 @@ black==20.8b1
flake8==3.8.4
flake8-import-order==0.18.1
mypy==0.782
-flake8-bugbear==20.11.1
+flake8-bugbear==21.3.1
pep8-naming==0.11.1
From b530b6f89ba9c13a9f65a0fa3f151ed42c9befe0 Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Mon, 8 Mar 2021 16:37:59 +0100
Subject: [PATCH 0160/2327] Clarified breaking change in release 1.0 changelog
(#1047)
---
CHANGELOG.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5046a922c..ca68b20f26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,9 +22,9 @@ A major release `N` implies the previous release `N-1` will no longer receive up
## 1.0.0
-This release contains breaking changes
+This release contains a breaking change
-- Feat: Moved `auto_session_tracking` experimental flag to a proper option and removed `session_mode`, hence enabling release health by default #994
+- **BREAKING CHANGE**: Feat: Moved `auto_session_tracking` experimental flag to a proper option and removed explicitly setting experimental `session_mode` in favor of auto detecting its value, hence enabling release health by default #994
- Fixed Django transaction name by setting the name to `request.path_info` rather than `request.path`
- Fix for tracing by getting HTTP headers from span rather than transaction when possible #1035
- Fix for Flask transactions missing request body in non errored transactions #1034
From 241f10ddaeaf64f83f3d3e0bbd4089fbb109dba0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 15 Mar 2021 07:47:42 +0000
Subject: [PATCH 0161/2327] build(deps): bump flake8 from 3.8.4 to 3.9.0
Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.8.4 to 3.9.0.
- [Release notes](https://gitlab.com/pycqa/flake8/tags)
- [Commits](https://gitlab.com/pycqa/flake8/compare/3.8.4...3.9.0)
Signed-off-by: dependabot-preview[bot]
---
linter-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linter-requirements.txt b/linter-requirements.txt
index 3accdd5edb..3f22f64edc 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -1,5 +1,5 @@
black==20.8b1
-flake8==3.8.4
+flake8==3.9.0
flake8-import-order==0.18.1
mypy==0.782
flake8-bugbear==21.3.1
From 0b0b67b9b598a1f67a4852a53f74251f76494ab3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 15 Mar 2021 08:23:43 +0000
Subject: [PATCH 0162/2327] build(deps): bump flake8-bugbear from 21.3.1 to
21.3.2
Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 21.3.1 to 21.3.2.
- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases)
- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/21.3.1...21.3.2)
Signed-off-by: dependabot-preview[bot]
---
linter-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linter-requirements.txt b/linter-requirements.txt
index 3f22f64edc..08b4795849 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -2,5 +2,5 @@ black==20.8b1
flake8==3.9.0
flake8-import-order==0.18.1
mypy==0.782
-flake8-bugbear==21.3.1
+flake8-bugbear==21.3.2
pep8-naming==0.11.1
From c94dd79d843ad92a961178327afdb7a33fd65d19 Mon Sep 17 00:00:00 2001
From: Narbonne
Date: Mon, 15 Mar 2021 10:56:02 +0100
Subject: [PATCH 0163/2327] fix(django): Deal with template_name being a list
(#1054)
Co-authored-by: Christophe Narbonne
Co-authored-by: sentry-bot
---
sentry_sdk/integrations/django/templates.py | 15 +++++++++++++--
tests/integrations/django/myapp/views.py | 4 +++-
tests/integrations/django/test_basic.py | 21 ++++++++++++++-------
3 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/sentry_sdk/integrations/django/templates.py b/sentry_sdk/integrations/django/templates.py
index 3f805f36c2..2ff9d1b184 100644
--- a/sentry_sdk/integrations/django/templates.py
+++ b/sentry_sdk/integrations/django/templates.py
@@ -42,6 +42,15 @@ def get_template_frame_from_exception(exc_value):
return None
+def _get_template_name_description(template_name):
+ # type: (str) -> str
+ if isinstance(template_name, (list, tuple)):
+ if template_name:
+ return "[{}, ...]".format(template_name[0])
+ else:
+ return template_name
+
+
def patch_templates():
# type: () -> None
from django.template.response import SimpleTemplateResponse
@@ -57,7 +66,8 @@ def rendered_content(self):
return real_rendered_content.fget(self)
with hub.start_span(
- op="django.template.render", description=self.template_name
+ op="django.template.render",
+ description=_get_template_name_description(self.template_name),
) as span:
span.set_data("context", self.context_data)
return real_rendered_content.fget(self)
@@ -78,7 +88,8 @@ def render(request, template_name, context=None, *args, **kwargs):
return real_render(request, template_name, context, *args, **kwargs)
with hub.start_span(
- op="django.template.render", description=template_name
+ op="django.template.render",
+ description=_get_template_name_description(template_name),
) as span:
span.set_data("context", context)
return real_render(request, template_name, context, *args, **kwargs)
diff --git a/tests/integrations/django/myapp/views.py b/tests/integrations/django/myapp/views.py
index 4bd05f8bbb..57d8fb98a2 100644
--- a/tests/integrations/django/myapp/views.py
+++ b/tests/integrations/django/myapp/views.py
@@ -122,7 +122,9 @@ def template_test(request, *args, **kwargs):
@csrf_exempt
def template_test2(request, *args, **kwargs):
- return TemplateResponse(request, "user_name.html", {"user_age": 25})
+ return TemplateResponse(
+ request, ("user_name.html", "another_template.html"), {"user_age": 25}
+ )
@csrf_exempt
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index 186a7d3f11..9341dc238d 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -563,18 +563,25 @@ def test_render_spans(sentry_init, client, capture_events, render_span_tree):
integrations=[DjangoIntegration()],
traces_sample_rate=1.0,
)
- views_urls = [reverse("template_test2")]
+ views_tests = [
+ (
+ reverse("template_test2"),
+ '- op="django.template.render": description="[user_name.html, ...]"',
+ ),
+ ]
if DJANGO_VERSION >= (1, 7):
- views_urls.append(reverse("template_test"))
+ views_tests.append(
+ (
+ reverse("template_test"),
+ '- op="django.template.render": description="user_name.html"',
+ ),
+ )
- for url in views_urls:
+ for url, expected_line in views_tests:
events = capture_events()
_content, status, _headers = client.get(url)
transaction = events[0]
- assert (
- '- op="django.template.render": description="user_name.html"'
- in render_span_tree(transaction)
- )
+ assert expected_line in render_span_tree(transaction)
def test_middleware_spans(sentry_init, client, capture_events, render_span_tree):
From f3b0b0012eb6f7b8af55bf5b65d85404b8822701 Mon Sep 17 00:00:00 2001
From: Mahmoud Hossam
Date: Mon, 15 Mar 2021 12:28:31 +0100
Subject: [PATCH 0164/2327] feat: Support wildcards in ignore_logger (#1053)
Co-authored-by: Mahmoud Hanafy
---
scripts/build_awslambda_layer.py | 10 +++++---
scripts/init_serverless_sdk.py | 2 +-
sentry_sdk/integrations/logging.py | 7 +++++-
tests/integrations/logging/test_logging.py | 29 +++++++++++++++++++++-
4 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/scripts/build_awslambda_layer.py b/scripts/build_awslambda_layer.py
index ae0ee185cc..1fda06e79f 100644
--- a/scripts/build_awslambda_layer.py
+++ b/scripts/build_awslambda_layer.py
@@ -51,12 +51,14 @@ def create_init_serverless_sdk_package(self):
Method that creates the init_serverless_sdk pkg in the
sentry-python-serverless zip
"""
- serverless_sdk_path = f'{self.packages_dir}/sentry_sdk/' \
- f'integrations/init_serverless_sdk'
+ serverless_sdk_path = (
+ f"{self.packages_dir}/sentry_sdk/" f"integrations/init_serverless_sdk"
+ )
if not os.path.exists(serverless_sdk_path):
os.makedirs(serverless_sdk_path)
- shutil.copy('scripts/init_serverless_sdk.py',
- f'{serverless_sdk_path}/__init__.py')
+ shutil.copy(
+ "scripts/init_serverless_sdk.py", f"{serverless_sdk_path}/__init__.py"
+ )
def zip(
self, filename # type: str
diff --git a/scripts/init_serverless_sdk.py b/scripts/init_serverless_sdk.py
index 42107e4c27..07b453eaf8 100644
--- a/scripts/init_serverless_sdk.py
+++ b/scripts/init_serverless_sdk.py
@@ -19,7 +19,7 @@
sentry_sdk.init(
dsn=os.environ["SENTRY_DSN"],
integrations=[AwsLambdaIntegration(timeout_warning=True)],
- traces_sample_rate=float(os.environ["SENTRY_TRACES_SAMPLE_RATE"])
+ traces_sample_rate=float(os.environ["SENTRY_TRACES_SAMPLE_RATE"]),
)
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
index 138a85317d..80524dbab2 100644
--- a/sentry_sdk/integrations/logging.py
+++ b/sentry_sdk/integrations/logging.py
@@ -2,6 +2,7 @@
import logging
import datetime
+from fnmatch import fnmatch
from sentry_sdk.hub import Hub
from sentry_sdk.utils import (
@@ -98,7 +99,11 @@ def sentry_patched_callhandlers(self, record):
def _can_record(record):
# type: (LogRecord) -> bool
- return record.name not in _IGNORED_LOGGERS
+ """Prevents ignored loggers from recording"""
+ for logger in _IGNORED_LOGGERS:
+ if fnmatch(record.name, logger):
+ return False
+ return True
def _breadcrumb_from_record(record):
diff --git a/tests/integrations/logging/test_logging.py b/tests/integrations/logging/test_logging.py
index e994027907..22ea14f8ae 100644
--- a/tests/integrations/logging/test_logging.py
+++ b/tests/integrations/logging/test_logging.py
@@ -3,7 +3,7 @@
import pytest
import logging
-from sentry_sdk.integrations.logging import LoggingIntegration
+from sentry_sdk.integrations.logging import LoggingIntegration, ignore_logger
other_logger = logging.getLogger("testfoo")
logger = logging.getLogger(__name__)
@@ -134,3 +134,30 @@ def filter(self, record):
(event,) = events
assert event["logentry"]["message"] == "hi"
+
+
+def test_ignore_logger(sentry_init, capture_events):
+ sentry_init(integrations=[LoggingIntegration()], default_integrations=False)
+ events = capture_events()
+
+ ignore_logger("testfoo")
+
+ other_logger.error("hi")
+
+ assert not events
+
+
+def test_ignore_logger_wildcard(sentry_init, capture_events):
+ sentry_init(integrations=[LoggingIntegration()], default_integrations=False)
+ events = capture_events()
+
+ ignore_logger("testfoo.*")
+
+ nested_logger = logging.getLogger("testfoo.submodule")
+
+ logger.error("hi")
+
+ nested_logger.error("bye")
+
+ (event,) = events
+ assert event["logentry"]["message"] == "hi"
From b95219f156609e1917581fc176d383114ba7ddea Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 07:30:31 +0000
Subject: [PATCH 0165/2327] build(deps): bump sphinx from 3.5.2 to 3.5.3
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 3.5.2 to 3.5.3.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/3.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/commits)
Signed-off-by: dependabot-preview[bot]
---
docs-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs-requirements.txt b/docs-requirements.txt
index 3aa6b4baec..8273d572e7 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx==3.5.2
+sphinx==3.5.3
sphinx-rtd-theme
sphinx-autodoc-typehints[type_comments]>=1.8.0
typing-extensions
From 4a376428a5b28ca9b2871c3c39896fccf437ab2d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 07:41:38 +0000
Subject: [PATCH 0166/2327] build(deps): bump checkouts/data-schemas from
`71cd4c1` to `f97137d`
Bumps [checkouts/data-schemas](https://github.com/getsentry/sentry-data-schemas) from `71cd4c1` to `f97137d`.
- [Release notes](https://github.com/getsentry/sentry-data-schemas/releases)
- [Commits](https://github.com/getsentry/sentry-data-schemas/compare/71cd4c1713ef350b7a1ae1819d79ad21fee6eb7e...f97137ddd16853269519de3c9ec00503a99b5da3)
Signed-off-by: dependabot-preview[bot]
---
checkouts/data-schemas | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/checkouts/data-schemas b/checkouts/data-schemas
index 71cd4c1713..f97137ddd1 160000
--- a/checkouts/data-schemas
+++ b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit 71cd4c1713ef350b7a1ae1819d79ad21fee6eb7e
+Subproject commit f97137ddd16853269519de3c9ec00503a99b5da3
From 4c09f3203d6d19789c6fa729a2e46557ad4ea913 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Wed, 24 Mar 2021 20:22:44 +0100
Subject: [PATCH 0167/2327] feat: Support tracing on Tornado (#1060)
* feat: Support tracing on Tornado
* add extra assertion about request body
* parametrize transaction test
* fix: Formatting
Co-authored-by: sentry-bot
---
sentry_sdk/integrations/aiohttp.py | 2 +-
sentry_sdk/integrations/tornado.py | 64 ++++++++------
tests/integrations/tornado/test_tornado.py | 97 +++++++++++++++++++++-
3 files changed, 136 insertions(+), 27 deletions(-)
diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py
index 2d8eaedfab..f74e6f4bf2 100644
--- a/sentry_sdk/integrations/aiohttp.py
+++ b/sentry_sdk/integrations/aiohttp.py
@@ -92,7 +92,7 @@ async def sentry_app_handle(self, request, *args, **kwargs):
weak_request = weakref.ref(request)
- with Hub(Hub.current) as hub:
+ with Hub(hub) as hub:
# Scope data will not leak between requests because aiohttp
# create a task to wrap each request.
with hub.configure_scope() as scope:
diff --git a/sentry_sdk/integrations/tornado.py b/sentry_sdk/integrations/tornado.py
index 27f254844d..e13549d4f7 100644
--- a/sentry_sdk/integrations/tornado.py
+++ b/sentry_sdk/integrations/tornado.py
@@ -1,7 +1,9 @@
import weakref
+import contextlib
from inspect import iscoroutinefunction
from sentry_sdk.hub import Hub, _should_send_default_pii
+from sentry_sdk.tracing import Transaction
from sentry_sdk.utils import (
HAS_REAL_CONTEXTVARS,
CONTEXTVARS_ERROR_MESSAGE,
@@ -32,6 +34,7 @@
from typing import Optional
from typing import Dict
from typing import Callable
+ from typing import Generator
from sentry_sdk._types import EventProcessor
@@ -63,19 +66,8 @@ def setup_once():
# Starting Tornado 6 RequestHandler._execute method is a standard Python coroutine (async/await)
# In that case our method should be a coroutine function too
async def sentry_execute_request_handler(self, *args, **kwargs):
- # type: (Any, *Any, **Any) -> Any
- hub = Hub.current
- integration = hub.get_integration(TornadoIntegration)
- if integration is None:
- return await old_execute(self, *args, **kwargs)
-
- weak_handler = weakref.ref(self)
-
- with Hub(hub) as hub:
- with hub.configure_scope() as scope:
- scope.clear_breadcrumbs()
- processor = _make_event_processor(weak_handler) # type: ignore
- scope.add_event_processor(processor)
+ # type: (RequestHandler, *Any, **Any) -> Any
+ with _handle_request_impl(self):
return await old_execute(self, *args, **kwargs)
else:
@@ -83,18 +75,7 @@ async def sentry_execute_request_handler(self, *args, **kwargs):
@coroutine # type: ignore
def sentry_execute_request_handler(self, *args, **kwargs):
# type: (RequestHandler, *Any, **Any) -> Any
- hub = Hub.current
- integration = hub.get_integration(TornadoIntegration)
- if integration is None:
- return old_execute(self, *args, **kwargs)
-
- weak_handler = weakref.ref(self)
-
- with Hub(hub) as hub:
- with hub.configure_scope() as scope:
- scope.clear_breadcrumbs()
- processor = _make_event_processor(weak_handler) # type: ignore
- scope.add_event_processor(processor)
+ with _handle_request_impl(self):
result = yield from old_execute(self, *args, **kwargs)
return result
@@ -110,6 +91,39 @@ def sentry_log_exception(self, ty, value, tb, *args, **kwargs):
RequestHandler.log_exception = sentry_log_exception # type: ignore
+@contextlib.contextmanager
+def _handle_request_impl(self):
+ # type: (RequestHandler) -> Generator[None, None, None]
+ hub = Hub.current
+ integration = hub.get_integration(TornadoIntegration)
+
+ if integration is None:
+ yield
+
+ weak_handler = weakref.ref(self)
+
+ with Hub(hub) as hub:
+ with hub.configure_scope() as scope:
+ scope.clear_breadcrumbs()
+ processor = _make_event_processor(weak_handler) # type: ignore
+ scope.add_event_processor(processor)
+
+ transaction = Transaction.continue_from_headers(
+ self.request.headers,
+ op="http.server",
+ # Like with all other integrations, this is our
+ # fallback transaction in case there is no route.
+ # sentry_urldispatcher_resolve is responsible for
+ # setting a transaction name later.
+ name="generic Tornado request",
+ )
+
+ with hub.start_transaction(
+ transaction, custom_sampling_context={"tornado_request": self.request}
+ ):
+ yield
+
+
def _capture_exception(ty, value, tb):
# type: (type, BaseException, Any) -> None
hub = Hub.current
diff --git a/tests/integrations/tornado/test_tornado.py b/tests/integrations/tornado/test_tornado.py
index 0cec16c4b7..1c5137f2b2 100644
--- a/tests/integrations/tornado/test_tornado.py
+++ b/tests/integrations/tornado/test_tornado.py
@@ -2,7 +2,7 @@
import pytest
-from sentry_sdk import configure_scope
+from sentry_sdk import configure_scope, start_transaction
from sentry_sdk.integrations.tornado import TornadoIntegration
from tornado.web import RequestHandler, Application, HTTPError
@@ -40,6 +40,25 @@ def get(self):
scope.set_tag("foo", "42")
1 / 0
+ def post(self):
+ with configure_scope() as scope:
+ scope.set_tag("foo", "43")
+ 1 / 0
+
+
+class HelloHandler(RequestHandler):
+ async def get(self):
+ with configure_scope() as scope:
+ scope.set_tag("foo", "42")
+
+ return b"hello"
+
+ async def post(self):
+ with configure_scope() as scope:
+ scope.set_tag("foo", "43")
+
+ return b"hello"
+
def test_basic(tornado_testcase, sentry_init, capture_events):
sentry_init(integrations=[TornadoIntegration()], send_default_pii=True)
@@ -82,6 +101,82 @@ def test_basic(tornado_testcase, sentry_init, capture_events):
assert not scope._tags
+@pytest.mark.parametrize(
+ "handler,code",
+ [
+ (CrashingHandler, 500),
+ (HelloHandler, 200),
+ ],
+)
+def test_transactions(tornado_testcase, sentry_init, capture_events, handler, code):
+ sentry_init(integrations=[TornadoIntegration()], traces_sample_rate=1.0, debug=True)
+ events = capture_events()
+ client = tornado_testcase(Application([(r"/hi", handler)]))
+
+ with start_transaction(name="client") as span:
+ pass
+
+ response = client.fetch(
+ "/hi", method="POST", body=b"heyoo", headers=dict(span.iter_headers())
+ )
+ assert response.code == code
+
+ if code == 200:
+ client_tx, server_tx = events
+ server_error = None
+ else:
+ client_tx, server_error, server_tx = events
+
+ assert client_tx["type"] == "transaction"
+ assert client_tx["transaction"] == "client"
+
+ if server_error is not None:
+ assert server_error["exception"]["values"][0]["type"] == "ZeroDivisionError"
+ assert (
+ server_error["transaction"]
+ == "tests.integrations.tornado.test_tornado.CrashingHandler.post"
+ )
+
+ if code == 200:
+ assert (
+ server_tx["transaction"]
+ == "tests.integrations.tornado.test_tornado.HelloHandler.post"
+ )
+ else:
+ assert (
+ server_tx["transaction"]
+ == "tests.integrations.tornado.test_tornado.CrashingHandler.post"
+ )
+
+ assert server_tx["type"] == "transaction"
+
+ request = server_tx["request"]
+ host = request["headers"]["Host"]
+ assert server_tx["request"] == {
+ "env": {"REMOTE_ADDR": "127.0.0.1"},
+ "headers": {
+ "Accept-Encoding": "gzip",
+ "Connection": "close",
+ **request["headers"],
+ },
+ "method": "POST",
+ "query_string": "",
+ "data": {"heyoo": [""]},
+ "url": "http://{host}/hi".format(host=host),
+ }
+
+ assert (
+ client_tx["contexts"]["trace"]["trace_id"]
+ == server_tx["contexts"]["trace"]["trace_id"]
+ )
+
+ if server_error is not None:
+ assert (
+ server_error["contexts"]["trace"]["trace_id"]
+ == server_tx["contexts"]["trace"]["trace_id"]
+ )
+
+
def test_400_not_logged(tornado_testcase, sentry_init, capture_events):
sentry_init(integrations=[TornadoIntegration()])
events = capture_events()
From f9bb3676aad275ce35f9f0a9a71eb2648730e107 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Thu, 25 Mar 2021 17:44:13 +0100
Subject: [PATCH 0168/2327] chore: Fix mypy
---
sentry_sdk/integrations/tornado.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sentry_sdk/integrations/tornado.py b/sentry_sdk/integrations/tornado.py
index e13549d4f7..f9796daca3 100644
--- a/sentry_sdk/integrations/tornado.py
+++ b/sentry_sdk/integrations/tornado.py
@@ -73,7 +73,7 @@ async def sentry_execute_request_handler(self, *args, **kwargs):
else:
@coroutine # type: ignore
- def sentry_execute_request_handler(self, *args, **kwargs):
+ def sentry_execute_request_handler(self, *args, **kwargs): # type: ignore
# type: (RequestHandler, *Any, **Any) -> Any
with _handle_request_impl(self):
result = yield from old_execute(self, *args, **kwargs)
From 19fa43fec5a20b3561a16970ce395c93ac1be57d Mon Sep 17 00:00:00 2001
From: "Michael D. Hoyle"
Date: Tue, 30 Mar 2021 10:29:12 -0400
Subject: [PATCH 0169/2327] Minor tweak of recommended version to pin (#1068)
Since we're on major version 1, I think the docs should recommend that version.
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca68b20f26..145ae7ae32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ This project follows [semver](https://semver.org/), with three additions:
- Certain features (e.g. integrations) may be explicitly called out as "experimental" or "unstable" in the documentation. They come with their own versioning policy described in the documentation.
-We recommend to pin your version requirements against `0.x.*` or `0.x.y`.
+We recommend to pin your version requirements against `1.x.*` or `1.x.y`.
Either one of the following is fine:
```
From a95bf9f549f915b175111c4bd160a79254faa842 Mon Sep 17 00:00:00 2001
From: Rodolfo Carvalho
Date: Wed, 14 Apr 2021 15:55:48 +0200
Subject: [PATCH 0170/2327] ci: Add CodeQL scanning
Decided to give it a try after suggestion from @bruno-garcia.
---
.github/workflows/codeql-analysis.yml | 67 +++++++++++++++++++++++++++
1 file changed, 67 insertions(+)
create mode 100644 .github/workflows/codeql-analysis.yml
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000000..d4bf49c6b3
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ # The branches below must be a subset of the branches above
+ branches: [ master ]
+ schedule:
+ - cron: '18 18 * * 3'
+
+jobs:
+ analyze:
+ name: Analyze
+ runs-on: ubuntu-latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ language: [ 'python' ]
+ # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+ # Learn more:
+ # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v2
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v1
+ with:
+ languages: ${{ matrix.language }}
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file.
+ # Prefix the list here with "+" to use these queries and those in the config file.
+ # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+ # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+ # If this step fails, then you should remove it and run the build manually (see below)
+ - name: Autobuild
+ uses: github/codeql-action/autobuild@v1
+
+ # ℹ️ Command-line programs to run using the OS shell.
+ # 📚 https://git.io/JvXDl
+
+ # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+ # and modify them (or add more) to build your code if your project
+ # uses a compiled language
+
+ #- run: |
+ # make bootstrap
+ # make release
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v1
From 927903e3b354a42e427d91129c399d64d480a6b9 Mon Sep 17 00:00:00 2001
From: Ogaday
Date: Fri, 16 Apr 2021 17:41:16 +0100
Subject: [PATCH 0171/2327] Update traces_sampler declaration to concrete types
(#1091)
Fixes getsentry/sentry-python#1090
---
sentry_sdk/_types.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sentry_sdk/_types.py b/sentry_sdk/_types.py
index 95e4ac3ba3..a69896a248 100644
--- a/sentry_sdk/_types.py
+++ b/sentry_sdk/_types.py
@@ -5,7 +5,6 @@
if MYPY:
- from numbers import Real
from types import TracebackType
from typing import Any
from typing import Callable
@@ -32,7 +31,7 @@
ErrorProcessor = Callable[[Event, ExcInfo], Optional[Event]]
BreadcrumbProcessor = Callable[[Breadcrumb, BreadcrumbHint], Optional[Breadcrumb]]
- TracesSampler = Callable[[SamplingContext], Union[Real, bool]]
+ TracesSampler = Callable[[SamplingContext], Union[float, int, bool]]
# https://github.com/python/mypy/issues/5710
NotImplementedType = Any
From d7cf16cd28248e0c12aa71e92ee9b2606a6a7400 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Thu, 29 Apr 2021 13:19:18 +0200
Subject: [PATCH 0172/2327] chore: Fix CI failures (#1101)
---
sentry_sdk/integrations/django/__init__.py | 3 ++-
sentry_sdk/integrations/flask.py | 12 ++++++++----
tox.ini | 4 ----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index 40f6ab3011..e26948e2dd 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -332,8 +332,9 @@ def _before_get_response(request):
# Rely on WSGI middleware to start a trace
try:
if integration.transaction_style == "function_name":
+ fn = resolve(request.path).func
scope.transaction = transaction_from_function(
- resolve(request.path).func
+ getattr(fn, "view_class", fn)
)
elif integration.transaction_style == "url":
scope.transaction = LEGACY_RESOLVER.resolve(request.path_info)
diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py
index f1856ed515..e4008fcdbe 100644
--- a/sentry_sdk/integrations/flask.py
+++ b/sentry_sdk/integrations/flask.py
@@ -65,13 +65,17 @@ def __init__(self, transaction_style="endpoint"):
@staticmethod
def setup_once():
# type: () -> None
+
+ # This version parsing is absolutely naive but the alternative is to
+ # import pkg_resources which slows down the SDK a lot.
try:
version = tuple(map(int, FLASK_VERSION.split(".")[:3]))
except (ValueError, TypeError):
- raise DidNotEnable("Unparsable Flask version: {}".format(FLASK_VERSION))
-
- if version < (0, 10):
- raise DidNotEnable("Flask 0.10 or newer is required.")
+ # It's probably a release candidate, we assume it's fine.
+ pass
+ else:
+ if version < (0, 10):
+ raise DidNotEnable("Flask 0.10 or newer is required.")
request_started.connect(_request_started)
got_request_exception.connect(_capture_exception)
diff --git a/tox.ini b/tox.ini
index ee9a859a16..40e322650c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -76,7 +76,6 @@ envlist =
{py2.7,py3.7,py3.8,py3.9}-sqlalchemy-{1.2,1.3}
- py3.7-spark
{py3.5,py3.6,py3.7,py3.8,py3.9}-pure_eval
@@ -215,8 +214,6 @@ deps =
sqlalchemy-1.2: sqlalchemy>=1.2,<1.3
sqlalchemy-1.3: sqlalchemy>=1.3,<1.4
- spark: pyspark==2.4.4
-
linters: -r linter-requirements.txt
py3.8: hypothesis
@@ -260,7 +257,6 @@ setenv =
rediscluster: TESTPATH=tests/integrations/rediscluster
asgi: TESTPATH=tests/integrations/asgi
sqlalchemy: TESTPATH=tests/integrations/sqlalchemy
- spark: TESTPATH=tests/integrations/spark
pure_eval: TESTPATH=tests/integrations/pure_eval
chalice: TESTPATH=tests/integrations/chalice
boto3: TESTPATH=tests/integrations/boto3
From 76aa1892741191a9ba242de511fde746241ab29b Mon Sep 17 00:00:00 2001
From: BobReid
Date: Mon, 3 May 2021 11:25:32 -0400
Subject: [PATCH 0173/2327] fix(rq): Only capture exception if RQ job has
failed (ignore retries) (#1076)
---
sentry_sdk/integrations/rq.py | 24 +++++++++++++-----------
tests/integrations/rq/test_rq.py | 21 ++++++++++++++++++---
2 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/sentry_sdk/integrations/rq.py b/sentry_sdk/integrations/rq.py
index 1af4b0babd..f4c77d7df2 100644
--- a/sentry_sdk/integrations/rq.py
+++ b/sentry_sdk/integrations/rq.py
@@ -3,30 +3,28 @@
import weakref
from sentry_sdk.hub import Hub
-from sentry_sdk.integrations import Integration, DidNotEnable
+from sentry_sdk.integrations import DidNotEnable, Integration
+from sentry_sdk.integrations.logging import ignore_logger
from sentry_sdk.tracing import Transaction
from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
-
try:
- from rq.version import VERSION as RQ_VERSION
+ from rq.queue import Queue
from rq.timeouts import JobTimeoutException
+ from rq.version import VERSION as RQ_VERSION
from rq.worker import Worker
- from rq.queue import Queue
except ImportError:
raise DidNotEnable("RQ not installed")
from sentry_sdk._types import MYPY
if MYPY:
- from typing import Any
- from typing import Dict
- from typing import Callable
-
- from rq.job import Job
+ from typing import Any, Callable, Dict
- from sentry_sdk.utils import ExcInfo
from sentry_sdk._types import EventProcessor
+ from sentry_sdk.utils import ExcInfo
+
+ from rq.job import Job
class RqIntegration(Integration):
@@ -89,7 +87,9 @@ def sentry_patched_perform_job(self, job, *args, **kwargs):
def sentry_patched_handle_exception(self, job, *exc_info, **kwargs):
# type: (Worker, Any, *Any, **Any) -> Any
- _capture_exception(exc_info) # type: ignore
+ if job.is_failed:
+ _capture_exception(exc_info) # type: ignore
+
return old_handle_exception(self, job, *exc_info, **kwargs)
Worker.handle_exception = sentry_patched_handle_exception
@@ -108,6 +108,8 @@ def sentry_patched_enqueue_job(self, job, **kwargs):
Queue.enqueue_job = sentry_patched_enqueue_job
+ ignore_logger("rq.worker")
+
def _make_event_processor(weak_job):
# type: (Callable[[], Job]) -> EventProcessor
diff --git a/tests/integrations/rq/test_rq.py b/tests/integrations/rq/test_rq.py
index ee3e5f51fa..651bf22248 100644
--- a/tests/integrations/rq/test_rq.py
+++ b/tests/integrations/rq/test_rq.py
@@ -1,8 +1,7 @@
-from sentry_sdk.integrations.rq import RqIntegration
-
import pytest
-
from fakeredis import FakeStrictRedis
+from sentry_sdk.integrations.rq import RqIntegration
+
import rq
try:
@@ -177,3 +176,19 @@ def test_traces_sampler_gets_correct_values_in_sampling_context(
}
)
)
+
+
+@pytest.mark.skipif(
+ rq.__version__.split(".") < ["1", "5"], reason="At least rq-1.5 required"
+)
+def test_job_with_retries(sentry_init, capture_events):
+ sentry_init(integrations=[RqIntegration()])
+ events = capture_events()
+
+ queue = rq.Queue(connection=FakeStrictRedis())
+ worker = rq.SimpleWorker([queue], connection=queue.connection)
+
+ queue.enqueue(crashing_job, foo=42, retry=rq.Retry(max=1))
+ worker.work(burst=True)
+
+ assert len(events) == 1
From b7b5c03ef3263ff62ffe00d6319a4ace508a7a26 Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Thu, 6 May 2021 16:07:55 +0200
Subject: [PATCH 0174/2327] fix(aws-lambda): Change function handler name to
'x.y' (#1107)
Fix for AWS Function Handler name to be in the format of filename.function-name because
passing paths as function names is giving us import errors from AWS Lambda
---
scripts/build_awslambda_layer.py | 2 +-
tests/integrations/aws_lambda/client.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/build_awslambda_layer.py b/scripts/build_awslambda_layer.py
index 1fda06e79f..f2e0594f6e 100644
--- a/scripts/build_awslambda_layer.py
+++ b/scripts/build_awslambda_layer.py
@@ -52,7 +52,7 @@ def create_init_serverless_sdk_package(self):
sentry-python-serverless zip
"""
serverless_sdk_path = (
- f"{self.packages_dir}/sentry_sdk/" f"integrations/init_serverless_sdk"
+ f"{self.packages_dir}/init_serverless_sdk"
)
if not os.path.exists(serverless_sdk_path):
os.makedirs(serverless_sdk_path)
diff --git a/tests/integrations/aws_lambda/client.py b/tests/integrations/aws_lambda/client.py
index 8273b281c3..a34ec38805 100644
--- a/tests/integrations/aws_lambda/client.py
+++ b/tests/integrations/aws_lambda/client.py
@@ -51,7 +51,7 @@ def build_no_code_serverless_function_and_layer(
}
},
Role=os.environ["SENTRY_PYTHON_TEST_AWS_IAM_ROLE"],
- Handler="sentry_sdk.integrations.init_serverless_sdk.sentry_lambda_handler",
+ Handler="init_serverless_sdk.sentry_lambda_handler",
Layers=[response["LayerVersionArn"]],
Code={"ZipFile": zip.read()},
Description="Created as part of testsuite for getsentry/sentry-python",
From 7c7bf31081ffa896e4fe6a7e6f5f110ff839fd4e Mon Sep 17 00:00:00 2001
From: Rodolfo Carvalho
Date: Thu, 6 May 2021 17:05:46 +0200
Subject: [PATCH 0175/2327] fix(serverless): Return value from original handler
(#1106)
---
scripts/init_serverless_sdk.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/init_serverless_sdk.py b/scripts/init_serverless_sdk.py
index 07b453eaf8..0d3545039b 100644
--- a/scripts/init_serverless_sdk.py
+++ b/scripts/init_serverless_sdk.py
@@ -35,4 +35,4 @@ def sentry_lambda_handler(event, context):
raise ValueError("Incorrect AWS Handler path (Not a path)")
lambda_function = __import__(module_name)
lambda_handler = getattr(lambda_function, handler_name)
- lambda_handler(event, context)
+ return lambda_handler(event, context)
From f6ea27cb7fb6beed25809026a3556353fb3be5db Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Thu, 6 May 2021 17:32:04 +0200
Subject: [PATCH 0176/2327] Revert "fix(aws-lambda): Change function handler
name to 'x.y' (#1107)" (#1109)
This reverts commit b7b5c03ef3263ff62ffe00d6319a4ace508a7a26.
---
scripts/build_awslambda_layer.py | 2 +-
tests/integrations/aws_lambda/client.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/build_awslambda_layer.py b/scripts/build_awslambda_layer.py
index f2e0594f6e..1fda06e79f 100644
--- a/scripts/build_awslambda_layer.py
+++ b/scripts/build_awslambda_layer.py
@@ -52,7 +52,7 @@ def create_init_serverless_sdk_package(self):
sentry-python-serverless zip
"""
serverless_sdk_path = (
- f"{self.packages_dir}/init_serverless_sdk"
+ f"{self.packages_dir}/sentry_sdk/" f"integrations/init_serverless_sdk"
)
if not os.path.exists(serverless_sdk_path):
os.makedirs(serverless_sdk_path)
diff --git a/tests/integrations/aws_lambda/client.py b/tests/integrations/aws_lambda/client.py
index a34ec38805..8273b281c3 100644
--- a/tests/integrations/aws_lambda/client.py
+++ b/tests/integrations/aws_lambda/client.py
@@ -51,7 +51,7 @@ def build_no_code_serverless_function_and_layer(
}
},
Role=os.environ["SENTRY_PYTHON_TEST_AWS_IAM_ROLE"],
- Handler="init_serverless_sdk.sentry_lambda_handler",
+ Handler="sentry_sdk.integrations.init_serverless_sdk.sentry_lambda_handler",
Layers=[response["LayerVersionArn"]],
Code={"ZipFile": zip.read()},
Description="Created as part of testsuite for getsentry/sentry-python",
From f2951178f58c0234dea0a235e0640e304da5ef66 Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Thu, 6 May 2021 18:05:20 +0200
Subject: [PATCH 0177/2327] Updated change log for new release 1.1 (#1108)
---
CHANGELOG.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 145ae7ae32..91e7704d66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,14 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+# 1.1.0
+
+- Fix for `AWSLambda` integration returns value of original handler #1106
+- Fix for `RQ` integration that only captures exception if RQ job has failed and ignore retries #1076
+- Feature that supports Tracing for the `Tornado` integration #1060
+- Feature that supports wild cards in `ignore_logger` in the `Logging` Integration #1053
+- Fix for django that deals with template span description names that are either lists or tuples #1054
+
## 1.0.0
This release contains a breaking change
From 059f334907c7e9608b5cf8cadb5b02345eb5863f Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Thu, 6 May 2021 18:28:11 +0200
Subject: [PATCH 0178/2327] docs: Fixed incorrect heading level on new release
(#1110)
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91e7704d66..b7a5003fb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
-# 1.1.0
+## 1.1.0
- Fix for `AWSLambda` integration returns value of original handler #1106
- Fix for `RQ` integration that only captures exception if RQ job has failed and ignore retries #1076
From 90ad89acb6c79343ab860e576379051db6ef76ec Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Thu, 6 May 2021 18:51:37 +0200
Subject: [PATCH 0179/2327] fix(ci): Removed failing pypy-2.7 from CI (#1111)
---
.github/workflows/ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b7df0771b8..ad916e8f24 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -77,7 +77,7 @@ jobs:
strategy:
matrix:
python-version:
- ["2.7", "pypy-2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9"]
+ ["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9"]
services:
# Label used to access the service container
From 7822f2ea20b27ed3ccbf22ebd105b5b82294213f Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Thu, 6 May 2021 16:58:30 +0000
Subject: [PATCH 0180/2327] release: 1.1.0
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 5c15d80c4a..64084a3970 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.0.0"
+release = "1.1.0"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 43a03364b6..824e874bbd 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -99,7 +99,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.0.0"
+VERSION = "1.1.0"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 87e5286e71..eaced8dbd9 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.0.0",
+ version="1.1.0",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 4b4ffc05795130c8a95577074a29462c2a512d66 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 17 May 2021 11:32:46 +0200
Subject: [PATCH 0181/2327] fix(transport): Unified hook for capturing metric
about dropped events (#1100)
---
sentry_sdk/transport.py | 31 +++++++++++++++++++++++--------
sentry_sdk/worker.py | 9 +++------
2 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/sentry_sdk/transport.py b/sentry_sdk/transport.py
index 5fdfdfbdc1..a254b4f6ee 100644
--- a/sentry_sdk/transport.py
+++ b/sentry_sdk/transport.py
@@ -150,12 +150,14 @@ def _update_rate_limits(self, response):
# no matter of the status code to update our internal rate limits.
header = response.headers.get("x-sentry-rate-limits")
if header:
+ logger.warning("Rate-limited via x-sentry-rate-limits")
self._disabled_until.update(_parse_rate_limits(header))
# old sentries only communicate global rate limit hits via the
# retry-after header on 429. This header can also be emitted on new
# sentries if a proxy in front wants to globally slow things down.
elif response.status == 429:
+ logger.warning("Rate-limited via 429")
self._disabled_until[None] = datetime.utcnow() + timedelta(
seconds=self._retry.get_retry_after(response) or 60
)
@@ -173,12 +175,16 @@ def _send_request(
"X-Sentry-Auth": str(self._auth.to_header()),
}
)
- response = self._pool.request(
- "POST",
- str(self._auth.get_api_url(endpoint_type)),
- body=body,
- headers=headers,
- )
+ try:
+ response = self._pool.request(
+ "POST",
+ str(self._auth.get_api_url(endpoint_type)),
+ body=body,
+ headers=headers,
+ )
+ except Exception:
+ self.on_dropped_event("network")
+ raise
try:
self._update_rate_limits(response)
@@ -186,6 +192,7 @@ def _send_request(
if response.status == 429:
# if we hit a 429. Something was rate limited but we already
# acted on this in `self._update_rate_limits`.
+ self.on_dropped_event("status_429")
pass
elif response.status >= 300 or response.status < 200:
@@ -194,9 +201,14 @@ def _send_request(
response.status,
response.data,
)
+ self.on_dropped_event("status_{}".format(response.status))
finally:
response.close()
+ def on_dropped_event(self, reason):
+ # type: (str) -> None
+ pass
+
def _check_disabled(self, category):
# type: (str) -> bool
def _disabled(bucket):
@@ -212,6 +224,7 @@ def _send_event(
# type: (...) -> None
if self._check_disabled("error"):
+ self.on_dropped_event("self_rate_limits")
return None
body = io.BytesIO()
@@ -325,7 +338,8 @@ def send_event_wrapper():
with capture_internal_exceptions():
self._send_event(event)
- self._worker.submit(send_event_wrapper)
+ if not self._worker.submit(send_event_wrapper):
+ self.on_dropped_event("full_queue")
def capture_envelope(
self, envelope # type: Envelope
@@ -339,7 +353,8 @@ def send_envelope_wrapper():
with capture_internal_exceptions():
self._send_envelope(envelope)
- self._worker.submit(send_envelope_wrapper)
+ if not self._worker.submit(send_envelope_wrapper):
+ self.on_dropped_event("full_queue")
def flush(
self,
diff --git a/sentry_sdk/worker.py b/sentry_sdk/worker.py
index a8e2fe1ce6..47272b81c0 100644
--- a/sentry_sdk/worker.py
+++ b/sentry_sdk/worker.py
@@ -109,16 +109,13 @@ def _wait_flush(self, timeout, callback):
logger.error("flush timed out, dropped %s events", pending)
def submit(self, callback):
- # type: (Callable[[], None]) -> None
+ # type: (Callable[[], None]) -> bool
self._ensure_thread()
try:
self._queue.put_nowait(callback)
+ return True
except Full:
- self.on_full_queue(callback)
-
- def on_full_queue(self, callback):
- # type: (Optional[Any]) -> None
- logger.error("background worker queue full, dropping event")
+ return False
def _target(self):
# type: () -> None
From e2d0893824481c9a5dd3141872d90d0888c4c5f8 Mon Sep 17 00:00:00 2001
From: elonzh
Date: Mon, 31 May 2021 17:24:29 +0800
Subject: [PATCH 0182/2327] feat(integration): Add Httpx Integration (#1119)
* feat(integration): Add Httpx Integration
Co-authored-by: Ahmed Etefy
---
sentry_sdk/integrations/httpx.py | 83 ++++++++++++++++++++++++++
setup.py | 1 +
tests/integrations/httpx/__init__.py | 3 +
tests/integrations/httpx/test_httpx.py | 66 ++++++++++++++++++++
tox.ini | 6 ++
5 files changed, 159 insertions(+)
create mode 100644 sentry_sdk/integrations/httpx.py
create mode 100644 tests/integrations/httpx/__init__.py
create mode 100644 tests/integrations/httpx/test_httpx.py
diff --git a/sentry_sdk/integrations/httpx.py b/sentry_sdk/integrations/httpx.py
new file mode 100644
index 0000000000..af67315338
--- /dev/null
+++ b/sentry_sdk/integrations/httpx.py
@@ -0,0 +1,83 @@
+from sentry_sdk import Hub
+from sentry_sdk.integrations import Integration, DidNotEnable
+
+from sentry_sdk._types import MYPY
+
+if MYPY:
+ from typing import Any
+
+
+try:
+ from httpx import AsyncClient, Client, Request, Response # type: ignore
+except ImportError:
+ raise DidNotEnable("httpx is not installed")
+
+__all__ = ["HttpxIntegration"]
+
+
+class HttpxIntegration(Integration):
+ identifier = "httpx"
+
+ @staticmethod
+ def setup_once():
+ # type: () -> None
+ """
+ httpx has its own transport layer and can be customized when needed,
+ so patch Client.send and AsyncClient.send to support both synchronous and async interfaces.
+ """
+ _install_httpx_client()
+ _install_httpx_async_client()
+
+
+def _install_httpx_client():
+ # type: () -> None
+ real_send = Client.send
+
+ def send(self, request, **kwargs):
+ # type: (Client, Request, **Any) -> Response
+ hub = Hub.current
+ if hub.get_integration(HttpxIntegration) is None:
+ return real_send(self, request, **kwargs)
+
+ with hub.start_span(
+ op="http", description="%s %s" % (request.method, request.url)
+ ) as span:
+ span.set_data("method", request.method)
+ span.set_data("url", str(request.url))
+ for key, value in hub.iter_trace_propagation_headers():
+ request.headers[key] = value
+ rv = real_send(self, request, **kwargs)
+
+ span.set_data("status_code", rv.status_code)
+ span.set_http_status(rv.status_code)
+ span.set_data("reason", rv.reason_phrase)
+ return rv
+
+ Client.send = send
+
+
+def _install_httpx_async_client():
+ # type: () -> None
+ real_send = AsyncClient.send
+
+ async def send(self, request, **kwargs):
+ # type: (AsyncClient, Request, **Any) -> Response
+ hub = Hub.current
+ if hub.get_integration(HttpxIntegration) is None:
+ return await real_send(self, request, **kwargs)
+
+ with hub.start_span(
+ op="http", description="%s %s" % (request.method, request.url)
+ ) as span:
+ span.set_data("method", request.method)
+ span.set_data("url", str(request.url))
+ for key, value in hub.iter_trace_propagation_headers():
+ request.headers[key] = value
+ rv = await real_send(self, request, **kwargs)
+
+ span.set_data("status_code", rv.status_code)
+ span.set_http_status(rv.status_code)
+ span.set_data("reason", rv.reason_phrase)
+ return rv
+
+ AsyncClient.send = send
diff --git a/setup.py b/setup.py
index eaced8dbd9..d854f87df5 100644
--- a/setup.py
+++ b/setup.py
@@ -53,6 +53,7 @@ def get_file_text(file_name):
"pyspark": ["pyspark>=2.4.4"],
"pure_eval": ["pure_eval", "executing", "asttokens"],
"chalice": ["chalice>=1.16.0"],
+ "httpx": ["httpx>=0.16.0"],
},
classifiers=[
"Development Status :: 5 - Production/Stable",
diff --git a/tests/integrations/httpx/__init__.py b/tests/integrations/httpx/__init__.py
new file mode 100644
index 0000000000..1afd90ea3a
--- /dev/null
+++ b/tests/integrations/httpx/__init__.py
@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("httpx")
diff --git a/tests/integrations/httpx/test_httpx.py b/tests/integrations/httpx/test_httpx.py
new file mode 100644
index 0000000000..4623f13348
--- /dev/null
+++ b/tests/integrations/httpx/test_httpx.py
@@ -0,0 +1,66 @@
+import asyncio
+
+import httpx
+
+from sentry_sdk import capture_message, start_transaction
+from sentry_sdk.integrations.httpx import HttpxIntegration
+
+
+def test_crumb_capture_and_hint(sentry_init, capture_events):
+ def before_breadcrumb(crumb, hint):
+ crumb["data"]["extra"] = "foo"
+ return crumb
+
+ sentry_init(integrations=[HttpxIntegration()], before_breadcrumb=before_breadcrumb)
+ clients = (httpx.Client(), httpx.AsyncClient())
+ for i, c in enumerate(clients):
+ with start_transaction():
+ events = capture_events()
+
+ url = "https://httpbin.org/status/200"
+ if not asyncio.iscoroutinefunction(c.get):
+ response = c.get(url)
+ else:
+ response = asyncio.get_event_loop().run_until_complete(c.get(url))
+
+ assert response.status_code == 200
+ capture_message("Testing!")
+
+ (event,) = events
+ # send request twice so we need get breadcrumb by index
+ crumb = event["breadcrumbs"]["values"][i]
+ assert crumb["type"] == "http"
+ assert crumb["category"] == "httplib"
+ assert crumb["data"] == {
+ "url": url,
+ "method": "GET",
+ "status_code": 200,
+ "reason": "OK",
+ "extra": "foo",
+ }
+
+
+def test_outgoing_trace_headers(sentry_init):
+ sentry_init(traces_sample_rate=1.0, integrations=[HttpxIntegration()])
+ clients = (httpx.Client(), httpx.AsyncClient())
+ for i, c in enumerate(clients):
+ with start_transaction(
+ name="/interactions/other-dogs/new-dog",
+ op="greeting.sniff",
+ # make trace_id difference between transactions
+ trace_id=f"012345678901234567890123456789{i}",
+ ) as transaction:
+ url = "https://httpbin.org/status/200"
+ if not asyncio.iscoroutinefunction(c.get):
+ response = c.get(url)
+ else:
+ response = asyncio.get_event_loop().run_until_complete(c.get(url))
+
+ request_span = transaction._span_recorder.spans[-1]
+ assert response.request.headers[
+ "sentry-trace"
+ ] == "{trace_id}-{parent_span_id}-{sampled}".format(
+ trace_id=transaction.trace_id,
+ parent_span_id=request_span.span_id,
+ sampled=1,
+ )
diff --git a/tox.ini b/tox.ini
index 40e322650c..728ddc793b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -83,6 +83,8 @@ envlist =
{py2.7,py3.6,py3.7,py3.8}-boto3-{1.9,1.10,1.11,1.12,1.13,1.14,1.15,1.16}
+ {py3.6,py3.7,py3.8,py3.9}-httpx-{0.16,0.17}
+
[testenv]
deps =
# if you change test-requirements.txt and your change is not being reflected
@@ -235,6 +237,9 @@ deps =
boto3-1.15: boto3>=1.15,<1.16
boto3-1.16: boto3>=1.16,<1.17
+ httpx-0.16: httpx>=0.16,<0.17
+ httpx-0.17: httpx>=0.17,<0.18
+
setenv =
PYTHONDONTWRITEBYTECODE=1
TESTPATH=tests
@@ -260,6 +265,7 @@ setenv =
pure_eval: TESTPATH=tests/integrations/pure_eval
chalice: TESTPATH=tests/integrations/chalice
boto3: TESTPATH=tests/integrations/boto3
+ httpx: TESTPATH=tests/integrations/httpx
COVERAGE_FILE=.coverage-{envname}
passenv =
From e91c6f14bc5ff95d46c5dd8c6ef28e3be93ad169 Mon Sep 17 00:00:00 2001
From: Yusuke Hayashi
Date: Wed, 2 Jun 2021 03:25:44 +0900
Subject: [PATCH 0183/2327] fix: typo (#1120)
---
sentry_sdk/integrations/redis.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sentry_sdk/integrations/redis.py b/sentry_sdk/integrations/redis.py
index 0df6121a54..6475d15bf6 100644
--- a/sentry_sdk/integrations/redis.py
+++ b/sentry_sdk/integrations/redis.py
@@ -56,7 +56,7 @@ def setup_once():
try:
_patch_rediscluster()
except Exception:
- logger.exception("Error occured while patching `rediscluster` library")
+ logger.exception("Error occurred while patching `rediscluster` library")
def patch_redis_client(cls):
From be67071dba2c5cf7582cc0f4b8e62a87f9d7d85b Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Tue, 1 Jun 2021 11:32:42 -0700
Subject: [PATCH 0184/2327] delete reference to rate being non-zero (#1065)
---
sentry_sdk/tracing.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 21269d68df..4ce25f27c2 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -666,7 +666,7 @@ def has_tracing_enabled(options):
# type: (Dict[str, Any]) -> bool
"""
Returns True if either traces_sample_rate or traces_sampler is
- non-zero/defined, False otherwise.
+ defined, False otherwise.
"""
return bool(
From b9c5cd4e06b57919c2d375fd3b4046d5799ab6bd Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Tue, 1 Jun 2021 20:44:23 +0200
Subject: [PATCH 0185/2327] fix(ci): Fix failing CI dependencies due to
Werkzeug and pytest_django (#1124)
* fix(ci): Pin trytond werkzeug dependency to Werkzeug<2.0
* Pinned Wekzeug frequence for flask
* Pinned pytest-django
* Fixed missing DB django tests issue
* fix: Formatting
* Allowed database access to postgres database in django tests
* Added hack to set the appropriate db decorator
* Converted string version into tuple for comparison
* fix: Formatting
* Handled dev versions of pytest_django in hack
Co-authored-by: sentry-bot
---
tests/integrations/django/test_basic.py | 20 +++++++++++++++++---
tox.ini | 7 +++----
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index 9341dc238d..09fefe6a4c 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -1,6 +1,7 @@
from __future__ import absolute_import
import pytest
+import pytest_django
import json
from werkzeug.test import Client
@@ -21,6 +22,19 @@
from tests.integrations.django.myapp.wsgi import application
+# Hack to prevent from experimental feature introduced in version `4.3.0` in `pytest-django` that
+# requires explicit database allow from failing the test
+pytest_mark_django_db_decorator = pytest.mark.django_db
+try:
+ pytest_version = tuple(map(int, pytest_django.__version__.split(".")))
+ if pytest_version > (4, 2, 0):
+ pytest_mark_django_db_decorator = pytest.mark.django_db(databases="__all__")
+except ValueError:
+ if "dev" in pytest_django.__version__:
+ pytest_mark_django_db_decorator = pytest.mark.django_db(databases="__all__")
+except AttributeError:
+ pass
+
@pytest.fixture
def client():
@@ -245,7 +259,7 @@ def test_sql_queries(sentry_init, capture_events, with_integration):
@pytest.mark.forked
-@pytest.mark.django_db
+@pytest_mark_django_db_decorator
def test_sql_dict_query_params(sentry_init, capture_events):
sentry_init(
integrations=[DjangoIntegration()],
@@ -290,7 +304,7 @@ def test_sql_dict_query_params(sentry_init, capture_events):
],
)
@pytest.mark.forked
-@pytest.mark.django_db
+@pytest_mark_django_db_decorator
def test_sql_psycopg2_string_composition(sentry_init, capture_events, query):
sentry_init(
integrations=[DjangoIntegration()],
@@ -323,7 +337,7 @@ def test_sql_psycopg2_string_composition(sentry_init, capture_events, query):
@pytest.mark.forked
-@pytest.mark.django_db
+@pytest_mark_django_db_decorator
def test_sql_psycopg2_placeholders(sentry_init, capture_events):
sentry_init(
integrations=[DjangoIntegration()],
diff --git a/tox.ini b/tox.ini
index 728ddc793b..5aac423c0a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -104,6 +104,7 @@ deps =
django-{1.6,1.7}: pytest-django<3.0
django-{1.8,1.9,1.10,1.11,2.0,2.1}: pytest-django<4.0
django-{2.2,3.0,3.1}: pytest-django>=4.0
+ django-{2.2,3.0,3.1}: Werkzeug<2.0
django-dev: git+https://github.com/pytest-dev/pytest-django#egg=pytest-django
django-1.6: Django>=1.6,<1.7
@@ -203,7 +204,7 @@ deps =
trytond-5.0: trytond>=5.0,<5.1
trytond-4.6: trytond>=4.6,<4.7
- trytond-4.8: werkzeug<1.0
+ trytond-{4.6,4.8,5.0,5.2,5.4}: werkzeug<2.0
redis: fakeredis
@@ -303,9 +304,7 @@ commands =
; https://github.com/pytest-dev/pytest/issues/5532
{py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12}: pip install pytest<5
-
- ; trytond tries to import werkzeug.contrib
- trytond-5.0: pip install werkzeug<1.0
+ {py3.6,py3.7,py3.8,py3.9}-flask-{0.11}: pip install Werkzeug<2
py.test {env:TESTPATH} {posargs}
From 41749c1b5dd003bbaa21675c00e2c80dd66b31ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20B=C3=A1rta?=
Date: Tue, 1 Jun 2021 20:55:12 +0200
Subject: [PATCH 0186/2327] fix(integration): Discard -dev when parsing
required versions for bottle
---
sentry_sdk/integrations/bottle.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sentry_sdk/integrations/bottle.py b/sentry_sdk/integrations/bottle.py
index 8bdabda4f7..4fa077e8f6 100644
--- a/sentry_sdk/integrations/bottle.py
+++ b/sentry_sdk/integrations/bottle.py
@@ -57,7 +57,7 @@ def setup_once():
# type: () -> None
try:
- version = tuple(map(int, BOTTLE_VERSION.split(".")))
+ version = tuple(map(int, BOTTLE_VERSION.replace("-dev", "").split(".")))
except (TypeError, ValueError):
raise DidNotEnable("Unparsable Bottle version: {}".format(version))
From 4915190848b0b2d07733efdbda02486cc9cd1846 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Jun 2021 13:57:04 +0000
Subject: [PATCH 0187/2327] build(deps): bump sphinx from 3.5.3 to 4.0.2
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 3.5.3 to 4.0.2.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/4.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/commits/v4.0.2)
Signed-off-by: dependabot-preview[bot]
---
docs-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs-requirements.txt b/docs-requirements.txt
index 8273d572e7..d04e38b90b 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx==3.5.3
+sphinx==4.0.2
sphinx-rtd-theme
sphinx-autodoc-typehints[type_comments]>=1.8.0
typing-extensions
From 69b3f8704481611916eb1c43d4e417dfcb709d93 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Jun 2021 13:58:40 +0000
Subject: [PATCH 0188/2327] build(deps): bump flake8 from 3.9.0 to 3.9.2
Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.9.0 to 3.9.2.
- [Release notes](https://gitlab.com/pycqa/flake8/tags)
- [Commits](https://gitlab.com/pycqa/flake8/compare/3.9.0...3.9.2)
Signed-off-by: dependabot-preview[bot]
---
linter-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linter-requirements.txt b/linter-requirements.txt
index 08b4795849..474bed4ff7 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -1,5 +1,5 @@
black==20.8b1
-flake8==3.9.0
+flake8==3.9.2
flake8-import-order==0.18.1
mypy==0.782
flake8-bugbear==21.3.2
From a3b71748c7b50482811241a84e5104b9f81ad145 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Jun 2021 16:43:44 +0200
Subject: [PATCH 0189/2327] build(deps): bump black from 20.8b1 to 21.5b2
(#1126)
Bumps [black](https://github.com/psf/black) from 20.8b1 to 21.5b2.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits)
Signed-off-by: dependabot-preview[bot]
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
linter-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linter-requirements.txt b/linter-requirements.txt
index 474bed4ff7..10faef6eda 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -1,4 +1,4 @@
-black==20.8b1
+black==21.5b2
flake8==3.9.2
flake8-import-order==0.18.1
mypy==0.782
From becf6db53eac242408b46120e7a2650aa2e9a67a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Jun 2021 14:22:21 +0000
Subject: [PATCH 0190/2327] build(deps): bump flake8-bugbear from 21.3.2 to
21.4.3
Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 21.3.2 to 21.4.3.
- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases)
- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/21.3.2...21.4.3)
Signed-off-by: dependabot-preview[bot]
---
linter-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linter-requirements.txt b/linter-requirements.txt
index 10faef6eda..ddf8ad551e 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -2,5 +2,5 @@ black==21.5b2
flake8==3.9.2
flake8-import-order==0.18.1
mypy==0.782
-flake8-bugbear==21.3.2
+flake8-bugbear==21.4.3
pep8-naming==0.11.1
From e33cf0579d43410cfa76e9b8cfaf49f8d161a705 Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya
Date: Fri, 11 Jun 2021 18:08:33 +0300
Subject: [PATCH 0191/2327] ref(craft): Modernize Craft config (#1127)
* ref(craft): Modernize Craft config
* Add missing comments back
---
.craft.yml | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/.craft.yml b/.craft.yml
index 5237c9debe..e351462f72 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -1,18 +1,12 @@
----
-minVersion: "0.14.0"
-github:
- owner: getsentry
- repo: sentry-python
-
+minVersion: 0.23.1
targets:
- name: pypi
includeNames: /^sentry[_\-]sdk.*$/
- name: github
- name: gh-pages
- name: registry
- type: sdk
- config:
- canonical: pypi:sentry-sdk
+ sdks:
+ pypi:sentry-sdk:
- name: aws-lambda-layer
includeNames: /^sentry-python-serverless-\d+(\.\d+)*\.zip$/
layerName: SentryPythonServerlessSDK
@@ -29,11 +23,5 @@ targets:
- python3.7
- python3.8
license: MIT
-
changelog: CHANGELOG.md
changelogPolicy: simple
-
-statusProvider:
- name: github
-artifactProvider:
- name: github
From e204e1aae5bb14ca3076e6e7f0962d657356cbd1 Mon Sep 17 00:00:00 2001
From: Charles Verdad
Date: Sat, 12 Jun 2021 02:08:11 +1000
Subject: [PATCH 0192/2327] Support China domain in lambda cloudwatch logs url
(#1051)
* Support china domain in lambda cloudwatch logs url
* Make tests pass
* trigger GitHub actions
Co-authored-by: Ahmed Etefy
---
sentry_sdk/integrations/aws_lambda.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
index 7f823dc04e..533250efaa 100644
--- a/sentry_sdk/integrations/aws_lambda.py
+++ b/sentry_sdk/integrations/aws_lambda.py
@@ -400,13 +400,15 @@ def _get_cloudwatch_logs_url(aws_context, start_time):
str -- AWS Console URL to logs.
"""
formatstring = "%Y-%m-%dT%H:%M:%SZ"
+ region = environ.get("AWS_REGION", "")
url = (
- "https://console.aws.amazon.com/cloudwatch/home?region={region}"
+ "https://console.{domain}/cloudwatch/home?region={region}"
"#logEventViewer:group={log_group};stream={log_stream}"
";start={start_time};end={end_time}"
).format(
- region=environ.get("AWS_REGION"),
+ domain="amazonaws.cn" if region.startswith("cn-") else "aws.amazon.com",
+ region=region,
log_group=aws_context.log_group_name,
log_stream=aws_context.log_stream_name,
start_time=(start_time - timedelta(seconds=1)).strftime(formatstring),
From 7e63541d988b8280fd602808013c84f1ec775bcf Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 14 Jun 2021 06:26:09 +0000
Subject: [PATCH 0193/2327] build(deps): bump black from 21.5b2 to 21.6b0
Bumps [black](https://github.com/psf/black) from 21.5b2 to 21.6b0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits)
Signed-off-by: dependabot-preview[bot]
---
linter-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linter-requirements.txt b/linter-requirements.txt
index ddf8ad551e..f7076751d5 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -1,4 +1,4 @@
-black==21.5b2
+black==21.6b0
flake8==3.9.2
flake8-import-order==0.18.1
mypy==0.782
From b0658904925ec2b625b367ae86f9762b5a382d5f Mon Sep 17 00:00:00 2001
From: Karthikeyan Singaravelan
Date: Mon, 14 Jun 2021 13:12:07 +0530
Subject: [PATCH 0194/2327] fix(worker): Set daemon attribute instead of using
setDaemon method that was deprecated in Python 3.10 (#1093)
---
sentry_sdk/worker.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sentry_sdk/worker.py b/sentry_sdk/worker.py
index 47272b81c0..a06fb8f0d1 100644
--- a/sentry_sdk/worker.py
+++ b/sentry_sdk/worker.py
@@ -66,7 +66,7 @@ def start(self):
self._thread = threading.Thread(
target=self._target, name="raven-sentry.BackgroundWorker"
)
- self._thread.setDaemon(True)
+ self._thread.daemon = True
self._thread.start()
self._thread_for_pid = os.getpid()
From ab0cd2c2aa1f8cbe3a43d51bb600a7c7f6ad6d6b Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Mon, 5 Jul 2021 18:53:07 +0300
Subject: [PATCH 0195/2327] fix(aws-lambda): Fix bug for initial handler path
(#1139)
* fix(aws-lambda): Fix bug for initial handler path
Adds support for long initial handler paths in the format of `x.y.z`
and dir paths in the format of `x/y.z`
---
scripts/init_serverless_sdk.py | 55 +++++++++++++++++---
tests/integrations/aws_lambda/client.py | 28 +++++++++--
tests/integrations/aws_lambda/test_aws.py | 56 ++++++++++++---------
tests/integrations/django/myapp/settings.py | 2 +-
4 files changed, 105 insertions(+), 36 deletions(-)
diff --git a/scripts/init_serverless_sdk.py b/scripts/init_serverless_sdk.py
index 0d3545039b..878ff6029e 100644
--- a/scripts/init_serverless_sdk.py
+++ b/scripts/init_serverless_sdk.py
@@ -6,6 +6,8 @@
'sentry_sdk.integrations.init_serverless_sdk.sentry_lambda_handler'
"""
import os
+import sys
+import re
import sentry_sdk
from sentry_sdk._types import MYPY
@@ -23,16 +25,53 @@
)
+class AWSLambdaModuleLoader:
+ DIR_PATH_REGEX = r"^(.+)\/([^\/]+)$"
+
+ def __init__(self, sentry_initial_handler):
+ try:
+ module_path, self.handler_name = sentry_initial_handler.rsplit(".", 1)
+ except ValueError:
+ raise ValueError("Incorrect AWS Handler path (Not a path)")
+
+ self.extract_and_load_lambda_function_module(module_path)
+
+ def extract_and_load_lambda_function_module(self, module_path):
+ """
+ Method that extracts and loads lambda function module from module_path
+ """
+ py_version = sys.version_info
+
+ if re.match(self.DIR_PATH_REGEX, module_path):
+ # With a path like -> `scheduler/scheduler/event`
+ # `module_name` is `event`, and `module_file_path` is `scheduler/scheduler/event.py`
+ module_name = module_path.split(os.path.sep)[-1]
+ module_file_path = module_path + ".py"
+
+ # Supported python versions are 2.7, 3.6, 3.7, 3.8
+ if py_version >= (3, 5):
+ import importlib.util
+ spec = importlib.util.spec_from_file_location(module_name, module_file_path)
+ self.lambda_function_module = importlib.util.module_from_spec(spec)
+ spec.loader.exec_module(self.lambda_function_module)
+ elif py_version[0] < 3:
+ import imp
+ self.lambda_function_module = imp.load_source(module_name, module_file_path)
+ else:
+ raise ValueError("Python version %s is not supported." % py_version)
+ else:
+ import importlib
+ self.lambda_function_module = importlib.import_module(module_path)
+
+ def get_lambda_handler(self):
+ return getattr(self.lambda_function_module, self.handler_name)
+
+
def sentry_lambda_handler(event, context):
# type: (Any, Any) -> None
"""
Handler function that invokes a lambda handler which path is defined in
- environment vairables as "SENTRY_INITIAL_HANDLER"
+ environment variables as "SENTRY_INITIAL_HANDLER"
"""
- try:
- module_name, handler_name = os.environ["SENTRY_INITIAL_HANDLER"].rsplit(".", 1)
- except ValueError:
- raise ValueError("Incorrect AWS Handler path (Not a path)")
- lambda_function = __import__(module_name)
- lambda_handler = getattr(lambda_function, handler_name)
- return lambda_handler(event, context)
+ module_loader = AWSLambdaModuleLoader(os.environ["SENTRY_INITIAL_HANDLER"])
+ return module_loader.get_lambda_handler()(event, context)
diff --git a/tests/integrations/aws_lambda/client.py b/tests/integrations/aws_lambda/client.py
index 8273b281c3..784a4a9006 100644
--- a/tests/integrations/aws_lambda/client.py
+++ b/tests/integrations/aws_lambda/client.py
@@ -18,7 +18,7 @@ def get_boto_client():
def build_no_code_serverless_function_and_layer(
- client, tmpdir, fn_name, runtime, timeout
+ client, tmpdir, fn_name, runtime, timeout, initial_handler
):
"""
Util function that auto instruments the no code implementation of the python
@@ -45,7 +45,7 @@ def build_no_code_serverless_function_and_layer(
Timeout=timeout,
Environment={
"Variables": {
- "SENTRY_INITIAL_HANDLER": "test_lambda.test_handler",
+ "SENTRY_INITIAL_HANDLER": initial_handler,
"SENTRY_DSN": "https://123abc@example.com/123",
"SENTRY_TRACES_SAMPLE_RATE": "1.0",
}
@@ -67,12 +67,27 @@ def run_lambda_function(
syntax_check=True,
timeout=30,
layer=None,
+ initial_handler=None,
subprocess_kwargs=(),
):
subprocess_kwargs = dict(subprocess_kwargs)
with tempfile.TemporaryDirectory() as tmpdir:
- test_lambda_py = os.path.join(tmpdir, "test_lambda.py")
+ if initial_handler:
+ # If Initial handler value is provided i.e. it is not the default
+ # `test_lambda.test_handler`, then create another dir level so that our path is
+ # test_dir.test_lambda.test_handler
+ test_dir_path = os.path.join(tmpdir, "test_dir")
+ python_init_file = os.path.join(test_dir_path, "__init__.py")
+ os.makedirs(test_dir_path)
+ with open(python_init_file, "w"):
+ # Create __init__ file to make it a python package
+ pass
+
+ test_lambda_py = os.path.join(tmpdir, "test_dir", "test_lambda.py")
+ else:
+ test_lambda_py = os.path.join(tmpdir, "test_lambda.py")
+
with open(test_lambda_py, "w") as f:
f.write(code)
@@ -127,8 +142,13 @@ def run_lambda_function(
cwd=tmpdir,
check=True,
)
+
+ # Default initial handler
+ if not initial_handler:
+ initial_handler = "test_lambda.test_handler"
+
build_no_code_serverless_function_and_layer(
- client, tmpdir, fn_name, runtime, timeout
+ client, tmpdir, fn_name, runtime, timeout, initial_handler
)
@add_finalizer
diff --git a/tests/integrations/aws_lambda/test_aws.py b/tests/integrations/aws_lambda/test_aws.py
index 36c212c08f..0f50753be7 100644
--- a/tests/integrations/aws_lambda/test_aws.py
+++ b/tests/integrations/aws_lambda/test_aws.py
@@ -112,7 +112,9 @@ def lambda_runtime(request):
@pytest.fixture
def run_lambda_function(request, lambda_client, lambda_runtime):
- def inner(code, payload, timeout=30, syntax_check=True, layer=None):
+ def inner(
+ code, payload, timeout=30, syntax_check=True, layer=None, initial_handler=None
+ ):
from tests.integrations.aws_lambda.client import run_lambda_function
response = run_lambda_function(
@@ -124,6 +126,7 @@ def inner(code, payload, timeout=30, syntax_check=True, layer=None):
timeout=timeout,
syntax_check=syntax_check,
layer=layer,
+ initial_handler=initial_handler,
)
# for better debugging
@@ -621,32 +624,39 @@ def test_serverless_no_code_instrumentation(run_lambda_function):
python sdk, with no code changes sentry is able to capture errors
"""
- _, _, response = run_lambda_function(
- dedent(
- """
- import sentry_sdk
+ for initial_handler in [
+ None,
+ "test_dir/test_lambda.test_handler",
+ "test_dir.test_lambda.test_handler",
+ ]:
+ print("Testing Initial Handler ", initial_handler)
+ _, _, response = run_lambda_function(
+ dedent(
+ """
+ import sentry_sdk
- def test_handler(event, context):
- current_client = sentry_sdk.Hub.current.client
+ def test_handler(event, context):
+ current_client = sentry_sdk.Hub.current.client
- assert current_client is not None
+ assert current_client is not None
- assert len(current_client.options['integrations']) == 1
- assert isinstance(current_client.options['integrations'][0],
- sentry_sdk.integrations.aws_lambda.AwsLambdaIntegration)
+ assert len(current_client.options['integrations']) == 1
+ assert isinstance(current_client.options['integrations'][0],
+ sentry_sdk.integrations.aws_lambda.AwsLambdaIntegration)
- raise Exception("something went wrong")
- """
- ),
- b'{"foo": "bar"}',
- layer=True,
- )
- assert response["FunctionError"] == "Unhandled"
- assert response["StatusCode"] == 200
+ raise Exception("something went wrong")
+ """
+ ),
+ b'{"foo": "bar"}',
+ layer=True,
+ initial_handler=initial_handler,
+ )
+ assert response["FunctionError"] == "Unhandled"
+ assert response["StatusCode"] == 200
- assert response["Payload"]["errorType"] != "AssertionError"
+ assert response["Payload"]["errorType"] != "AssertionError"
- assert response["Payload"]["errorType"] == "Exception"
- assert response["Payload"]["errorMessage"] == "something went wrong"
+ assert response["Payload"]["errorType"] == "Exception"
+ assert response["Payload"]["errorMessage"] == "something went wrong"
- assert "sentry_handler" in response["LogResult"][3].decode("utf-8")
+ assert "sentry_handler" in response["LogResult"][3].decode("utf-8")
diff --git a/tests/integrations/django/myapp/settings.py b/tests/integrations/django/myapp/settings.py
index bea1c35bf4..cc4d249082 100644
--- a/tests/integrations/django/myapp/settings.py
+++ b/tests/integrations/django/myapp/settings.py
@@ -157,7 +157,7 @@ def middleware(request):
USE_L10N = True
-USE_TZ = True
+USE_TZ = False
TEMPLATE_DEBUG = True
From 5563bba89f813d6df0ac6edfff3456990098ce07 Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Tue, 6 Jul 2021 13:19:59 +0300
Subject: [PATCH 0196/2327] doc: Updated change log for new release 1.1.1
---
CHANGELOG.md | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7a5003fb4..34960169f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,15 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 1.1.1
+
+- Fix for `AWSLambda` Integration to handle other path formats for function initial handler #1139
+- Fix for worker to set deamon attribute instead of deprecated setDaemon method #1093
+- Fix for `bottle` Integration that discards `-dev` for version extraction #1085
+- Fix for transport that adds a unified hook for capturing metrics about dropped events #1100
+- Add `Httpx` Integration #1119
+- Add support for china domains in `AWSLambda` Integration #1051
+
## 1.1.0
- Fix for `AWSLambda` integration returns value of original handler #1106
From 020bf1b99068130dca12be61b4c09a1ea6ea427d Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Tue, 6 Jul 2021 13:29:15 +0300
Subject: [PATCH 0197/2327] doc: Update CHANGELOG.md for release 1.2.0 (#1141)
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34960169f9..92f3c9f5d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
-## 1.1.1
+## 1.2.0
- Fix for `AWSLambda` Integration to handle other path formats for function initial handler #1139
- Fix for worker to set deamon attribute instead of deprecated setDaemon method #1093
From 169c224b6f6b3638fb8a367ee64bf9029cd9f51e Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Tue, 6 Jul 2021 14:15:54 +0300
Subject: [PATCH 0198/2327] fix(docs): Add sphinx imports to docs conf to
prevent circular dependency (#1142)
---
docs/conf.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/docs/conf.py b/docs/conf.py
index 64084a3970..6d0bde20c2 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -5,6 +5,13 @@
import typing
+# prevent circular imports
+import sphinx.builders.html
+import sphinx.builders.latex
+import sphinx.builders.texinfo
+import sphinx.builders.text
+import sphinx.ext.autodoc
+
typing.TYPE_CHECKING = True
#
From 861b0aefd2ea51a4f3f25acb019612be97202f83 Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Tue, 6 Jul 2021 11:17:29 +0000
Subject: [PATCH 0199/2327] release: 1.2.0
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 6d0bde20c2..da68a4e8d4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.1.0"
+release = "1.2.0"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 824e874bbd..005d9573b5 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -99,7 +99,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.1.0"
+VERSION = "1.2.0"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index d854f87df5..056074757d 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.1.0",
+ version="1.2.0",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From c6a0ea4c253c8f09b12e90574a23af87958b520e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 6 Jul 2021 13:32:31 +0200
Subject: [PATCH 0200/2327] Upgrade to GitHub-native Dependabot (#1103)
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
.github/dependabot.yml | 43 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 43 insertions(+)
create mode 100644 .github/dependabot.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..9c69247970
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,43 @@
+version: 2
+updates:
+- package-ecosystem: pip
+ directory: "/"
+ schedule:
+ interval: weekly
+ open-pull-requests-limit: 10
+ allow:
+ - dependency-type: direct
+ - dependency-type: indirect
+ ignore:
+ - dependency-name: pytest
+ versions:
+ - "> 3.7.3"
+ - dependency-name: pytest-cov
+ versions:
+ - "> 2.8.1"
+ - dependency-name: pytest-forked
+ versions:
+ - "> 1.1.3"
+ - dependency-name: sphinx
+ versions:
+ - ">= 2.4.a, < 2.5"
+ - dependency-name: tox
+ versions:
+ - "> 3.7.0"
+ - dependency-name: werkzeug
+ versions:
+ - "> 0.15.5, < 1"
+ - dependency-name: werkzeug
+ versions:
+ - ">= 1.0.a, < 1.1"
+ - dependency-name: mypy
+ versions:
+ - "0.800"
+ - dependency-name: sphinx
+ versions:
+ - 3.4.3
+- package-ecosystem: gitsubmodule
+ directory: "/"
+ schedule:
+ interval: weekly
+ open-pull-requests-limit: 10
From b67fe105a323b1ada052bcb137cea3508fa2e068 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 6 Jul 2021 11:32:00 +0000
Subject: [PATCH 0201/2327] build(deps): bump checkouts/data-schemas from
`f97137d` to `f8615df`
Bumps [checkouts/data-schemas](https://github.com/getsentry/sentry-data-schemas) from `f97137d` to `f8615df`.
- [Release notes](https://github.com/getsentry/sentry-data-schemas/releases)
- [Commits](https://github.com/getsentry/sentry-data-schemas/compare/f97137ddd16853269519de3c9ec00503a99b5da3...f8615dff7f4640ff8a1810b264589b9fc6a4684a)
Signed-off-by: dependabot-preview[bot]
---
checkouts/data-schemas | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/checkouts/data-schemas b/checkouts/data-schemas
index f97137ddd1..f8615dff7f 160000
--- a/checkouts/data-schemas
+++ b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit f97137ddd16853269519de3c9ec00503a99b5da3
+Subproject commit f8615dff7f4640ff8a1810b264589b9fc6a4684a
From dd91a8b3e30b67edb6e29c75372f278563523edc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Jul 2021 12:04:09 +0200
Subject: [PATCH 0202/2327] build(deps): bump sphinx from 4.0.2 to 4.0.3
(#1144)
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/4.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v4.0.2...v4.0.3)
---
updated-dependencies:
- dependency-name: sphinx
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
docs-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs-requirements.txt b/docs-requirements.txt
index d04e38b90b..e8239919ca 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx==4.0.2
+sphinx==4.0.3
sphinx-rtd-theme
sphinx-autodoc-typehints[type_comments]>=1.8.0
typing-extensions
From 73bb478f1d2bec580af46825a763a31bcef08514 Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Thu, 8 Jul 2021 09:15:06 +0300
Subject: [PATCH 0203/2327] feat(integration): Add support for Sanic >=21.3
(#1146)
* feat(integration): Add support for Sanic >=21.3
* PR changes requested
* Fixed failing test + consistent transaction names
* fix: Formatting
* Trigger Build
* Small refactor
* Removed python 3.9 sanic 19 env due to lack of support
* Added checks for splitting app name from route name
Co-authored-by: sentry-bot
---
sentry_sdk/integrations/sanic.py | 23 +++++++++--
tests/integrations/sanic/test_sanic.py | 53 +++++++++++++++++++++++---
tox.ini | 5 +++
3 files changed, 71 insertions(+), 10 deletions(-)
diff --git a/sentry_sdk/integrations/sanic.py b/sentry_sdk/integrations/sanic.py
index d5eb7fae87..890bb2f3e2 100644
--- a/sentry_sdk/integrations/sanic.py
+++ b/sentry_sdk/integrations/sanic.py
@@ -96,14 +96,29 @@ async def sentry_handle_request(self, request, *args, **kwargs):
old_router_get = Router.get
- def sentry_router_get(self, request):
- # type: (Any, Request) -> Any
- rv = old_router_get(self, request)
+ def sentry_router_get(self, *args):
+ # type: (Any, Union[Any, Request]) -> Any
+ rv = old_router_get(self, *args)
hub = Hub.current
if hub.get_integration(SanicIntegration) is not None:
with capture_internal_exceptions():
with hub.configure_scope() as scope:
- scope.transaction = rv[0].__name__
+ if version >= (21, 3):
+ # Sanic versions above and including 21.3 append the app name to the
+ # route name, and so we need to remove it from Route name so the
+ # transaction name is consistent across all versions
+ sanic_app_name = self.ctx.app.name
+ sanic_route = rv[0].name
+
+ if sanic_route.startswith("%s." % sanic_app_name):
+ # We add a 1 to the len of the sanic_app_name because there is a dot
+ # that joins app name and the route name
+ # Format: app_name.route_name
+ sanic_route = sanic_route[len(sanic_app_name) + 1 :]
+
+ scope.transaction = sanic_route
+ else:
+ scope.transaction = rv[0].__name__
return rv
Router.get = sentry_router_get
diff --git a/tests/integrations/sanic/test_sanic.py b/tests/integrations/sanic/test_sanic.py
index 72425abbcb..8ee19844c5 100644
--- a/tests/integrations/sanic/test_sanic.py
+++ b/tests/integrations/sanic/test_sanic.py
@@ -9,6 +9,7 @@
from sentry_sdk.integrations.sanic import SanicIntegration
from sanic import Sanic, request, response, __version__ as SANIC_VERSION_RAW
+from sanic.response import HTTPResponse
from sanic.exceptions import abort
SANIC_VERSION = tuple(map(int, SANIC_VERSION_RAW.split(".")))
@@ -16,7 +17,12 @@
@pytest.fixture
def app():
- app = Sanic(__name__)
+ if SANIC_VERSION >= (20, 12):
+ # Build (20.12.0) adds a feature where the instance is stored in an internal class
+ # registry for later retrieval, and so add register=False to disable that
+ app = Sanic(__name__, register=False)
+ else:
+ app = Sanic(__name__)
@app.route("/message")
def hi(request):
@@ -166,11 +172,46 @@ async def task(i):
if SANIC_VERSION >= (19,):
kwargs["app"] = app
- await app.handle_request(
- request.Request(**kwargs),
- write_callback=responses.append,
- stream_callback=responses.append,
- )
+ if SANIC_VERSION >= (21, 3):
+ try:
+ app.router.reset()
+ app.router.finalize()
+ except AttributeError:
+ ...
+
+ class MockAsyncStreamer:
+ def __init__(self, request_body):
+ self.request_body = request_body
+ self.iter = iter(self.request_body)
+ self.response = b"success"
+
+ def respond(self, response):
+ responses.append(response)
+ patched_response = HTTPResponse()
+ patched_response.send = lambda end_stream: asyncio.sleep(0.001)
+ return patched_response
+
+ def __aiter__(self):
+ return self
+
+ async def __anext__(self):
+ try:
+ return next(self.iter)
+ except StopIteration:
+ raise StopAsyncIteration
+
+ patched_request = request.Request(**kwargs)
+ patched_request.stream = MockAsyncStreamer([b"hello", b"foo"])
+
+ await app.handle_request(
+ patched_request,
+ )
+ else:
+ await app.handle_request(
+ request.Request(**kwargs),
+ write_callback=responses.append,
+ stream_callback=responses.append,
+ )
(r,) = responses
assert r.status == 200
diff --git a/tox.ini b/tox.ini
index 5aac423c0a..68cee8e587 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,6 +39,8 @@ envlist =
{py3.5,py3.6,py3.7}-sanic-{0.8,18}
{py3.6,py3.7}-sanic-19
+ {py3.6,py3.7,py3.8}-sanic-20
+ {py3.7,py3.8,py3.9}-sanic-21
# TODO: Add py3.9
{pypy,py2.7}-celery-3
@@ -139,6 +141,9 @@ deps =
sanic-0.8: sanic>=0.8,<0.9
sanic-18: sanic>=18.0,<19.0
sanic-19: sanic>=19.0,<20.0
+ sanic-20: sanic>=20.0,<21.0
+ sanic-21: sanic>=21.0,<22.0
+ {py3.7,py3.8,py3.9}-sanic-21: sanic_testing
{py3.5,py3.6}-sanic: aiocontextvars==0.2.1
sanic: aiohttp
py3.5-sanic: ujson<4
From a9bb245ae28bc203b252d1a8fb280203f219c93e Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Thu, 8 Jul 2021 10:17:29 +0300
Subject: [PATCH 0204/2327] Update changelog (#1147)
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92f3c9f5d8..c34bd5439b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,10 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 1.3.0
+
+- Add support for Sanic versions 20 and 21 #1146
+
## 1.2.0
- Fix for `AWSLambda` Integration to handle other path formats for function initial handler #1139
From 956101e9ba18f8c9a2e323808e0a2baacff03ca0 Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Thu, 8 Jul 2021 07:18:25 +0000
Subject: [PATCH 0205/2327] release: 1.3.0
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index da68a4e8d4..e95252c80d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.2.0"
+release = "1.3.0"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 005d9573b5..2d00fca7eb 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -99,7 +99,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.2.0"
+VERSION = "1.3.0"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 056074757d..6472c663d3 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.2.0",
+ version="1.3.0",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From f005c3037a0a32e8bc3a9dd8020e70aca74e7046 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Jul 2021 17:11:51 +0200
Subject: [PATCH 0206/2327] build(deps): bump sphinx from 4.0.3 to 4.1.0
(#1149)
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 4.0.3 to 4.1.0.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/4.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v4.0.3...v4.1.0)
---
updated-dependencies:
- dependency-name: sphinx
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
docs-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs-requirements.txt b/docs-requirements.txt
index e8239919ca..1c32b7dec2 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx==4.0.3
+sphinx==4.1.0
sphinx-rtd-theme
sphinx-autodoc-typehints[type_comments]>=1.8.0
typing-extensions
From 5bff724b5364ade78991874732df362e5dedfe34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jul 2021 12:40:25 +0200
Subject: [PATCH 0207/2327] build(deps): bump sphinx from 4.1.0 to 4.1.1
(#1152)
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/4.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v4.1.0...v4.1.1)
---
updated-dependencies:
- dependency-name: sphinx
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
docs-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs-requirements.txt b/docs-requirements.txt
index 1c32b7dec2..e66af3de2c 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx==4.1.0
+sphinx==4.1.1
sphinx-rtd-theme
sphinx-autodoc-typehints[type_comments]>=1.8.0
typing-extensions
From 06f0265a9e926b38b04529dc77d2df51fba919f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jul 2021 12:40:36 +0200
Subject: [PATCH 0208/2327] build(deps): bump black from 21.6b0 to 21.7b0
(#1153)
Bumps [black](https://github.com/psf/black) from 21.6b0 to 21.7b0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits)
---
updated-dependencies:
- dependency-name: black
dependency-type: direct:production
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
linter-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linter-requirements.txt b/linter-requirements.txt
index f7076751d5..812b929c97 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -1,4 +1,4 @@
-black==21.6b0
+black==21.7b0
flake8==3.9.2
flake8-import-order==0.18.1
mypy==0.782
From e8d45870b7354859760e498ef15928e74018e505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?=
Date: Tue, 27 Jul 2021 11:25:09 +0200
Subject: [PATCH 0209/2327] =?UTF-8?q?=F0=9F=90=9B=20Fix=20detection=20of?=
=?UTF-8?q?=20contextvars=20compatibility=20with=20Gevent=2020.9.0+=20(#11?=
=?UTF-8?q?57)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* 🐛 Fix detection of contextvars compatibility with Gevent 20.9.0+
* 🐛 Improve implementation of version detection and account for Python versions
* 🔥 Remove duplicated sys import
* 🚨 Fix linter warnings
---
sentry_sdk/utils.py | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 323e4ceffa..43b63b41ac 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -785,12 +785,24 @@ def _is_contextvars_broken():
Returns whether gevent/eventlet have patched the stdlib in a way where thread locals are now more "correct" than contextvars.
"""
try:
+ import gevent # type: ignore
from gevent.monkey import is_object_patched # type: ignore
+ # Get the MAJOR and MINOR version numbers of Gevent
+ version_tuple = tuple([int(part) for part in gevent.__version__.split(".")[:2]])
if is_object_patched("threading", "local"):
- # Gevent 20.5 is able to patch both thread locals and contextvars,
- # in that case all is good.
- if is_object_patched("contextvars", "ContextVar"):
+ # Gevent 20.9.0 depends on Greenlet 0.4.17 which natively handles switching
+ # context vars when greenlets are switched, so, Gevent 20.9.0+ is all fine.
+ # Ref: https://github.com/gevent/gevent/blob/83c9e2ae5b0834b8f84233760aabe82c3ba065b4/src/gevent/monkey.py#L604-L609
+ # Gevent 20.5, that doesn't depend on Greenlet 0.4.17 with native support
+ # for contextvars, is able to patch both thread locals and contextvars, in
+ # that case, check if contextvars are effectively patched.
+ if (
+ # Gevent 20.9.0+
+ (sys.version_info >= (3, 7) and version_tuple >= (20, 9))
+ # Gevent 20.5.0+ or Python < 3.7
+ or (is_object_patched("contextvars", "ContextVar"))
+ ):
return False
return True
From 7268cb38fd0afbe321c3582f05d67482f1aaa153 Mon Sep 17 00:00:00 2001
From: Ahmed Etefy
Date: Tue, 27 Jul 2021 17:02:52 +0300
Subject: [PATCH 0210/2327] docs: Update changelog (#1158)
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c34bd5439b..672c2ef016 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,10 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 1.3.1
+
+- Fix detection of contextvars compatibility with Gevent versions >=20.9.0 #1157
+
## 1.3.0
- Add support for Sanic versions 20 and 21 #1146
From 770cd6ab13b29425d5d50531d73d066f725d818f Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Tue, 27 Jul 2021 14:03:41 +0000
Subject: [PATCH 0211/2327] release: 1.3.1
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index e95252c80d..67a32f39ae 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.3.0"
+release = "1.3.1"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 2d00fca7eb..a9822e8223 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -99,7 +99,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.3.0"
+VERSION = "1.3.1"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 6472c663d3..bec94832c6 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.3.0",
+ version="1.3.1",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 832263bedca595be1e31a519d4f49f477bd77760 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad
Date: Fri, 20 Aug 2021 17:10:24 +0200
Subject: [PATCH 0212/2327] fix(mypy): Use correct typings for set_user (#1167)
Switch from using (Dict[str, Any]) -> None to
(Optional[Dict[str, Any]]) -> None for the `set_user` function's type
hints.
---
sentry_sdk/api.py | 2 +-
sentry_sdk/scope.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sentry_sdk/api.py b/sentry_sdk/api.py
index c0301073df..f4a44e4500 100644
--- a/sentry_sdk/api.py
+++ b/sentry_sdk/api.py
@@ -171,7 +171,7 @@ def set_extra(key, value):
@scopemethod # noqa
def set_user(value):
- # type: (Dict[str, Any]) -> None
+ # type: (Optional[Dict[str, Any]]) -> None
return Hub.current.scope.set_user(value)
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
index b8e8901c5b..ccf6f4e086 100644
--- a/sentry_sdk/scope.py
+++ b/sentry_sdk/scope.py
@@ -185,12 +185,12 @@ def transaction(self, value):
@_attr_setter
def user(self, value):
- # type: (Dict[str, Any]) -> None
+ # type: (Optional[Dict[str, Any]]) -> None
"""When set a specific user is bound to the scope. Deprecated in favor of set_user."""
self.set_user(value)
def set_user(self, value):
- # type: (Dict[str, Any]) -> None
+ # type: (Optional[Dict[str, Any]]) -> None
"""Sets a user for the scope."""
self._user = value
if self._session is not None:
From e06c9c53860d4192363d0f25c2fb62c6e8d3525a Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Wed, 1 Sep 2021 14:34:19 -0700
Subject: [PATCH 0213/2327] chore(ci): Update GHA jobs to run on
`ubuntu-latest` (#1180)
GitHub is retiring `ubuntu-16.04` as a platform for GitHub Actions at the end of Sept 2021.
This moves all but our Python 3.4 tests to `ubuntu-latest` (which is currently `20.04`). GitHub doesn't host a `py3.4` binary on `latest`, so those tests are now run on `18.04`.
---
.github/workflows/black.yml | 4 ++--
.github/workflows/ci.yml | 19 +++++++++++++------
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
index 5cb9439e6b..b89bab82fe 100644
--- a/.github/workflows/black.yml
+++ b/.github/workflows/black.yml
@@ -4,12 +4,12 @@ on: push
jobs:
format:
- runs-on: ubuntu-16.04
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
- python-version: '3.x'
+ python-version: "3.x"
- name: Install Black
run: pip install -r linter-requirements.txt
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ad916e8f24..790eb69bc0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
dist:
name: distribution packages
timeout-minutes: 10
- runs-on: ubuntu-16.04
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -35,7 +35,7 @@ jobs:
docs:
timeout-minutes: 10
name: build documentation
- runs-on: ubuntu-16.04
+ runs-on: ubuntu-latest
if: "startsWith(github.ref, 'refs/heads/release/')"
@@ -58,7 +58,7 @@ jobs:
lint:
timeout-minutes: 10
- runs-on: ubuntu-16.04
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
@@ -73,11 +73,18 @@ jobs:
test:
continue-on-error: true
timeout-minutes: 45
- runs-on: ubuntu-18.04
+ runs-on: ${{ matrix.linux-version }}
strategy:
matrix:
- python-version:
- ["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9"]
+ linux-version: [ubuntu-latest]
+ python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
+ include:
+ # GHA doesn't host the combo of python 3.4 and ubuntu-latest (which is
+ # currently 20.04), so run just that one under 18.04. (See
+ # https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json
+ # for a listing of supported python/os combos.)
+ - linux-version: ubuntu-18.04
+ python-version: "3.4"
services:
# Label used to access the service container
From 1e02895df0ef6505e96c7d821023b1b60ebbce69 Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Fri, 10 Sep 2021 13:16:33 +0200
Subject: [PATCH 0214/2327] fix: no longer set the last event id for
transactions (#1186)
---
CHANGELOG.md | 4 ++++
sentry_sdk/hub.py | 3 ++-
tests/test_basics.py | 5 +++++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 672c2ef016..a68d7bc40b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,10 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## Unreleased
+
+- No longer set the last event id for transactions #1186
+
## 1.3.1
- Fix detection of contextvars compatibility with Gevent versions >=20.9.0 #1157
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
index 1bffd1a0db..1976aaba34 100644
--- a/sentry_sdk/hub.py
+++ b/sentry_sdk/hub.py
@@ -318,8 +318,9 @@ def capture_event(
client, top_scope = self._stack[-1]
scope = _update_scope(top_scope, scope, scope_args)
if client is not None:
+ is_transaction = event.get("type") == "transaction"
rv = client.capture_event(event, hint, scope)
- if rv is not None:
+ if rv is not None and not is_transaction:
self._last_event_id = rv
return rv
return None
diff --git a/tests/test_basics.py b/tests/test_basics.py
index 128b85d7a4..3972c2ae2d 100644
--- a/tests/test_basics.py
+++ b/tests/test_basics.py
@@ -71,6 +71,11 @@ def test_event_id(sentry_init, capture_events):
assert last_event_id() == event_id
assert Hub.current.last_event_id() == event_id
+ new_event_id = Hub.current.capture_event({"type": "transaction"})
+ assert new_event_id is not None
+ assert new_event_id != event_id
+ assert Hub.current.last_event_id() == event_id
+
def test_option_callback(sentry_init, capture_events):
drop_events = False
From 7b48589351427c42ed0f5a6e03b9aa929b55acfc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Sep 2021 03:06:57 +0000
Subject: [PATCH 0215/2327] build(deps): bump checkouts/data-schemas from
`f8615df` to `3647b8c`
Bumps [checkouts/data-schemas](https://github.com/getsentry/sentry-data-schemas) from `f8615df` to `3647b8c`.
- [Release notes](https://github.com/getsentry/sentry-data-schemas/releases)
- [Commits](https://github.com/getsentry/sentry-data-schemas/compare/f8615dff7f4640ff8a1810b264589b9fc6a4684a...3647b8cab1b3cfa289e8d7d995a5c9efee8c4b91)
---
updated-dependencies:
- dependency-name: checkouts/data-schemas
dependency-type: direct:production
...
Signed-off-by: dependabot[bot]
---
checkouts/data-schemas | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/checkouts/data-schemas b/checkouts/data-schemas
index f8615dff7f..3647b8cab1 160000
--- a/checkouts/data-schemas
+++ b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit f8615dff7f4640ff8a1810b264589b9fc6a4684a
+Subproject commit 3647b8cab1b3cfa289e8d7d995a5c9efee8c4b91
From a6a1be305cc40468670156f78e10092c1b78ea60 Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Wed, 15 Sep 2021 16:01:44 +0200
Subject: [PATCH 0216/2327] feat(transport): Client Report Support (#1181)
This adds support for client reports to the python SDK. This will cause the SDK
to send a report once every 30 seconds or once a minute. After 30 seconds it
will attempt to attach the report to a scheduled envelope if there is one, after
60 seconds it will send it as a separate envelope. Attempts of sending are
only made as a byproduct of attempted event / envelope sending or an
explicit flush.
---
.vscode/settings.json | 3 +-
scripts/init_serverless_sdk.py | 11 +-
sentry_sdk/_types.py | 9 +-
sentry_sdk/client.py | 3 +
sentry_sdk/consts.py | 1 +
sentry_sdk/envelope.py | 18 ++-
sentry_sdk/tracing.py | 15 ++-
sentry_sdk/transport.py | 132 ++++++++++++++++++--
tests/test_transport.py | 220 ++++++++++++++++++++++++++++-----
9 files changed, 360 insertions(+), 52 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c7cadb4d6c..c167a13dc2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,4 @@
{
- "python.pythonPath": ".venv/bin/python"
+ "python.pythonPath": ".venv/bin/python",
+ "python.formatting.provider": "black"
}
\ No newline at end of file
diff --git a/scripts/init_serverless_sdk.py b/scripts/init_serverless_sdk.py
index 878ff6029e..7a414ff406 100644
--- a/scripts/init_serverless_sdk.py
+++ b/scripts/init_serverless_sdk.py
@@ -51,16 +51,23 @@ def extract_and_load_lambda_function_module(self, module_path):
# Supported python versions are 2.7, 3.6, 3.7, 3.8
if py_version >= (3, 5):
import importlib.util
- spec = importlib.util.spec_from_file_location(module_name, module_file_path)
+
+ spec = importlib.util.spec_from_file_location(
+ module_name, module_file_path
+ )
self.lambda_function_module = importlib.util.module_from_spec(spec)
spec.loader.exec_module(self.lambda_function_module)
elif py_version[0] < 3:
import imp
- self.lambda_function_module = imp.load_source(module_name, module_file_path)
+
+ self.lambda_function_module = imp.load_source(
+ module_name, module_file_path
+ )
else:
raise ValueError("Python version %s is not supported." % py_version)
else:
import importlib
+
self.lambda_function_module = importlib.import_module(module_path)
def get_lambda_handler(self):
diff --git a/sentry_sdk/_types.py b/sentry_sdk/_types.py
index a69896a248..7ce7e9e4f6 100644
--- a/sentry_sdk/_types.py
+++ b/sentry_sdk/_types.py
@@ -37,7 +37,14 @@
NotImplementedType = Any
EventDataCategory = Literal[
- "default", "error", "crash", "transaction", "security", "attachment", "session"
+ "default",
+ "error",
+ "crash",
+ "transaction",
+ "security",
+ "attachment",
+ "session",
+ "internal",
]
SessionStatus = Literal["ok", "exited", "crashed", "abnormal"]
EndpointType = Literal["store", "envelope"]
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 7687baa76f..05ea4dec99 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -243,6 +243,9 @@ def _should_capture(
self.options["sample_rate"] < 1.0
and random.random() >= self.options["sample_rate"]
):
+ # record a lost event if we did not sample this.
+ if self.transport:
+ self.transport.record_lost_event("sample_rate", data_category="error")
return False
if self._is_ignored_error(event, hint):
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index a9822e8223..5370fec7b2 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -75,6 +75,7 @@ def __init__(
traces_sampler=None, # type: Optional[TracesSampler]
auto_enabling_integrations=True, # type: bool
auto_session_tracking=True, # type: bool
+ send_client_reports=True, # type: bool
_experiments={}, # type: Experiments # noqa: B006
):
# type: (...) -> None
diff --git a/sentry_sdk/envelope.py b/sentry_sdk/envelope.py
index 5645eb8a12..ebb2842000 100644
--- a/sentry_sdk/envelope.py
+++ b/sentry_sdk/envelope.py
@@ -2,7 +2,7 @@
import json
import mimetypes
-from sentry_sdk._compat import text_type
+from sentry_sdk._compat import text_type, PY2
from sentry_sdk._types import MYPY
from sentry_sdk.session import Session
from sentry_sdk.utils import json_dumps, capture_internal_exceptions
@@ -18,6 +18,14 @@
from sentry_sdk._types import Event, EventDataCategory
+def parse_json(data):
+ # type: (Union[bytes, text_type]) -> Any
+ # on some python 3 versions this needs to be bytes
+ if not PY2 and isinstance(data, bytes):
+ data = data.decode("utf-8", "replace")
+ return json.loads(data)
+
+
class Envelope(object):
def __init__(
self,
@@ -114,7 +122,7 @@ def deserialize_from(
cls, f # type: Any
):
# type: (...) -> Envelope
- headers = json.loads(f.readline())
+ headers = parse_json(f.readline())
items = []
while 1:
item = Item.deserialize_from(f)
@@ -236,6 +244,8 @@ def data_category(self):
return "transaction"
elif ty == "event":
return "error"
+ elif ty == "client_report":
+ return "internal"
else:
return "default"
@@ -284,11 +294,11 @@ def deserialize_from(
line = f.readline().rstrip()
if not line:
return None
- headers = json.loads(line)
+ headers = parse_json(line)
length = headers["length"]
payload = f.read(length)
if headers.get("type") in ("event", "transaction"):
- rv = cls(headers=headers, payload=PayloadRef(json=json.loads(payload)))
+ rv = cls(headers=headers, payload=PayloadRef(json=parse_json(payload)))
else:
rv = cls(headers=headers, payload=payload)
f.readline()
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 4ce25f27c2..749ab63b5b 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -507,13 +507,22 @@ def finish(self, hub=None):
# This transaction is already finished, ignore.
return None
+ hub = hub or self.hub or sentry_sdk.Hub.current
+ client = hub.client
+
# This is a de facto proxy for checking if sampled = False
if self._span_recorder is None:
logger.debug("Discarding transaction because sampled = False")
- return None
- hub = hub or self.hub or sentry_sdk.Hub.current
- client = hub.client
+ # This is not entirely accurate because discards here are not
+ # exclusively based on sample rate but also traces sampler, but
+ # we handle this the same here.
+ if client and client.transport:
+ client.transport.record_lost_event(
+ "sample_rate", data_category="transaction"
+ )
+
+ return None
if client is None:
# We have no client and therefore nowhere to send this transaction.
diff --git a/sentry_sdk/transport.py b/sentry_sdk/transport.py
index a254b4f6ee..bcaebf37b7 100644
--- a/sentry_sdk/transport.py
+++ b/sentry_sdk/transport.py
@@ -4,12 +4,14 @@
import urllib3 # type: ignore
import certifi
import gzip
+import time
from datetime import datetime, timedelta
+from collections import defaultdict
from sentry_sdk.utils import Dsn, logger, capture_internal_exceptions, json_dumps
from sentry_sdk.worker import BackgroundWorker
-from sentry_sdk.envelope import Envelope
+from sentry_sdk.envelope import Envelope, Item, PayloadRef
from sentry_sdk._types import MYPY
@@ -22,6 +24,7 @@
from typing import Tuple
from typing import Type
from typing import Union
+ from typing import DefaultDict
from urllib3.poolmanager import PoolManager # type: ignore
from urllib3.poolmanager import ProxyManager
@@ -92,6 +95,18 @@ def kill(self):
"""Forcefully kills the transport."""
pass
+ def record_lost_event(
+ self,
+ reason, # type: str
+ data_category=None, # type: Optional[str]
+ item=None, # type: Optional[Item]
+ ):
+ # type: (...) -> None
+ """This increments a counter for event loss by reason and
+ data category.
+ """
+ return None
+
def __del__(self):
# type: () -> None
try:
@@ -126,11 +141,15 @@ def __init__(
Transport.__init__(self, options)
assert self.parsed_dsn is not None
- self.options = options
+ self.options = options # type: Dict[str, Any]
self._worker = BackgroundWorker(queue_size=options["transport_queue_size"])
self._auth = self.parsed_dsn.to_auth("sentry.python/%s" % VERSION)
self._disabled_until = {} # type: Dict[DataCategory, datetime]
self._retry = urllib3.util.Retry()
+ self._discarded_events = defaultdict(
+ int
+ ) # type: DefaultDict[Tuple[str, str], int]
+ self._last_client_report_sent = time.time()
self._pool = self._make_pool(
self.parsed_dsn,
@@ -143,6 +162,28 @@ def __init__(
self.hub_cls = Hub
+ def record_lost_event(
+ self,
+ reason, # type: str
+ data_category=None, # type: Optional[str]
+ item=None, # type: Optional[Item]
+ ):
+ # type: (...) -> None
+ if not self.options["send_client_reports"]:
+ return
+
+ quantity = 1
+ if item is not None:
+ data_category = item.data_category
+ if data_category == "attachment":
+ # quantity of 0 is actually 1 as we do not want to count
+ # empty attachments as actually empty.
+ quantity = len(item.get_bytes()) or 1
+ elif data_category is None:
+ raise TypeError("data category not provided")
+
+ self._discarded_events[data_category, reason] += quantity
+
def _update_rate_limits(self, response):
# type: (urllib3.HTTPResponse) -> None
@@ -167,8 +208,18 @@ def _send_request(
body, # type: bytes
headers, # type: Dict[str, str]
endpoint_type="store", # type: EndpointType
+ envelope=None, # type: Optional[Envelope]
):
# type: (...) -> None
+
+ def record_loss(reason):
+ # type: (str) -> None
+ if envelope is None:
+ self.record_lost_event(reason, data_category="error")
+ else:
+ for item in envelope.items:
+ self.record_lost_event(reason, item=item)
+
headers.update(
{
"User-Agent": str(self._auth.client),
@@ -184,6 +235,7 @@ def _send_request(
)
except Exception:
self.on_dropped_event("network")
+ record_loss("network_error")
raise
try:
@@ -191,7 +243,9 @@ def _send_request(
if response.status == 429:
# if we hit a 429. Something was rate limited but we already
- # acted on this in `self._update_rate_limits`.
+ # acted on this in `self._update_rate_limits`. Note that we
+ # do not want to record event loss here as we will have recorded
+ # an outcome in relay already.
self.on_dropped_event("status_429")
pass
@@ -202,12 +256,50 @@ def _send_request(
response.data,
)
self.on_dropped_event("status_{}".format(response.status))
+ record_loss("network_error")
finally:
response.close()
def on_dropped_event(self, reason):
# type: (str) -> None
- pass
+ return None
+
+ def _fetch_pending_client_report(self, force=False, interval=60):
+ # type: (bool, int) -> Optional[Item]
+ if not self.options["send_client_reports"]:
+ return None
+
+ if not (force or self._last_client_report_sent < time.time() - interval):
+ return None
+
+ discarded_events = self._discarded_events
+ self._discarded_events = defaultdict(int)
+ self._last_client_report_sent = time.time()
+
+ if not discarded_events:
+ return None
+
+ return Item(
+ PayloadRef(
+ json={
+ "timestamp": time.time(),
+ "discarded_events": [
+ {"reason": reason, "category": category, "quantity": quantity}
+ for (
+ (category, reason),
+ quantity,
+ ) in discarded_events.items()
+ ],
+ }
+ ),
+ type="client_report",
+ )
+
+ def _flush_client_reports(self, force=False):
+ # type: (bool) -> None
+ client_report = self._fetch_pending_client_report(force=force, interval=60)
+ if client_report is not None:
+ self.capture_envelope(Envelope(items=[client_report]))
def _check_disabled(self, category):
# type: (str) -> bool
@@ -225,6 +317,7 @@ def _send_event(
if self._check_disabled("error"):
self.on_dropped_event("self_rate_limits")
+ self.record_lost_event("ratelimit_backoff", data_category="error")
return None
body = io.BytesIO()
@@ -254,12 +347,28 @@ def _send_envelope(
# type: (...) -> None
# remove all items from the envelope which are over quota
- envelope.items[:] = [
- x for x in envelope.items if not self._check_disabled(x.data_category)
- ]
+ new_items = []
+ for item in envelope.items:
+ if self._check_disabled(item.data_category):
+ if item.data_category in ("transaction", "error", "default"):
+ self.on_dropped_event("self_rate_limits")
+ self.record_lost_event("ratelimit_backoff", item=item)
+ else:
+ new_items.append(item)
+
+ envelope.items[:] = new_items
if not envelope.items:
return None
+ # since we're already in the business of sending out an envelope here
+ # check if we have one pending for the stats session envelopes so we
+ # can attach it to this enveloped scheduled for sending. This will
+ # currently typically attach the client report to the most recent
+ # session update.
+ client_report_item = self._fetch_pending_client_report(interval=30)
+ if client_report_item is not None:
+ envelope.items.append(client_report_item)
+
body = io.BytesIO()
with gzip.GzipFile(fileobj=body, mode="w") as f:
envelope.serialize_into(f)
@@ -271,6 +380,7 @@ def _send_envelope(
self.parsed_dsn.project_id,
self.parsed_dsn.host,
)
+
self._send_request(
body.getvalue(),
headers={
@@ -278,6 +388,7 @@ def _send_envelope(
"Content-Encoding": "gzip",
},
endpoint_type="envelope",
+ envelope=envelope,
)
return None
@@ -337,9 +448,11 @@ def send_event_wrapper():
with hub:
with capture_internal_exceptions():
self._send_event(event)
+ self._flush_client_reports()
if not self._worker.submit(send_event_wrapper):
self.on_dropped_event("full_queue")
+ self.record_lost_event("queue_overflow", data_category="error")
def capture_envelope(
self, envelope # type: Envelope
@@ -352,9 +465,12 @@ def send_envelope_wrapper():
with hub:
with capture_internal_exceptions():
self._send_envelope(envelope)
+ self._flush_client_reports()
if not self._worker.submit(send_envelope_wrapper):
self.on_dropped_event("full_queue")
+ for item in envelope.items:
+ self.record_lost_event("queue_overflow", item=item)
def flush(
self,
@@ -363,7 +479,9 @@ def flush(
):
# type: (...) -> None
logger.debug("Flushing HTTP transport")
+
if timeout > 0:
+ self._worker.submit(lambda: self._flush_client_reports(force=True))
self._worker.flush(timeout, callback)
def kill(self):
diff --git a/tests/test_transport.py b/tests/test_transport.py
index 96145eb951..0ce155e6e6 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -1,21 +1,77 @@
# coding: utf-8
import logging
import pickle
+import gzip
+import io
from datetime import datetime, timedelta
import pytest
+from collections import namedtuple
+from werkzeug.wrappers import Request, Response
-from sentry_sdk import Hub, Client, add_breadcrumb, capture_message
+from pytest_localserver.http import WSGIServer
+
+from sentry_sdk import Hub, Client, add_breadcrumb, capture_message, Scope
from sentry_sdk.transport import _parse_rate_limits
+from sentry_sdk.envelope import Envelope, parse_json
from sentry_sdk.integrations.logging import LoggingIntegration
+CapturedData = namedtuple("CapturedData", ["path", "event", "envelope"])
+
+
+class CapturingServer(WSGIServer):
+ def __init__(self, host="127.0.0.1", port=0, ssl_context=None):
+ WSGIServer.__init__(self, host, port, self, ssl_context=ssl_context)
+ self.code = 204
+ self.headers = {}
+ self.captured = []
+
+ def respond_with(self, code=200, headers=None):
+ self.code = code
+ if headers:
+ self.headers = headers
+
+ def clear_captured(self):
+ del self.captured[:]
+
+ def __call__(self, environ, start_response):
+ """
+ This is the WSGI application.
+ """
+ request = Request(environ)
+ event = envelope = None
+ if request.mimetype == "application/json":
+ event = parse_json(gzip.GzipFile(fileobj=io.BytesIO(request.data)).read())
+ else:
+ envelope = Envelope.deserialize_from(
+ gzip.GzipFile(fileobj=io.BytesIO(request.data))
+ )
+
+ self.captured.append(
+ CapturedData(path=request.path, event=event, envelope=envelope)
+ )
+
+ response = Response(status=self.code)
+ response.headers.extend(self.headers)
+ return response(environ, start_response)
+
+
@pytest.fixture
-def make_client(request, httpserver):
+def capturing_server(request):
+ server = CapturingServer()
+ server.start()
+ request.addfinalizer(server.stop)
+ return server
+
+
+@pytest.fixture
+def make_client(request, capturing_server):
def inner(**kwargs):
return Client(
- "http://foobar@{}/132".format(httpserver.url[len("http://") :]), **kwargs
+ "http://foobar@{}/132".format(capturing_server.url[len("http://") :]),
+ **kwargs
)
return inner
@@ -26,7 +82,7 @@ def inner(**kwargs):
@pytest.mark.parametrize("client_flush_method", ["close", "flush"])
@pytest.mark.parametrize("use_pickle", (True, False))
def test_transport_works(
- httpserver,
+ capturing_server,
request,
capsys,
caplog,
@@ -36,7 +92,6 @@ def test_transport_works(
use_pickle,
maybe_monkeypatched_threading,
):
- httpserver.serve_content("ok", 200)
caplog.set_level(logging.DEBUG)
client = make_client(debug=debug)
@@ -53,14 +108,12 @@ def test_transport_works(
out, err = capsys.readouterr()
assert not err and not out
- assert httpserver.requests
+ assert capturing_server.captured
assert any("Sending event" in record.msg for record in caplog.records) == debug
-def test_transport_infinite_loop(httpserver, request, make_client):
- httpserver.serve_content("ok", 200)
-
+def test_transport_infinite_loop(capturing_server, request, make_client):
client = make_client(
debug=True,
# Make sure we cannot create events from our own logging
@@ -71,7 +124,7 @@ def test_transport_infinite_loop(httpserver, request, make_client):
capture_message("hi")
client.flush()
- assert len(httpserver.requests) == 1
+ assert len(capturing_server.captured) == 1
NOW = datetime(2014, 6, 2)
@@ -109,16 +162,16 @@ def test_parse_rate_limits(input, expected):
assert dict(_parse_rate_limits(input, now=NOW)) == expected
-def test_simple_rate_limits(httpserver, capsys, caplog, make_client):
+def test_simple_rate_limits(capturing_server, capsys, caplog, make_client):
client = make_client()
- httpserver.serve_content("no", 429, headers={"Retry-After": "4"})
+ capturing_server.respond_with(code=429, headers={"Retry-After": "4"})
client.capture_event({"type": "transaction"})
client.flush()
- assert len(httpserver.requests) == 1
- assert httpserver.requests[0].url.endswith("/api/132/envelope/")
- del httpserver.requests[:]
+ assert len(capturing_server.captured) == 1
+ assert capturing_server.captured[0].path == "/api/132/envelope/"
+ capturing_server.clear_captured()
assert set(client.transport._disabled_until) == set([None])
@@ -126,24 +179,35 @@ def test_simple_rate_limits(httpserver, capsys, caplog, make_client):
client.capture_event({"type": "event"})
client.flush()
- assert not httpserver.requests
+ assert not capturing_server.captured
@pytest.mark.parametrize("response_code", [200, 429])
-def test_data_category_limits(httpserver, capsys, caplog, response_code, make_client):
- client = make_client()
- httpserver.serve_content(
- "hm",
- response_code,
+def test_data_category_limits(
+ capturing_server, capsys, caplog, response_code, make_client, monkeypatch
+):
+ client = make_client(send_client_reports=False)
+
+ captured_outcomes = []
+
+ def record_lost_event(reason, data_category=None, item=None):
+ if data_category is None:
+ data_category = item.data_category
+ return captured_outcomes.append((reason, data_category))
+
+ monkeypatch.setattr(client.transport, "record_lost_event", record_lost_event)
+
+ capturing_server.respond_with(
+ code=response_code,
headers={"X-Sentry-Rate-Limits": "4711:transaction:organization"},
)
client.capture_event({"type": "transaction"})
client.flush()
- assert len(httpserver.requests) == 1
- assert httpserver.requests[0].url.endswith("/api/132/envelope/")
- del httpserver.requests[:]
+ assert len(capturing_server.captured) == 1
+ assert capturing_server.captured[0].path == "/api/132/envelope/"
+ capturing_server.clear_captured()
assert set(client.transport._disabled_until) == set(["transaction"])
@@ -151,31 +215,119 @@ def test_data_category_limits(httpserver, capsys, caplog, response_code, make_cl
client.capture_event({"type": "transaction"})
client.flush()
- assert not httpserver.requests
+ assert not capturing_server.captured
client.capture_event({"type": "event"})
client.flush()
- assert len(httpserver.requests) == 1
+ assert len(capturing_server.captured) == 1
+ assert capturing_server.captured[0].path == "/api/132/store/"
+
+ assert captured_outcomes == [
+ ("ratelimit_backoff", "transaction"),
+ ("ratelimit_backoff", "transaction"),
+ ]
+
+
+@pytest.mark.parametrize("response_code", [200, 429])
+def test_data_category_limits_reporting(
+ capturing_server, capsys, caplog, response_code, make_client, monkeypatch
+):
+ client = make_client(send_client_reports=True)
+
+ capturing_server.respond_with(
+ code=response_code,
+ headers={
+ "X-Sentry-Rate-Limits": "4711:transaction:organization, 4711:attachment:organization"
+ },
+ )
+
+ outcomes_enabled = False
+ real_fetch = client.transport._fetch_pending_client_report
+
+ def intercepting_fetch(*args, **kwargs):
+ if outcomes_enabled:
+ return real_fetch(*args, **kwargs)
+
+ monkeypatch.setattr(
+ client.transport, "_fetch_pending_client_report", intercepting_fetch
+ )
+ # get rid of threading making things hard to track
+ monkeypatch.setattr(client.transport._worker, "submit", lambda x: x() or True)
+
+ client.capture_event({"type": "transaction"})
+ client.flush()
+
+ assert len(capturing_server.captured) == 1
+ assert capturing_server.captured[0].path == "/api/132/envelope/"
+ capturing_server.clear_captured()
+
+ assert set(client.transport._disabled_until) == set(["attachment", "transaction"])
+
+ client.capture_event({"type": "transaction"})
+ client.capture_event({"type": "transaction"})
+ capturing_server.clear_captured()
+
+ # flush out the events but don't flush the client reports
+ client.flush()
+ client.transport._last_client_report_sent = 0
+ outcomes_enabled = True
+
+ scope = Scope()
+ scope.add_attachment(bytes=b"Hello World", filename="hello.txt")
+ client.capture_event({"type": "error"}, scope=scope)
+ client.flush()
+
+ # this goes out with an extra envelope because it's flushed after the last item
+ # that is normally in the queue. This is quite funny in a way beacuse it means
+ # that the envelope that caused its own over quota report (an error with an
+ # attachment) will include its outcome since it's pending.
+ assert len(capturing_server.captured) == 1
+ envelope = capturing_server.captured[0].envelope
+ assert envelope.items[0].type == "event"
+ assert envelope.items[1].type == "client_report"
+ report = parse_json(envelope.items[1].get_bytes())
+ assert sorted(report["discarded_events"], key=lambda x: x["quantity"]) == [
+ {"category": "transaction", "reason": "ratelimit_backoff", "quantity": 2},
+ {"category": "attachment", "reason": "ratelimit_backoff", "quantity": 11},
+ ]
+ capturing_server.clear_captured()
+
+ # here we sent a normal event
+ client.capture_event({"type": "transaction"})
+ client.capture_event({"type": "error", "release": "foo"})
+ client.flush()
+
+ assert len(capturing_server.captured) == 2
+
+ event = capturing_server.captured[0].event
+ assert event["type"] == "error"
+ assert event["release"] == "foo"
+
+ envelope = capturing_server.captured[1].envelope
+ assert envelope.items[0].type == "client_report"
+ report = parse_json(envelope.items[0].get_bytes())
+ assert report["discarded_events"] == [
+ {"category": "transaction", "reason": "ratelimit_backoff", "quantity": 1},
+ ]
@pytest.mark.parametrize("response_code", [200, 429])
def test_complex_limits_without_data_category(
- httpserver, capsys, caplog, response_code, make_client
+ capturing_server, capsys, caplog, response_code, make_client
):
client = make_client()
- httpserver.serve_content(
- "hm",
- response_code,
+ capturing_server.respond_with(
+ code=response_code,
headers={"X-Sentry-Rate-Limits": "4711::organization"},
)
client.capture_event({"type": "transaction"})
client.flush()
- assert len(httpserver.requests) == 1
- assert httpserver.requests[0].url.endswith("/api/132/envelope/")
- del httpserver.requests[:]
+ assert len(capturing_server.captured) == 1
+ assert capturing_server.captured[0].path == "/api/132/envelope/"
+ capturing_server.clear_captured()
assert set(client.transport._disabled_until) == set([None])
@@ -184,4 +336,4 @@ def test_complex_limits_without_data_category(
client.capture_event({"type": "event"})
client.flush()
- assert len(httpserver.requests) == 0
+ assert len(capturing_server.captured) == 0
From f03c95c0469ad9ee7c216378e7aae194fcb9ad4b Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Thu, 16 Sep 2021 14:40:58 +0200
Subject: [PATCH 0217/2327] meta: added missing changelog entry
---
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a68d7bc40b..ebe0d0528b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ A major release `N` implies the previous release `N-1` will no longer receive up
## Unreleased
- No longer set the last event id for transactions #1186
+- Added support for client reports #1181
## 1.3.1
From 54bc81cfb68d4c1df752d2358b8caf1969f1490d Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Thu, 16 Sep 2021 11:07:44 -0700
Subject: [PATCH 0218/2327] feat(tracing): Add `tracestate` header handling
(#1179)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This introduces handling of the `tracestate` header, as described in the W3C Trace Context spec[1] and our own corresponding spec[2].
Key features:
- Deprecation of `from_traceparent` in favor of `continue_from_headers`, which now propagates both incoming `sentry-trace` and incoming `tracestate` headers.
- Propagation of `tracestate` value as a header on outgoing HTTP requests when they're made during a transaction.
- Addition of `tracestate` data to transaction envelope headers.
Supporting changes:
- New utility methods for converting strings to and from base64.
- Some refactoring vis-à-vis the links between transactions, span recorders, and spans. See https://github.com/getsentry/sentry-python/pull/1173 and https://github.com/getsentry/sentry-python/pull/1184.
- Moving of some tracing code to a separate `tracing_utils` file.
Note: `tracestate` handling is currently feature-gated by the flag `propagate_tracestate` in the `_experiments` SDK option.
More details can be found in the main PR on this branch, https://github.com/getsentry/sentry-python/pull/971.
[1] https://www.w3.org/TR/trace-context/#tracestate-header
[2] https://develop.sentry.dev/sdk/performance/trace-context/
---
sentry_sdk/client.py | 29 +-
sentry_sdk/consts.py | 1 +
sentry_sdk/hub.py | 3 +-
sentry_sdk/integrations/django/__init__.py | 2 +-
sentry_sdk/integrations/httpx.py | 11 +
sentry_sdk/integrations/sqlalchemy.py | 2 +-
sentry_sdk/integrations/stdlib.py | 9 +-
sentry_sdk/scope.py | 20 +-
sentry_sdk/tracing.py | 411 +++++++-----------
sentry_sdk/tracing_utils.py | 407 +++++++++++++++++
sentry_sdk/utils.py | 42 ++
.../sqlalchemy/test_sqlalchemy.py | 4 +-
tests/test_envelope.py | 100 ++++-
tests/tracing/test_http_headers.py | 332 ++++++++++++++
tests/tracing/test_integration_tests.py | 50 +--
tests/tracing/test_misc.py | 140 +++++-
tests/tracing/test_sampling.py | 11 +-
tests/utils/test_general.py | 57 ++-
18 files changed, 1304 insertions(+), 327 deletions(-)
create mode 100644 sentry_sdk/tracing_utils.py
create mode 100644 tests/tracing/test_http_headers.py
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 05ea4dec99..659299c632 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -22,6 +22,7 @@
from sentry_sdk.utils import ContextVar
from sentry_sdk.sessions import SessionFlusher
from sentry_sdk.envelope import Envelope
+from sentry_sdk.tracing_utils import has_tracestate_enabled, reinflate_tracestate
from sentry_sdk._types import MYPY
@@ -332,15 +333,29 @@ def capture_event(
attachments = hint.get("attachments")
is_transaction = event_opt.get("type") == "transaction"
+ # this is outside of the `if` immediately below because even if we don't
+ # use the value, we want to make sure we remove it before the event is
+ # sent
+ raw_tracestate = (
+ event_opt.get("contexts", {}).get("trace", {}).pop("tracestate", "")
+ )
+
+ # Transactions or events with attachments should go to the /envelope/
+ # endpoint.
if is_transaction or attachments:
- # Transactions or events with attachments should go to the
- # /envelope/ endpoint.
- envelope = Envelope(
- headers={
- "event_id": event_opt["event_id"],
- "sent_at": format_timestamp(datetime.utcnow()),
- }
+
+ headers = {
+ "event_id": event_opt["event_id"],
+ "sent_at": format_timestamp(datetime.utcnow()),
+ }
+
+ tracestate_data = raw_tracestate and reinflate_tracestate(
+ raw_tracestate.replace("sentry=", "")
)
+ if tracestate_data and has_tracestate_enabled():
+ headers["trace"] = tracestate_data
+
+ envelope = Envelope(headers=headers)
if is_transaction:
envelope.add_transaction(event_opt)
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 5370fec7b2..51c54375e6 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -32,6 +32,7 @@
"max_spans": Optional[int],
"record_sql_params": Optional[bool],
"smart_transaction_trimming": Optional[bool],
+ "propagate_tracestate": Optional[bool],
},
total=False,
)
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
index 1976aaba34..addca57417 100644
--- a/sentry_sdk/hub.py
+++ b/sentry_sdk/hub.py
@@ -700,7 +700,8 @@ def iter_trace_propagation_headers(self, span=None):
if not propagate_traces:
return
- yield "sentry-trace", span.to_traceparent()
+ for header in span.iter_headers():
+ yield header
GLOBAL_HUB = Hub()
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index e26948e2dd..87f9c7bc61 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -9,7 +9,7 @@
from sentry_sdk.hub import Hub, _should_send_default_pii
from sentry_sdk.scope import add_global_event_processor
from sentry_sdk.serializer import add_global_repr_processor
-from sentry_sdk.tracing import record_sql_queries
+from sentry_sdk.tracing_utils import record_sql_queries
from sentry_sdk.utils import (
HAS_REAL_CONTEXTVARS,
CONTEXTVARS_ERROR_MESSAGE,
diff --git a/sentry_sdk/integrations/httpx.py b/sentry_sdk/integrations/httpx.py
index af67315338..3d4bbf8300 100644
--- a/sentry_sdk/integrations/httpx.py
+++ b/sentry_sdk/integrations/httpx.py
@@ -1,5 +1,6 @@
from sentry_sdk import Hub
from sentry_sdk.integrations import Integration, DidNotEnable
+from sentry_sdk.utils import logger
from sentry_sdk._types import MYPY
@@ -45,6 +46,11 @@ def send(self, request, **kwargs):
span.set_data("method", request.method)
span.set_data("url", str(request.url))
for key, value in hub.iter_trace_propagation_headers():
+ logger.debug(
+ "[Tracing] Adding `{key}` header {value} to outgoing request to {url}.".format(
+ key=key, value=value, url=request.url
+ )
+ )
request.headers[key] = value
rv = real_send(self, request, **kwargs)
@@ -72,6 +78,11 @@ async def send(self, request, **kwargs):
span.set_data("method", request.method)
span.set_data("url", str(request.url))
for key, value in hub.iter_trace_propagation_headers():
+ logger.debug(
+ "[Tracing] Adding `{key}` header {value} to outgoing request to {url}.".format(
+ key=key, value=value, url=request.url
+ )
+ )
request.headers[key] = value
rv = await real_send(self, request, **kwargs)
diff --git a/sentry_sdk/integrations/sqlalchemy.py b/sentry_sdk/integrations/sqlalchemy.py
index 6c8e5eb88e..4b0207f5ec 100644
--- a/sentry_sdk/integrations/sqlalchemy.py
+++ b/sentry_sdk/integrations/sqlalchemy.py
@@ -3,7 +3,7 @@
from sentry_sdk._types import MYPY
from sentry_sdk.hub import Hub
from sentry_sdk.integrations import Integration, DidNotEnable
-from sentry_sdk.tracing import record_sql_queries
+from sentry_sdk.tracing_utils import record_sql_queries
try:
from sqlalchemy.engine import Engine # type: ignore
diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py
index ac2ec103c7..adea742b2d 100644
--- a/sentry_sdk/integrations/stdlib.py
+++ b/sentry_sdk/integrations/stdlib.py
@@ -6,8 +6,8 @@
from sentry_sdk.hub import Hub
from sentry_sdk.integrations import Integration
from sentry_sdk.scope import add_global_event_processor
-from sentry_sdk.tracing import EnvironHeaders
-from sentry_sdk.utils import capture_internal_exceptions, safe_repr
+from sentry_sdk.tracing_utils import EnvironHeaders
+from sentry_sdk.utils import capture_internal_exceptions, logger, safe_repr
from sentry_sdk._types import MYPY
@@ -86,6 +86,11 @@ def putrequest(self, method, url, *args, **kwargs):
rv = real_putrequest(self, method, url, *args, **kwargs)
for key, value in hub.iter_trace_propagation_headers(span):
+ logger.debug(
+ "[Tracing] Adding `{key}` header {value} to outgoing request to {real_url}.".format(
+ key=key, value=value, real_url=real_url
+ )
+ )
self.putheader(key, value)
self._sentrysdk_span = span
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
index ccf6f4e086..fb3bee42f1 100644
--- a/sentry_sdk/scope.py
+++ b/sentry_sdk/scope.py
@@ -150,19 +150,13 @@ def transaction(self):
if self._span is None:
return None
- # the span on the scope is itself a transaction
- if isinstance(self._span, Transaction):
- return self._span
-
- # the span on the scope isn't a transaction but belongs to one
- if self._span._containing_transaction:
- return self._span._containing_transaction
+ # there is an orphan span on the scope
+ if self._span.containing_transaction is None:
+ return None
- # there's a span (not a transaction) on the scope, but it was started on
- # its own, not as the descendant of a transaction (this is deprecated
- # behavior, but as long as the start_span function exists, it can still
- # happen)
- return None
+ # there is either a transaction (which is its own containing
+ # transaction) or a non-orphan span on the scope
+ return self._span.containing_transaction
@transaction.setter
def transaction(self, value):
@@ -174,7 +168,7 @@ def transaction(self, value):
# anything set in the scope.
# XXX: note that with the introduction of the Scope.transaction getter,
# there is a semantic and type mismatch between getter and setter. The
- # getter returns a transaction, the setter sets a transaction name.
+ # getter returns a Transaction, the setter sets a transaction name.
# Without breaking version compatibility, we could make the setter set a
# transaction name or transaction (self._span) depending on the type of
# the value argument.
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 749ab63b5b..fb1da88cc0 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -1,79 +1,37 @@
-import re
import uuid
-import contextlib
-import math
import random
import time
from datetime import datetime, timedelta
-from numbers import Real
import sentry_sdk
-from sentry_sdk.utils import (
- capture_internal_exceptions,
- logger,
- to_string,
+from sentry_sdk.utils import logger
+from sentry_sdk.tracing_utils import (
+ EnvironHeaders,
+ compute_tracestate_entry,
+ extract_sentrytrace_data,
+ extract_tracestate_data,
+ has_tracestate_enabled,
+ has_tracing_enabled,
+ is_valid_sample_rate,
+ maybe_create_breadcrumbs_from_span,
)
-from sentry_sdk._compat import PY2
from sentry_sdk._types import MYPY
-if PY2:
- from collections import Mapping
-else:
- from collections.abc import Mapping
if MYPY:
import typing
- from typing import Generator
from typing import Optional
from typing import Any
from typing import Dict
from typing import List
from typing import Tuple
+ from typing import Iterator
from sentry_sdk._types import SamplingContext
-_traceparent_header_format_re = re.compile(
- "^[ \t]*" # whitespace
- "([0-9a-f]{32})?" # trace_id
- "-?([0-9a-f]{16})?" # span_id
- "-?([01])?" # sampled
- "[ \t]*$" # whitespace
-)
-
-
-class EnvironHeaders(Mapping): # type: ignore
- def __init__(
- self,
- environ, # type: typing.Mapping[str, str]
- prefix="HTTP_", # type: str
- ):
- # type: (...) -> None
- self.environ = environ
- self.prefix = prefix
-
- def __getitem__(self, key):
- # type: (str) -> Optional[Any]
- return self.environ[self.prefix + key.replace("-", "_").upper()]
-
- def __len__(self):
- # type: () -> int
- return sum(1 for _ in iter(self))
-
- def __iter__(self):
- # type: () -> Generator[str, None, None]
- for k in self.environ:
- if not isinstance(k, str):
- continue
-
- k = k.replace("-", "_").upper()
- if not k.startswith(self.prefix):
- continue
-
- yield k[len(self.prefix) :]
-
class _SpanRecorder(object):
"""Limits the number of spans recorded in a transaction."""
@@ -116,8 +74,6 @@ class Span(object):
"_span_recorder",
"hub",
"_context_manager_state",
- # TODO: rename this "transaction" once we fully and truly deprecate the
- # old "transaction" attribute (which was actually the transaction name)?
"_containing_transaction",
)
@@ -147,6 +103,7 @@ def __init__(
hub=None, # type: Optional[sentry_sdk.Hub]
status=None, # type: Optional[str]
transaction=None, # type: Optional[str] # deprecated
+ containing_transaction=None, # type: Optional[Transaction]
):
# type: (...) -> None
self.trace_id = trace_id or uuid.uuid4().hex
@@ -160,6 +117,7 @@ def __init__(
self.hub = hub
self._tags = {} # type: Dict[str, str]
self._data = {} # type: Dict[str, Any]
+ self._containing_transaction = containing_transaction
self.start_timestamp = datetime.utcnow()
try:
# TODO: For Python 3.7+, we could use a clock with ns resolution:
@@ -174,13 +132,13 @@ def __init__(
self.timestamp = None # type: Optional[datetime]
self._span_recorder = None # type: Optional[_SpanRecorder]
- self._containing_transaction = None # type: Optional[Transaction]
+ # TODO this should really live on the Transaction class rather than the Span
+ # class
def init_span_recorder(self, maxlen):
# type: (int) -> None
if self._span_recorder is None:
self._span_recorder = _SpanRecorder(maxlen)
- self._span_recorder.add(self)
def __repr__(self):
# type: () -> str
@@ -215,6 +173,15 @@ def __exit__(self, ty, value, tb):
self.finish(hub)
scope.span = old_span
+ @property
+ def containing_transaction(self):
+ # type: () -> Optional[Transaction]
+
+ # this is a getter rather than a regular attribute so that transactions
+ # can return `self` here instead (as a way to prevent them circularly
+ # referencing themselves)
+ return self._containing_transaction
+
def start_child(self, **kwargs):
# type: (**Any) -> Span
"""
@@ -226,19 +193,19 @@ def start_child(self, **kwargs):
"""
kwargs.setdefault("sampled", self.sampled)
- rv = Span(
- trace_id=self.trace_id, span_id=None, parent_span_id=self.span_id, **kwargs
+ child = Span(
+ trace_id=self.trace_id,
+ parent_span_id=self.span_id,
+ containing_transaction=self.containing_transaction,
+ **kwargs
)
- if isinstance(self, Transaction):
- rv._containing_transaction = self
- else:
- rv._containing_transaction = self._containing_transaction
-
- rv._span_recorder = recorder = self._span_recorder
- if recorder:
- recorder.add(rv)
- return rv
+ span_recorder = (
+ self.containing_transaction and self.containing_transaction._span_recorder
+ )
+ if span_recorder:
+ span_recorder.add(child)
+ return child
def new_span(self, **kwargs):
# type: (**Any) -> Span
@@ -255,11 +222,12 @@ def continue_from_environ(
# type: (...) -> Transaction
"""
Create a Transaction with the given params, then add in data pulled from
- the 'sentry-trace' header in the environ (if any) before returning the
- Transaction.
+ the 'sentry-trace' and 'tracestate' headers from the environ (if any)
+ before returning the Transaction.
- If the 'sentry-trace' header is malformed or missing, just create and
- return a Transaction instance with the given params.
+ This is different from `continue_from_headers` in that it assumes header
+ names in the form "HTTP_HEADER_NAME" - such as you would get from a wsgi
+ environ - rather than the form "header-name".
"""
if cls is Span:
logger.warning(
@@ -276,29 +244,43 @@ def continue_from_headers(
):
# type: (...) -> Transaction
"""
- Create a Transaction with the given params, then add in data pulled from
- the 'sentry-trace' header (if any) before returning the Transaction.
-
- If the 'sentry-trace' header is malformed or missing, just create and
- return a Transaction instance with the given params.
+ Create a transaction with the given params (including any data pulled from
+ the 'sentry-trace' and 'tracestate' headers).
"""
+ # TODO move this to the Transaction class
if cls is Span:
logger.warning(
"Deprecated: use Transaction.continue_from_headers "
"instead of Span.continue_from_headers."
)
- transaction = Transaction.from_traceparent(
- headers.get("sentry-trace"), **kwargs
- )
- if transaction is None:
- transaction = Transaction(**kwargs)
+
+ kwargs.update(extract_sentrytrace_data(headers.get("sentry-trace")))
+ kwargs.update(extract_tracestate_data(headers.get("tracestate")))
+
+ transaction = Transaction(**kwargs)
transaction.same_process_as_parent = False
+
return transaction
def iter_headers(self):
- # type: () -> Generator[Tuple[str, str], None, None]
+ # type: () -> Iterator[Tuple[str, str]]
+ """
+ Creates a generator which returns the span's `sentry-trace` and
+ `tracestate` headers.
+
+ If the span's containing transaction doesn't yet have a
+ `sentry_tracestate` value, this will cause one to be generated and
+ stored.
+ """
yield "sentry-trace", self.to_traceparent()
+ tracestate = self.to_tracestate() if has_tracestate_enabled(self) else None
+ # `tracestate` will only be `None` if there's no client or no DSN
+ # TODO (kmclb) the above will be true once the feature is no longer
+ # behind a flag
+ if tracestate:
+ yield "tracestate", tracestate
+
@classmethod
def from_traceparent(
cls,
@@ -307,46 +289,21 @@ def from_traceparent(
):
# type: (...) -> Optional[Transaction]
"""
+ DEPRECATED: Use Transaction.continue_from_headers(headers, **kwargs)
+
Create a Transaction with the given params, then add in data pulled from
the given 'sentry-trace' header value before returning the Transaction.
- If the header value is malformed or missing, just create and return a
- Transaction instance with the given params.
"""
- if cls is Span:
- logger.warning(
- "Deprecated: use Transaction.from_traceparent "
- "instead of Span.from_traceparent."
- )
+ logger.warning(
+ "Deprecated: Use Transaction.continue_from_headers(headers, **kwargs) "
+ "instead of from_traceparent(traceparent, **kwargs)"
+ )
if not traceparent:
return None
- if traceparent.startswith("00-") and traceparent.endswith("-00"):
- traceparent = traceparent[3:-3]
-
- match = _traceparent_header_format_re.match(str(traceparent))
- if match is None:
- return None
-
- trace_id, parent_span_id, sampled_str = match.groups()
-
- if trace_id is not None:
- trace_id = "{:032x}".format(int(trace_id, 16))
- if parent_span_id is not None:
- parent_span_id = "{:016x}".format(int(parent_span_id, 16))
-
- if sampled_str:
- parent_sampled = sampled_str != "0" # type: Optional[bool]
- else:
- parent_sampled = None
-
- return Transaction(
- trace_id=trace_id,
- parent_span_id=parent_span_id,
- parent_sampled=parent_sampled,
- **kwargs
- )
+ return cls.continue_from_headers({"sentry-trace": traceparent}, **kwargs)
def to_traceparent(self):
# type: () -> str
@@ -357,6 +314,57 @@ def to_traceparent(self):
sampled = "0"
return "%s-%s-%s" % (self.trace_id, self.span_id, sampled)
+ def to_tracestate(self):
+ # type: () -> Optional[str]
+ """
+ Computes the `tracestate` header value using data from the containing
+ transaction.
+
+ If the containing transaction doesn't yet have a `sentry_tracestate`
+ value, this will cause one to be generated and stored.
+
+ If there is no containing transaction, a value will be generated but not
+ stored.
+
+ Returns None if there's no client and/or no DSN.
+ """
+
+ sentry_tracestate = self.get_or_set_sentry_tracestate()
+ third_party_tracestate = (
+ self.containing_transaction._third_party_tracestate
+ if self.containing_transaction
+ else None
+ )
+
+ if not sentry_tracestate:
+ return None
+
+ header_value = sentry_tracestate
+
+ if third_party_tracestate:
+ header_value = header_value + "," + third_party_tracestate
+
+ return header_value
+
+ def get_or_set_sentry_tracestate(self):
+ # type: (Span) -> Optional[str]
+ """
+ Read sentry tracestate off of the span's containing transaction.
+
+ If the transaction doesn't yet have a `_sentry_tracestate` value,
+ compute one and store it.
+ """
+ transaction = self.containing_transaction
+
+ if transaction:
+ if not transaction._sentry_tracestate:
+ transaction._sentry_tracestate = compute_tracestate_entry(self)
+
+ return transaction._sentry_tracestate
+
+ # orphan span - nowhere to store the value, so just return it
+ return compute_tracestate_entry(self)
+
def set_tag(self, key, value):
# type: (str, Any) -> None
self._tags[key] = value
@@ -422,7 +430,7 @@ def finish(self, hub=None):
except AttributeError:
self.timestamp = datetime.utcnow()
- _maybe_create_breadcrumbs_from_span(hub, self)
+ maybe_create_breadcrumbs_from_span(hub, self)
return None
def to_json(self):
@@ -463,16 +471,37 @@ def get_trace_context(self):
if self.status:
rv["status"] = self.status
+ # if the transaction didn't inherit a tracestate value, and no outgoing
+ # requests - whose need for headers would have caused a tracestate value
+ # to be created - were made as part of the transaction, the transaction
+ # still won't have a tracestate value, so compute one now
+ sentry_tracestate = self.get_or_set_sentry_tracestate()
+
+ if sentry_tracestate:
+ rv["tracestate"] = sentry_tracestate
+
return rv
class Transaction(Span):
- __slots__ = ("name", "parent_sampled")
+ __slots__ = (
+ "name",
+ "parent_sampled",
+ # the sentry portion of the `tracestate` header used to transmit
+ # correlation context for server-side dynamic sampling, of the form
+ # `sentry=xxxxx`, where `xxxxx` is the base64-encoded json of the
+ # correlation context data, missing trailing any =
+ "_sentry_tracestate",
+ # tracestate data from other vendors, of the form `dogs=yes,cats=maybe`
+ "_third_party_tracestate",
+ )
def __init__(
self,
name="", # type: str
parent_sampled=None, # type: Optional[bool]
+ sentry_tracestate=None, # type: Optional[str]
+ third_party_tracestate=None, # type: Optional[str]
**kwargs # type: Any
):
# type: (...) -> None
@@ -488,6 +517,11 @@ def __init__(
Span.__init__(self, **kwargs)
self.name = name
self.parent_sampled = parent_sampled
+ # if tracestate isn't inherited and set here, it will get set lazily,
+ # either the first time an outgoing request needs it for a header or the
+ # first time an event needs it for inclusion in the captured data
+ self._sentry_tracestate = sentry_tracestate
+ self._third_party_tracestate = third_party_tracestate
def __repr__(self):
# type: () -> str
@@ -501,6 +535,15 @@ def __repr__(self):
self.sampled,
)
+ @property
+ def containing_transaction(self):
+ # type: () -> Transaction
+
+ # Transactions (as spans) belong to themselves (as transactions). This
+ # is a getter rather than a regular attribute to avoid having a circular
+ # reference.
+ return self
+
def finish(self, hub=None):
# type: (Optional[sentry_sdk.Hub]) -> Optional[str]
if self.timestamp is not None:
@@ -546,9 +589,15 @@ def finish(self, hub=None):
finished_spans = [
span.to_json()
for span in self._span_recorder.spans
- if span is not self and span.timestamp is not None
+ if span.timestamp is not None
]
+ # we do this to break the circular reference of transaction -> span
+ # recorder -> span -> containing transaction (which is where we started)
+ # before either the spans or the transaction goes out of scope and has
+ # to be garbage collected
+ del self._span_recorder
+
return hub.capture_event(
{
"type": "transaction",
@@ -626,7 +675,7 @@ def _set_initial_sampling_decision(self, sampling_context):
# Since this is coming from the user (or from a function provided by the
# user), who knows what we might get. (The only valid values are
# booleans or numbers between 0 and 1.)
- if not _is_valid_sample_rate(sample_rate):
+ if not is_valid_sample_rate(sample_rate):
logger.warning(
"[Tracing] Discarding {transaction_description} because of invalid sample rate.".format(
transaction_description=transaction_description,
@@ -669,127 +718,3 @@ def _set_initial_sampling_decision(self, sampling_context):
sample_rate=float(sample_rate),
)
)
-
-
-def has_tracing_enabled(options):
- # type: (Dict[str, Any]) -> bool
- """
- Returns True if either traces_sample_rate or traces_sampler is
- defined, False otherwise.
- """
-
- return bool(
- options.get("traces_sample_rate") is not None
- or options.get("traces_sampler") is not None
- )
-
-
-def _is_valid_sample_rate(rate):
- # type: (Any) -> bool
- """
- Checks the given sample rate to make sure it is valid type and value (a
- boolean or a number between 0 and 1, inclusive).
- """
-
- # both booleans and NaN are instances of Real, so a) checking for Real
- # checks for the possibility of a boolean also, and b) we have to check
- # separately for NaN
- if not isinstance(rate, Real) or math.isnan(rate):
- logger.warning(
- "[Tracing] Given sample rate is invalid. Sample rate must be a boolean or a number between 0 and 1. Got {rate} of type {type}.".format(
- rate=rate, type=type(rate)
- )
- )
- return False
-
- # in case rate is a boolean, it will get cast to 1 if it's True and 0 if it's False
- rate = float(rate)
- if rate < 0 or rate > 1:
- logger.warning(
- "[Tracing] Given sample rate is invalid. Sample rate must be between 0 and 1. Got {rate}.".format(
- rate=rate
- )
- )
- return False
-
- return True
-
-
-def _format_sql(cursor, sql):
- # type: (Any, str) -> Optional[str]
-
- real_sql = None
-
- # If we're using psycopg2, it could be that we're
- # looking at a query that uses Composed objects. Use psycopg2's mogrify
- # function to format the query. We lose per-parameter trimming but gain
- # accuracy in formatting.
- try:
- if hasattr(cursor, "mogrify"):
- real_sql = cursor.mogrify(sql)
- if isinstance(real_sql, bytes):
- real_sql = real_sql.decode(cursor.connection.encoding)
- except Exception:
- real_sql = None
-
- return real_sql or to_string(sql)
-
-
-@contextlib.contextmanager
-def record_sql_queries(
- hub, # type: sentry_sdk.Hub
- cursor, # type: Any
- query, # type: Any
- params_list, # type: Any
- paramstyle, # type: Optional[str]
- executemany, # type: bool
-):
- # type: (...) -> Generator[Span, None, None]
-
- # TODO: Bring back capturing of params by default
- if hub.client and hub.client.options["_experiments"].get(
- "record_sql_params", False
- ):
- if not params_list or params_list == [None]:
- params_list = None
-
- if paramstyle == "pyformat":
- paramstyle = "format"
- else:
- params_list = None
- paramstyle = None
-
- query = _format_sql(cursor, query)
-
- data = {}
- if params_list is not None:
- data["db.params"] = params_list
- if paramstyle is not None:
- data["db.paramstyle"] = paramstyle
- if executemany:
- data["db.executemany"] = True
-
- with capture_internal_exceptions():
- hub.add_breadcrumb(message=query, category="query", data=data)
-
- with hub.start_span(op="db", description=query) as span:
- for k, v in data.items():
- span.set_data(k, v)
- yield span
-
-
-def _maybe_create_breadcrumbs_from_span(hub, span):
- # type: (sentry_sdk.Hub, Span) -> None
- if span.op == "redis":
- hub.add_breadcrumb(
- message=span.description, type="redis", category="redis", data=span._tags
- )
- elif span.op == "http":
- hub.add_breadcrumb(type="http", category="httplib", data=span._data)
- elif span.op == "subprocess":
- hub.add_breadcrumb(
- type="subprocess",
- category="subprocess",
- message=span.description,
- data=span._data,
- )
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
new file mode 100644
index 0000000000..4214c208b9
--- /dev/null
+++ b/sentry_sdk/tracing_utils.py
@@ -0,0 +1,407 @@
+import re
+import contextlib
+import json
+import math
+
+from numbers import Real
+
+import sentry_sdk
+
+from sentry_sdk.utils import (
+ capture_internal_exceptions,
+ Dsn,
+ logger,
+ to_base64,
+ to_string,
+ from_base64,
+)
+from sentry_sdk._compat import PY2
+from sentry_sdk._types import MYPY
+
+if PY2:
+ from collections import Mapping
+else:
+ from collections.abc import Mapping
+
+if MYPY:
+ import typing
+
+ from typing import Generator
+ from typing import Optional
+ from typing import Any
+ from typing import Dict
+ from typing import Union
+
+ from sentry_sdk.tracing import Span
+
+
+SENTRY_TRACE_REGEX = re.compile(
+ "^[ \t]*" # whitespace
+ "([0-9a-f]{32})?" # trace_id
+ "-?([0-9a-f]{16})?" # span_id
+ "-?([01])?" # sampled
+ "[ \t]*$" # whitespace
+)
+
+# This is a normal base64 regex, modified to reflect that fact that we strip the
+# trailing = or == off
+base64_stripped = (
+ # any of the characters in the base64 "alphabet", in multiples of 4
+ "([a-zA-Z0-9+/]{4})*"
+ # either nothing or 2 or 3 base64-alphabet characters (see
+ # https://en.wikipedia.org/wiki/Base64#Decoding_Base64_without_padding for
+ # why there's never only 1 extra character)
+ "([a-zA-Z0-9+/]{2,3})?"
+)
+
+# comma-delimited list of entries of the form `xxx=yyy`
+tracestate_entry = "[^=]+=[^=]+"
+TRACESTATE_ENTRIES_REGEX = re.compile(
+ # one or more xxxxx=yyyy entries
+ "^({te})+"
+ # each entry except the last must be followed by a comma
+ "(,|$)".format(te=tracestate_entry)
+)
+
+# this doesn't check that the value is valid, just that there's something there
+# of the form `sentry=xxxx`
+SENTRY_TRACESTATE_ENTRY_REGEX = re.compile(
+ # either sentry is the first entry or there's stuff immediately before it,
+ # ending in a commma (this prevents matching something like `coolsentry=xxx`)
+ "(?:^|.+,)"
+ # sentry's part, not including the potential comma
+ "(sentry=[^,]*)"
+ # either there's a comma and another vendor's entry or we end
+ "(?:,.+|$)"
+)
+
+
+class EnvironHeaders(Mapping): # type: ignore
+ def __init__(
+ self,
+ environ, # type: typing.Mapping[str, str]
+ prefix="HTTP_", # type: str
+ ):
+ # type: (...) -> None
+ self.environ = environ
+ self.prefix = prefix
+
+ def __getitem__(self, key):
+ # type: (str) -> Optional[Any]
+ return self.environ[self.prefix + key.replace("-", "_").upper()]
+
+ def __len__(self):
+ # type: () -> int
+ return sum(1 for _ in iter(self))
+
+ def __iter__(self):
+ # type: () -> Generator[str, None, None]
+ for k in self.environ:
+ if not isinstance(k, str):
+ continue
+
+ k = k.replace("-", "_").upper()
+ if not k.startswith(self.prefix):
+ continue
+
+ yield k[len(self.prefix) :]
+
+
+def has_tracing_enabled(options):
+ # type: (Dict[str, Any]) -> bool
+ """
+ Returns True if either traces_sample_rate or traces_sampler is
+ non-zero/defined, False otherwise.
+ """
+
+ return bool(
+ options.get("traces_sample_rate") is not None
+ or options.get("traces_sampler") is not None
+ )
+
+
+def is_valid_sample_rate(rate):
+ # type: (Any) -> bool
+ """
+ Checks the given sample rate to make sure it is valid type and value (a
+ boolean or a number between 0 and 1, inclusive).
+ """
+
+ # both booleans and NaN are instances of Real, so a) checking for Real
+ # checks for the possibility of a boolean also, and b) we have to check
+ # separately for NaN
+ if not isinstance(rate, Real) or math.isnan(rate):
+ logger.warning(
+ "[Tracing] Given sample rate is invalid. Sample rate must be a boolean or a number between 0 and 1. Got {rate} of type {type}.".format(
+ rate=rate, type=type(rate)
+ )
+ )
+ return False
+
+ # in case rate is a boolean, it will get cast to 1 if it's True and 0 if it's False
+ rate = float(rate)
+ if rate < 0 or rate > 1:
+ logger.warning(
+ "[Tracing] Given sample rate is invalid. Sample rate must be between 0 and 1. Got {rate}.".format(
+ rate=rate
+ )
+ )
+ return False
+
+ return True
+
+
+@contextlib.contextmanager
+def record_sql_queries(
+ hub, # type: sentry_sdk.Hub
+ cursor, # type: Any
+ query, # type: Any
+ params_list, # type: Any
+ paramstyle, # type: Optional[str]
+ executemany, # type: bool
+):
+ # type: (...) -> Generator[Span, None, None]
+
+ # TODO: Bring back capturing of params by default
+ if hub.client and hub.client.options["_experiments"].get(
+ "record_sql_params", False
+ ):
+ if not params_list or params_list == [None]:
+ params_list = None
+
+ if paramstyle == "pyformat":
+ paramstyle = "format"
+ else:
+ params_list = None
+ paramstyle = None
+
+ query = _format_sql(cursor, query)
+
+ data = {}
+ if params_list is not None:
+ data["db.params"] = params_list
+ if paramstyle is not None:
+ data["db.paramstyle"] = paramstyle
+ if executemany:
+ data["db.executemany"] = True
+
+ with capture_internal_exceptions():
+ hub.add_breadcrumb(message=query, category="query", data=data)
+
+ with hub.start_span(op="db", description=query) as span:
+ for k, v in data.items():
+ span.set_data(k, v)
+ yield span
+
+
+def maybe_create_breadcrumbs_from_span(hub, span):
+ # type: (sentry_sdk.Hub, Span) -> None
+ if span.op == "redis":
+ hub.add_breadcrumb(
+ message=span.description, type="redis", category="redis", data=span._tags
+ )
+ elif span.op == "http":
+ hub.add_breadcrumb(type="http", category="httplib", data=span._data)
+ elif span.op == "subprocess":
+ hub.add_breadcrumb(
+ type="subprocess",
+ category="subprocess",
+ message=span.description,
+ data=span._data,
+ )
+
+
+def extract_sentrytrace_data(header):
+ # type: (Optional[str]) -> typing.Mapping[str, Union[str, bool, None]]
+ """
+ Given a `sentry-trace` header string, return a dictionary of data.
+ """
+ trace_id = parent_span_id = parent_sampled = None
+
+ if header:
+ if header.startswith("00-") and header.endswith("-00"):
+ header = header[3:-3]
+
+ match = SENTRY_TRACE_REGEX.match(header)
+
+ if match:
+ trace_id, parent_span_id, sampled_str = match.groups()
+
+ if trace_id:
+ trace_id = "{:032x}".format(int(trace_id, 16))
+ if parent_span_id:
+ parent_span_id = "{:016x}".format(int(parent_span_id, 16))
+ if sampled_str:
+ parent_sampled = sampled_str != "0"
+
+ return {
+ "trace_id": trace_id,
+ "parent_span_id": parent_span_id,
+ "parent_sampled": parent_sampled,
+ }
+
+
+def extract_tracestate_data(header):
+ # type: (Optional[str]) -> typing.Mapping[str, Optional[str]]
+ """
+ Extracts the sentry tracestate value and any third-party data from the given
+ tracestate header, returning a dictionary of data.
+ """
+ sentry_entry = third_party_entry = None
+ before = after = ""
+
+ if header:
+ # find sentry's entry, if any
+ sentry_match = SENTRY_TRACESTATE_ENTRY_REGEX.search(header)
+
+ if sentry_match:
+ sentry_entry = sentry_match.group(1)
+
+ # remove the commas after the split so we don't end up with
+ # `xxx=yyy,,zzz=qqq` (double commas) when we put them back together
+ before, after = map(lambda s: s.strip(","), header.split(sentry_entry))
+
+ # extract sentry's value from its entry and test to make sure it's
+ # valid; if it isn't, discard the entire entry so that a new one
+ # will be created
+ sentry_value = sentry_entry.replace("sentry=", "")
+ if not re.search("^{b64}$".format(b64=base64_stripped), sentry_value):
+ sentry_entry = None
+ else:
+ after = header
+
+ # if either part is invalid or empty, remove it before gluing them together
+ third_party_entry = (
+ ",".join(filter(TRACESTATE_ENTRIES_REGEX.search, [before, after])) or None
+ )
+
+ return {
+ "sentry_tracestate": sentry_entry,
+ "third_party_tracestate": third_party_entry,
+ }
+
+
+def compute_tracestate_value(data):
+ # type: (typing.Mapping[str, str]) -> str
+ """
+ Computes a new tracestate value using the given data.
+
+ Note: Returns just the base64-encoded data, NOT the full `sentry=...`
+ tracestate entry.
+ """
+
+ tracestate_json = json.dumps(data)
+
+ # Base64-encoded strings always come out with a length which is a multiple
+ # of 4. In order to achieve this, the end is padded with one or more `=`
+ # signs. Because the tracestate standard calls for using `=` signs between
+ # vendor name and value (`sentry=xxx,dogsaregreat=yyy`), to avoid confusion
+ # we strip the `=`
+ return (to_base64(tracestate_json) or "").rstrip("=")
+
+
+def compute_tracestate_entry(span):
+ # type: (Span) -> Optional[str]
+ """
+ Computes a new sentry tracestate for the span. Includes the `sentry=`.
+
+ Will return `None` if there's no client and/or no DSN.
+ """
+ data = {}
+
+ hub = span.hub or sentry_sdk.Hub.current
+
+ client = hub.client
+ scope = hub.scope
+
+ if client and client.options.get("dsn"):
+ options = client.options
+ user = scope._user
+
+ data = {
+ "trace_id": span.trace_id,
+ "environment": options["environment"],
+ "release": options.get("release"),
+ "public_key": Dsn(options["dsn"]).public_key,
+ }
+
+ if user and (user.get("id") or user.get("segment")):
+ user_data = {}
+
+ if user.get("id"):
+ user_data["id"] = user["id"]
+
+ if user.get("segment"):
+ user_data["segment"] = user["segment"]
+
+ data["user"] = user_data
+
+ if span.containing_transaction:
+ data["transaction"] = span.containing_transaction.name
+
+ return "sentry=" + compute_tracestate_value(data)
+
+ return None
+
+
+def reinflate_tracestate(encoded_tracestate):
+ # type: (str) -> typing.Optional[Mapping[str, str]]
+ """
+ Given a sentry tracestate value in its encoded form, translate it back into
+ a dictionary of data.
+ """
+ inflated_tracestate = None
+
+ if encoded_tracestate:
+ # Base64-encoded strings always come out with a length which is a
+ # multiple of 4. In order to achieve this, the end is padded with one or
+ # more `=` signs. Because the tracestate standard calls for using `=`
+ # signs between vendor name and value (`sentry=xxx,dogsaregreat=yyy`),
+ # to avoid confusion we strip the `=` when the data is initially
+ # encoded. Python's decoding function requires they be put back.
+ # Fortunately, it doesn't complain if there are too many, so we just
+ # attach two `=` on spec (there will never be more than 2, see
+ # https://en.wikipedia.org/wiki/Base64#Decoding_Base64_without_padding).
+ tracestate_json = from_base64(encoded_tracestate + "==")
+
+ try:
+ assert tracestate_json is not None
+ inflated_tracestate = json.loads(tracestate_json)
+ except Exception as err:
+ logger.warning(
+ (
+ "Unable to attach tracestate data to envelope header: {err}"
+ + "\nTracestate value is {encoded_tracestate}"
+ ).format(err=err, encoded_tracestate=encoded_tracestate),
+ )
+
+ return inflated_tracestate
+
+
+def _format_sql(cursor, sql):
+ # type: (Any, str) -> Optional[str]
+
+ real_sql = None
+
+ # If we're using psycopg2, it could be that we're
+ # looking at a query that uses Composed objects. Use psycopg2's mogrify
+ # function to format the query. We lose per-parameter trimming but gain
+ # accuracy in formatting.
+ try:
+ if hasattr(cursor, "mogrify"):
+ real_sql = cursor.mogrify(sql)
+ if isinstance(real_sql, bytes):
+ real_sql = real_sql.decode(cursor.connection.encoding)
+ except Exception:
+ real_sql = None
+
+ return real_sql or to_string(sql)
+
+
+def has_tracestate_enabled(span=None):
+ # type: (Optional[Span]) -> bool
+
+ client = ((span and span.hub) or sentry_sdk.Hub.current).client
+ options = client and client.options
+
+ return bool(options and options["_experiments"].get("propagate_tracestate"))
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 43b63b41ac..8fb03e014d 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -1,3 +1,4 @@
+import base64
import json
import linecache
import logging
@@ -5,6 +6,7 @@
import sys
import threading
import subprocess
+import re
from datetime import datetime
@@ -39,6 +41,7 @@
MAX_STRING_LENGTH = 512
MAX_FORMAT_PARAM_LENGTH = 128
+BASE64_ALPHABET = re.compile(r"^[a-zA-Z0-9/+=]*$")
def json_dumps(data):
@@ -968,3 +971,42 @@ def run(self):
integer_configured_timeout
)
)
+
+
+def to_base64(original):
+ # type: (str) -> Optional[str]
+ """
+ Convert a string to base64, via UTF-8. Returns None on invalid input.
+ """
+ base64_string = None
+
+ try:
+ utf8_bytes = original.encode("UTF-8")
+ base64_bytes = base64.b64encode(utf8_bytes)
+ base64_string = base64_bytes.decode("UTF-8")
+ except Exception as err:
+ logger.warning("Unable to encode {orig} to base64:".format(orig=original), err)
+
+ return base64_string
+
+
+def from_base64(base64_string):
+ # type: (str) -> Optional[str]
+ """
+ Convert a string from base64, via UTF-8. Returns None on invalid input.
+ """
+ utf8_string = None
+
+ try:
+ only_valid_chars = BASE64_ALPHABET.match(base64_string)
+ assert only_valid_chars
+
+ base64_bytes = base64_string.encode("UTF-8")
+ utf8_bytes = base64.b64decode(base64_bytes)
+ utf8_string = utf8_bytes.decode("UTF-8")
+ except Exception as err:
+ logger.warning(
+ "Unable to decode {b64} from base64:".format(b64=base64_string), err
+ )
+
+ return utf8_string
diff --git a/tests/integrations/sqlalchemy/test_sqlalchemy.py b/tests/integrations/sqlalchemy/test_sqlalchemy.py
index 2821126387..421a72ebae 100644
--- a/tests/integrations/sqlalchemy/test_sqlalchemy.py
+++ b/tests/integrations/sqlalchemy/test_sqlalchemy.py
@@ -189,7 +189,7 @@ def processor(event, hint):
assert len(json_dumps(event)) < max_bytes
# Some spans are discarded.
- assert len(event["spans"]) == 999
+ assert len(event["spans"]) == 1000
# Some spans have their descriptions truncated. Because the test always
# generates the same amount of descriptions and truncation is deterministic,
@@ -197,7 +197,7 @@ def processor(event, hint):
#
# Which exact span descriptions are truncated depends on the span durations
# of each SQL query and is non-deterministic.
- assert len(event["_meta"]["spans"]) == 536
+ assert len(event["_meta"]["spans"]) == 537
for i, span in enumerate(event["spans"]):
description = span["description"]
diff --git a/tests/test_envelope.py b/tests/test_envelope.py
index e795e9d93c..6e990aa96c 100644
--- a/tests/test_envelope.py
+++ b/tests/test_envelope.py
@@ -1,36 +1,58 @@
from sentry_sdk.envelope import Envelope
from sentry_sdk.session import Session
+from sentry_sdk import capture_event
+from sentry_sdk.tracing_utils import compute_tracestate_value
+import sentry_sdk.client
+
+import pytest
+
+try:
+ from unittest import mock # python 3.3 and above
+except ImportError:
+ import mock # python < 3.3
def generate_transaction_item():
return {
- "event_id": "d2132d31b39445f1938d7e21b6bf0ec4",
+ "event_id": "15210411201320122115110420122013",
"type": "transaction",
- "transaction": "/organizations/:orgId/performance/:eventSlug/",
- "start_timestamp": 1597976392.6542819,
- "timestamp": 1597976400.6189718,
+ "transaction": "/interactions/other-dogs/new-dog",
+ "start_timestamp": 1353568872.11122131,
+ "timestamp": 1356942672.09040815,
"contexts": {
"trace": {
- "trace_id": "4C79F60C11214EB38604F4AE0781BFB2",
- "span_id": "FA90FDEAD5F74052",
- "type": "trace",
+ "trace_id": "12312012123120121231201212312012",
+ "span_id": "0415201309082013",
+ "parent_span_id": None,
+ "description": "",
+ "op": "greeting.sniff",
+ "tracestate": compute_tracestate_value(
+ {
+ "trace_id": "12312012123120121231201212312012",
+ "environment": "dogpark",
+ "release": "off.leash.park",
+ "public_key": "dogsarebadatkeepingsecrets",
+ "user": {"id": 12312013, "segment": "bigs"},
+ "transaction": "/interactions/other-dogs/new-dog",
+ }
+ ),
}
},
"spans": [
{
"description": "",
- "op": "react.mount",
- "parent_span_id": "8f5a2b8768cafb4e",
- "span_id": "bd429c44b67a3eb4",
- "start_timestamp": 1597976393.4619668,
- "timestamp": 1597976393.4718769,
- "trace_id": "ff62a8b040f340bda5d830223def1d81",
+ "op": "greeting.sniff",
+ "parent_span_id": None,
+ "span_id": "0415201309082013",
+ "start_timestamp": 1353568872.11122131,
+ "timestamp": 1356942672.09040815,
+ "trace_id": "12312012123120121231201212312012",
}
],
}
-def test_basic_event():
+def test_add_and_get_basic_event():
envelope = Envelope()
expected = {"message": "Hello, World!"}
@@ -39,7 +61,7 @@ def test_basic_event():
assert envelope.get_event() == {"message": "Hello, World!"}
-def test_transaction_event():
+def test_add_and_get_transaction_event():
envelope = Envelope()
transaction_item = generate_transaction_item()
@@ -55,7 +77,7 @@ def test_transaction_event():
assert envelope.get_transaction_event() == transaction_item
-def test_session():
+def test_add_and_get_session():
envelope = Envelope()
expected = Session()
@@ -64,3 +86,49 @@ def test_session():
for item in envelope:
if item.type == "session":
assert item.payload.json == expected.to_json()
+
+
+# TODO (kmclb) remove this parameterization once tracestate is a real feature
+@pytest.mark.parametrize("tracestate_enabled", [True, False])
+def test_envelope_headers(
+ sentry_init, capture_envelopes, monkeypatch, tracestate_enabled
+):
+ monkeypatch.setattr(
+ sentry_sdk.client,
+ "format_timestamp",
+ lambda x: "2012-11-21T12:31:12.415908Z",
+ )
+
+ monkeypatch.setattr(
+ sentry_sdk.client,
+ "has_tracestate_enabled",
+ mock.Mock(return_value=tracestate_enabled),
+ )
+
+ sentry_init(
+ dsn="https://dogsarebadatkeepingsecrets@squirrelchasers.ingest.sentry.io/12312012",
+ )
+ envelopes = capture_envelopes()
+
+ capture_event(generate_transaction_item())
+
+ assert len(envelopes) == 1
+
+ if tracestate_enabled:
+ assert envelopes[0].headers == {
+ "event_id": "15210411201320122115110420122013",
+ "sent_at": "2012-11-21T12:31:12.415908Z",
+ "trace": {
+ "trace_id": "12312012123120121231201212312012",
+ "environment": "dogpark",
+ "release": "off.leash.park",
+ "public_key": "dogsarebadatkeepingsecrets",
+ "user": {"id": 12312013, "segment": "bigs"},
+ "transaction": "/interactions/other-dogs/new-dog",
+ },
+ }
+ else:
+ assert envelopes[0].headers == {
+ "event_id": "15210411201320122115110420122013",
+ "sent_at": "2012-11-21T12:31:12.415908Z",
+ }
diff --git a/tests/tracing/test_http_headers.py b/tests/tracing/test_http_headers.py
new file mode 100644
index 0000000000..3db967b24b
--- /dev/null
+++ b/tests/tracing/test_http_headers.py
@@ -0,0 +1,332 @@
+import json
+
+import pytest
+
+import sentry_sdk
+from sentry_sdk.tracing import Transaction, Span
+from sentry_sdk.tracing_utils import (
+ compute_tracestate_value,
+ extract_sentrytrace_data,
+ extract_tracestate_data,
+ reinflate_tracestate,
+)
+from sentry_sdk.utils import from_base64, to_base64
+
+
+try:
+ from unittest import mock # python 3.3 and above
+except ImportError:
+ import mock # python < 3.3
+
+
+def test_tracestate_computation(sentry_init):
+ sentry_init(
+ dsn="https://dogsarebadatkeepingsecrets@squirrelchasers.ingest.sentry.io/12312012",
+ environment="dogpark",
+ release="off.leash.park",
+ )
+
+ sentry_sdk.set_user({"id": 12312013, "segment": "bigs"})
+
+ transaction = Transaction(
+ name="/interactions/other-dogs/new-dog",
+ op="greeting.sniff",
+ trace_id="12312012123120121231201212312012",
+ )
+
+ # force lazy computation to create a value
+ transaction.to_tracestate()
+
+ computed_value = transaction._sentry_tracestate.replace("sentry=", "")
+ # we have to decode and reinflate the data because we can guarantee that the
+ # order of the entries in the jsonified dict will be the same here as when
+ # the tracestate is computed
+ reinflated_trace_data = json.loads(from_base64(computed_value))
+
+ assert reinflated_trace_data == {
+ "trace_id": "12312012123120121231201212312012",
+ "environment": "dogpark",
+ "release": "off.leash.park",
+ "public_key": "dogsarebadatkeepingsecrets",
+ "user": {"id": 12312013, "segment": "bigs"},
+ "transaction": "/interactions/other-dogs/new-dog",
+ }
+
+
+def test_doesnt_add_new_tracestate_to_transaction_when_none_given(sentry_init):
+ sentry_init(
+ dsn="https://dogsarebadatkeepingsecrets@squirrelchasers.ingest.sentry.io/12312012",
+ environment="dogpark",
+ release="off.leash.park",
+ )
+
+ transaction = Transaction(
+ name="/interactions/other-dogs/new-dog",
+ op="greeting.sniff",
+ # sentry_tracestate=< value would be passed here >
+ )
+
+ assert transaction._sentry_tracestate is None
+
+
+def test_adds_tracestate_to_transaction_when_to_traceparent_called(sentry_init):
+ sentry_init(
+ dsn="https://dogsarebadatkeepingsecrets@squirrelchasers.ingest.sentry.io/12312012",
+ environment="dogpark",
+ release="off.leash.park",
+ )
+
+ transaction = Transaction(
+ name="/interactions/other-dogs/new-dog",
+ op="greeting.sniff",
+ )
+
+ # no inherited tracestate, and none created in Transaction constructor
+ assert transaction._sentry_tracestate is None
+
+ transaction.to_tracestate()
+
+ assert transaction._sentry_tracestate is not None
+
+
+def test_adds_tracestate_to_transaction_when_getting_trace_context(sentry_init):
+ sentry_init(
+ dsn="https://dogsarebadatkeepingsecrets@squirrelchasers.ingest.sentry.io/12312012",
+ environment="dogpark",
+ release="off.leash.park",
+ )
+
+ transaction = Transaction(
+ name="/interactions/other-dogs/new-dog",
+ op="greeting.sniff",
+ )
+
+ # no inherited tracestate, and none created in Transaction constructor
+ assert transaction._sentry_tracestate is None
+
+ transaction.get_trace_context()
+
+ assert transaction._sentry_tracestate is not None
+
+
+@pytest.mark.parametrize(
+ "set_by", ["inheritance", "to_tracestate", "get_trace_context"]
+)
+def test_tracestate_is_immutable_once_set(sentry_init, monkeypatch, set_by):
+ monkeypatch.setattr(
+ sentry_sdk.tracing,
+ "compute_tracestate_entry",
+ mock.Mock(return_value="sentry=doGsaREgReaT"),
+ )
+
+ sentry_init(
+ dsn="https://dogsarebadatkeepingsecrets@squirrelchasers.ingest.sentry.io/12312012",
+ environment="dogpark",
+ release="off.leash.park",
+ )
+
+ # for each scenario, get to the point where tracestate has been set
+ if set_by == "inheritance":
+ transaction = Transaction(
+ name="/interactions/other-dogs/new-dog",
+ op="greeting.sniff",
+ sentry_tracestate=("sentry=doGsaREgReaT"),
+ )
+ else:
+ transaction = Transaction(
+ name="/interactions/other-dogs/new-dog",
+ op="greeting.sniff",
+ )
+
+ if set_by == "to_tracestate":
+ transaction.to_tracestate()
+ if set_by == "get_trace_context":
+ transaction.get_trace_context()
+
+ assert transaction._sentry_tracestate == "sentry=doGsaREgReaT"
+
+ # user data would be included in tracestate if it were recomputed at this point
+ sentry_sdk.set_user({"id": 12312013, "segment": "bigs"})
+
+ # value hasn't changed
+ assert transaction._sentry_tracestate == "sentry=doGsaREgReaT"
+
+
+@pytest.mark.parametrize("sampled", [True, False, None])
+def test_to_traceparent(sentry_init, sampled):
+
+ transaction = Transaction(
+ name="/interactions/other-dogs/new-dog",
+ op="greeting.sniff",
+ trace_id="12312012123120121231201212312012",
+ sampled=sampled,
+ )
+
+ traceparent = transaction.to_traceparent()
+
+ trace_id, parent_span_id, parent_sampled = traceparent.split("-")
+ assert trace_id == "12312012123120121231201212312012"
+ assert parent_span_id == transaction.span_id
+ assert parent_sampled == (
+ "1" if sampled is True else "0" if sampled is False else ""
+ )
+
+
+def test_to_tracestate(sentry_init):
+ sentry_init(
+ dsn="https://dogsarebadatkeepingsecrets@squirrelchasers.ingest.sentry.io/12312012",
+ environment="dogpark",
+ release="off.leash.park",
+ )
+
+ # it correctly uses the value from the transaction itself or the span's
+ # containing transaction
+ transaction_no_third_party = Transaction(
+ trace_id="12312012123120121231201212312012",
+ sentry_tracestate="sentry=doGsaREgReaT",
+ )
+ non_orphan_span = Span()
+ non_orphan_span._containing_transaction = transaction_no_third_party
+ assert transaction_no_third_party.to_tracestate() == "sentry=doGsaREgReaT"
+ assert non_orphan_span.to_tracestate() == "sentry=doGsaREgReaT"
+
+ # it combines sentry and third-party values correctly
+ transaction_with_third_party = Transaction(
+ trace_id="12312012123120121231201212312012",
+ sentry_tracestate="sentry=doGsaREgReaT",
+ third_party_tracestate="maisey=silly",
+ )
+ assert (
+ transaction_with_third_party.to_tracestate()
+ == "sentry=doGsaREgReaT,maisey=silly"
+ )
+
+ # it computes a tracestate from scratch for orphan transactions
+ orphan_span = Span(
+ trace_id="12312012123120121231201212312012",
+ )
+ assert orphan_span._containing_transaction is None
+ assert orphan_span.to_tracestate() == "sentry=" + compute_tracestate_value(
+ {
+ "trace_id": "12312012123120121231201212312012",
+ "environment": "dogpark",
+ "release": "off.leash.park",
+ "public_key": "dogsarebadatkeepingsecrets",
+ }
+ )
+
+
+@pytest.mark.parametrize("sampling_decision", [True, False])
+def test_sentrytrace_extraction(sampling_decision):
+ sentrytrace_header = "12312012123120121231201212312012-0415201309082013-{}".format(
+ 1 if sampling_decision is True else 0
+ )
+ assert extract_sentrytrace_data(sentrytrace_header) == {
+ "trace_id": "12312012123120121231201212312012",
+ "parent_span_id": "0415201309082013",
+ "parent_sampled": sampling_decision,
+ }
+
+
+@pytest.mark.parametrize(
+ ("incoming_header", "expected_sentry_value", "expected_third_party"),
+ [
+ # sentry only
+ ("sentry=doGsaREgReaT", "sentry=doGsaREgReaT", None),
+ # sentry only, invalid (`!` isn't a valid base64 character)
+ ("sentry=doGsaREgReaT!", None, None),
+ # stuff before
+ ("maisey=silly,sentry=doGsaREgReaT", "sentry=doGsaREgReaT", "maisey=silly"),
+ # stuff after
+ ("sentry=doGsaREgReaT,maisey=silly", "sentry=doGsaREgReaT", "maisey=silly"),
+ # stuff before and after
+ (
+ "charlie=goofy,sentry=doGsaREgReaT,maisey=silly",
+ "sentry=doGsaREgReaT",
+ "charlie=goofy,maisey=silly",
+ ),
+ # multiple before
+ (
+ "charlie=goofy,maisey=silly,sentry=doGsaREgReaT",
+ "sentry=doGsaREgReaT",
+ "charlie=goofy,maisey=silly",
+ ),
+ # multiple after
+ (
+ "sentry=doGsaREgReaT,charlie=goofy,maisey=silly",
+ "sentry=doGsaREgReaT",
+ "charlie=goofy,maisey=silly",
+ ),
+ # multiple before and after
+ (
+ "charlie=goofy,maisey=silly,sentry=doGsaREgReaT,bodhi=floppy,cory=loyal",
+ "sentry=doGsaREgReaT",
+ "charlie=goofy,maisey=silly,bodhi=floppy,cory=loyal",
+ ),
+ # only third-party data
+ ("maisey=silly", None, "maisey=silly"),
+ # invalid third-party data, valid sentry data
+ ("maisey_is_silly,sentry=doGsaREgReaT", "sentry=doGsaREgReaT", None),
+ # valid third-party data, invalid sentry data
+ ("maisey=silly,sentry=doGsaREgReaT!", None, "maisey=silly"),
+ # nothing valid at all
+ ("maisey_is_silly,sentry=doGsaREgReaT!", None, None),
+ ],
+)
+def test_tracestate_extraction(
+ incoming_header, expected_sentry_value, expected_third_party
+):
+ assert extract_tracestate_data(incoming_header) == {
+ "sentry_tracestate": expected_sentry_value,
+ "third_party_tracestate": expected_third_party,
+ }
+
+
+# TODO (kmclb) remove this parameterization once tracestate is a real feature
+@pytest.mark.parametrize("tracestate_enabled", [True, False])
+def test_iter_headers(sentry_init, monkeypatch, tracestate_enabled):
+ monkeypatch.setattr(
+ Transaction,
+ "to_traceparent",
+ mock.Mock(return_value="12312012123120121231201212312012-0415201309082013-0"),
+ )
+ monkeypatch.setattr(
+ Transaction,
+ "to_tracestate",
+ mock.Mock(return_value="sentry=doGsaREgReaT,charlie=goofy"),
+ )
+ monkeypatch.setattr(
+ sentry_sdk.tracing,
+ "has_tracestate_enabled",
+ mock.Mock(return_value=tracestate_enabled),
+ )
+
+ transaction = Transaction(
+ name="/interactions/other-dogs/new-dog",
+ op="greeting.sniff",
+ )
+
+ headers = dict(transaction.iter_headers())
+ assert (
+ headers["sentry-trace"] == "12312012123120121231201212312012-0415201309082013-0"
+ )
+ if tracestate_enabled:
+ assert "tracestate" in headers
+ assert headers["tracestate"] == "sentry=doGsaREgReaT,charlie=goofy"
+ else:
+ assert "tracestate" not in headers
+
+
+@pytest.mark.parametrize(
+ "data",
+ [ # comes out with no trailing `=`
+ {"name": "Maisey", "birthday": "12/31/12"},
+ # comes out with one trailing `=`
+ {"dogs": "yes", "cats": "maybe"},
+ # comes out with two trailing `=`
+ {"name": "Charlie", "birthday": "11/21/12"},
+ ],
+)
+def test_tracestate_reinflation(data):
+ encoded_tracestate = to_base64(json.dumps(data)).strip("=")
+ assert reinflate_tracestate(encoded_tracestate) == data
diff --git a/tests/tracing/test_integration_tests.py b/tests/tracing/test_integration_tests.py
index b2ce2e3a18..f9530d31b3 100644
--- a/tests/tracing/test_integration_tests.py
+++ b/tests/tracing/test_integration_tests.py
@@ -47,46 +47,46 @@ def test_basic(sentry_init, capture_events, sample_rate):
@pytest.mark.parametrize("sampled", [True, False, None])
-@pytest.mark.parametrize(
- "sample_rate", [0.0, 1.0]
-) # ensure sampling decision is actually passed along via headers
+@pytest.mark.parametrize("sample_rate", [0.0, 1.0])
def test_continue_from_headers(sentry_init, capture_events, sampled, sample_rate):
+ """
+ Ensure data is actually passed along via headers, and that they are read
+ correctly.
+ """
sentry_init(traces_sample_rate=sample_rate)
events = capture_events()
# make a parent transaction (normally this would be in a different service)
- with start_transaction(name="hi", sampled=True if sample_rate == 0 else None):
+ with start_transaction(
+ name="hi", sampled=True if sample_rate == 0 else None
+ ) as parent_transaction:
with start_span() as old_span:
old_span.sampled = sampled
headers = dict(Hub.current.iter_trace_propagation_headers(old_span))
-
- # test that the sampling decision is getting encoded in the header correctly
- header = headers["sentry-trace"]
- if sampled is True:
- assert header.endswith("-1")
- if sampled is False:
- assert header.endswith("-0")
- if sampled is None:
- assert header.endswith("-")
-
- # child transaction, to prove that we can read 'sentry-trace' header data
- # correctly
- transaction = Transaction.continue_from_headers(headers, name="WRONG")
- assert transaction is not None
- assert transaction.parent_sampled == sampled
- assert transaction.trace_id == old_span.trace_id
- assert transaction.same_process_as_parent is False
- assert transaction.parent_span_id == old_span.span_id
- assert transaction.span_id != old_span.span_id
+ tracestate = parent_transaction._sentry_tracestate
+
+ # child transaction, to prove that we can read 'sentry-trace' and
+ # `tracestate` header data correctly
+ child_transaction = Transaction.continue_from_headers(headers, name="WRONG")
+ assert child_transaction is not None
+ assert child_transaction.parent_sampled == sampled
+ assert child_transaction.trace_id == old_span.trace_id
+ assert child_transaction.same_process_as_parent is False
+ assert child_transaction.parent_span_id == old_span.span_id
+ assert child_transaction.span_id != old_span.span_id
+ assert child_transaction._sentry_tracestate == tracestate
# add child transaction to the scope, to show that the captured message will
# be tagged with the trace id (since it happens while the transaction is
# open)
- with start_transaction(transaction):
+ with start_transaction(child_transaction):
with configure_scope() as scope:
+ # change the transaction name from "WRONG" to make sure the change
+ # is reflected in the final data
scope.transaction = "ho"
capture_message("hello")
+ # in this case the child transaction won't be captured
if sampled is False or (sample_rate == 0 and sampled is None):
trace1, message = events
@@ -100,7 +100,7 @@ def test_continue_from_headers(sentry_init, capture_events, sampled, sample_rate
assert (
trace1["contexts"]["trace"]["trace_id"]
== trace2["contexts"]["trace"]["trace_id"]
- == transaction.trace_id
+ == child_transaction.trace_id
== message["contexts"]["trace"]["trace_id"]
)
diff --git a/tests/tracing/test_misc.py b/tests/tracing/test_misc.py
index f5b8aa5e85..5d6613cd28 100644
--- a/tests/tracing/test_misc.py
+++ b/tests/tracing/test_misc.py
@@ -1,7 +1,17 @@
import pytest
+import gc
+import uuid
+import os
+import sentry_sdk
from sentry_sdk import Hub, start_span, start_transaction
from sentry_sdk.tracing import Span, Transaction
+from sentry_sdk.tracing_utils import has_tracestate_enabled
+
+try:
+ from unittest import mock # python 3.3 and above
+except ImportError:
+ import mock # python < 3.3
def test_span_trimming(sentry_init, capture_events):
@@ -15,40 +25,59 @@ def test_span_trimming(sentry_init, capture_events):
(event,) = events
- # the transaction is its own first span (which counts for max_spans) but it
- # doesn't show up in the span list in the event, so this is 1 less than our
- # max_spans value
- assert len(event["spans"]) == 2
+ assert len(event["spans"]) == 3
- span1, span2 = event["spans"]
+ span1, span2, span3 = event["spans"]
assert span1["op"] == "foo0"
assert span2["op"] == "foo1"
+ assert span3["op"] == "foo2"
-def test_transaction_method_signature(sentry_init, capture_events):
+def test_transaction_naming(sentry_init, capture_events):
sentry_init(traces_sample_rate=1.0)
events = capture_events()
+ # only transactions have names - spans don't
with pytest.raises(TypeError):
start_span(name="foo")
assert len(events) == 0
+ # default name in event if no name is passed
with start_transaction() as transaction:
pass
- assert transaction.name == ""
assert len(events) == 1
+ assert events[0]["transaction"] == ""
+ # the name can be set once the transaction's already started
with start_transaction() as transaction:
transaction.name = "name-known-after-transaction-started"
assert len(events) == 2
+ assert events[1]["transaction"] == "name-known-after-transaction-started"
+ # passing in a name works, too
with start_transaction(name="a"):
pass
assert len(events) == 3
+ assert events[2]["transaction"] == "a"
- with start_transaction(Transaction(name="c")):
- pass
- assert len(events) == 4
+
+def test_start_transaction(sentry_init):
+ sentry_init(traces_sample_rate=1.0)
+
+ # you can have it start a transaction for you
+ result1 = start_transaction(
+ name="/interactions/other-dogs/new-dog", op="greeting.sniff"
+ )
+ assert isinstance(result1, Transaction)
+ assert result1.name == "/interactions/other-dogs/new-dog"
+ assert result1.op == "greeting.sniff"
+
+ # or you can pass it an already-created transaction
+ preexisting_transaction = Transaction(
+ name="/interactions/other-dogs/new-dog", op="greeting.sniff"
+ )
+ result2 = start_transaction(preexisting_transaction)
+ assert result2 is preexisting_transaction
def test_finds_transaction_on_scope(sentry_init):
@@ -77,7 +106,7 @@ def test_finds_transaction_on_scope(sentry_init):
assert scope._span.name == "dogpark"
-def test_finds_transaction_when_decedent_span_is_on_scope(
+def test_finds_transaction_when_descendent_span_is_on_scope(
sentry_init,
):
sentry_init(traces_sample_rate=1.0)
@@ -128,3 +157,92 @@ def test_finds_non_orphan_span_on_scope(sentry_init):
assert scope._span is not None
assert isinstance(scope._span, Span)
assert scope._span.op == "sniffing"
+
+
+def test_circular_references(monkeypatch, sentry_init, request):
+ # TODO: We discovered while writing this test about transaction/span
+ # reference cycles that there's actually also a circular reference in
+ # `serializer.py`, between the functions `_serialize_node` and
+ # `_serialize_node_impl`, both of which are defined inside of the main
+ # `serialize` function, and each of which calls the other one. For now, in
+ # order to avoid having those ref cycles give us a false positive here, we
+ # can mock out `serialize`. In the long run, though, we should probably fix
+ # that. (Whenever we do work on fixing it, it may be useful to add
+ #
+ # gc.set_debug(gc.DEBUG_LEAK)
+ # request.addfinalizer(lambda: gc.set_debug(~gc.DEBUG_LEAK))
+ #
+ # immediately after the initial collection below, so we can see what new
+ # objects the garbage collecter has to clean up once `transaction.finish` is
+ # called and the serializer runs.)
+ monkeypatch.setattr(
+ sentry_sdk.client,
+ "serialize",
+ mock.Mock(
+ return_value=None,
+ ),
+ )
+
+ # In certain versions of python, in some environments (specifically, python
+ # 3.4 when run in GH Actions), we run into a `ctypes` bug which creates
+ # circular references when `uuid4()` is called, as happens when we're
+ # generating event ids. Mocking it with an implementation which doesn't use
+ # the `ctypes` function lets us avoid having false positives when garbage
+ # collecting. See https://bugs.python.org/issue20519.
+ monkeypatch.setattr(
+ uuid,
+ "uuid4",
+ mock.Mock(
+ return_value=uuid.UUID(bytes=os.urandom(16)),
+ ),
+ )
+
+ gc.disable()
+ request.addfinalizer(gc.enable)
+
+ sentry_init(traces_sample_rate=1.0)
+
+ # Make sure that we're starting with a clean slate before we start creating
+ # transaction/span reference cycles
+ gc.collect()
+
+ dogpark_transaction = start_transaction(name="dogpark")
+ sniffing_span = dogpark_transaction.start_child(op="sniffing")
+ wagging_span = dogpark_transaction.start_child(op="wagging")
+
+ # At some point, you have to stop sniffing - there are balls to chase! - so finish
+ # this span while the dogpark transaction is still open
+ sniffing_span.finish()
+
+ # The wagging, however, continues long past the dogpark, so that span will
+ # NOT finish before the transaction ends. (Doing it in this order proves
+ # that both finished and unfinished spans get their cycles broken.)
+ dogpark_transaction.finish()
+
+ # Eventually you gotta sleep...
+ wagging_span.finish()
+
+ # assuming there are no cycles by this point, these should all be able to go
+ # out of scope and get their memory deallocated without the garbage
+ # collector having anything to do
+ del sniffing_span
+ del wagging_span
+ del dogpark_transaction
+
+ assert gc.collect() == 0
+
+
+# TODO (kmclb) remove this test once tracestate is a real feature
+@pytest.mark.parametrize("tracestate_enabled", [True, False, None])
+def test_has_tracestate_enabled(sentry_init, tracestate_enabled):
+ experiments = (
+ {"propagate_tracestate": tracestate_enabled}
+ if tracestate_enabled is not None
+ else {}
+ )
+ sentry_init(_experiments=experiments)
+
+ if tracestate_enabled is True:
+ assert has_tracestate_enabled() is True
+ else:
+ assert has_tracestate_enabled() is False
diff --git a/tests/tracing/test_sampling.py b/tests/tracing/test_sampling.py
index 672110ada2..6f09b451e1 100644
--- a/tests/tracing/test_sampling.py
+++ b/tests/tracing/test_sampling.py
@@ -3,7 +3,8 @@
import pytest
from sentry_sdk import Hub, start_span, start_transaction
-from sentry_sdk.tracing import Transaction, _is_valid_sample_rate
+from sentry_sdk.tracing import Transaction
+from sentry_sdk.tracing_utils import is_valid_sample_rate
from sentry_sdk.utils import logger
try:
@@ -56,7 +57,7 @@ def test_no_double_sampling(sentry_init, capture_events):
)
def test_accepts_valid_sample_rate(rate):
with mock.patch.object(logger, "warning", mock.Mock()):
- result = _is_valid_sample_rate(rate)
+ result = is_valid_sample_rate(rate)
assert logger.warning.called is False
assert result is True
@@ -77,7 +78,7 @@ def test_accepts_valid_sample_rate(rate):
)
def test_warns_on_invalid_sample_rate(rate, StringContaining): # noqa: N803
with mock.patch.object(logger, "warning", mock.Mock()):
- result = _is_valid_sample_rate(rate)
+ result = is_valid_sample_rate(rate)
logger.warning.assert_any_call(StringContaining("Given sample rate is invalid"))
assert result is False
@@ -231,7 +232,9 @@ def test_passes_parent_sampling_decision_in_sampling_context(
)
)
- transaction = Transaction.from_traceparent(sentry_trace_header, name="dogpark")
+ transaction = Transaction.continue_from_headers(
+ headers={"sentry-trace": sentry_trace_header}, name="dogpark"
+ )
spy = mock.Mock(wraps=transaction)
start_transaction(transaction=spy)
diff --git a/tests/utils/test_general.py b/tests/utils/test_general.py
index 370a6327ff..03be52ca17 100644
--- a/tests/utils/test_general.py
+++ b/tests/utils/test_general.py
@@ -13,8 +13,10 @@
filename_for_module,
handle_in_app_impl,
iter_event_stacktraces,
+ to_base64,
+ from_base64,
)
-from sentry_sdk._compat import text_type
+from sentry_sdk._compat import text_type, string_types
try:
@@ -168,3 +170,56 @@ def test_iter_stacktraces():
)
== {1, 2, 3}
)
+
+
+@pytest.mark.parametrize(
+ ("original", "base64_encoded"),
+ [
+ # ascii only
+ ("Dogs are great!", "RG9ncyBhcmUgZ3JlYXQh"),
+ # emoji
+ (u"🐶", "8J+Qtg=="),
+ # non-ascii
+ (
+ u"Καλό κορίτσι, Μάιζεϊ!",
+ "zprOsc67z4wgzrrOv8+Bzq/PhM+DzrksIM6czqzOuc62zrXPiiE=",
+ ),
+ # mix of ascii and non-ascii
+ (
+ u"Of margir hundar! Ég geri ráð fyrir að ég þurfi stærra rúm.",
+ "T2YgbWFyZ2lyIGh1bmRhciEgw4lnIGdlcmkgcsOhw7AgZnlyaXIgYcOwIMOpZyDDvnVyZmkgc3TDpnJyYSByw7ptLg==",
+ ),
+ ],
+)
+def test_successful_base64_conversion(original, base64_encoded):
+ # all unicode characters should be handled correctly
+ assert to_base64(original) == base64_encoded
+ assert from_base64(base64_encoded) == original
+
+ # "to" and "from" should be inverses
+ assert from_base64(to_base64(original)) == original
+ assert to_base64(from_base64(base64_encoded)) == base64_encoded
+
+
+@pytest.mark.parametrize(
+ "input",
+ [
+ 1231, # incorrect type
+ True, # incorrect type
+ [], # incorrect type
+ {}, # incorrect type
+ None, # incorrect type
+ "yayfordogs", # wrong length
+ "#dog", # invalid ascii character
+ "🐶", # non-ascii character
+ ],
+)
+def test_failed_base64_conversion(input):
+ # conversion from base64 should fail if given input of the wrong type or
+ # input which isn't a valid base64 string
+ assert from_base64(input) is None
+
+ # any string can be converted to base64, so only type errors will cause
+ # failures
+ if type(input) not in string_types:
+ assert to_base64(input) is None
From d50cf3fc78afa67adc3015a2f92a630a89584d60 Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Mon, 20 Sep 2021 12:34:05 +0200
Subject: [PATCH 0219/2327] feat: disable client reports by default (#1194)
---
CHANGELOG.md | 2 +-
sentry_sdk/consts.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebe0d0528b..befee16bf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,7 @@ A major release `N` implies the previous release `N-1` will no longer receive up
## Unreleased
- No longer set the last event id for transactions #1186
-- Added support for client reports #1181
+- Added support for client reports (disabled by default for now) #1181
## 1.3.1
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 51c54375e6..2f8c537dae 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -76,7 +76,7 @@ def __init__(
traces_sampler=None, # type: Optional[TracesSampler]
auto_enabling_integrations=True, # type: bool
auto_session_tracking=True, # type: bool
- send_client_reports=True, # type: bool
+ send_client_reports=False, # type: bool
_experiments={}, # type: Experiments # noqa: B006
):
# type: (...) -> None
From 8b82c50030cb7c4ee6074307f835f60e6ed79931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Og=C3=B3rek?=
Date: Mon, 20 Sep 2021 14:29:27 +0200
Subject: [PATCH 0220/2327] misc: 1.4.0 changelog
---
CHANGELOG.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index befee16bf3..b8248c99b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,8 +22,13 @@ A major release `N` implies the previous release `N-1` will no longer receive up
## Unreleased
+- TBA
+
+# 1.4.0
+
- No longer set the last event id for transactions #1186
- Added support for client reports (disabled by default for now) #1181
+- Added `tracestate` header handling #1179
## 1.3.1
From a12a719f1c45d368a78d1317fde0e0e19f4fede2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Og=C3=B3rek?=
Date: Mon, 20 Sep 2021 14:34:04 +0200
Subject: [PATCH 0221/2327] misc: 1.4.0 changelog
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8248c99b5..f56ec5633d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,7 @@ A major release `N` implies the previous release `N-1` will no longer receive up
- TBA
-# 1.4.0
+## 1.4.0
- No longer set the last event id for transactions #1186
- Added support for client reports (disabled by default for now) #1181
From 9de8d4717f4a9846f0df86708307632ae317f20f Mon Sep 17 00:00:00 2001
From: Augusto Zanellato
Date: Tue, 21 Sep 2021 09:37:58 +0200
Subject: [PATCH 0222/2327] Add real ip detection to asgi integration (#1199)
Closes getsentry/sentry-python#1154
---
sentry_sdk/integrations/asgi.py | 16 ++++++++++-
tests/integrations/asgi/test_asgi.py | 41 ++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py
index cfe8c6f8d1..ce84b77f53 100644
--- a/sentry_sdk/integrations/asgi.py
+++ b/sentry_sdk/integrations/asgi.py
@@ -171,7 +171,7 @@ def event_processor(self, event, hint, asgi_scope):
client = asgi_scope.get("client")
if client and _should_send_default_pii():
- request_info["env"] = {"REMOTE_ADDR": client[0]}
+ request_info["env"] = {"REMOTE_ADDR": self._get_ip(asgi_scope)}
if (
event.get("transaction", _DEFAULT_TRANSACTION_NAME)
@@ -225,6 +225,20 @@ def _get_query(self, scope):
return None
return urllib.parse.unquote(qs.decode("latin-1"))
+ def _get_ip(self, scope):
+ # type: (Any) -> str
+ try:
+ return scope["headers"]["x_forwarded_for"].split(",")[0].strip()
+ except (KeyError, IndexError):
+ pass
+
+ try:
+ return scope["headers"]["x_real_ip"]
+ except KeyError:
+ pass
+
+ return scope.get("client")[0]
+
def _get_headers(self, scope):
# type: (Any) -> Dict[str, str]
"""
diff --git a/tests/integrations/asgi/test_asgi.py b/tests/integrations/asgi/test_asgi.py
index b698f619e1..6d3ab8e2d2 100644
--- a/tests/integrations/asgi/test_asgi.py
+++ b/tests/integrations/asgi/test_asgi.py
@@ -251,3 +251,44 @@ def kangaroo_handler(request):
}
)
)
+
+
+def test_x_forwarded_for(sentry_init, app, capture_events):
+ sentry_init(send_default_pii=True)
+ events = capture_events()
+
+ client = TestClient(app)
+ response = client.get("/", headers={"X-Forwarded-For": "testproxy"})
+
+ assert response.status_code == 200
+
+ (event,) = events
+ assert event["request"]["env"] == {"REMOTE_ADDR": "testproxy"}
+
+
+def test_x_forwarded_for_multiple_entries(sentry_init, app, capture_events):
+ sentry_init(send_default_pii=True)
+ events = capture_events()
+
+ client = TestClient(app)
+ response = client.get(
+ "/", headers={"X-Forwarded-For": "testproxy1,testproxy2,testproxy3"}
+ )
+
+ assert response.status_code == 200
+
+ (event,) = events
+ assert event["request"]["env"] == {"REMOTE_ADDR": "testproxy1"}
+
+
+def test_x_real_ip(sentry_init, app, capture_events):
+ sentry_init(send_default_pii=True)
+ events = capture_events()
+
+ client = TestClient(app)
+ response = client.get("/", headers={"X-Real-IP": "1.2.3.4"})
+
+ assert response.status_code == 200
+
+ (event,) = events
+ assert event["request"]["env"] == {"REMOTE_ADDR": "1.2.3.4"}
From a7807847811b5ba46980547985ac572c287272a4 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Tue, 21 Sep 2021 09:38:23 +0200
Subject: [PATCH 0223/2327] fix(apidocs): Fix circular imports, run in PRs and
master (#1197)
---
.github/workflows/ci.yml | 2 --
checkouts/data-schemas | 2 +-
sentry_sdk/tracing.py | 24 ++++++++++++++----------
sentry_sdk/tracing_utils.py | 8 ++++++--
4 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 790eb69bc0..6724359e85 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,8 +37,6 @@ jobs:
name: build documentation
runs-on: ubuntu-latest
- if: "startsWith(github.ref, 'refs/heads/release/')"
-
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
diff --git a/checkouts/data-schemas b/checkouts/data-schemas
index 3647b8cab1..f8615dff7f 160000
--- a/checkouts/data-schemas
+++ b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit 3647b8cab1b3cfa289e8d7d995a5c9efee8c4b91
+Subproject commit f8615dff7f4640ff8a1810b264589b9fc6a4684a
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index fb1da88cc0..abd96606dd 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -7,16 +7,6 @@
import sentry_sdk
from sentry_sdk.utils import logger
-from sentry_sdk.tracing_utils import (
- EnvironHeaders,
- compute_tracestate_entry,
- extract_sentrytrace_data,
- extract_tracestate_data,
- has_tracestate_enabled,
- has_tracing_enabled,
- is_valid_sample_rate,
- maybe_create_breadcrumbs_from_span,
-)
from sentry_sdk._types import MYPY
@@ -718,3 +708,17 @@ def _set_initial_sampling_decision(self, sampling_context):
sample_rate=float(sample_rate),
)
)
+
+
+# Circular imports
+
+from sentry_sdk.tracing_utils import (
+ EnvironHeaders,
+ compute_tracestate_entry,
+ extract_sentrytrace_data,
+ extract_tracestate_data,
+ has_tracestate_enabled,
+ has_tracing_enabled,
+ is_valid_sample_rate,
+ maybe_create_breadcrumbs_from_span,
+)
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
index 4214c208b9..5ad8520cab 100644
--- a/sentry_sdk/tracing_utils.py
+++ b/sentry_sdk/tracing_utils.py
@@ -32,8 +32,6 @@
from typing import Dict
from typing import Union
- from sentry_sdk.tracing import Span
-
SENTRY_TRACE_REGEX = re.compile(
"^[ \t]*" # whitespace
@@ -405,3 +403,9 @@ def has_tracestate_enabled(span=None):
options = client and client.options
return bool(options and options["_experiments"].get("propagate_tracestate"))
+
+
+# Circular imports
+
+if MYPY:
+ from sentry_sdk.tracing import Span
From a6e1faeadf02133549f8f8c009c3134861d012b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Og=C3=B3rek?=
Date: Tue, 21 Sep 2021 09:41:50 +0200
Subject: [PATCH 0224/2327] misc(test): Dont run tests on -dev branches and add
latest versions of Django and Flask (#1196)
---
CHANGELOG.md | 1 +
tox.ini | 31 ++++++++++---------------------
2 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f56ec5633d..e2ab981b00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ A major release `N` implies the previous release `N-1` will no longer receive up
- No longer set the last event id for transactions #1186
- Added support for client reports (disabled by default for now) #1181
- Added `tracestate` header handling #1179
+- Added real ip detection to asgi integration #1199
## 1.3.1
diff --git a/tox.ini b/tox.ini
index 68cee8e587..bcff15c605 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,13 +24,11 @@ envlist =
{pypy,py2.7,py3.5}-django-{1.8,1.9,1.10}
{pypy,py2.7}-django-{1.8,1.9,1.10,1.11}
{py3.5,py3.6,py3.7}-django-{2.0,2.1}
- {py3.7,py3.8,py3.9}-django-{2.2,3.0,3.1}
- {py3.8,py3.9}-django-dev
+ {py3.7,py3.8,py3.9}-django-{2.2,3.0,3.1,3.2}
{pypy,py2.7,py3.4,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12,1.0}
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-1.1
-
- {py3.7,py3.8,py3.9}-flask-dev
+ {py3.6,py3.8,py3.9}-flask-2.0
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-bottle-0.12
@@ -48,7 +46,7 @@ envlist =
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.3,4.4}
{py3.6,py3.7,py3.8}-celery-5.0
- {py2.7,py3.7}-beam-{2.12,2.13}
+ py3.7-beam-{2.12,2.13}
# The aws_lambda tests deploy to the real AWS and have their own matrix of Python versions.
py3.7-aws_lambda
@@ -94,20 +92,16 @@ deps =
# with the -r flag
-r test-requirements.txt
- django-{1.11,2.0,2.1,2.2,3.0,3.1,dev}: djangorestframework>=3.0.0,<4.0.0
+ django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: djangorestframework>=3.0.0,<4.0.0
- {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1}: channels>2
- {py3.8,py3.9}-django-dev: channels>2
- {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1}: pytest-asyncio
- {py3.8,py3.9}-django-dev: pytest-asyncio
- {py2.7,py3.7,py3.8,py3.9}-django-{1.11,2.2,3.0,3.1}: psycopg2-binary
- {py2.7,py3.8,py3.9}-django-dev: psycopg2-binary
+ {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: channels>2
+ {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: pytest-asyncio
+ {py2.7,py3.7,py3.8,py3.9}-django-{1.11,2.2,3.0,3.1,3.2}: psycopg2-binary
django-{1.6,1.7}: pytest-django<3.0
django-{1.8,1.9,1.10,1.11,2.0,2.1}: pytest-django<4.0
- django-{2.2,3.0,3.1}: pytest-django>=4.0
- django-{2.2,3.0,3.1}: Werkzeug<2.0
- django-dev: git+https://github.com/pytest-dev/pytest-django#egg=pytest-django
+ django-{2.2,3.0,3.1,3.2}: pytest-django>=4.0
+ django-{2.2,3.0,3.1,3.2}: Werkzeug<2.0
django-1.6: Django>=1.6,<1.7
django-1.7: Django>=1.7,<1.8
@@ -120,7 +114,6 @@ deps =
django-2.2: Django>=2.2,<2.3
django-3.0: Django>=3.0,<3.1
django-3.1: Django>=3.1,<3.2
- django-dev: git+https://github.com/django/django.git#egg=Django
flask: flask-login
flask-0.10: Flask>=0.10,<0.11
@@ -128,12 +121,9 @@ deps =
flask-0.12: Flask>=0.12,<0.13
flask-1.0: Flask>=1.0,<1.1
flask-1.1: Flask>=1.1,<1.2
-
- flask-dev: git+https://github.com/pallets/flask.git#egg=flask
- flask-dev: git+https://github.com/pallets/werkzeug.git#egg=werkzeug
+ flask-2.0: Flask>=2.0,<2.1
bottle-0.12: bottle>=0.12,<0.13
- bottle-dev: git+https://github.com/bottlepy/bottle#egg=bottle
falcon-1.4: falcon>=1.4,<1.5
falcon-2.0: falcon>=2.0.0rc3,<3.0
@@ -148,7 +138,6 @@ deps =
sanic: aiohttp
py3.5-sanic: ujson<4
- py2.7-beam: rsa<=4.0
beam-2.12: apache-beam>=2.12.0, <2.13.0
beam-2.13: apache-beam>=2.13.0, <2.14.0
beam-master: git+https://github.com/apache/beam#egg=apache-beam&subdirectory=sdks/python
From 19b85878b1fa959a17e618adb280e48113da59c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Og=C3=B3rek?=
Date: Tue, 21 Sep 2021 14:15:54 +0200
Subject: [PATCH 0225/2327] fix(test): Update IP extraction for ASGI tests
(#1200)
---
sentry_sdk/integrations/asgi.py | 8 ++++++--
tests/integrations/asgi/test_asgi.py | 6 +++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py
index ce84b77f53..f73b856730 100644
--- a/sentry_sdk/integrations/asgi.py
+++ b/sentry_sdk/integrations/asgi.py
@@ -227,13 +227,17 @@ def _get_query(self, scope):
def _get_ip(self, scope):
# type: (Any) -> str
+ """
+ Extract IP Address from the ASGI scope based on request headers with fallback to scope client.
+ """
+ headers = self._get_headers(scope)
try:
- return scope["headers"]["x_forwarded_for"].split(",")[0].strip()
+ return headers["x-forwarded-for"].split(",")[0].strip()
except (KeyError, IndexError):
pass
try:
- return scope["headers"]["x_real_ip"]
+ return headers["x-real-ip"]
except KeyError:
pass
diff --git a/tests/integrations/asgi/test_asgi.py b/tests/integrations/asgi/test_asgi.py
index 6d3ab8e2d2..9af224b41b 100644
--- a/tests/integrations/asgi/test_asgi.py
+++ b/tests/integrations/asgi/test_asgi.py
@@ -258,7 +258,7 @@ def test_x_forwarded_for(sentry_init, app, capture_events):
events = capture_events()
client = TestClient(app)
- response = client.get("/", headers={"X-Forwarded-For": "testproxy"})
+ response = client.get("/sync-message", headers={"X-Forwarded-For": "testproxy"})
assert response.status_code == 200
@@ -272,7 +272,7 @@ def test_x_forwarded_for_multiple_entries(sentry_init, app, capture_events):
client = TestClient(app)
response = client.get(
- "/", headers={"X-Forwarded-For": "testproxy1,testproxy2,testproxy3"}
+ "/sync-message", headers={"X-Forwarded-For": "testproxy1,testproxy2,testproxy3"}
)
assert response.status_code == 200
@@ -286,7 +286,7 @@ def test_x_real_ip(sentry_init, app, capture_events):
events = capture_events()
client = TestClient(app)
- response = client.get("/", headers={"X-Real-IP": "1.2.3.4"})
+ response = client.get("/sync-message", headers={"X-Real-IP": "1.2.3.4"})
assert response.status_code == 200
From b986a23bcb7ec8936838a61653656a88473b59d4 Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Tue, 21 Sep 2021 12:23:04 +0000
Subject: [PATCH 0226/2327] release: 1.4.0
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 67a32f39ae..629e4f6417 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.3.1"
+release = "1.4.0"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 2f8c537dae..0bb1d1b001 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.3.1"
+VERSION = "1.4.0"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index bec94832c6..ed7752a94e 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.3.1",
+ version="1.4.0",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 63972684f57e8d40983fe6d24c92e9ba769b2a5a Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya
Date: Tue, 21 Sep 2021 17:59:09 +0300
Subject: [PATCH 0227/2327] ci(release): Use the latest version of publish
(#1201)
Upgrade to latest version of `getsentry/action-prepare-release` (from 1.1 to 1.3+)
---
.github/workflows/release.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9e59d221ae..493032b221 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
token: ${{ secrets.GH_RELEASE_PAT }}
fetch-depth: 0
- name: Prepare release
- uses: getsentry/action-prepare-release@v1.1
+ uses: getsentry/action-prepare-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
with:
From 44b18cb15ba8485e4950be7f50884c645795e0f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Og=C3=B3rek?=
Date: Wed, 22 Sep 2021 14:31:34 +0200
Subject: [PATCH 0228/2327] fix(tracing): Fix race condition between finish and
start_child (#1203)
---
sentry_sdk/tracing.py | 2 +-
tests/tracing/test_integration_tests.py | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index abd96606dd..bfca30c6d4 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -586,7 +586,7 @@ def finish(self, hub=None):
# recorder -> span -> containing transaction (which is where we started)
# before either the spans or the transaction goes out of scope and has
# to be garbage collected
- del self._span_recorder
+ self._span_recorder = None
return hub.capture_event(
{
diff --git a/tests/tracing/test_integration_tests.py b/tests/tracing/test_integration_tests.py
index f9530d31b3..486651c754 100644
--- a/tests/tracing/test_integration_tests.py
+++ b/tests/tracing/test_integration_tests.py
@@ -10,6 +10,7 @@
start_span,
start_transaction,
)
+from sentry_sdk.transport import Transport
from sentry_sdk.tracing import Transaction
@@ -147,3 +148,22 @@ def before_send(event, hint):
pass
assert len(events) == 1
+
+
+def test_start_span_after_finish(sentry_init, capture_events):
+ class CustomTransport(Transport):
+ def capture_envelope(self, envelope):
+ pass
+
+ def capture_event(self, event):
+ start_span(op="toolate", description="justdont")
+ pass
+
+ sentry_init(traces_sample_rate=1, transport=CustomTransport())
+ events = capture_events()
+
+ with start_transaction(name="hi"):
+ with start_span(op="bar", description="bardesc"):
+ pass
+
+ assert len(events) == 1
From 9a07b86f0381c39ed603c6e39faf9cbcd30ccbce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Og=C3=B3rek?=
Date: Wed, 22 Sep 2021 14:33:43 +0200
Subject: [PATCH 0229/2327] misc: 1.4.1 changelog
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2ab981b00..3798a53161 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,10 @@ A major release `N` implies the previous release `N-1` will no longer receive up
- TBA
+## 1.4.1
+
+- Fix race condition between `finish` and `start_child` in tracing #1203
+
## 1.4.0
- No longer set the last event id for transactions #1186
From 668b0a86d09bed63142d2216e3737a199fdfa49d Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Wed, 22 Sep 2021 12:34:25 +0000
Subject: [PATCH 0230/2327] release: 1.4.1
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 629e4f6417..73e794f59e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.4.0"
+release = "1.4.1"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 0bb1d1b001..fcccba2a9a 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.4.0"
+VERSION = "1.4.1"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index ed7752a94e..25efb448a0 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.4.0",
+ version="1.4.1",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 7d218168c3af8a272786c7264b4d86a43d26c6f5 Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Mon, 27 Sep 2021 12:17:15 +0200
Subject: [PATCH 0231/2327] fix: Ensure that an envelope is cloned before it's
modified (#1206)
---
sentry_sdk/transport.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sentry_sdk/transport.py b/sentry_sdk/transport.py
index bcaebf37b7..fca6fa8aec 100644
--- a/sentry_sdk/transport.py
+++ b/sentry_sdk/transport.py
@@ -356,7 +356,10 @@ def _send_envelope(
else:
new_items.append(item)
- envelope.items[:] = new_items
+ # Since we're modifying the envelope here make a copy so that others
+ # that hold references do not see their envelope modified.
+ envelope = Envelope(headers=envelope.headers, items=new_items)
+
if not envelope.items:
return None
From 2152edf358fddd58d2be0527e3ee01f486cd3a85 Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Mon, 27 Sep 2021 13:53:01 +0200
Subject: [PATCH 0232/2327] meta: updated changelog for 1.4.2
---
CHANGELOG.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3798a53161..3fd2cb4924 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,9 +20,9 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
-## Unreleased
+## 1.4.2
-- TBA
+- Made envelope modifications in the HTTP transport non observable #1206
## 1.4.1
From f8b00c8910e4b884df661fb6ef33b058b48a76ac Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Mon, 27 Sep 2021 13:55:46 +0200
Subject: [PATCH 0233/2327] meta: set title back to unreleased in changelog
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fd2cb4924..5eb09e7ab7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
-## 1.4.2
+## Unreleased
- Made envelope modifications in the HTTP transport non observable #1206
From 765f3dd7871f73acc48fb65262089d9dc3d78a89 Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Mon, 27 Sep 2021 14:59:34 +0200
Subject: [PATCH 0234/2327] Revert "meta: set title back to unreleased in
changelog"
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5eb09e7ab7..3fd2cb4924 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
-## Unreleased
+## 1.4.2
- Made envelope modifications in the HTTP transport non observable #1206
From 6fe2658213655912aaa247ea24ad8a731806b04e Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Mon, 27 Sep 2021 13:00:29 +0000
Subject: [PATCH 0235/2327] release: 1.4.2
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 73e794f59e..5683da988a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.4.1"
+release = "1.4.2"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index fcccba2a9a..7d0267c5a1 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.4.1"
+VERSION = "1.4.2"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 25efb448a0..0fcaff1084 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.4.1",
+ version="1.4.2",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 37b067c876382ab4f246cc219d96779888552ee1 Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Wed, 29 Sep 2021 14:43:00 +0200
Subject: [PATCH 0236/2327] feat: Turn on client reports by default (#1209)
---
CHANGELOG.md | 4 ++++
sentry_sdk/consts.py | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fd2cb4924..e14658dac1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,10 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 1.4.3
+
+- Turned client reports on by default.
+
## 1.4.2
- Made envelope modifications in the HTTP transport non observable #1206
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 7d0267c5a1..30aa41e3e9 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -76,7 +76,7 @@ def __init__(
traces_sampler=None, # type: Optional[TracesSampler]
auto_enabling_integrations=True, # type: bool
auto_session_tracking=True, # type: bool
- send_client_reports=False, # type: bool
+ send_client_reports=True, # type: bool
_experiments={}, # type: Experiments # noqa: B006
):
# type: (...) -> None
From ddeff802436123865082462e203d604aabac0380 Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Wed, 29 Sep 2021 12:45:37 +0000
Subject: [PATCH 0237/2327] release: 1.4.3
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 5683da988a..44ffba4edb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.4.2"
+release = "1.4.3"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 30aa41e3e9..7817abd2df 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.4.2"
+VERSION = "1.4.3"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 0fcaff1084..721727f85d 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.4.2",
+ version="1.4.3",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 5bd47750871a392be4ed2632b70c444990844b51 Mon Sep 17 00:00:00 2001
From: Armin Ronacher
Date: Fri, 1 Oct 2021 14:31:35 +0200
Subject: [PATCH 0238/2327] feat(client_reports): Report before_send as client
report (#1211)
---
CHANGELOG.md | 4 ++++
sentry_sdk/client.py | 4 ++++
tests/test_basics.py | 12 +++++++++++-
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e14658dac1..6f60058d05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,10 @@ sentry-sdk==0.10.1
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## Unreleased
+
+- Also record client outcomes for before send.
+
## 1.4.3
- Turned client reports on by default.
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 659299c632..67ed94cc38 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -201,6 +201,10 @@ def _prepare_event(
new_event = before_send(event, hint or {})
if new_event is None:
logger.info("before send dropped event (%s)", event)
+ if self.transport:
+ self.transport.record_lost_event(
+ "before_send", data_category="error"
+ )
event = new_event # type: ignore
return event
diff --git a/tests/test_basics.py b/tests/test_basics.py
index 3972c2ae2d..55d7ff8bab 100644
--- a/tests/test_basics.py
+++ b/tests/test_basics.py
@@ -77,9 +77,13 @@ def test_event_id(sentry_init, capture_events):
assert Hub.current.last_event_id() == event_id
-def test_option_callback(sentry_init, capture_events):
+def test_option_callback(sentry_init, capture_events, monkeypatch):
drop_events = False
drop_breadcrumbs = False
+ reports = []
+
+ def record_lost_event(reason, data_category=None, item=None):
+ reports.append((reason, data_category))
def before_send(event, hint):
assert isinstance(hint["exc_info"][1], ValueError)
@@ -96,6 +100,10 @@ def before_breadcrumb(crumb, hint):
sentry_init(before_send=before_send, before_breadcrumb=before_breadcrumb)
events = capture_events()
+ monkeypatch.setattr(
+ Hub.current.client.transport, "record_lost_event", record_lost_event
+ )
+
def do_this():
add_breadcrumb(message="Hello", hint={"foo": 42})
try:
@@ -106,8 +114,10 @@ def do_this():
do_this()
drop_breadcrumbs = True
do_this()
+ assert not reports
drop_events = True
do_this()
+ assert reports == [("before_send", "error")]
normal, no_crumbs = events
From cad2f65316bab4ee5792b1b788c32c57293eea5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Sep 2021 03:08:25 +0000
Subject: [PATCH 0239/2327] build(deps): bump checkouts/data-schemas from
`f8615df` to `c5f90f8`
Bumps [checkouts/data-schemas](https://github.com/getsentry/sentry-data-schemas) from `f8615df` to `c5f90f8`.
- [Release notes](https://github.com/getsentry/sentry-data-schemas/releases)
- [Commits](https://github.com/getsentry/sentry-data-schemas/compare/f8615dff7f4640ff8a1810b264589b9fc6a4684a...c5f90f84c6707effbb63cd248b1b1569b3b09e7b)
---
updated-dependencies:
- dependency-name: checkouts/data-schemas
dependency-type: direct:production
...
Signed-off-by: dependabot[bot]
---
checkouts/data-schemas | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/checkouts/data-schemas b/checkouts/data-schemas
index f8615dff7f..c5f90f84c6 160000
--- a/checkouts/data-schemas
+++ b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit f8615dff7f4640ff8a1810b264589b9fc6a4684a
+Subproject commit c5f90f84c6707effbb63cd248b1b1569b3b09e7b
From 49cae6009a4e39c47ef8834b07668f5eb9789ca8 Mon Sep 17 00:00:00 2001
From: Radu Woinaroski <5281987+RaduW@users.noreply.github.com>
Date: Wed, 3 Nov 2021 11:07:29 +0100
Subject: [PATCH 0240/2327] fix(envelope) Add support for implicitly sized
envelope items (#1229)
add implicitly sized items to envelope parsing
---
sentry_sdk/envelope.py | 13 ++--
tests/test_envelope.py | 132 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 141 insertions(+), 4 deletions(-)
diff --git a/sentry_sdk/envelope.py b/sentry_sdk/envelope.py
index ebb2842000..928c691cdd 100644
--- a/sentry_sdk/envelope.py
+++ b/sentry_sdk/envelope.py
@@ -295,13 +295,18 @@ def deserialize_from(
if not line:
return None
headers = parse_json(line)
- length = headers["length"]
- payload = f.read(length)
- if headers.get("type") in ("event", "transaction"):
+ length = headers.get("length")
+ if length is not None:
+ payload = f.read(length)
+ f.readline()
+ else:
+ # if no length was specified we need to read up to the end of line
+ # and remove it (if it is present, i.e. not the very last char in an eof terminated envelope)
+ payload = f.readline().rstrip(b"\n")
+ if headers.get("type") in ("event", "transaction", "metric_buckets"):
rv = cls(headers=headers, payload=PayloadRef(json=parse_json(payload)))
else:
rv = cls(headers=headers, payload=payload)
- f.readline()
return rv
@classmethod
diff --git a/tests/test_envelope.py b/tests/test_envelope.py
index 6e990aa96c..582fe6236f 100644
--- a/tests/test_envelope.py
+++ b/tests/test_envelope.py
@@ -132,3 +132,135 @@ def test_envelope_headers(
"event_id": "15210411201320122115110420122013",
"sent_at": "2012-11-21T12:31:12.415908Z",
}
+
+
+def test_envelope_with_sized_items():
+ """
+ Tests that it successfully parses envelopes with
+ the item size specified in the header
+ """
+ envelope_raw = (
+ b'{"event_id":"9ec79c33ec9942ab8353589fcb2e04dc"}\n'
+ + b'{"type":"type1","length":4 }\n1234\n'
+ + b'{"type":"type2","length":4 }\nabcd\n'
+ + b'{"type":"type3","length":0}\n\n'
+ + b'{"type":"type4","length":4 }\nab12\n'
+ )
+ envelope_raw_eof_terminated = envelope_raw[:-1]
+
+ for envelope_raw in (envelope_raw, envelope_raw_eof_terminated):
+ actual = Envelope.deserialize(envelope_raw)
+
+ items = [item for item in actual]
+
+ assert len(items) == 4
+
+ assert items[0].type == "type1"
+ assert items[0].get_bytes() == b"1234"
+
+ assert items[1].type == "type2"
+ assert items[1].get_bytes() == b"abcd"
+
+ assert items[2].type == "type3"
+ assert items[2].get_bytes() == b""
+
+ assert items[3].type == "type4"
+ assert items[3].get_bytes() == b"ab12"
+
+ assert actual.headers["event_id"] == "9ec79c33ec9942ab8353589fcb2e04dc"
+
+
+def test_envelope_with_implicitly_sized_items():
+ """
+ Tests that it successfully parses envelopes with
+ the item size not specified in the header
+ """
+ envelope_raw = (
+ b'{"event_id":"9ec79c33ec9942ab8353589fcb2e04dc"}\n'
+ + b'{"type":"type1"}\n1234\n'
+ + b'{"type":"type2"}\nabcd\n'
+ + b'{"type":"type3"}\n\n'
+ + b'{"type":"type4"}\nab12\n'
+ )
+ envelope_raw_eof_terminated = envelope_raw[:-1]
+
+ for envelope_raw in (envelope_raw, envelope_raw_eof_terminated):
+ actual = Envelope.deserialize(envelope_raw)
+ assert actual.headers["event_id"] == "9ec79c33ec9942ab8353589fcb2e04dc"
+
+ items = [item for item in actual]
+
+ assert len(items) == 4
+
+ assert items[0].type == "type1"
+ assert items[0].get_bytes() == b"1234"
+
+ assert items[1].type == "type2"
+ assert items[1].get_bytes() == b"abcd"
+
+ assert items[2].type == "type3"
+ assert items[2].get_bytes() == b""
+
+ assert items[3].type == "type4"
+ assert items[3].get_bytes() == b"ab12"
+
+
+def test_envelope_with_two_attachments():
+ """
+ Test that items are correctly parsed in an envelope with to size specified items
+ """
+ two_attachments = (
+ b'{"event_id":"9ec79c33ec9942ab8353589fcb2e04dc","dsn":"https://e12d836b15bb49d7bbf99e64295d995b:@sentry.io/42"}\n'
+ + b'{"type":"attachment","length":10,"content_type":"text/plain","filename":"hello.txt"}\n'
+ + b"\xef\xbb\xbfHello\r\n\n"
+ + b'{"type":"event","length":41,"content_type":"application/json","filename":"application.log"}\n'
+ + b'{"message":"hello world","level":"error"}\n'
+ )
+ two_attachments_eof_terminated = two_attachments[
+ :-1
+ ] # last \n is optional, without it should still be a valid envelope
+
+ for envelope_raw in (two_attachments, two_attachments_eof_terminated):
+ actual = Envelope.deserialize(envelope_raw)
+ items = [item for item in actual]
+
+ assert len(items) == 2
+ assert items[0].get_bytes() == b"\xef\xbb\xbfHello\r\n"
+ assert items[1].payload.json == {"message": "hello world", "level": "error"}
+
+
+def test_envelope_with_empty_attachments():
+ """
+ Test that items are correctly parsed in an envelope with two 0 length items (with size specified in the header
+ """
+ two_empty_attachments = (
+ b'{"event_id":"9ec79c33ec9942ab8353589fcb2e04dc"}\n'
+ + b'{"type":"attachment","length":0}\n\n'
+ + b'{"type":"attachment","length":0}\n\n'
+ )
+
+ two_empty_attachments_eof_terminated = two_empty_attachments[
+ :-1
+ ] # last \n is optional, without it should still be a valid envelope
+
+ for envelope_raw in (two_empty_attachments, two_empty_attachments_eof_terminated):
+ actual = Envelope.deserialize(envelope_raw)
+ items = [item for item in actual]
+
+ assert len(items) == 2
+ assert items[0].get_bytes() == b""
+ assert items[1].get_bytes() == b""
+
+
+def test_envelope_without_headers():
+ """
+ Test that an envelope without headers is parsed successfully
+ """
+ envelope_without_headers = (
+ b"{}\n" + b'{"type":"session"}\n' + b'{"started": "2020-02-07T14:16:00Z"}'
+ )
+ actual = Envelope.deserialize(envelope_without_headers)
+ items = [item for item in actual]
+
+ assert len(items) == 1
+ assert items[0].payload.get_bytes() == b'{"started": "2020-02-07T14:16:00Z"}'
From 81b2c70a26c27c0ce15dc1843fef06277c147c95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Ga=C5=82uszka?=
Date: Thu, 4 Nov 2021 13:27:51 +0100
Subject: [PATCH 0241/2327] fix: integration with Apache Beam 2.32, 2.33
reported in #1231 (#1233)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Kamil Gałuszka
---
sentry_sdk/integrations/beam.py | 3 ++-
tests/integrations/beam/test_beam.py | 4 +++-
tox.ini | 4 +++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/sentry_sdk/integrations/beam.py b/sentry_sdk/integrations/beam.py
index be1615dc4b..30faa3814f 100644
--- a/sentry_sdk/integrations/beam.py
+++ b/sentry_sdk/integrations/beam.py
@@ -80,7 +80,6 @@ def sentry_init_pardo(self, fn, *args, **kwargs):
def _wrap_inspect_call(cls, func_name):
# type: (Any, Any) -> Any
- from apache_beam.typehints.decorators import getfullargspec # type: ignore
if not hasattr(cls, func_name):
return None
@@ -105,6 +104,8 @@ def _inspect(self):
return get_function_args_defaults(process_func)
except ImportError:
+ from apache_beam.typehints.decorators import getfullargspec # type: ignore
+
return getfullargspec(process_func)
setattr(_inspect, USED_FUNC, True)
diff --git a/tests/integrations/beam/test_beam.py b/tests/integrations/beam/test_beam.py
index 8beb9b80a1..7aeb617e3c 100644
--- a/tests/integrations/beam/test_beam.py
+++ b/tests/integrations/beam/test_beam.py
@@ -152,7 +152,9 @@ def test_monkey_patch_signature(f, args, kwargs):
class _OutputProcessor(OutputProcessor):
- def process_outputs(self, windowed_input_element, results):
+ def process_outputs(
+ self, windowed_input_element, results, watermark_estimator=None
+ ):
print(windowed_input_element)
try:
for result in results:
diff --git a/tox.ini b/tox.ini
index bcff15c605..229d434c3a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,7 +46,7 @@ envlist =
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.3,4.4}
{py3.6,py3.7,py3.8}-celery-5.0
- py3.7-beam-{2.12,2.13}
+ py3.7-beam-{2.12,2.13,2.32,2.33}
# The aws_lambda tests deploy to the real AWS and have their own matrix of Python versions.
py3.7-aws_lambda
@@ -140,6 +140,8 @@ deps =
beam-2.12: apache-beam>=2.12.0, <2.13.0
beam-2.13: apache-beam>=2.13.0, <2.14.0
+ beam-2.32: apache-beam>=2.32.0, <2.33.0
+ beam-2.33: apache-beam>=2.33.0, <2.34.0
beam-master: git+https://github.com/apache/beam#egg=apache-beam&subdirectory=sdks/python
celery: redis
From ed4ba68cad42ebfbab162b37bf7edad25ebeae55 Mon Sep 17 00:00:00 2001
From: iker barriocanal <32816711+iker-barriocanal@users.noreply.github.com>
Date: Fri, 5 Nov 2021 10:04:32 +0100
Subject: [PATCH 0242/2327] build(craft): Remove Python 2.7 support for AWS
Lambda layers (#1241)
Since Python 2.7 is no longer supported, there's no point in having it as a compatible runtime for the created layers.
---
.craft.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.craft.yml b/.craft.yml
index e351462f72..c6d13cfc2c 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -18,7 +18,6 @@ targets:
# On the other hand, AWS Lambda does not support every Python runtime.
# The supported runtimes are available in the following link:
# https://docs.aws.amazon.com/lambda/latest/dg/lambda-python.html
- - python2.7
- python3.6
- python3.7
- python3.8
From 1ed232cff4c829471639be443b415e6dfbb2ddb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Nov 2021 13:30:19 -0500
Subject: [PATCH 0243/2327] build(deps): bump checkouts/data-schemas from
`c5f90f8` to `f0a57f2` (#1252)
Bumps [checkouts/data-schemas](https://github.com/getsentry/sentry-data-schemas) from `c5f90f8` to `f0a57f2`.
- [Release notes](https://github.com/getsentry/sentry-data-schemas/releases)
- [Commits](https://github.com/getsentry/sentry-data-schemas/compare/c5f90f84c6707effbb63cd248b1b1569b3b09e7b...f0a57f23cf04d0b4b1e19e1398d9712b09759911)
---
updated-dependencies:
- dependency-name: checkouts/data-schemas
dependency-type: direct:production
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
checkouts/data-schemas | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/checkouts/data-schemas b/checkouts/data-schemas
index c5f90f84c6..f0a57f23cf 160000
--- a/checkouts/data-schemas
+++ b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit c5f90f84c6707effbb63cd248b1b1569b3b09e7b
+Subproject commit f0a57f23cf04d0b4b1e19e1398d9712b09759911
From 40ab71687c7efded16103544c4beecb2afc9a3b0 Mon Sep 17 00:00:00 2001
From: Kian Meng Ang
Date: Tue, 16 Nov 2021 21:41:03 +0800
Subject: [PATCH 0244/2327] chore: fix typos (#1253)
---
CHANGELOG.md | 2 +-
sentry_sdk/integrations/aiohttp.py | 2 +-
sentry_sdk/tracing.py | 2 +-
sentry_sdk/tracing_utils.py | 2 +-
tests/test_transport.py | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f60058d05..4c9502dc04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,7 +54,7 @@ A major release `N` implies the previous release `N-1` will no longer receive up
## 1.2.0
- Fix for `AWSLambda` Integration to handle other path formats for function initial handler #1139
-- Fix for worker to set deamon attribute instead of deprecated setDaemon method #1093
+- Fix for worker to set daemon attribute instead of deprecated setDaemon method #1093
- Fix for `bottle` Integration that discards `-dev` for version extraction #1085
- Fix for transport that adds a unified hook for capturing metrics about dropped events #1100
- Add `Httpx` Integration #1119
diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py
index f74e6f4bf2..1781ddc5e0 100644
--- a/sentry_sdk/integrations/aiohttp.py
+++ b/sentry_sdk/integrations/aiohttp.py
@@ -66,7 +66,7 @@ def setup_once():
version = tuple(map(int, AIOHTTP_VERSION.split(".")[:2]))
except (TypeError, ValueError):
raise DidNotEnable(
- "AIOHTTP version unparseable: {}".format(AIOHTTP_VERSION)
+ "AIOHTTP version unparsable: {}".format(AIOHTTP_VERSION)
)
if version < (3, 4):
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index bfca30c6d4..aff6a90659 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -617,7 +617,7 @@ def _set_initial_sampling_decision(self, sampling_context):
1. If a sampling decision is passed to `start_transaction`
(`start_transaction(name: "my transaction", sampled: True)`), that
- decision will be used, regardlesss of anything else
+ decision will be used, regardless of anything else
2. If `traces_sampler` is defined, its decision will be used. It can
choose to keep or ignore any parent sampling decision, or use the
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
index 5ad8520cab..ff00b2e444 100644
--- a/sentry_sdk/tracing_utils.py
+++ b/sentry_sdk/tracing_utils.py
@@ -65,7 +65,7 @@
# of the form `sentry=xxxx`
SENTRY_TRACESTATE_ENTRY_REGEX = re.compile(
# either sentry is the first entry or there's stuff immediately before it,
- # ending in a commma (this prevents matching something like `coolsentry=xxx`)
+ # ending in a comma (this prevents matching something like `coolsentry=xxx`)
"(?:^|.+,)"
# sentry's part, not including the potential comma
"(sentry=[^,]*)"
diff --git a/tests/test_transport.py b/tests/test_transport.py
index 0ce155e6e6..a837182f6d 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -279,7 +279,7 @@ def intercepting_fetch(*args, **kwargs):
client.flush()
# this goes out with an extra envelope because it's flushed after the last item
- # that is normally in the queue. This is quite funny in a way beacuse it means
+ # that is normally in the queue. This is quite funny in a way because it means
# that the envelope that caused its own over quota report (an error with an
# attachment) will include its outcome since it's pending.
assert len(capturing_server.captured) == 1
From dd0efc08414ee2ef1a5f22d2cc4e243b54a1b455 Mon Sep 17 00:00:00 2001
From: sentry-bot
Date: Tue, 16 Nov 2021 13:41:46 +0000
Subject: [PATCH 0245/2327] fix: Formatting
---
sentry_sdk/integrations/aiohttp.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py
index 1781ddc5e0..95ca6d3d12 100644
--- a/sentry_sdk/integrations/aiohttp.py
+++ b/sentry_sdk/integrations/aiohttp.py
@@ -65,9 +65,7 @@ def setup_once():
try:
version = tuple(map(int, AIOHTTP_VERSION.split(".")[:2]))
except (TypeError, ValueError):
- raise DidNotEnable(
- "AIOHTTP version unparsable: {}".format(AIOHTTP_VERSION)
- )
+ raise DidNotEnable("AIOHTTP version unparsable: {}".format(AIOHTTP_VERSION))
if version < (3, 4):
raise DidNotEnable("AIOHTTP 3.4 or newer required.")
From 5d357d0a5a0fae0e1c237cd2105700b0cfda9812 Mon Sep 17 00:00:00 2001
From: Adam Hopkins
Date: Tue, 16 Nov 2021 16:28:06 +0200
Subject: [PATCH 0246/2327] feat(sanic): Refactor Sanic integration for v21.9
support (#1212)
This PR allows for Sanic v21.9 style error handlers to operate and provide full access to handling Blueprint specific error handlers.
Co-authored-by: Rodolfo Carvalho
---
sentry_sdk/integrations/sanic.py | 288 ++++++++++++++++---------
tests/integrations/sanic/test_sanic.py | 21 +-
2 files changed, 201 insertions(+), 108 deletions(-)
diff --git a/sentry_sdk/integrations/sanic.py b/sentry_sdk/integrations/sanic.py
index 890bb2f3e2..e7da9ca6d7 100644
--- a/sentry_sdk/integrations/sanic.py
+++ b/sentry_sdk/integrations/sanic.py
@@ -27,6 +27,7 @@
from sanic.request import Request, RequestParameters
from sentry_sdk._types import Event, EventProcessor, Hint
+ from sanic.router import Route
try:
from sanic import Sanic, __version__ as SANIC_VERSION
@@ -36,19 +37,31 @@
except ImportError:
raise DidNotEnable("Sanic not installed")
+old_error_handler_lookup = ErrorHandler.lookup
+old_handle_request = Sanic.handle_request
+old_router_get = Router.get
+
+try:
+ # This method was introduced in Sanic v21.9
+ old_startup = Sanic._startup
+except AttributeError:
+ pass
+
class SanicIntegration(Integration):
identifier = "sanic"
+ version = (0, 0) # type: Tuple[int, ...]
@staticmethod
def setup_once():
# type: () -> None
+
try:
- version = tuple(map(int, SANIC_VERSION.split(".")))
+ SanicIntegration.version = tuple(map(int, SANIC_VERSION.split(".")))
except (TypeError, ValueError):
raise DidNotEnable("Unparsable Sanic version: {}".format(SANIC_VERSION))
- if version < (0, 8):
+ if SanicIntegration.version < (0, 8):
raise DidNotEnable("Sanic 0.8 or newer required.")
if not HAS_REAL_CONTEXTVARS:
@@ -71,89 +84,194 @@ def setup_once():
# https://github.com/huge-success/sanic/issues/1332
ignore_logger("root")
- old_handle_request = Sanic.handle_request
+ if SanicIntegration.version < (21, 9):
+ _setup_legacy_sanic()
+ return
- async def sentry_handle_request(self, request, *args, **kwargs):
- # type: (Any, Request, *Any, **Any) -> Any
- hub = Hub.current
- if hub.get_integration(SanicIntegration) is None:
- return old_handle_request(self, request, *args, **kwargs)
+ _setup_sanic()
- weak_request = weakref.ref(request)
- with Hub(hub) as hub:
- with hub.configure_scope() as scope:
- scope.clear_breadcrumbs()
- scope.add_event_processor(_make_request_processor(weak_request))
+class SanicRequestExtractor(RequestExtractor):
+ def content_length(self):
+ # type: () -> int
+ if self.request.body is None:
+ return 0
+ return len(self.request.body)
- response = old_handle_request(self, request, *args, **kwargs)
- if isawaitable(response):
- response = await response
+ def cookies(self):
+ # type: () -> Dict[str, str]
+ return dict(self.request.cookies)
- return response
+ def raw_data(self):
+ # type: () -> bytes
+ return self.request.body
- Sanic.handle_request = sentry_handle_request
+ def form(self):
+ # type: () -> RequestParameters
+ return self.request.form
- old_router_get = Router.get
+ def is_json(self):
+ # type: () -> bool
+ raise NotImplementedError()
- def sentry_router_get(self, *args):
- # type: (Any, Union[Any, Request]) -> Any
- rv = old_router_get(self, *args)
- hub = Hub.current
- if hub.get_integration(SanicIntegration) is not None:
- with capture_internal_exceptions():
- with hub.configure_scope() as scope:
- if version >= (21, 3):
- # Sanic versions above and including 21.3 append the app name to the
- # route name, and so we need to remove it from Route name so the
- # transaction name is consistent across all versions
- sanic_app_name = self.ctx.app.name
- sanic_route = rv[0].name
+ def json(self):
+ # type: () -> Optional[Any]
+ return self.request.json
- if sanic_route.startswith("%s." % sanic_app_name):
- # We add a 1 to the len of the sanic_app_name because there is a dot
- # that joins app name and the route name
- # Format: app_name.route_name
- sanic_route = sanic_route[len(sanic_app_name) + 1 :]
+ def files(self):
+ # type: () -> RequestParameters
+ return self.request.files
+
+ def size_of_file(self, file):
+ # type: (Any) -> int
+ return len(file.body or ())
- scope.transaction = sanic_route
- else:
- scope.transaction = rv[0].__name__
- return rv
- Router.get = sentry_router_get
+def _setup_sanic():
+ # type: () -> None
+ Sanic._startup = _startup
+ ErrorHandler.lookup = _sentry_error_handler_lookup
- old_error_handler_lookup = ErrorHandler.lookup
- def sentry_error_handler_lookup(self, exception):
- # type: (Any, Exception) -> Optional[object]
- _capture_exception(exception)
- old_error_handler = old_error_handler_lookup(self, exception)
+def _setup_legacy_sanic():
+ # type: () -> None
+ Sanic.handle_request = _legacy_handle_request
+ Router.get = _legacy_router_get
+ ErrorHandler.lookup = _sentry_error_handler_lookup
- if old_error_handler is None:
- return None
- if Hub.current.get_integration(SanicIntegration) is None:
- return old_error_handler
+async def _startup(self):
+ # type: (Sanic) -> None
+ # This happens about as early in the lifecycle as possible, just after the
+ # Request object is created. The body has not yet been consumed.
+ self.signal("http.lifecycle.request")(_hub_enter)
+
+ # This happens after the handler is complete. In v21.9 this signal is not
+ # dispatched when there is an exception. Therefore we need to close out
+ # and call _hub_exit from the custom exception handler as well.
+ # See https://github.com/sanic-org/sanic/issues/2297
+ self.signal("http.lifecycle.response")(_hub_exit)
+
+ # This happens inside of request handling immediately after the route
+ # has been identified by the router.
+ self.signal("http.routing.after")(_set_transaction)
+
+ # The above signals need to be declared before this can be called.
+ await old_startup(self)
+
+
+async def _hub_enter(request):
+ # type: (Request) -> None
+ hub = Hub.current
+ request.ctx._sentry_do_integration = (
+ hub.get_integration(SanicIntegration) is not None
+ )
+
+ if not request.ctx._sentry_do_integration:
+ return
+
+ weak_request = weakref.ref(request)
+ request.ctx._sentry_hub = Hub(hub)
+ request.ctx._sentry_hub.__enter__()
+
+ with request.ctx._sentry_hub.configure_scope() as scope:
+ scope.clear_breadcrumbs()
+ scope.add_event_processor(_make_request_processor(weak_request))
+
+
+async def _hub_exit(request, **_):
+ # type: (Request, **Any) -> None
+ request.ctx._sentry_hub.__exit__(None, None, None)
+
+
+async def _set_transaction(request, route, **kwargs):
+ # type: (Request, Route, **Any) -> None
+ hub = Hub.current
+ if hub.get_integration(SanicIntegration) is not None:
+ with capture_internal_exceptions():
+ with hub.configure_scope() as scope:
+ route_name = route.name.replace(request.app.name, "").strip(".")
+ scope.transaction = route_name
- async def sentry_wrapped_error_handler(request, exception):
- # type: (Request, Exception) -> Any
- try:
- response = old_error_handler(request, exception)
- if isawaitable(response):
- response = await response
- return response
- except Exception:
- # Report errors that occur in Sanic error handler. These
- # exceptions will not even show up in Sanic's
- # `sanic.exceptions` logger.
- exc_info = sys.exc_info()
- _capture_exception(exc_info)
- reraise(*exc_info)
- return sentry_wrapped_error_handler
+def _sentry_error_handler_lookup(self, exception, *args, **kwargs):
+ # type: (Any, Exception, *Any, **Any) -> Optional[object]
+ _capture_exception(exception)
+ old_error_handler = old_error_handler_lookup(self, exception, *args, **kwargs)
- ErrorHandler.lookup = sentry_error_handler_lookup
+ if old_error_handler is None:
+ return None
+
+ if Hub.current.get_integration(SanicIntegration) is None:
+ return old_error_handler
+
+ async def sentry_wrapped_error_handler(request, exception):
+ # type: (Request, Exception) -> Any
+ try:
+ response = old_error_handler(request, exception)
+ if isawaitable(response):
+ response = await response
+ return response
+ except Exception:
+ # Report errors that occur in Sanic error handler. These
+ # exceptions will not even show up in Sanic's
+ # `sanic.exceptions` logger.
+ exc_info = sys.exc_info()
+ _capture_exception(exc_info)
+ reraise(*exc_info)
+ finally:
+ # As mentioned in previous comment in _startup, this can be removed
+ # after https://github.com/sanic-org/sanic/issues/2297 is resolved
+ if SanicIntegration.version >= (21, 9):
+ await _hub_exit(request)
+
+ return sentry_wrapped_error_handler
+
+
+async def _legacy_handle_request(self, request, *args, **kwargs):
+ # type: (Any, Request, *Any, **Any) -> Any
+ hub = Hub.current
+ if hub.get_integration(SanicIntegration) is None:
+ return old_handle_request(self, request, *args, **kwargs)
+
+ weak_request = weakref.ref(request)
+
+ with Hub(hub) as hub:
+ with hub.configure_scope() as scope:
+ scope.clear_breadcrumbs()
+ scope.add_event_processor(_make_request_processor(weak_request))
+
+ response = old_handle_request(self, request, *args, **kwargs)
+ if isawaitable(response):
+ response = await response
+
+ return response
+
+
+def _legacy_router_get(self, *args):
+ # type: (Any, Union[Any, Request]) -> Any
+ rv = old_router_get(self, *args)
+ hub = Hub.current
+ if hub.get_integration(SanicIntegration) is not None:
+ with capture_internal_exceptions():
+ with hub.configure_scope() as scope:
+ if SanicIntegration.version and SanicIntegration.version >= (21, 3):
+ # Sanic versions above and including 21.3 append the app name to the
+ # route name, and so we need to remove it from Route name so the
+ # transaction name is consistent across all versions
+ sanic_app_name = self.ctx.app.name
+ sanic_route = rv[0].name
+
+ if sanic_route.startswith("%s." % sanic_app_name):
+ # We add a 1 to the len of the sanic_app_name because there is a dot
+ # that joins app name and the route name
+ # Format: app_name.route_name
+ sanic_route = sanic_route[len(sanic_app_name) + 1 :]
+
+ scope.transaction = sanic_route
+ else:
+ scope.transaction = rv[0].__name__
+ return rv
def _capture_exception(exception):
@@ -211,39 +329,3 @@ def sanic_processor(event, hint):
return event
return sanic_processor
-
-
-class SanicRequestExtractor(RequestExtractor):
- def content_length(self):
- # type: () -> int
- if self.request.body is None:
- return 0
- return len(self.request.body)
-
- def cookies(self):
- # type: () -> Dict[str, str]
- return dict(self.request.cookies)
-
- def raw_data(self):
- # type: () -> bytes
- return self.request.body
-
- def form(self):
- # type: () -> RequestParameters
- return self.request.form
-
- def is_json(self):
- # type: () -> bool
- raise NotImplementedError()
-
- def json(self):
- # type: () -> Optional[Any]
- return self.request.json
-
- def files(self):
- # type: () -> RequestParameters
- return self.request.files
-
- def size_of_file(self, file):
- # type: (Any) -> int
- return len(file.body or ())
diff --git a/tests/integrations/sanic/test_sanic.py b/tests/integrations/sanic/test_sanic.py
index 8ee19844c5..1933f0f51f 100644
--- a/tests/integrations/sanic/test_sanic.py
+++ b/tests/integrations/sanic/test_sanic.py
@@ -173,11 +173,6 @@ async def task(i):
kwargs["app"] = app
if SANIC_VERSION >= (21, 3):
- try:
- app.router.reset()
- app.router.finalize()
- except AttributeError:
- ...
class MockAsyncStreamer:
def __init__(self, request_body):
@@ -203,6 +198,13 @@ async def __anext__(self):
patched_request = request.Request(**kwargs)
patched_request.stream = MockAsyncStreamer([b"hello", b"foo"])
+ if SANIC_VERSION >= (21, 9):
+ await app.dispatch(
+ "http.lifecycle.request",
+ context={"request": patched_request},
+ inline=True,
+ )
+
await app.handle_request(
patched_request,
)
@@ -217,6 +219,15 @@ async def __anext__(self):
assert r.status == 200
async def runner():
+ if SANIC_VERSION >= (21, 3):
+ if SANIC_VERSION >= (21, 9):
+ await app._startup()
+ else:
+ try:
+ app.router.reset()
+ app.router.finalize()
+ except AttributeError:
+ ...
await asyncio.gather(*(task(i) for i in range(1000)))
if sys.version_info < (3, 7):
From b2864068ea74111849f651ed6193c4cc843ff3ec Mon Sep 17 00:00:00 2001
From: T
Date: Tue, 16 Nov 2021 15:42:15 +0000
Subject: [PATCH 0247/2327] feat(aws): AWS Lambda Python 3.9 runtime support
(#1239)
- Added AWS Lambda Python 3.9 runtime support
- Fixed check bug and added python3.9 runtime to tests
- add python3.9 as compatible runtime in .craft.yml
Co-authored-by: razumeiko <2330426+razumeiko@users.noreply.github.com>
---
.craft.yml | 1 +
sentry_sdk/integrations/aws_lambda.py | 18 ++++++++++++++----
tests/integrations/aws_lambda/test_aws.py | 4 +++-
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/.craft.yml b/.craft.yml
index c6d13cfc2c..864d689271 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -21,6 +21,7 @@ targets:
- python3.6
- python3.7
- python3.8
+ - python3.9
license: MIT
changelog: CHANGELOG.md
changelogPolicy: simple
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
index 533250efaa..0eae710bff 100644
--- a/sentry_sdk/integrations/aws_lambda.py
+++ b/sentry_sdk/integrations/aws_lambda.py
@@ -284,12 +284,14 @@ def get_lambda_bootstrap():
# Python 3.7: If the bootstrap module is *already imported*, it is the
# one we actually want to use (no idea what's in __main__)
#
- # On Python 3.8 bootstrap is also importable, but will be the same file
+ # Python 3.8: bootstrap is also importable, but will be the same file
# as __main__ imported under a different name:
#
# sys.modules['__main__'].__file__ == sys.modules['bootstrap'].__file__
# sys.modules['__main__'] is not sys.modules['bootstrap']
#
+ # Python 3.9: bootstrap is in __main__.awslambdaricmain
+ #
# On container builds using the `aws-lambda-python-runtime-interface-client`
# (awslamdaric) module, bootstrap is located in sys.modules['__main__'].bootstrap
#
@@ -297,10 +299,18 @@ def get_lambda_bootstrap():
if "bootstrap" in sys.modules:
return sys.modules["bootstrap"]
elif "__main__" in sys.modules:
- if hasattr(sys.modules["__main__"], "bootstrap"):
+ module = sys.modules["__main__"]
+ # python3.9 runtime
+ if hasattr(module, "awslambdaricmain") and hasattr(
+ module.awslambdaricmain, "bootstrap" # type: ignore
+ ):
+ return module.awslambdaricmain.bootstrap # type: ignore
+ elif hasattr(module, "bootstrap"):
# awslambdaric python module in container builds
- return sys.modules["__main__"].bootstrap # type: ignore
- return sys.modules["__main__"]
+ return module.bootstrap # type: ignore
+
+ # python3.8 runtime
+ return module
else:
return None
diff --git a/tests/integrations/aws_lambda/test_aws.py b/tests/integrations/aws_lambda/test_aws.py
index 0f50753be7..c9084beb14 100644
--- a/tests/integrations/aws_lambda/test_aws.py
+++ b/tests/integrations/aws_lambda/test_aws.py
@@ -105,7 +105,9 @@ def lambda_client():
return get_boto_client()
-@pytest.fixture(params=["python3.6", "python3.7", "python3.8", "python2.7"])
+@pytest.fixture(
+ params=["python3.6", "python3.7", "python3.8", "python3.9", "python2.7"]
+)
def lambda_runtime(request):
return request.param
From b0826feef2643321ce1281bacf85bfe8481bb187 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad
Date: Tue, 16 Nov 2021 12:15:23 -0500
Subject: [PATCH 0248/2327] fix(tests): Pin more-itertools in tests for Python
3.5 compat (#1254)
Version 8.11.0 of more-itertools drops Python 3.5 support. This pins
the library to <8.11.0 so that we still run tests.
---
tox.ini | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tox.ini b/tox.ini
index 229d434c3a..6493fb95bc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -302,6 +302,9 @@ commands =
{py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12}: pip install pytest<5
{py3.6,py3.7,py3.8,py3.9}-flask-{0.11}: pip install Werkzeug<2
+ ; https://github.com/more-itertools/more-itertools/issues/578
+ py3.5-flask-{0.10,0.11,0.12}: pip install more-itertools<8.11.0
+
py.test {env:TESTPATH} {posargs}
[testenv:linters]
From 40a309a348a56b60a945de6efb68e8d0b79ca5a6 Mon Sep 17 00:00:00 2001
From: Igor Mozharovsky
Date: Tue, 16 Nov 2021 20:07:38 +0200
Subject: [PATCH 0249/2327] Fix "shutdown_timeout" typing (#1256)
Change "shutdown_timeout" typing from `int` -> `float`
---
sentry_sdk/consts.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 7817abd2df..6e426aeb7f 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -52,7 +52,7 @@ def __init__(
release=None, # type: Optional[str]
environment=None, # type: Optional[str]
server_name=None, # type: Optional[str]
- shutdown_timeout=2, # type: int
+ shutdown_timeout=2, # type: float
integrations=[], # type: Sequence[Integration] # noqa: B006
in_app_include=[], # type: List[str] # noqa: B006
in_app_exclude=[], # type: List[str] # noqa: B006
From 8699db7fc4abd1db4f55a2bde2c4869f8627ca57 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad
Date: Tue, 16 Nov 2021 13:56:27 -0500
Subject: [PATCH 0250/2327] meta: Changelog for 1.5.0
---
CHANGELOG.md | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c9502dc04..9660c26d0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,17 @@ A major release `N` implies the previous release `N-1` will no longer receive up
## Unreleased
-- Also record client outcomes for before send.
+## 1.5.0
+
+- Also record client outcomes for before send #1211
+- Add support for implicitly sized envelope items #1229
+- Fix integration with Apache Beam 2.32, 2.33 #1233
+- Remove Python 2.7 support for AWS Lambda layers in craft config #1241
+- Refactor Sanic integration for v21.9 support #1212
+- AWS Lambda Python 3.9 runtime support #1239
+- Fix "shutdown_timeout" typing #1256
+
+Work in this release contributed by @galuszkak, @kianmeng, @ahopkins, @razumeiko, @tomscytale, and @seedofjoy. Thank you for your contribution!
## 1.4.3
From 293c8a40f9f490023720b3f9f094ce2aeba0aead Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Tue, 16 Nov 2021 18:57:37 +0000
Subject: [PATCH 0251/2327] release: 1.5.0
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 44ffba4edb..2ca8797a22 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.4.3"
+release = "1.5.0"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 6e426aeb7f..0f7675fbcd 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.4.3"
+VERSION = "1.5.0"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 721727f85d..53d17fb146 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.4.3",
+ version="1.5.0",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From df542a2af93ad34c1c802266599c55b2f4678049 Mon Sep 17 00:00:00 2001
From: Christopher Dignam
Date: Wed, 17 Nov 2021 08:37:34 -0500
Subject: [PATCH 0252/2327] record span and breadcrumb when Django opens db
connection (#1250)
---
sentry_sdk/integrations/django/__init__.py | 21 ++++++
tests/integrations/django/myapp/urls.py | 1 +
tests/integrations/django/myapp/views.py | 9 +++
tests/integrations/django/test_basic.py | 83 ++++++++++++++++++++--
4 files changed, 108 insertions(+), 6 deletions(-)
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index 87f9c7bc61..ca93546083 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -481,9 +481,17 @@ def install_sql_hook():
except ImportError:
from django.db.backends.util import CursorWrapper
+ try:
+ # django 1.6 and 1.7 compatability
+ from django.db.backends import BaseDatabaseWrapper
+ except ImportError:
+ # django 1.8 or later
+ from django.db.backends.base.base import BaseDatabaseWrapper
+
try:
real_execute = CursorWrapper.execute
real_executemany = CursorWrapper.executemany
+ real_connect = BaseDatabaseWrapper.connect
except AttributeError:
# This won't work on Django versions < 1.6
return
@@ -510,6 +518,19 @@ def executemany(self, sql, param_list):
):
return real_executemany(self, sql, param_list)
+ def connect(self):
+ # type: (BaseDatabaseWrapper) -> None
+ hub = Hub.current
+ if hub.get_integration(DjangoIntegration) is None:
+ return real_connect(self)
+
+ with capture_internal_exceptions():
+ hub.add_breadcrumb(message="connect", category="query")
+
+ with hub.start_span(op="db", description="connect"):
+ return real_connect(self)
+
CursorWrapper.execute = execute
CursorWrapper.executemany = executemany
+ BaseDatabaseWrapper.connect = connect
ignore_logger("django.db.backends")
diff --git a/tests/integrations/django/myapp/urls.py b/tests/integrations/django/myapp/urls.py
index 23698830c2..8e43460bba 100644
--- a/tests/integrations/django/myapp/urls.py
+++ b/tests/integrations/django/myapp/urls.py
@@ -47,6 +47,7 @@ def path(path, *args, **kwargs):
path("template-exc", views.template_exc, name="template_exc"),
path("template-test", views.template_test, name="template_test"),
path("template-test2", views.template_test2, name="template_test2"),
+ path("postgres-select", views.postgres_select, name="postgres_select"),
path(
"permission-denied-exc",
views.permission_denied_exc,
diff --git a/tests/integrations/django/myapp/views.py b/tests/integrations/django/myapp/views.py
index 57d8fb98a2..0a6ae10635 100644
--- a/tests/integrations/django/myapp/views.py
+++ b/tests/integrations/django/myapp/views.py
@@ -127,6 +127,15 @@ def template_test2(request, *args, **kwargs):
)
+@csrf_exempt
+def postgres_select(request, *args, **kwargs):
+ from django.db import connections
+
+ cursor = connections["postgres"].cursor()
+ cursor.execute("SELECT 1;")
+ return HttpResponse("ok")
+
+
@csrf_exempt
def permission_denied_exc(*args, **kwargs):
raise PermissionDenied("bye")
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index 09fefe6a4c..56a085d561 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -19,19 +19,24 @@
from sentry_sdk import capture_message, capture_exception, configure_scope
from sentry_sdk.integrations.django import DjangoIntegration
+from functools import partial
from tests.integrations.django.myapp.wsgi import application
# Hack to prevent from experimental feature introduced in version `4.3.0` in `pytest-django` that
# requires explicit database allow from failing the test
-pytest_mark_django_db_decorator = pytest.mark.django_db
+pytest_mark_django_db_decorator = partial(pytest.mark.django_db)
try:
pytest_version = tuple(map(int, pytest_django.__version__.split(".")))
if pytest_version > (4, 2, 0):
- pytest_mark_django_db_decorator = pytest.mark.django_db(databases="__all__")
+ pytest_mark_django_db_decorator = partial(
+ pytest.mark.django_db, databases="__all__"
+ )
except ValueError:
if "dev" in pytest_django.__version__:
- pytest_mark_django_db_decorator = pytest.mark.django_db(databases="__all__")
+ pytest_mark_django_db_decorator = partial(
+ pytest.mark.django_db, databases="__all__"
+ )
except AttributeError:
pass
@@ -259,7 +264,7 @@ def test_sql_queries(sentry_init, capture_events, with_integration):
@pytest.mark.forked
-@pytest_mark_django_db_decorator
+@pytest_mark_django_db_decorator()
def test_sql_dict_query_params(sentry_init, capture_events):
sentry_init(
integrations=[DjangoIntegration()],
@@ -304,7 +309,7 @@ def test_sql_dict_query_params(sentry_init, capture_events):
],
)
@pytest.mark.forked
-@pytest_mark_django_db_decorator
+@pytest_mark_django_db_decorator()
def test_sql_psycopg2_string_composition(sentry_init, capture_events, query):
sentry_init(
integrations=[DjangoIntegration()],
@@ -337,7 +342,7 @@ def test_sql_psycopg2_string_composition(sentry_init, capture_events, query):
@pytest.mark.forked
-@pytest_mark_django_db_decorator
+@pytest_mark_django_db_decorator()
def test_sql_psycopg2_placeholders(sentry_init, capture_events):
sentry_init(
integrations=[DjangoIntegration()],
@@ -397,6 +402,72 @@ def test_sql_psycopg2_placeholders(sentry_init, capture_events):
]
+@pytest.mark.forked
+@pytest_mark_django_db_decorator(transaction=True)
+def test_django_connect_trace(sentry_init, client, capture_events, render_span_tree):
+ """
+ Verify we record a span when opening a new database.
+ """
+ sentry_init(
+ integrations=[DjangoIntegration()],
+ send_default_pii=True,
+ traces_sample_rate=1.0,
+ )
+
+ from django.db import connections
+
+ if "postgres" not in connections:
+ pytest.skip("postgres tests disabled")
+
+ # trigger Django to open a new connection by marking the existing one as None.
+ connections["postgres"].connection = None
+
+ events = capture_events()
+
+ content, status, headers = client.get(reverse("postgres_select"))
+ assert status == "200 OK"
+
+ assert '- op="db": description="connect"' in render_span_tree(events[0])
+
+
+@pytest.mark.forked
+@pytest_mark_django_db_decorator(transaction=True)
+def test_django_connect_breadcrumbs(
+ sentry_init, client, capture_events, render_span_tree
+):
+ """
+ Verify we record a breadcrumb when opening a new database.
+ """
+ sentry_init(
+ integrations=[DjangoIntegration()],
+ send_default_pii=True,
+ )
+
+ from django.db import connections
+
+ if "postgres" not in connections:
+ pytest.skip("postgres tests disabled")
+
+ # trigger Django to open a new connection by marking the existing one as None.
+ connections["postgres"].connection = None
+
+ events = capture_events()
+
+ cursor = connections["postgres"].cursor()
+ cursor.execute("select 1")
+
+ # trigger recording of event.
+ capture_message("HI")
+ (event,) = events
+ for crumb in event["breadcrumbs"]["values"]:
+ del crumb["timestamp"]
+
+ assert event["breadcrumbs"]["values"][-2:] == [
+ {"message": "connect", "category": "query", "type": "default"},
+ {"message": "select 1", "category": "query", "data": {}, "type": "default"},
+ ]
+
+
@pytest.mark.parametrize(
"transaction_style,expected_transaction",
[
From 9c72c226f109107993f7f245e2249ec57b220ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Gait=C3=A1n?=
Date: Wed, 1 Dec 2021 16:31:14 -0300
Subject: [PATCH 0253/2327] Parse gevent version supporting non-numeric parts.
(#1243)
fixes #1163
---
sentry_sdk/utils.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 8fb03e014d..a2bc528e7b 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -792,7 +792,9 @@ def _is_contextvars_broken():
from gevent.monkey import is_object_patched # type: ignore
# Get the MAJOR and MINOR version numbers of Gevent
- version_tuple = tuple([int(part) for part in gevent.__version__.split(".")[:2]])
+ version_tuple = tuple(
+ [int(part) for part in re.split(r"a|b|rc|\.", gevent.__version__)[:2]]
+ )
if is_object_patched("threading", "local"):
# Gevent 20.9.0 depends on Greenlet 0.4.17 which natively handles switching
# context vars when greenlets are switched, so, Gevent 20.9.0+ is all fine.
From ec482d28bf4121cf33cd5a9ff466e90a6e0264fd Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti
Date: Wed, 1 Dec 2021 20:35:18 +0100
Subject: [PATCH 0254/2327] CHANGELOG: update requirements example (#1262)
To match at least a > 1.0.0 world as the description
---
CHANGELOG.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9660c26d0e..638e50c590 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,8 +14,8 @@ We recommend to pin your version requirements against `1.x.*` or `1.x.y`.
Either one of the following is fine:
```
-sentry-sdk>=0.10.0,<0.11.0
-sentry-sdk==0.10.1
+sentry-sdk>=1.0.0,<2.0.0
+sentry-sdk==1.5.0
```
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
From 3a7943b85c97a117cd2f171d47a4dffea980a67f Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Thu, 9 Dec 2021 15:51:07 +0100
Subject: [PATCH 0255/2327] fix(django): Fix django legacy url resolver regex
substitution (#1272)
* fix(django): Fix django legacy url resolver regex substitution
Upstream django CVE fix caused master tests to fail.
This patches our url resolver regex substition to account for \A and \Z
metacharacters.
https://github.com/django/django/compare/2.2.24...2.2.25#diff-ecd72d5e5c6a5496735ace4b936d519f89699baff8d932b908de0b598c58f662L233
---
CHANGELOG.md | 2 ++
sentry_sdk/integrations/django/transactions.py | 2 ++
tox.ini | 1 +
3 files changed, 5 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 638e50c590..f91d9e0689 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@ A major release `N` implies the previous release `N-1` will no longer receive up
## Unreleased
+- Fix django legacy url resolver regex substitution due to upstream CVE-2021-44420 fix #1272
+
## 1.5.0
- Also record client outcomes for before send #1211
diff --git a/sentry_sdk/integrations/django/transactions.py b/sentry_sdk/integrations/django/transactions.py
index 146a71a362..b0f88e916a 100644
--- a/sentry_sdk/integrations/django/transactions.py
+++ b/sentry_sdk/integrations/django/transactions.py
@@ -76,6 +76,8 @@ def _simplify(self, pattern):
result.replace("^", "")
.replace("$", "")
.replace("?", "")
+ .replace("\\A", "")
+ .replace("\\Z", "")
.replace("//", "/")
.replace("\\", "")
)
diff --git a/tox.ini b/tox.ini
index 6493fb95bc..7f0b044230 100644
--- a/tox.ini
+++ b/tox.ini
@@ -114,6 +114,7 @@ deps =
django-2.2: Django>=2.2,<2.3
django-3.0: Django>=3.0,<3.1
django-3.1: Django>=3.1,<3.2
+ django-3.2: Django>=3.1,<3.3
flask: flask-login
flask-0.10: Flask>=0.10,<0.11
From d09221db3b370537b42ac0f25522e528005e647b Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Fri, 10 Dec 2021 12:50:40 +0100
Subject: [PATCH 0256/2327] fix(client-reports): Record lost `sample_rate`
events only if tracing is enabled (#1268)
---
CHANGELOG.md | 1 +
sentry_sdk/tracing.py | 10 +++---
sentry_sdk/tracing_utils.py | 2 +-
tests/tracing/test_sampling.py | 58 ++++++++++++++++++++++++++++++++++
4 files changed, 65 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f91d9e0689..db57b02597 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ A major release `N` implies the previous release `N-1` will no longer receive up
## Unreleased
- Fix django legacy url resolver regex substitution due to upstream CVE-2021-44420 fix #1272
+- Record lost `sample_rate` events only if tracing is enabled
## 1.5.0
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index aff6a90659..48050350fb 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -543,6 +543,10 @@ def finish(self, hub=None):
hub = hub or self.hub or sentry_sdk.Hub.current
client = hub.client
+ if client is None:
+ # We have no client and therefore nowhere to send this transaction.
+ return None
+
# This is a de facto proxy for checking if sampled = False
if self._span_recorder is None:
logger.debug("Discarding transaction because sampled = False")
@@ -550,17 +554,13 @@ def finish(self, hub=None):
# This is not entirely accurate because discards here are not
# exclusively based on sample rate but also traces sampler, but
# we handle this the same here.
- if client and client.transport:
+ if client.transport and has_tracing_enabled(client.options):
client.transport.record_lost_event(
"sample_rate", data_category="transaction"
)
return None
- if client is None:
- # We have no client and therefore nowhere to send this transaction.
- return None
-
if not self.name:
logger.warning(
"Transaction has no name, falling back to ``."
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
index ff00b2e444..e0eb994231 100644
--- a/sentry_sdk/tracing_utils.py
+++ b/sentry_sdk/tracing_utils.py
@@ -109,7 +109,7 @@ def has_tracing_enabled(options):
# type: (Dict[str, Any]) -> bool
"""
Returns True if either traces_sample_rate or traces_sampler is
- non-zero/defined, False otherwise.
+ defined, False otherwise.
"""
return bool(
diff --git a/tests/tracing/test_sampling.py b/tests/tracing/test_sampling.py
index 6f09b451e1..9975abad5d 100644
--- a/tests/tracing/test_sampling.py
+++ b/tests/tracing/test_sampling.py
@@ -284,3 +284,61 @@ def test_warns_and_sets_sampled_to_false_on_invalid_traces_sampler_return_value(
transaction = start_transaction(name="dogpark")
logger.warning.assert_any_call(StringContaining("Given sample rate is invalid"))
assert transaction.sampled is False
+
+
+@pytest.mark.parametrize(
+ "traces_sample_rate,sampled_output,reports_output",
+ [
+ (None, False, []),
+ (0.0, False, [("sample_rate", "transaction")]),
+ (1.0, True, []),
+ ],
+)
+def test_records_lost_event_only_if_traces_sample_rate_enabled(
+ sentry_init, traces_sample_rate, sampled_output, reports_output, monkeypatch
+):
+ reports = []
+
+ def record_lost_event(reason, data_category=None, item=None):
+ reports.append((reason, data_category))
+
+ sentry_init(traces_sample_rate=traces_sample_rate)
+
+ monkeypatch.setattr(
+ Hub.current.client.transport, "record_lost_event", record_lost_event
+ )
+
+ transaction = start_transaction(name="dogpark")
+ assert transaction.sampled is sampled_output
+ transaction.finish()
+
+ assert reports == reports_output
+
+
+@pytest.mark.parametrize(
+ "traces_sampler,sampled_output,reports_output",
+ [
+ (None, False, []),
+ (lambda _x: 0.0, False, [("sample_rate", "transaction")]),
+ (lambda _x: 1.0, True, []),
+ ],
+)
+def test_records_lost_event_only_if_traces_sampler_enabled(
+ sentry_init, traces_sampler, sampled_output, reports_output, monkeypatch
+):
+ reports = []
+
+ def record_lost_event(reason, data_category=None, item=None):
+ reports.append((reason, data_category))
+
+ sentry_init(traces_sampler=traces_sampler)
+
+ monkeypatch.setattr(
+ Hub.current.client.transport, "record_lost_event", record_lost_event
+ )
+
+ transaction = start_transaction(name="dogpark")
+ assert transaction.sampled is sampled_output
+ transaction.finish()
+
+ assert reports == reports_output
From d2f1d61512d22ee269d33ebe61ff13e63cc776f4 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Fri, 10 Dec 2021 13:52:26 +0100
Subject: [PATCH 0257/2327] fix(tests): Fix tox django-3.2 pin
---
tox.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tox.ini b/tox.ini
index 7f0b044230..8f19258398 100644
--- a/tox.ini
+++ b/tox.ini
@@ -114,7 +114,7 @@ deps =
django-2.2: Django>=2.2,<2.3
django-3.0: Django>=3.0,<3.1
django-3.1: Django>=3.1,<3.2
- django-3.2: Django>=3.1,<3.3
+ django-3.2: Django>=3.2,<3.3
flask: flask-login
flask-0.10: Flask>=0.10,<0.11
From 519033dbb1f245df6566cfa126aa7511d4733a77 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Mon, 13 Dec 2021 14:54:08 +0100
Subject: [PATCH 0258/2327] meta: Changelog for 1.5.1 (#1279)
---
CHANGELOG.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index db57b02597..4b2ec48aac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,10 +20,12 @@ sentry-sdk==1.5.0
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
-## Unreleased
+## 1.5.1
- Fix django legacy url resolver regex substitution due to upstream CVE-2021-44420 fix #1272
-- Record lost `sample_rate` events only if tracing is enabled
+- Record lost `sample_rate` events only if tracing is enabled #1268
+- Fix gevent version parsing for non-numeric parts #1243
+- Record span and breadcrumb when Django opens db connection #1250
## 1.5.0
From f9ce7d72f5fc8e1675ad797674df5c62616b09cd Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Mon, 13 Dec 2021 13:55:18 +0000
Subject: [PATCH 0259/2327] release: 1.5.1
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 2ca8797a22..ab2cca1313 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.5.0"
+release = "1.5.1"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 0f7675fbcd..00de2b7608 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.5.0"
+VERSION = "1.5.1"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 53d17fb146..97363af076 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.5.0",
+ version="1.5.1",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From c64a1a4c779f75ddb728c843844187006c160102 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Fri, 17 Dec 2021 12:36:57 +0100
Subject: [PATCH 0260/2327] feat(client-reports): Record event_processor client
reports (#1281)
---
sentry_sdk/client.py | 9 +++++
tests/conftest.py | 19 ++++++++++
tests/integrations/gcp/test_gcp.py | 3 ++
tests/test_basics.py | 60 ++++++++++++++++++++++++++++++
4 files changed, 91 insertions(+)
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 67ed94cc38..1720993c1a 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -145,9 +145,18 @@ def _prepare_event(
event["timestamp"] = datetime.utcnow()
if scope is not None:
+ is_transaction = event.get("type") == "transaction"
event_ = scope.apply_to_event(event, hint)
+
+ # one of the event/error processors returned None
if event_ is None:
+ if self.transport:
+ self.transport.record_lost_event(
+ "event_processor",
+ data_category=("transaction" if is_transaction else "error"),
+ )
return None
+
event = event_
if (
diff --git a/tests/conftest.py b/tests/conftest.py
index 1df4416f7f..692a274d71 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -243,6 +243,25 @@ def append_envelope(envelope):
return inner
+@pytest.fixture
+def capture_client_reports(monkeypatch):
+ def inner():
+ reports = []
+ test_client = sentry_sdk.Hub.current.client
+
+ def record_lost_event(reason, data_category=None, item=None):
+ if data_category is None:
+ data_category = item.data_category
+ return reports.append((reason, data_category))
+
+ monkeypatch.setattr(
+ test_client.transport, "record_lost_event", record_lost_event
+ )
+ return reports
+
+ return inner
+
+
@pytest.fixture
def capture_events_forksafe(monkeypatch, capture_events, request):
def inner():
diff --git a/tests/integrations/gcp/test_gcp.py b/tests/integrations/gcp/test_gcp.py
index debcf8386f..893aad0086 100644
--- a/tests/integrations/gcp/test_gcp.py
+++ b/tests/integrations/gcp/test_gcp.py
@@ -81,6 +81,9 @@ def init_sdk(timeout_warning=False, **extra_init_args):
transport=TestTransport,
integrations=[GcpIntegration(timeout_warning=timeout_warning)],
shutdown_timeout=10,
+ # excepthook -> dedupe -> event_processor client report gets added
+ # which we don't really care about for these tests
+ send_client_reports=False,
**extra_init_args
)
diff --git a/tests/test_basics.py b/tests/test_basics.py
index 55d7ff8bab..7991a58f75 100644
--- a/tests/test_basics.py
+++ b/tests/test_basics.py
@@ -1,4 +1,5 @@
import os
+import sys
import logging
import pytest
@@ -10,13 +11,19 @@
capture_event,
capture_exception,
capture_message,
+ start_transaction,
add_breadcrumb,
last_event_id,
Hub,
)
+from sentry_sdk._compat import reraise
from sentry_sdk.integrations import _AUTO_ENABLING_INTEGRATIONS
from sentry_sdk.integrations.logging import LoggingIntegration
+from sentry_sdk.scope import ( # noqa: F401
+ add_global_event_processor,
+ global_event_processors,
+)
def test_processors(sentry_init, capture_events):
@@ -371,3 +378,56 @@ def test_capture_event_with_scope_kwargs(sentry_init, capture_events):
(event,) = events
assert event["level"] == "info"
assert event["extra"]["foo"] == "bar"
+
+
+def test_dedupe_event_processor_drop_records_client_report(
+ sentry_init, capture_events, capture_client_reports
+):
+ """
+ DedupeIntegration internally has an event_processor that filters duplicate exceptions.
+ We want a duplicate exception to be captured only once and the drop being recorded as
+ a client report.
+ """
+ sentry_init()
+ events = capture_events()
+ reports = capture_client_reports()
+
+ try:
+ raise ValueError("aha!")
+ except Exception:
+ try:
+ capture_exception()
+ reraise(*sys.exc_info())
+ except Exception:
+ capture_exception()
+
+ (event,) = events
+ (report,) = reports
+
+ assert event["level"] == "error"
+ assert "exception" in event
+ assert report == ("event_processor", "error")
+
+
+def test_event_processor_drop_records_client_report(
+ sentry_init, capture_events, capture_client_reports
+):
+ sentry_init(traces_sample_rate=1.0)
+ events = capture_events()
+ reports = capture_client_reports()
+
+ global global_event_processors
+
+ @add_global_event_processor
+ def foo(event, hint):
+ return None
+
+ capture_message("dropped")
+
+ with start_transaction(name="dropped"):
+ pass
+
+ assert len(events) == 0
+ assert reports == [("event_processor", "error"), ("event_processor", "transaction")]
+
+ global_event_processors.pop()
From 412c44aadb11dcc8b05e1061051da482c71d2f23 Mon Sep 17 00:00:00 2001
From: Chad Whitacre
Date: Thu, 23 Dec 2021 08:15:42 -0500
Subject: [PATCH 0261/2327] meta(gha): Deploy action stale.yml (#1195)
Co-authored-by: Vladan Paunovic
---
.github/workflows/stale.yml | 47 +++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
create mode 100644 .github/workflows/stale.yml
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 0000000000..5054c94db5
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,47 @@
+name: 'close stale issues/PRs'
+on:
+ schedule:
+ - cron: '* */3 * * *'
+ workflow_dispatch:
+jobs:
+ stale:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/stale@87c2b794b9b47a9bec68ae03c01aeb572ffebdb1
+ with:
+ repo-token: ${{ github.token }}
+ days-before-stale: 21
+ days-before-close: 7
+ only-labels: ""
+ operations-per-run: 100
+ remove-stale-when-updated: true
+ debug-only: false
+ ascending: false
+
+ exempt-issue-labels: "Status: Backlog,Status: In Progress"
+ stale-issue-label: "Status: Stale"
+ stale-issue-message: |-
+ This issue has gone three weeks without activity. In another week, I will close it.
+
+ But! If you comment or otherwise update it, I will reset the clock, and if you label it `Status: Backlog` or `Status: In Progress`, I will leave it alone ... forever!
+
+ ----
+
+ "A weed is but an unloved flower." ― _Ella Wheeler Wilcox_ 🥀
+ skip-stale-issue-message: false
+ close-issue-label: ""
+ close-issue-message: ""
+
+ exempt-pr-labels: "Status: Backlog,Status: In Progress"
+ stale-pr-label: "Status: Stale"
+ stale-pr-message: |-
+ This pull request has gone three weeks without activity. In another week, I will close it.
+
+ But! If you comment or otherwise update it, I will reset the clock, and if you label it `Status: Backlog` or `Status: In Progress`, I will leave it alone ... forever!
+
+ ----
+
+ "A weed is but an unloved flower." ― _Ella Wheeler Wilcox_ 🥀
+ skip-stale-pr-message: false
+ close-pr-label:
+ close-pr-message: ""
From 2246620143d90973fd951f3558a792f4a7a93b6e Mon Sep 17 00:00:00 2001
From: Phil Jones
Date: Mon, 3 Jan 2022 22:33:35 +0000
Subject: [PATCH 0262/2327] feat(quart): Add a Quart integration (#1248)
This is based on the Flask integration but includes background and websocket exceptions, and works with asgi.
---
sentry_sdk/integrations/quart.py | 171 +++++++++
setup.py | 1 +
tests/integrations/quart/__init__.py | 3 +
tests/integrations/quart/test_quart.py | 507 +++++++++++++++++++++++++
tox.ini | 8 +
5 files changed, 690 insertions(+)
create mode 100644 sentry_sdk/integrations/quart.py
create mode 100644 tests/integrations/quart/__init__.py
create mode 100644 tests/integrations/quart/test_quart.py
diff --git a/sentry_sdk/integrations/quart.py b/sentry_sdk/integrations/quart.py
new file mode 100644
index 0000000000..411817c708
--- /dev/null
+++ b/sentry_sdk/integrations/quart.py
@@ -0,0 +1,171 @@
+from __future__ import absolute_import
+
+from sentry_sdk.hub import _should_send_default_pii, Hub
+from sentry_sdk.integrations import DidNotEnable, Integration
+from sentry_sdk.integrations._wsgi_common import _filter_headers
+from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
+from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
+
+from sentry_sdk._types import MYPY
+
+if MYPY:
+ from typing import Any
+ from typing import Dict
+ from typing import Union
+
+ from sentry_sdk._types import EventProcessor
+
+try:
+ import quart_auth # type: ignore
+except ImportError:
+ quart_auth = None
+
+try:
+ from quart import ( # type: ignore
+ Request,
+ Quart,
+ _request_ctx_stack,
+ _websocket_ctx_stack,
+ _app_ctx_stack,
+ )
+ from quart.signals import ( # type: ignore
+ got_background_exception,
+ got_request_exception,
+ got_websocket_exception,
+ request_started,
+ websocket_started,
+ )
+except ImportError:
+ raise DidNotEnable("Quart is not installed")
+
+TRANSACTION_STYLE_VALUES = ("endpoint", "url")
+
+
+class QuartIntegration(Integration):
+ identifier = "quart"
+
+ transaction_style = None
+
+ def __init__(self, transaction_style="endpoint"):
+ # type: (str) -> None
+ if transaction_style not in TRANSACTION_STYLE_VALUES:
+ raise ValueError(
+ "Invalid value for transaction_style: %s (must be in %s)"
+ % (transaction_style, TRANSACTION_STYLE_VALUES)
+ )
+ self.transaction_style = transaction_style
+
+ @staticmethod
+ def setup_once():
+ # type: () -> None
+
+ request_started.connect(_request_websocket_started)
+ websocket_started.connect(_request_websocket_started)
+ got_background_exception.connect(_capture_exception)
+ got_request_exception.connect(_capture_exception)
+ got_websocket_exception.connect(_capture_exception)
+
+ old_app = Quart.__call__
+
+ async def sentry_patched_asgi_app(self, scope, receive, send):
+ # type: (Any, Any, Any, Any) -> Any
+ if Hub.current.get_integration(QuartIntegration) is None:
+ return await old_app(self, scope, receive, send)
+
+ middleware = SentryAsgiMiddleware(lambda *a, **kw: old_app(self, *a, **kw))
+ middleware.__call__ = middleware._run_asgi3
+ return await middleware(scope, receive, send)
+
+ Quart.__call__ = sentry_patched_asgi_app
+
+
+def _request_websocket_started(sender, **kwargs):
+ # type: (Quart, **Any) -> None
+ hub = Hub.current
+ integration = hub.get_integration(QuartIntegration)
+ if integration is None:
+ return
+
+ app = _app_ctx_stack.top.app
+ with hub.configure_scope() as scope:
+ if _request_ctx_stack.top is not None:
+ request_websocket = _request_ctx_stack.top.request
+ if _websocket_ctx_stack.top is not None:
+ request_websocket = _websocket_ctx_stack.top.websocket
+
+ # Set the transaction name here, but rely on ASGI middleware
+ # to actually start the transaction
+ try:
+ if integration.transaction_style == "endpoint":
+ scope.transaction = request_websocket.url_rule.endpoint
+ elif integration.transaction_style == "url":
+ scope.transaction = request_websocket.url_rule.rule
+ except Exception:
+ pass
+
+ evt_processor = _make_request_event_processor(
+ app, request_websocket, integration
+ )
+ scope.add_event_processor(evt_processor)
+
+
+def _make_request_event_processor(app, request, integration):
+ # type: (Quart, Request, QuartIntegration) -> EventProcessor
+ def inner(event, hint):
+ # type: (Dict[str, Any], Dict[str, Any]) -> Dict[str, Any]
+ # if the request is gone we are fine not logging the data from
+ # it. This might happen if the processor is pushed away to
+ # another thread.
+ if request is None:
+ return event
+
+ with capture_internal_exceptions():
+ # TODO: Figure out what to do with request body. Methods on request
+ # are async, but event processors are not.
+
+ request_info = event.setdefault("request", {})
+ request_info["url"] = request.url
+ request_info["query_string"] = request.query_string
+ request_info["method"] = request.method
+ request_info["headers"] = _filter_headers(dict(request.headers))
+
+ if _should_send_default_pii():
+ request_info["env"] = {"REMOTE_ADDR": request.access_route[0]}
+ _add_user_to_event(event)
+
+ return event
+
+ return inner
+
+
+def _capture_exception(sender, exception, **kwargs):
+ # type: (Quart, Union[ValueError, BaseException], **Any) -> None
+ hub = Hub.current
+ if hub.get_integration(QuartIntegration) is None:
+ return
+
+ # If an integration is there, a client has to be there.
+ client = hub.client # type: Any
+
+ event, hint = event_from_exception(
+ exception,
+ client_options=client.options,
+ mechanism={"type": "quart", "handled": False},
+ )
+
+ hub.capture_event(event, hint=hint)
+
+
+def _add_user_to_event(event):
+ # type: (Dict[str, Any]) -> None
+ if quart_auth is None:
+ return
+
+ user = quart_auth.current_user
+ if user is None:
+ return
+
+ with capture_internal_exceptions():
+ user_info = event.setdefault("user", {})
+
+ user_info["id"] = quart_auth.current_user._auth_id
diff --git a/setup.py b/setup.py
index 97363af076..653ea6ea01 100644
--- a/setup.py
+++ b/setup.py
@@ -40,6 +40,7 @@ def get_file_text(file_name):
install_requires=["urllib3>=1.10.0", "certifi"],
extras_require={
"flask": ["flask>=0.11", "blinker>=1.1"],
+ "quart": ["quart>=0.16.1", "blinker>=1.1"],
"bottle": ["bottle>=0.12.13"],
"falcon": ["falcon>=1.4"],
"django": ["django>=1.8"],
diff --git a/tests/integrations/quart/__init__.py b/tests/integrations/quart/__init__.py
new file mode 100644
index 0000000000..ea02dfb3a6
--- /dev/null
+++ b/tests/integrations/quart/__init__.py
@@ -0,0 +1,3 @@
+import pytest
+
+quart = pytest.importorskip("quart")
diff --git a/tests/integrations/quart/test_quart.py b/tests/integrations/quart/test_quart.py
new file mode 100644
index 0000000000..0b886ebf18
--- /dev/null
+++ b/tests/integrations/quart/test_quart.py
@@ -0,0 +1,507 @@
+import pytest
+
+quart = pytest.importorskip("quart")
+
+from quart import Quart, Response, abort, stream_with_context
+from quart.views import View
+
+from quart_auth import AuthManager, AuthUser, login_user
+
+from sentry_sdk import (
+ set_tag,
+ configure_scope,
+ capture_message,
+ capture_exception,
+ last_event_id,
+)
+from sentry_sdk.integrations.logging import LoggingIntegration
+import sentry_sdk.integrations.quart as quart_sentry
+
+
+auth_manager = AuthManager()
+
+
+@pytest.fixture
+async def app():
+ app = Quart(__name__)
+ app.debug = True
+ app.config["TESTING"] = True
+ app.secret_key = "haha"
+
+ auth_manager.init_app(app)
+
+ @app.route("/message")
+ async def hi():
+ capture_message("hi")
+ return "ok"
+
+ return app
+
+
+@pytest.fixture(params=("manual"))
+def integration_enabled_params(request):
+ if request.param == "manual":
+ return {"integrations": [quart_sentry.QuartIntegration()]}
+ else:
+ raise ValueError(request.param)
+
+
+@pytest.mark.asyncio
+async def test_has_context(sentry_init, app, capture_events):
+ sentry_init(integrations=[quart_sentry.QuartIntegration()])
+ events = capture_events()
+
+ client = app.test_client()
+ response = await client.get("/message")
+ assert response.status_code == 200
+
+ (event,) = events
+ assert event["transaction"] == "hi"
+ assert "data" not in event["request"]
+ assert event["request"]["url"] == "http://localhost/message"
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+ "transaction_style,expected_transaction", [("endpoint", "hi"), ("url", "/message")]
+)
+async def test_transaction_style(
+ sentry_init, app, capture_events, transaction_style, expected_transaction
+):
+ sentry_init(
+ integrations=[
+ quart_sentry.QuartIntegration(transaction_style=transaction_style)
+ ]
+ )
+ events = capture_events()
+
+ client = app.test_client()
+ response = await client.get("/message")
+ assert response.status_code == 200
+
+ (event,) = events
+ assert event["transaction"] == expected_transaction
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("debug", (True, False))
+@pytest.mark.parametrize("testing", (True, False))
+async def test_errors(
+ sentry_init,
+ capture_exceptions,
+ capture_events,
+ app,
+ debug,
+ testing,
+ integration_enabled_params,
+):
+ sentry_init(debug=True, **integration_enabled_params)
+
+ app.debug = debug
+ app.testing = testing
+
+ @app.route("/")
+ async def index():
+ 1 / 0
+
+ exceptions = capture_exceptions()
+ events = capture_events()
+
+ client = app.test_client()
+ try:
+ await client.get("/")
+ except ZeroDivisionError:
+ pass
+
+ (exc,) = exceptions
+ assert isinstance(exc, ZeroDivisionError)
+
+ (event,) = events
+ assert event["exception"]["values"][0]["mechanism"]["type"] == "quart"
+
+
+@pytest.mark.asyncio
+async def test_quart_auth_not_installed(
+ sentry_init, app, capture_events, monkeypatch, integration_enabled_params
+):
+ sentry_init(**integration_enabled_params)
+
+ monkeypatch.setattr(quart_sentry, "quart_auth", None)
+
+ events = capture_events()
+
+ client = app.test_client()
+ await client.get("/message")
+
+ (event,) = events
+ assert event.get("user", {}).get("id") is None
+
+
+@pytest.mark.asyncio
+async def test_quart_auth_not_configured(
+ sentry_init, app, capture_events, monkeypatch, integration_enabled_params
+):
+ sentry_init(**integration_enabled_params)
+
+ assert quart_sentry.quart_auth
+
+ events = capture_events()
+ client = app.test_client()
+ await client.get("/message")
+
+ (event,) = events
+ assert event.get("user", {}).get("id") is None
+
+
+@pytest.mark.asyncio
+async def test_quart_auth_partially_configured(
+ sentry_init, app, capture_events, monkeypatch, integration_enabled_params
+):
+ sentry_init(**integration_enabled_params)
+
+ events = capture_events()
+
+ client = app.test_client()
+ await client.get("/message")
+
+ (event,) = events
+ assert event.get("user", {}).get("id") is None
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("send_default_pii", [True, False])
+@pytest.mark.parametrize("user_id", [None, "42", "3"])
+async def test_quart_auth_configured(
+ send_default_pii,
+ sentry_init,
+ app,
+ user_id,
+ capture_events,
+ monkeypatch,
+ integration_enabled_params,
+):
+ sentry_init(send_default_pii=send_default_pii, **integration_enabled_params)
+
+ @app.route("/login")
+ async def login():
+ if user_id is not None:
+ login_user(AuthUser(user_id))
+ return "ok"
+
+ events = capture_events()
+
+ client = app.test_client()
+ assert (await client.get("/login")).status_code == 200
+ assert not events
+
+ assert (await client.get("/message")).status_code == 200
+
+ (event,) = events
+ if user_id is None or not send_default_pii:
+ assert event.get("user", {}).get("id") is None
+ else:
+ assert event["user"]["id"] == str(user_id)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+ "integrations",
+ [
+ [quart_sentry.QuartIntegration()],
+ [quart_sentry.QuartIntegration(), LoggingIntegration(event_level="ERROR")],
+ ],
+)
+async def test_errors_not_reported_twice(
+ sentry_init, integrations, capture_events, app
+):
+ sentry_init(integrations=integrations)
+
+ @app.route("/")
+ async def index():
+ try:
+ 1 / 0
+ except Exception as e:
+ app.logger.exception(e)
+ raise e
+
+ events = capture_events()
+
+ client = app.test_client()
+ # with pytest.raises(ZeroDivisionError):
+ await client.get("/")
+
+ assert len(events) == 1
+
+
+@pytest.mark.asyncio
+async def test_logging(sentry_init, capture_events, app):
+ # ensure that Quart's logger magic doesn't break ours
+ sentry_init(
+ integrations=[
+ quart_sentry.QuartIntegration(),
+ LoggingIntegration(event_level="ERROR"),
+ ]
+ )
+
+ @app.route("/")
+ async def index():
+ app.logger.error("hi")
+ return "ok"
+
+ events = capture_events()
+
+ client = app.test_client()
+ await client.get("/")
+
+ (event,) = events
+ assert event["level"] == "error"
+
+
+@pytest.mark.asyncio
+async def test_no_errors_without_request(app, sentry_init):
+ sentry_init(integrations=[quart_sentry.QuartIntegration()])
+ async with app.app_context():
+ capture_exception(ValueError())
+
+
+def test_cli_commands_raise(app):
+ if not hasattr(app, "cli"):
+ pytest.skip("Too old quart version")
+
+ from quart.cli import ScriptInfo
+
+ @app.cli.command()
+ def foo():
+ 1 / 0
+
+ with pytest.raises(ZeroDivisionError):
+ app.cli.main(
+ args=["foo"], prog_name="myapp", obj=ScriptInfo(create_app=lambda _: app)
+ )
+
+
+@pytest.mark.asyncio
+async def test_500(sentry_init, capture_events, app):
+ sentry_init(integrations=[quart_sentry.QuartIntegration()])
+
+ app.debug = False
+ app.testing = False
+
+ @app.route("/")
+ async def index():
+ 1 / 0
+
+ @app.errorhandler(500)
+ async def error_handler(err):
+ return "Sentry error: %s" % last_event_id()
+
+ events = capture_events()
+
+ client = app.test_client()
+ response = await client.get("/")
+
+ (event,) = events
+ assert (await response.get_data(as_text=True)) == "Sentry error: %s" % event[
+ "event_id"
+ ]
+
+
+@pytest.mark.asyncio
+async def test_error_in_errorhandler(sentry_init, capture_events, app):
+ sentry_init(integrations=[quart_sentry.QuartIntegration()])
+
+ app.debug = False
+ app.testing = False
+
+ @app.route("/")
+ async def index():
+ raise ValueError()
+
+ @app.errorhandler(500)
+ async def error_handler(err):
+ 1 / 0
+
+ events = capture_events()
+
+ client = app.test_client()
+
+ with pytest.raises(ZeroDivisionError):
+ await client.get("/")
+
+ event1, event2 = events
+
+ (exception,) = event1["exception"]["values"]
+ assert exception["type"] == "ValueError"
+
+ exception = event2["exception"]["values"][-1]
+ assert exception["type"] == "ZeroDivisionError"
+
+
+@pytest.mark.asyncio
+async def test_bad_request_not_captured(sentry_init, capture_events, app):
+ sentry_init(integrations=[quart_sentry.QuartIntegration()])
+ events = capture_events()
+
+ @app.route("/")
+ async def index():
+ abort(400)
+
+ client = app.test_client()
+
+ await client.get("/")
+
+ assert not events
+
+
+@pytest.mark.asyncio
+async def test_does_not_leak_scope(sentry_init, capture_events, app):
+ sentry_init(integrations=[quart_sentry.QuartIntegration()])
+ events = capture_events()
+
+ with configure_scope() as scope:
+ scope.set_tag("request_data", False)
+
+ @app.route("/")
+ async def index():
+ with configure_scope() as scope:
+ scope.set_tag("request_data", True)
+
+ async def generate():
+ for row in range(1000):
+ with configure_scope() as scope:
+ assert scope._tags["request_data"]
+
+ yield str(row) + "\n"
+
+ return Response(stream_with_context(generate)(), mimetype="text/csv")
+
+ client = app.test_client()
+ response = await client.get("/")
+ assert (await response.get_data(as_text=True)) == "".join(
+ str(row) + "\n" for row in range(1000)
+ )
+ assert not events
+
+ with configure_scope() as scope:
+ assert not scope._tags["request_data"]
+
+
+@pytest.mark.asyncio
+async def test_scoped_test_client(sentry_init, app):
+ sentry_init(integrations=[quart_sentry.QuartIntegration()])
+
+ @app.route("/")
+ async def index():
+ return "ok"
+
+ async with app.test_client() as client:
+ response = await client.get("/")
+ assert response.status_code == 200
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("exc_cls", [ZeroDivisionError, Exception])
+async def test_errorhandler_for_exception_swallows_exception(
+ sentry_init, app, capture_events, exc_cls
+):
+ # In contrast to error handlers for a status code, error
+ # handlers for exceptions can swallow the exception (this is
+ # just how the Quart signal works)
+ sentry_init(integrations=[quart_sentry.QuartIntegration()])
+ events = capture_events()
+
+ @app.route("/")
+ async def index():
+ 1 / 0
+
+ @app.errorhandler(exc_cls)
+ async def zerodivision(e):
+ return "ok"
+
+ async with app.test_client() as client:
+ response = await client.get("/")
+ assert response.status_code == 200
+
+ assert not events
+
+
+@pytest.mark.asyncio
+async def test_tracing_success(sentry_init, capture_events, app):
+ sentry_init(traces_sample_rate=1.0, integrations=[quart_sentry.QuartIntegration()])
+
+ @app.before_request
+ async def _():
+ set_tag("before_request", "yes")
+
+ @app.route("/message_tx")
+ async def hi_tx():
+ set_tag("view", "yes")
+ capture_message("hi")
+ return "ok"
+
+ events = capture_events()
+
+ async with app.test_client() as client:
+ response = await client.get("/message_tx")
+ assert response.status_code == 200
+
+ message_event, transaction_event = events
+
+ assert transaction_event["type"] == "transaction"
+ assert transaction_event["transaction"] == "hi_tx"
+ assert transaction_event["tags"]["view"] == "yes"
+ assert transaction_event["tags"]["before_request"] == "yes"
+
+ assert message_event["message"] == "hi"
+ assert message_event["transaction"] == "hi_tx"
+ assert message_event["tags"]["view"] == "yes"
+ assert message_event["tags"]["before_request"] == "yes"
+
+
+@pytest.mark.asyncio
+async def test_tracing_error(sentry_init, capture_events, app):
+ sentry_init(traces_sample_rate=1.0, integrations=[quart_sentry.QuartIntegration()])
+
+ events = capture_events()
+
+ @app.route("/error")
+ async def error():
+ 1 / 0
+
+ async with app.test_client() as client:
+ response = await client.get("/error")
+ assert response.status_code == 500
+
+ error_event, transaction_event = events
+
+ assert transaction_event["type"] == "transaction"
+ assert transaction_event["transaction"] == "error"
+
+ assert error_event["transaction"] == "error"
+ (exception,) = error_event["exception"]["values"]
+ assert exception["type"] == "ZeroDivisionError"
+
+
+@pytest.mark.asyncio
+async def test_class_based_views(sentry_init, app, capture_events):
+ sentry_init(integrations=[quart_sentry.QuartIntegration()])
+ events = capture_events()
+
+ @app.route("/")
+ class HelloClass(View):
+ methods = ["GET"]
+
+ async def dispatch_request(self):
+ capture_message("hi")
+ return "ok"
+
+ app.add_url_rule("/hello-class/", view_func=HelloClass.as_view("hello_class"))
+
+ async with app.test_client() as client:
+ response = await client.get("/hello-class/")
+ assert response.status_code == 200
+
+ (event,) = events
+
+ assert event["message"] == "hi"
+ assert event["transaction"] == "hello_class"
diff --git a/tox.ini b/tox.ini
index 8f19258398..d282f65d17 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,6 +30,8 @@ envlist =
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-1.1
{py3.6,py3.8,py3.9}-flask-2.0
+ {py3.7,py3.8,py3.9}-quart
+
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-bottle-0.12
{pypy,py2.7,py3.5,py3.6,py3.7}-falcon-1.4
@@ -124,6 +126,10 @@ deps =
flask-1.1: Flask>=1.1,<1.2
flask-2.0: Flask>=2.0,<2.1
+ quart: quart>=0.16.1
+ quart: quart-auth
+ quart: pytest-asyncio
+
bottle-0.12: bottle>=0.12,<0.13
falcon-1.4: falcon>=1.4,<1.5
@@ -244,6 +250,7 @@ setenv =
beam: TESTPATH=tests/integrations/beam
django: TESTPATH=tests/integrations/django
flask: TESTPATH=tests/integrations/flask
+ quart: TESTPATH=tests/integrations/quart
bottle: TESTPATH=tests/integrations/bottle
falcon: TESTPATH=tests/integrations/falcon
celery: TESTPATH=tests/integrations/celery
@@ -278,6 +285,7 @@ extras =
flask: flask
bottle: bottle
falcon: falcon
+ quart: quart
basepython =
py2.7: python2.7
From 7d739fab92210bba6622a23233dafee1ec3a548c Mon Sep 17 00:00:00 2001
From: Adam Hopkins
Date: Tue, 4 Jan 2022 01:56:45 +0200
Subject: [PATCH 0263/2327] feat(sanic): Sanic v21.12 support (#1292)
* Set version check for v21.9 only
* Upgrade tests for v21.12 compat
* Add message to exception in tests
Co-authored-by: Neel Shah
---
sentry_sdk/integrations/sanic.py | 2 +-
tests/integrations/sanic/test_sanic.py | 16 +++++++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/sentry_sdk/integrations/sanic.py b/sentry_sdk/integrations/sanic.py
index e7da9ca6d7..4e20cc9ece 100644
--- a/sentry_sdk/integrations/sanic.py
+++ b/sentry_sdk/integrations/sanic.py
@@ -222,7 +222,7 @@ async def sentry_wrapped_error_handler(request, exception):
finally:
# As mentioned in previous comment in _startup, this can be removed
# after https://github.com/sanic-org/sanic/issues/2297 is resolved
- if SanicIntegration.version >= (21, 9):
+ if SanicIntegration.version == (21, 9):
await _hub_exit(request)
return sentry_wrapped_error_handler
diff --git a/tests/integrations/sanic/test_sanic.py b/tests/integrations/sanic/test_sanic.py
index 1933f0f51f..b91f94bfe9 100644
--- a/tests/integrations/sanic/test_sanic.py
+++ b/tests/integrations/sanic/test_sanic.py
@@ -2,6 +2,7 @@
import random
import asyncio
+from unittest.mock import Mock
import pytest
@@ -10,7 +11,7 @@
from sanic import Sanic, request, response, __version__ as SANIC_VERSION_RAW
from sanic.response import HTTPResponse
-from sanic.exceptions import abort
+from sanic.exceptions import SanicException
SANIC_VERSION = tuple(map(int, SANIC_VERSION_RAW.split(".")))
@@ -20,9 +21,9 @@ def app():
if SANIC_VERSION >= (20, 12):
# Build (20.12.0) adds a feature where the instance is stored in an internal class
# registry for later retrieval, and so add register=False to disable that
- app = Sanic(__name__, register=False)
+ app = Sanic("Test", register=False)
else:
- app = Sanic(__name__)
+ app = Sanic("Test")
@app.route("/message")
def hi(request):
@@ -90,7 +91,7 @@ def test_bad_request_not_captured(sentry_init, app, capture_events):
@app.route("/")
def index(request):
- abort(400)
+ raise SanicException("...", status_code=400)
request, response = app.test_client.get("/")
assert response.status == 400
@@ -178,7 +179,12 @@ class MockAsyncStreamer:
def __init__(self, request_body):
self.request_body = request_body
self.iter = iter(self.request_body)
- self.response = b"success"
+
+ if SANIC_VERSION >= (21, 12):
+ self.response = None
+ self.stage = Mock()
+ else:
+ self.response = b"success"
def respond(self, response):
responses.append(response)
From 5f2af2d2848e474c5114dda671410eb422c7d16b Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Tue, 4 Jan 2022 01:37:00 +0100
Subject: [PATCH 0264/2327] fix(tests): Fix quart test (#1293)
---
tests/integrations/quart/test_quart.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/integrations/quart/test_quart.py b/tests/integrations/quart/test_quart.py
index 0b886ebf18..d827b3c4aa 100644
--- a/tests/integrations/quart/test_quart.py
+++ b/tests/integrations/quart/test_quart.py
@@ -38,7 +38,7 @@ async def hi():
return app
-@pytest.fixture(params=("manual"))
+@pytest.fixture(params=("manual",))
def integration_enabled_params(request):
if request.param == "manual":
return {"integrations": [quart_sentry.QuartIntegration()]}
From e971cafb896aa9bef0fdfb8df2588d42752aad4b Mon Sep 17 00:00:00 2001
From: John Zeringue
Date: Tue, 4 Jan 2022 16:05:21 -0500
Subject: [PATCH 0265/2327] feat(celery): Support Celery abstract tasks (#1287)
Prior to this change, the Celery integration always instruments
`task.run` and incorrectly instruments `task.__call__` (`task(...)` is
equivalent to `type(task).__call__(...)`, not `task.__call__(...)`).
After this change, we'll use the same logic as Celery to decide whether
to instrument `task.__call__` or `task.run`. That change allows abstract
tasks to catch/raise exceptions before the Sentry wrapper.
---
mypy.ini | 2 ++
sentry_sdk/integrations/celery.py | 11 +++++++----
tests/integrations/celery/test_celery.py | 22 ++++++++++++++++++++++
3 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/mypy.ini b/mypy.ini
index dd095e4d13..7e30dddb5b 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -59,3 +59,5 @@ ignore_missing_imports = True
[mypy-sentry_sdk._queue]
ignore_missing_imports = True
disallow_untyped_defs = False
+[mypy-celery.app.trace]
+ignore_missing_imports = True
diff --git a/sentry_sdk/integrations/celery.py b/sentry_sdk/integrations/celery.py
index 9ba458a387..40a2dfbe39 100644
--- a/sentry_sdk/integrations/celery.py
+++ b/sentry_sdk/integrations/celery.py
@@ -30,6 +30,7 @@
Ignore,
Reject,
)
+ from celery.app.trace import task_has_custom
except ImportError:
raise DidNotEnable("Celery not installed")
@@ -57,10 +58,12 @@ def setup_once():
def sentry_build_tracer(name, task, *args, **kwargs):
# type: (Any, Any, *Any, **Any) -> Any
if not getattr(task, "_sentry_is_patched", False):
- # Need to patch both methods because older celery sometimes
- # short-circuits to task.run if it thinks it's safe.
- task.__call__ = _wrap_task_call(task, task.__call__)
- task.run = _wrap_task_call(task, task.run)
+ # determine whether Celery will use __call__ or run and patch
+ # accordingly
+ if task_has_custom(task, "__call__"):
+ type(task).__call__ = _wrap_task_call(task, type(task).__call__)
+ else:
+ task.run = _wrap_task_call(task, task.run)
# `build_tracer` is apparently called for every task
# invocation. Can't wrap every celery task for every invocation
diff --git a/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py
index a405e53fd9..bdf1706c59 100644
--- a/tests/integrations/celery/test_celery.py
+++ b/tests/integrations/celery/test_celery.py
@@ -407,3 +407,25 @@ def walk_dogs(x, y):
# passed as args or as kwargs, so make this generic
DictionaryContaining({"celery_job": dict(task="dog_walk", **args_kwargs)})
)
+
+
+def test_abstract_task(capture_events, celery, celery_invocation):
+ events = capture_events()
+
+ class AbstractTask(celery.Task):
+ abstract = True
+
+ def __call__(self, *args, **kwargs):
+ try:
+ return self.run(*args, **kwargs)
+ except ZeroDivisionError:
+ return None
+
+ @celery.task(name="dummy_task", base=AbstractTask)
+ def dummy_task(x, y):
+ return x / y
+
+ with start_transaction():
+ celery_invocation(dummy_task, 1, 0)
+
+ assert not events
From d97cc4718b17db2ddc856623eaa57490ad3c8154 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Fri, 7 Jan 2022 14:07:30 +0100
Subject: [PATCH 0266/2327] meta: Changelog for 1.5.2 (#1294)
---
CHANGELOG.md | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b2ec48aac..efb309b44e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,15 @@ sentry-sdk==1.5.0
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 1.5.2
+
+- Record event_processor client reports #1281
+- Add a Quart integration #1248
+- Sanic v21.12 support #1292
+- Support Celery abstract tasks #1287
+
+Work in this release contributed by @johnzeringue, @pgjones and @ahopkins. Thank you for your contribution!
+
## 1.5.1
- Fix django legacy url resolver regex substitution due to upstream CVE-2021-44420 fix #1272
From 65786fd88df5460a7446bb1c8e412584c856679c Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Mon, 10 Jan 2022 13:26:27 +0000
Subject: [PATCH 0267/2327] release: 1.5.2
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index ab2cca1313..a78fc51b88 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.5.1"
+release = "1.5.2"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 00de2b7608..f71e27f819 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.5.1"
+VERSION = "1.5.2"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 653ea6ea01..6ad99e6027 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.5.1",
+ version="1.5.2",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From f92e9707ea73765eb9fdcf6482dc46aed4221a7a Mon Sep 17 00:00:00 2001
From: Vladan Paunovic
Date: Wed, 12 Jan 2022 14:08:59 +0100
Subject: [PATCH 0268/2327] chore: add JIRA integration (#1299)
---
.github/workflows/jira.yml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 .github/workflows/jira.yml
diff --git a/.github/workflows/jira.yml b/.github/workflows/jira.yml
new file mode 100644
index 0000000000..485915ba5e
--- /dev/null
+++ b/.github/workflows/jira.yml
@@ -0,0 +1,18 @@
+name: Create JIRA issue
+
+on:
+ issues:
+ types: [labeled]
+
+jobs:
+ createIssue:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: getsentry/ga-jira-integration@main
+ with:
+ JIRA_API_HOST: ${{secrets.JIRA_BASEURL}}
+ JIRA_API_TOKEN: ${{secrets.JIRA_APITOKEN}}
+ JIRA_EMAIL: ${{secrets.JIRA_USEREMAIL}}
+ TRIGGER_LABEL: "Jira"
+ JIRA_PROJECT_ID: WEBBACKEND
+ JIRA_ISSUE_NAME: Story
From 20f0a76e680c6969a78cbeab191befd079699b58 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Wed, 19 Jan 2022 20:34:24 +0100
Subject: [PATCH 0269/2327] feat(django): Pick custom urlconf up from request
if any (#1308)
Django middlewares sometimes can override `request.urlconf` which we also need to respect in our transaction name resolving.
This fixes an issue (WEB-530) with a customer using `django-tenants` where all their transactions were named `Generic WSGI request` due to the default url resolution failing.
---
sentry_sdk/integrations/django/__init__.py | 29 ++++++++++++++-
.../integrations/django/myapp/custom_urls.py | 31 ++++++++++++++++
tests/integrations/django/myapp/middleware.py | 35 ++++++++++++-------
tests/integrations/django/myapp/views.py | 5 +++
tests/integrations/django/test_basic.py | 27 ++++++++++++++
5 files changed, 114 insertions(+), 13 deletions(-)
create mode 100644 tests/integrations/django/myapp/custom_urls.py
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index ca93546083..5037a82854 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -346,6 +346,31 @@ def _before_get_response(request):
)
+def _after_get_response(request):
+ # type: (WSGIRequest) -> None
+ """
+ Some django middlewares overwrite request.urlconf
+ so we need to respect that contract,
+ so we try to resolve the url again.
+ """
+ if not hasattr(request, "urlconf"):
+ return
+
+ hub = Hub.current
+ integration = hub.get_integration(DjangoIntegration)
+ if integration is None or integration.transaction_style != "url":
+ return
+
+ with hub.configure_scope() as scope:
+ try:
+ scope.transaction = LEGACY_RESOLVER.resolve(
+ request.path_info,
+ urlconf=request.urlconf,
+ )
+ except Exception:
+ pass
+
+
def _patch_get_response():
# type: () -> None
"""
@@ -358,7 +383,9 @@ def _patch_get_response():
def sentry_patched_get_response(self, request):
# type: (Any, WSGIRequest) -> Union[HttpResponse, BaseException]
_before_get_response(request)
- return old_get_response(self, request)
+ rv = old_get_response(self, request)
+ _after_get_response(request)
+ return rv
BaseHandler.get_response = sentry_patched_get_response
diff --git a/tests/integrations/django/myapp/custom_urls.py b/tests/integrations/django/myapp/custom_urls.py
new file mode 100644
index 0000000000..af454d1e9e
--- /dev/null
+++ b/tests/integrations/django/myapp/custom_urls.py
@@ -0,0 +1,31 @@
+"""myapp URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+ https://docs.djangoproject.com/en/2.0/topics/http/urls/
+Examples:
+Function views
+ 1. Add an import: from my_app import views
+ 2. Add a URL to urlpatterns: path('', views.home, name='home')
+Class-based views
+ 1. Add an import: from other_app.views import Home
+ 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
+Including another URLconf
+ 1. Import the include() function: from django.urls import include, path
+ 2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
+"""
+from __future__ import absolute_import
+
+try:
+ from django.urls import path
+except ImportError:
+ from django.conf.urls import url
+
+ def path(path, *args, **kwargs):
+ return url("^{}$".format(path), *args, **kwargs)
+
+
+from . import views
+
+urlpatterns = [
+ path("custom/ok", views.custom_ok, name="custom_ok"),
+]
diff --git a/tests/integrations/django/myapp/middleware.py b/tests/integrations/django/myapp/middleware.py
index b4c1145390..a6c847deba 100644
--- a/tests/integrations/django/myapp/middleware.py
+++ b/tests/integrations/django/myapp/middleware.py
@@ -1,19 +1,30 @@
-import asyncio
-from django.utils.decorators import sync_and_async_middleware
+import django
+if django.VERSION >= (3, 1):
+ import asyncio
+ from django.utils.decorators import sync_and_async_middleware
-@sync_and_async_middleware
-def simple_middleware(get_response):
- if asyncio.iscoroutinefunction(get_response):
+ @sync_and_async_middleware
+ def simple_middleware(get_response):
+ if asyncio.iscoroutinefunction(get_response):
- async def middleware(request):
- response = await get_response(request)
- return response
+ async def middleware(request):
+ response = await get_response(request)
+ return response
- else:
+ else:
- def middleware(request):
- response = get_response(request)
- return response
+ def middleware(request):
+ response = get_response(request)
+ return response
+
+ return middleware
+
+
+def custom_urlconf_middleware(get_response):
+ def middleware(request):
+ request.urlconf = "tests.integrations.django.myapp.custom_urls"
+ response = get_response(request)
+ return response
return middleware
diff --git a/tests/integrations/django/myapp/views.py b/tests/integrations/django/myapp/views.py
index 0a6ae10635..f7d4d8bd81 100644
--- a/tests/integrations/django/myapp/views.py
+++ b/tests/integrations/django/myapp/views.py
@@ -120,6 +120,11 @@ def template_test(request, *args, **kwargs):
return render(request, "user_name.html", {"user_age": 20})
+@csrf_exempt
+def custom_ok(request, *args, **kwargs):
+ return HttpResponse("custom ok")
+
+
@csrf_exempt
def template_test2(request, *args, **kwargs):
return TemplateResponse(
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index 56a085d561..6b2c220759 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -755,3 +755,30 @@ def test_csrf(sentry_init, client):
content, status, _headers = client.post(reverse("message"))
assert status.lower() == "200 ok"
assert b"".join(content) == b"ok"
+
+
+@pytest.mark.skipif(DJANGO_VERSION < (2, 0), reason="Requires Django > 2.0")
+def test_custom_urlconf_middleware(
+ settings, sentry_init, client, capture_events, render_span_tree
+):
+ """
+ Some middlewares (for instance in django-tenants) overwrite request.urlconf.
+ Test that the resolver picks up the correct urlconf for transaction naming.
+ """
+ urlconf = "tests.integrations.django.myapp.middleware.custom_urlconf_middleware"
+ settings.ROOT_URLCONF = ""
+ settings.MIDDLEWARE.insert(0, urlconf)
+ client.application.load_middleware()
+
+ sentry_init(integrations=[DjangoIntegration()], traces_sample_rate=1.0)
+ events = capture_events()
+
+ content, status, _headers = client.get("/custom/ok")
+ assert status.lower() == "200 ok"
+ assert b"".join(content) == b"custom ok"
+
+ (event,) = events
+ assert event["transaction"] == "/custom/ok"
+ assert "custom_urlconf_middleware" in render_span_tree(event)
+
+ settings.MIDDLEWARE.pop(0)
From ca382acac75aa4b9ee453bdd46191940f8e88637 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Thu, 20 Jan 2022 14:32:12 +0100
Subject: [PATCH 0270/2327] meta: Changelog for 1.5.3 (#1313)
---
CHANGELOG.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index efb309b44e..ffd898a4b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,10 @@ sentry-sdk==1.5.0
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 1.5.3
+
+- Pick up custom urlconf set by Django middlewares from request if any (#1308)
+
## 1.5.2
- Record event_processor client reports #1281
From 95a8e50a78bd18d095f6331884397f19d99cf5fa Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Thu, 20 Jan 2022 13:33:35 +0000
Subject: [PATCH 0271/2327] release: 1.5.3
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index a78fc51b88..6264f1d41f 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.5.2"
+release = "1.5.3"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index f71e27f819..a05ab53fa6 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.5.2"
+VERSION = "1.5.3"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 6ad99e6027..85c6de2fc4 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.5.2",
+ version="1.5.3",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From bebd8155180febe304fc2edbe7e75ca8f17b3ae4 Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Mon, 24 Jan 2022 14:21:47 +0100
Subject: [PATCH 0272/2327] fix(python): Capture only 5xx HTTP errors in Falcon
Integration (#1314)
* Only catch errors that lead to a HTTP 5xx
* Write code that is actually somehow typed and can be linted.
Co-authored-by: sentry-bot
---
sentry_sdk/integrations/falcon.py | 14 +++--
tests/integrations/falcon/test_falcon.py | 75 +++++++++++++++++++++++-
2 files changed, 82 insertions(+), 7 deletions(-)
diff --git a/sentry_sdk/integrations/falcon.py b/sentry_sdk/integrations/falcon.py
index f794216140..8129fab46b 100644
--- a/sentry_sdk/integrations/falcon.py
+++ b/sentry_sdk/integrations/falcon.py
@@ -153,7 +153,7 @@ def sentry_patched_handle_exception(self, *args):
hub = Hub.current
integration = hub.get_integration(FalconIntegration)
- if integration is not None and not _is_falcon_http_error(ex):
+ if integration is not None and _exception_leads_to_http_5xx(ex):
# If an integration is there, a client has to be there.
client = hub.client # type: Any
@@ -186,9 +186,15 @@ def sentry_patched_prepare_middleware(
falcon.api_helpers.prepare_middleware = sentry_patched_prepare_middleware
-def _is_falcon_http_error(ex):
- # type: (BaseException) -> bool
- return isinstance(ex, (falcon.HTTPError, falcon.http_status.HTTPStatus))
+def _exception_leads_to_http_5xx(ex):
+ # type: (Exception) -> bool
+ is_server_error = isinstance(ex, falcon.HTTPError) and (ex.status or "").startswith(
+ "5"
+ )
+ is_unhandled_error = not isinstance(
+ ex, (falcon.HTTPError, falcon.http_status.HTTPStatus)
+ )
+ return is_server_error or is_unhandled_error
def _make_request_event_processor(req, integration):
diff --git a/tests/integrations/falcon/test_falcon.py b/tests/integrations/falcon/test_falcon.py
index a810da33c5..84e8d228f0 100644
--- a/tests/integrations/falcon/test_falcon.py
+++ b/tests/integrations/falcon/test_falcon.py
@@ -71,15 +71,15 @@ def test_transaction_style(
assert event["transaction"] == expected_transaction
-def test_errors(sentry_init, capture_exceptions, capture_events):
+def test_unhandled_errors(sentry_init, capture_exceptions, capture_events):
sentry_init(integrations=[FalconIntegration()], debug=True)
- class ZeroDivisionErrorResource:
+ class Resource:
def on_get(self, req, resp):
1 / 0
app = falcon.API()
- app.add_route("/", ZeroDivisionErrorResource())
+ app.add_route("/", Resource())
exceptions = capture_exceptions()
events = capture_events()
@@ -96,6 +96,75 @@ def on_get(self, req, resp):
(event,) = events
assert event["exception"]["values"][0]["mechanism"]["type"] == "falcon"
+ assert " by zero" in event["exception"]["values"][0]["value"]
+
+
+def test_raised_5xx_errors(sentry_init, capture_exceptions, capture_events):
+ sentry_init(integrations=[FalconIntegration()], debug=True)
+
+ class Resource:
+ def on_get(self, req, resp):
+ raise falcon.HTTPError(falcon.HTTP_502)
+
+ app = falcon.API()
+ app.add_route("/", Resource())
+
+ exceptions = capture_exceptions()
+ events = capture_events()
+
+ client = falcon.testing.TestClient(app)
+ client.simulate_get("/")
+
+ (exc,) = exceptions
+ assert isinstance(exc, falcon.HTTPError)
+
+ (event,) = events
+ assert event["exception"]["values"][0]["mechanism"]["type"] == "falcon"
+ assert event["exception"]["values"][0]["type"] == "HTTPError"
+
+
+def test_raised_4xx_errors(sentry_init, capture_exceptions, capture_events):
+ sentry_init(integrations=[FalconIntegration()], debug=True)
+
+ class Resource:
+ def on_get(self, req, resp):
+ raise falcon.HTTPError(falcon.HTTP_400)
+
+ app = falcon.API()
+ app.add_route("/", Resource())
+
+ exceptions = capture_exceptions()
+ events = capture_events()
+
+ client = falcon.testing.TestClient(app)
+ client.simulate_get("/")
+
+ assert len(exceptions) == 0
+ assert len(events) == 0
+
+
+def test_http_status(sentry_init, capture_exceptions, capture_events):
+ """
+ This just demonstrates, that if Falcon raises a HTTPStatus with code 500
+ (instead of a HTTPError with code 500) Sentry will not capture it.
+ """
+ sentry_init(integrations=[FalconIntegration()], debug=True)
+
+ class Resource:
+ def on_get(self, req, resp):
+ raise falcon.http_status.HTTPStatus(falcon.HTTP_508)
+
+ app = falcon.API()
+ app.add_route("/", Resource())
+
+ exceptions = capture_exceptions()
+ events = capture_events()
+
+ client = falcon.testing.TestClient(app)
+ client.simulate_get("/")
+
+ assert len(exceptions) == 0
+ assert len(events) == 0
def test_falcon_large_json_request(sentry_init, capture_events):
From 639c9411309f7cce232da91547a808fbff2567cf Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Mon, 24 Jan 2022 15:56:43 +0100
Subject: [PATCH 0273/2327] build(tests): Python 3.10 support (#1309)
Adding Python 3.10 to our test suite
Refs GH-1273
* Do not test Flask 0.11 and 0.12 in Python 3.10
* fix(python): Capture only 5xx HTTP errors in Falcon Integration (#1314)
* Write code that is actually somehow typed and can be linted.
* Updated test matrix for Tornado and Asgi
---
.github/workflows/ci.yml | 2 +-
setup.py | 1 +
test-requirements.txt | 2 +-
tox.ini | 52 +++++++++++++++++++++-------------------
4 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6724359e85..8850aaddc7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,7 +75,7 @@ jobs:
strategy:
matrix:
linux-version: [ubuntu-latest]
- python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9"]
+ python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
include:
# GHA doesn't host the combo of python 3.4 and ubuntu-latest (which is
# currently 20.04), so run just that one under 18.04. (See
diff --git a/setup.py b/setup.py
index 85c6de2fc4..6c9219e872 100644
--- a/setup.py
+++ b/setup.py
@@ -72,6 +72,7 @@ def get_file_text(file_name):
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
+ "Programming Language :: Python :: 3.10",
"Topic :: Software Development :: Libraries :: Python Modules",
],
options={"bdist_wheel": {"universal": "1"}},
diff --git a/test-requirements.txt b/test-requirements.txt
index 3f95d90ed3..f980aeee9c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,5 @@
pytest
-pytest-forked==1.1.3
+pytest-forked
tox==3.7.0
Werkzeug
pytest-localserver==0.5.0
diff --git a/tox.ini b/tox.ini
index d282f65d17..4a488cbffa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@
[tox]
envlist =
# === Core ===
- py{2.7,3.4,3.5,3.6,3.7,3.8,3.9}
+ py{2.7,3.4,3.5,3.6,3.7,3.8,3.9,3.10}
pypy
@@ -24,29 +24,28 @@ envlist =
{pypy,py2.7,py3.5}-django-{1.8,1.9,1.10}
{pypy,py2.7}-django-{1.8,1.9,1.10,1.11}
{py3.5,py3.6,py3.7}-django-{2.0,2.1}
- {py3.7,py3.8,py3.9}-django-{2.2,3.0,3.1,3.2}
+ {py3.7,py3.8,py3.9,py3.10}-django-{2.2,3.0,3.1,3.2}
{pypy,py2.7,py3.4,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12,1.0}
- {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-1.1
- {py3.6,py3.8,py3.9}-flask-2.0
+ {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-flask-1.1
+ {py3.6,py3.8,py3.9,py3.10}-flask-2.0
- {py3.7,py3.8,py3.9}-quart
+ {py3.7,py3.8,py3.9,py3.10}-quart
- {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-bottle-0.12
+ {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-bottle-0.12
{pypy,py2.7,py3.5,py3.6,py3.7}-falcon-1.4
- {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-falcon-2.0
+ {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-falcon-2.0
{py3.5,py3.6,py3.7}-sanic-{0.8,18}
{py3.6,py3.7}-sanic-19
{py3.6,py3.7,py3.8}-sanic-20
- {py3.7,py3.8,py3.9}-sanic-21
+ {py3.7,py3.8,py3.9,py3.10}-sanic-21
- # TODO: Add py3.9
{pypy,py2.7}-celery-3
{pypy,py2.7,py3.5,py3.6}-celery-{4.1,4.2}
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.3,4.4}
- {py3.6,py3.7,py3.8}-celery-5.0
+ {py3.6,py3.7,py3.8,py3.9,py3.10}-celery-5.0
py3.7-beam-{2.12,2.13,2.32,2.33}
@@ -55,37 +54,38 @@ envlist =
py3.7-gcp
- {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-pyramid-{1.6,1.7,1.8,1.9,1.10}
+ {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-pyramid-{1.6,1.7,1.8,1.9,1.10}
{pypy,py2.7,py3.5,py3.6}-rq-{0.6,0.7,0.8,0.9,0.10,0.11}
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-rq-{0.12,0.13,1.0,1.1,1.2,1.3}
- {py3.5,py3.6,py3.7,py3.8,py3.9}-rq-{1.4,1.5}
+ {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-rq-{1.4,1.5}
py3.7-aiohttp-3.5
- {py3.7,py3.8,py3.9}-aiohttp-3.6
+ {py3.7,py3.8,py3.9,py3.10}-aiohttp-3.6
- {py3.7,py3.8,py3.9}-tornado-{5,6}
+ {py3.7,py3.8,py3.9}-tornado-{5}
+ {py3.7,py3.8,py3.9,py3.10}-tornado-{6}
{py3.5,py3.6,py3.7,py3.8,py3.9}-trytond-{4.6,5.0,5.2}
- {py3.6,py3.7,py3.8,py3.9}-trytond-{5.4}
+ {py3.6,py3.7,py3.8,py3.9,py3.10}-trytond-{5.4}
{py2.7,py3.8,py3.9}-requests
{py2.7,py3.7,py3.8,py3.9}-redis
{py2.7,py3.7,py3.8,py3.9}-rediscluster-{1,2}
- py{3.7,3.8,3.9}-asgi
+ py{3.7,3.8,3.9,3.10}-asgi
- {py2.7,py3.7,py3.8,py3.9}-sqlalchemy-{1.2,1.3}
+ {py2.7,py3.7,py3.8,py3.9,py3.10}-sqlalchemy-{1.2,1.3}
- {py3.5,py3.6,py3.7,py3.8,py3.9}-pure_eval
+ {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-pure_eval
{py3.6,py3.7,py3.8}-chalice-{1.16,1.17,1.18,1.19,1.20}
{py2.7,py3.6,py3.7,py3.8}-boto3-{1.9,1.10,1.11,1.12,1.13,1.14,1.15,1.16}
- {py3.6,py3.7,py3.8,py3.9}-httpx-{0.16,0.17}
+ {py3.6,py3.7,py3.8,py3.9,py3.10}-httpx-{0.16,0.17}
[testenv]
deps =
@@ -96,9 +96,9 @@ deps =
django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: djangorestframework>=3.0.0,<4.0.0
- {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: channels>2
- {py3.7,py3.8,py3.9}-django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: pytest-asyncio
- {py2.7,py3.7,py3.8,py3.9}-django-{1.11,2.2,3.0,3.1,3.2}: psycopg2-binary
+ {py3.7,py3.8,py3.9,py3.10}-django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: channels>2
+ {py3.7,py3.8,py3.9,py3.10}-django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: pytest-asyncio
+ {py2.7,py3.7,py3.8,py3.9,py3.10}-django-{1.11,2.2,3.0,3.1,3.2}: psycopg2-binary
django-{1.6,1.7}: pytest-django<3.0
django-{1.8,1.9,1.10,1.11,2.0,2.1}: pytest-django<4.0
@@ -140,7 +140,7 @@ deps =
sanic-19: sanic>=19.0,<20.0
sanic-20: sanic>=20.0,<21.0
sanic-21: sanic>=21.0,<22.0
- {py3.7,py3.8,py3.9}-sanic-21: sanic_testing
+ {py3.7,py3.8,py3.9,py3.10}-sanic-21: sanic_testing
{py3.5,py3.6}-sanic: aiocontextvars==0.2.1
sanic: aiohttp
py3.5-sanic: ujson<4
@@ -163,7 +163,7 @@ deps =
celery-5.0: Celery>=5.0,<5.1
py3.5-celery: newrelic<6.0.0
- {pypy,py2.7,py3.6,py3.7,py3.8,py3.9}-celery: newrelic
+ {pypy,py2.7,py3.6,py3.7,py3.8,py3.9,py3.10}-celery: newrelic
requests: requests>=2.0
@@ -295,6 +295,7 @@ basepython =
py3.7: python3.7
py3.8: python3.8
py3.9: python3.9
+ py3.10: python3.10
# Python version is pinned here because flake8 actually behaves differently
# depending on which version is used. You can patch this out to point to
@@ -314,6 +315,9 @@ commands =
; https://github.com/more-itertools/more-itertools/issues/578
py3.5-flask-{0.10,0.11,0.12}: pip install more-itertools<8.11.0
+ ; use old pytest for old Python versions:
+ {py2.7,py3.4,py3.5}: pip install pytest-forked==1.1.3
+
py.test {env:TESTPATH} {posargs}
[testenv:linters]
From 4dc2deb3ba88f50bddb0981dde8a557a2c75de41 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Mon, 24 Jan 2022 18:27:29 +0100
Subject: [PATCH 0274/2327] fix(django): Attempt custom urlconf resolve in
got_request_exception as well (#1317)
---
sentry_sdk/integrations/django/__init__.py | 28 +++++++++++++------
.../integrations/django/myapp/custom_urls.py | 1 +
tests/integrations/django/myapp/views.py | 5 ++++
tests/integrations/django/test_basic.py | 11 +++++++-
4 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index 5037a82854..ee7fbee0c7 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -58,6 +58,7 @@
from django.http.request import QueryDict
from django.utils.datastructures import MultiValueDict
+ from sentry_sdk.scope import Scope
from sentry_sdk.integrations.wsgi import _ScopedResponse
from sentry_sdk._types import Event, Hint, EventProcessor, NotImplementedType
@@ -346,8 +347,8 @@ def _before_get_response(request):
)
-def _after_get_response(request):
- # type: (WSGIRequest) -> None
+def _attempt_resolve_again(request, scope):
+ # type: (WSGIRequest, Scope) -> None
"""
Some django middlewares overwrite request.urlconf
so we need to respect that contract,
@@ -356,19 +357,24 @@ def _after_get_response(request):
if not hasattr(request, "urlconf"):
return
+ try:
+ scope.transaction = LEGACY_RESOLVER.resolve(
+ request.path_info,
+ urlconf=request.urlconf,
+ )
+ except Exception:
+ pass
+
+
+def _after_get_response(request):
+ # type: (WSGIRequest) -> None
hub = Hub.current
integration = hub.get_integration(DjangoIntegration)
if integration is None or integration.transaction_style != "url":
return
with hub.configure_scope() as scope:
- try:
- scope.transaction = LEGACY_RESOLVER.resolve(
- request.path_info,
- urlconf=request.urlconf,
- )
- except Exception:
- pass
+ _attempt_resolve_again(request, scope)
def _patch_get_response():
@@ -431,6 +437,10 @@ def _got_request_exception(request=None, **kwargs):
integration = hub.get_integration(DjangoIntegration)
if integration is not None:
+ if request is not None and integration.transaction_style == "url":
+ with hub.configure_scope() as scope:
+ _attempt_resolve_again(request, scope)
+
# If an integration is there, a client has to be there.
client = hub.client # type: Any
diff --git a/tests/integrations/django/myapp/custom_urls.py b/tests/integrations/django/myapp/custom_urls.py
index af454d1e9e..6dfa2ed2f1 100644
--- a/tests/integrations/django/myapp/custom_urls.py
+++ b/tests/integrations/django/myapp/custom_urls.py
@@ -28,4 +28,5 @@ def path(path, *args, **kwargs):
urlpatterns = [
path("custom/ok", views.custom_ok, name="custom_ok"),
+ path("custom/exc", views.custom_exc, name="custom_exc"),
]
diff --git a/tests/integrations/django/myapp/views.py b/tests/integrations/django/myapp/views.py
index f7d4d8bd81..cac881552c 100644
--- a/tests/integrations/django/myapp/views.py
+++ b/tests/integrations/django/myapp/views.py
@@ -125,6 +125,11 @@ def custom_ok(request, *args, **kwargs):
return HttpResponse("custom ok")
+@csrf_exempt
+def custom_exc(request, *args, **kwargs):
+ 1 / 0
+
+
@csrf_exempt
def template_test2(request, *args, **kwargs):
return TemplateResponse(
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index 6b2c220759..cc77c9a76a 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -777,8 +777,17 @@ def test_custom_urlconf_middleware(
assert status.lower() == "200 ok"
assert b"".join(content) == b"custom ok"
- (event,) = events
+ event = events.pop(0)
assert event["transaction"] == "/custom/ok"
assert "custom_urlconf_middleware" in render_span_tree(event)
+ _content, status, _headers = client.get("/custom/exc")
+ assert status.lower() == "500 internal server error"
+
+ error_event, transaction_event = events
+ assert error_event["transaction"] == "/custom/exc"
+ assert error_event["exception"]["values"][-1]["mechanism"]["type"] == "django"
+ assert transaction_event["transaction"] == "/custom/exc"
+ assert "custom_urlconf_middleware" in render_span_tree(transaction_event)
+
settings.MIDDLEWARE.pop(0)
From b9bef6238874ae95ad11f1bbc9737b9d5cbd47ad Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Tue, 25 Jan 2022 14:07:41 +0100
Subject: [PATCH 0275/2327] meta: Changelog for 1.5.4 (#1320)
---
CHANGELOG.md | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffd898a4b1..45eb18f133 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,12 @@ sentry-sdk==1.5.0
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 1.5.4
+
+- Add Python 3.10 to text suite (#1309)
+- Capture only 5xx HTTP errors in Falcon Integration (#1314)
+- Attempt custom urlconf resolve in `got_request_exception` as well (#1317)
+
## 1.5.3
- Pick up custom urlconf set by Django middlewares from request if any (#1308)
From f3c44bdadbc0030266b63d7c120a2d5eb921f16b Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Tue, 25 Jan 2022 14:26:19 +0100
Subject: [PATCH 0276/2327] meta: Fix changelog typo (#1321)
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45eb18f133..e32a9590b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,7 @@ A major release `N` implies the previous release `N-1` will no longer receive up
## 1.5.4
-- Add Python 3.10 to text suite (#1309)
+- Add Python 3.10 to test suite (#1309)
- Capture only 5xx HTTP errors in Falcon Integration (#1314)
- Attempt custom urlconf resolve in `got_request_exception` as well (#1317)
From 817c6df93c23da63f8b13f01a7a36b86f8193f43 Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Tue, 25 Jan 2022 13:34:51 +0000
Subject: [PATCH 0277/2327] release: 1.5.4
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 6264f1d41f..f1e6139bf4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.5.3"
+release = "1.5.4"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index a05ab53fa6..d9dc050f91 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.5.3"
+VERSION = "1.5.4"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 6c9219e872..cd74a27d85 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.5.3",
+ version="1.5.4",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 4ce0a1d8d15a1081d5353dc7ba9385cd90545c5e Mon Sep 17 00:00:00 2001
From: Thomas Achtemichuk
Date: Tue, 25 Jan 2022 15:09:20 -0500
Subject: [PATCH 0278/2327] fix(tracing): Set default on json.dumps in
compute_tracestate_value to ensure string conversion (#1318)
---
sentry_sdk/tracing_utils.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
index e0eb994231..faed37cbb7 100644
--- a/sentry_sdk/tracing_utils.py
+++ b/sentry_sdk/tracing_utils.py
@@ -11,6 +11,7 @@
capture_internal_exceptions,
Dsn,
logger,
+ safe_str,
to_base64,
to_string,
from_base64,
@@ -288,7 +289,7 @@ def compute_tracestate_value(data):
tracestate entry.
"""
- tracestate_json = json.dumps(data)
+ tracestate_json = json.dumps(data, default=safe_str)
# Base64-encoded strings always come out with a length which is a multiple
# of 4. In order to achieve this, the end is padded with one or more `=`
From cdfab0d7ae371ed2dcb296d0e7d4dc10ddd07b86 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Wed, 26 Jan 2022 15:57:55 +0100
Subject: [PATCH 0279/2327] feat(serializer): Allow classes to short circuit
serializer with `sentry_repr` (#1322)
---
sentry_sdk/serializer.py | 3 +++
tests/test_serializer.py | 9 +++++++++
2 files changed, 12 insertions(+)
diff --git a/sentry_sdk/serializer.py b/sentry_sdk/serializer.py
index 4dc4bb5177..df6a9053c1 100644
--- a/sentry_sdk/serializer.py
+++ b/sentry_sdk/serializer.py
@@ -281,6 +281,9 @@ def _serialize_node_impl(
else:
return obj
+ elif callable(getattr(obj, "sentry_repr", None)):
+ return obj.sentry_repr()
+
elif isinstance(obj, datetime):
return (
text_type(format_timestamp(obj))
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
index 35cbdfb96b..503bc14fb2 100644
--- a/tests/test_serializer.py
+++ b/tests/test_serializer.py
@@ -64,3 +64,12 @@ def test_bytes_serialization_repr(message_normalizer):
def test_serialize_sets(extra_normalizer):
result = extra_normalizer({1, 2, 3})
assert result == [1, 2, 3]
+
+
+def test_serialize_custom_mapping(extra_normalizer):
+ class CustomReprDict(dict):
+ def sentry_repr(self):
+ return "custom!"
+
+ result = extra_normalizer(CustomReprDict(one=1, two=2))
+ assert result == "custom!"
From f6d3adcb3d7017a55c1b06e5253d08dc5121db07 Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Thu, 3 Feb 2022 10:21:28 +0100
Subject: [PATCH 0280/2327] docs(readme): Updated readme so it does not look
abandoned anymore. (#1319)
* docs(readme): Updated readme so it does not look abandoned anymore.
* docs(contribution): Updated contribution guide
---
CONTRIBUTING.md | 151 ++++++++++++++++++++++++++++++++++++------------
README.md | 88 ++++++++++++++++++++++++----
2 files changed, 192 insertions(+), 47 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 427d4ad4e4..732855150e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,36 +1,109 @@
-# How to contribute to the Sentry Python SDK
+# Contributing to Sentry SDK for Python
-`sentry-sdk` is an ordinary Python package. You can install it with `pip
-install -e .` into some virtualenv, edit the sourcecode and test out your
-changes manually.
+We welcome contributions to python-sentry by the community. See the [Contributing to Docs](https://docs.sentry.io/contributing/) page if you want to fix or update the documentation on the website.
-## Community
+## How to report a problem
-The public-facing channels for support and development of Sentry SDKs can be found on [Discord](https://discord.gg/Ww9hbqr).
+Please search the [issue tracker](https://github.com/getsentry/sentry-python/issues) before creating a new issue (a problem or an improvement request). Please also ask in our [Sentry Community on Discord](https://discord.com/invite/Ww9hbqr) before submitting a new issue. There is a ton of great people in our Discord community ready to help you!
-## Running tests and linters
+If you feel that you can fix or implement it yourself, please read a few paragraphs below to learn how to submit your changes.
-Make sure you have `virtualenv` installed, and the Python versions you care
-about. You should have Python 2.7 and the latest Python 3 installed.
+## Submitting changes
-We have a `Makefile` that is supposed to help people get started with hacking
-on the SDK without having to know or understand the Python ecosystem. You don't
-need to `workon` or `bin/activate` anything, the `Makefile` will do everything
-for you. Run `make` or `make help` to list commands.
+- Setup the development environment.
+- Clone sentry-python and prepare necessary changes.
+- Add tests for your changes to `tests/`.
+- Run tests and make sure all of them pass.
+- Submit a pull request, referencing any issues it addresses.
+
+We will review your pull request as soon as possible.
+Thank you for contributing!
+
+## Development environment
+
+### Clone the repo:
+
+```bash
+git clone git@github.com:getsentry/sentry-python.git
+```
+
+Make sure that you have Python 3 installed. Version 3.7 or higher is required to run style checkers on pre-commit. On macOS, we recommend using brew to install Python. For Windows, we recommend an official python.org release.
+
+### Create a virtual environment:
+
+```bash
+cd sentry-python
+
+python -m venv .env
+
+source .env/bin/activate
+
+pip install -e .
+```
+
+**Hint:** Sometimes you need a sample project to run your new changes to sentry-python. In this case install the sample project in the same virtualenv and you should be good to go because the ` pip install -e .` from above installed your local sentry-python in editable mode. So you can just hack away!
+
+### Install coding style pre-commit hooks:
+
+```bash
+cd sentry-python
+
+pip install -r linter-requirements.txt
+
+pip install pre-commit
+
+pre-commit install
+```
+
+That's it. You should be ready to make changes, run tests, and make commits! If you experience any problems, please don't hesitate to ping us in our [Discord Community](https://discord.com/invite/Ww9hbqr).
+
+## Running tests
+
+We have a `Makefile` to help people get started with hacking on the SDK
+without having to know or understand the Python ecosystem.
+Run `make` or `make help` to list commands.
+
+So the simplest way to run tests is:
+
+```bash
+cd sentry-python
+
+make tests
+```
+
+This will use [Tox](https://tox.wiki/en/latest/) to run our whole test suite
+under Python 2.7 and Python 3.7.
Of course you can always run the underlying commands yourself, which is
particularly useful when wanting to provide arguments to `pytest` to run
-specific tests. If you want to do that, we expect you to know your way around
-Python development. To get started, clone the SDK repository, cd into it, set
-up a virtualenv and run:
+specific tests:
+
+```bash
+cd sentry-python
- # This is "advanced mode". Use `make help` if you have no clue what's
- # happening here!
+# create virtual environment
+python -m venv .env
- pip install -e .
- pip install -r test-requirements.txt
+# activate virtual environment
+source .env/bin/activate
- pytest tests/
+# install sentry-python
+pip install -e .
+
+# install requirements
+pip install -r test-requirements.txt
+
+# run tests
+pytest tests/
+```
+
+If you want to run the tests for a specific integration you should do so by doing this:
+
+```bash
+pytest -rs tests/integrations/flask/
+```
+
+**Hint:** Tests of integrations need additional dependencies. The switch `-rs` will show you why tests where skipped and what dependencies you need to install for the tests to run. (You can also consult the [tox.ini](tox.ini) file to see what dependencies are installed for each integration)
## Releasing a new version
@@ -48,42 +121,48 @@ The usual release process goes like this:
1. Write the integration.
- * Instrument all application instances by default. Prefer global signals/patches instead of configuring a specific instance. Don't make the user pass anything to your integration for anything to work. Aim for zero configuration.
+ - Instrument all application instances by default. Prefer global signals/patches instead of configuring a specific instance. Don't make the user pass anything to your integration for anything to work. Aim for zero configuration.
- * Everybody monkeypatches. That means:
+ - Everybody monkeypatches. That means:
- * Make sure to think about conflicts with other monkeypatches when monkeypatching.
+ - Make sure to think about conflicts with other monkeypatches when monkeypatching.
- * You don't need to feel bad about it.
+ - You don't need to feel bad about it.
- * Avoid modifying the hub, registering a new client or the like. The user drives the client, and the client owns integrations.
+ - Avoid modifying the hub, registering a new client or the like. The user drives the client, and the client owns integrations.
- * Allow the user to disable the integration by changing the client. Check `Hub.current.get_integration(MyIntegration)` from within your signal handlers to see if your integration is still active before you do anything impactful (such as sending an event).
+ - Allow the user to disable the integration by changing the client. Check `Hub.current.get_integration(MyIntegration)` from within your signal handlers to see if your integration is still active before you do anything impactful (such as sending an event).
2. Write tests.
- * Think about the minimum versions supported, and test each version in a separate env in `tox.ini`.
+ - Think about the minimum versions supported, and test each version in a separate env in `tox.ini`.
- * Create a new folder in `tests/integrations/`, with an `__init__` file that skips the entire suite if the package is not installed.
+ - Create a new folder in `tests/integrations/`, with an `__init__` file that skips the entire suite if the package is not installed.
3. Update package metadata.
- * We use `extras_require` in `setup.py` to communicate minimum version requirements for integrations. People can use this in combination with tools like Poetry or Pipenv to detect conflicts between our supported versions and their used versions programmatically.
+ - We use `extras_require` in `setup.py` to communicate minimum version requirements for integrations. People can use this in combination with tools like Poetry or Pipenv to detect conflicts between our supported versions and their used versions programmatically.
- Do not set upper-bounds on version requirements as people are often faster in adopting new versions of a web framework than we are in adding them to the test matrix or our package metadata.
+ Do not set upper-bounds on version requirements as people are often faster in adopting new versions of a web framework than we are in adding them to the test matrix or our package metadata.
4. Write the [docs](https://github.com/getsentry/sentry-docs). Answer the following questions:
- * What does your integration do? Split in two sections: Executive summary at top and exact behavior further down.
+ - What does your integration do? Split in two sections: Executive summary at top and exact behavior further down.
- * Which version of the SDK supports which versions of the modules it hooks into?
+ - Which version of the SDK supports which versions of the modules it hooks into?
- * One code example with basic setup.
+ - One code example with basic setup.
- * Make sure to add integration page to `python/index.md` (people forget to do that all the time).
+ - Make sure to add integration page to `python/index.md` (people forget to do that all the time).
- Tip: Put most relevant parts wrapped in `..` tags for usage from within the Sentry UI.
+Tip: Put most relevant parts wrapped in `..` tags for usage from within the Sentry UI.
5. Merge docs after new version has been released (auto-deploys on merge).
6. (optional) Update data in [`sdk_updates.py`](https://github.com/getsentry/sentry/blob/master/src/sentry/sdk_updates.py) to give users in-app suggestions to use your integration. May not be applicable or doable for all kinds of integrations.
+
+## Commit message format guidelines
+
+See the documentation on commit messages here:
+
+https://develop.sentry.dev/commit-messages/#commit-message-format
diff --git a/README.md b/README.md
index ad215fe3e4..65653155b6 100644
--- a/README.md
+++ b/README.md
@@ -6,32 +6,98 @@
_Bad software is everywhere, and we're tired of it. Sentry is on a mission to help developers write better software faster, so we can get back to enjoying technology. If you want to join us [**Check out our open positions**](https://sentry.io/careers/)_
-# sentry-python - Sentry SDK for Python
+# Official Sentry SDK for Python
[](https://travis-ci.com/getsentry/sentry-python)
[](https://pypi.python.org/pypi/sentry-sdk)
[](https://discord.gg/cWnMQeA)
-This is the next line of the Python SDK for [Sentry](http://sentry.io/), intended to replace the `raven` package on PyPI.
+This is the official Python SDK for [Sentry](http://sentry.io/)
+
+---
+
+## Migrate From sentry-raven
+
+The old `raven-python` client has entered maintenance mode and was moved [here](https://github.com/getsentry/raven-python).
+
+If you're using `raven-python`, we recommend you to migrate to this new SDK. You can find the benefits of migrating and how to do it in our [migration guide](https://docs.sentry.io/platforms/python/migration/).
+
+## Getting Started
+
+### Install
+
+```bash
+pip install --upgrade sentry-sdk
+```
+
+### Configuration
```python
-from sentry_sdk import init, capture_message
+import sentry_sdk
-init("https://mydsn@sentry.io/123")
+sentry_sdk.init(
+ "https://12927b5f211046b575ee51fd8b1ac34f@o1.ingest.sentry.io/1",
-capture_message("Hello World") # Will create an event.
+ # Set traces_sample_rate to 1.0 to capture 100%
+ # of transactions for performance monitoring.
+ # We recommend adjusting this value in production.
+ traces_sample_rate=1.0,
+)
+```
-raise ValueError() # Will also create an event.
+### Usage
+
+```python
+from sentry_sdk import capture_message
+capture_message("Hello World") # Will create an event in Sentry.
+
+raise ValueError() # Will also create an event in Sentry.
```
- To learn more about how to use the SDK [refer to our docs](https://docs.sentry.io/platforms/python/)
-- Are you coming from raven-python? [Use this cheatsheet](https://docs.sentry.io/platforms/python/migration/)
+- Are you coming from raven-python? [Use this migration guide](https://docs.sentry.io/platforms/python/migration/)
- To learn about internals use the [API Reference](https://getsentry.github.io/sentry-python/)
-# Contributing to the SDK
+## Integrations
+
+- [Django](https://docs.sentry.io/platforms/python/guides/django/)
+- [Flask](https://docs.sentry.io/platforms/python/guides/flask/)
+- [Bottle](https://docs.sentry.io/platforms/python/guides/bottle/)
+- [AWS Lambda](https://docs.sentry.io/platforms/python/guides/aws-lambda/)
+- [Google Cloud Functions](https://docs.sentry.io/platforms/python/guides/gcp-functions/)
+- [WSGI](https://docs.sentry.io/platforms/python/guides/wsgi/)
+- [ASGI](https://docs.sentry.io/platforms/python/guides/asgi/)
+- [AIOHTTP](https://docs.sentry.io/platforms/python/guides/aiohttp/)
+- [RQ (Redis Queue)](https://docs.sentry.io/platforms/python/guides/rq/)
+- [Celery](https://docs.sentry.io/platforms/python/guides/celery/)
+- [Chalice](https://docs.sentry.io/platforms/python/guides/chalice/)
+- [Falcon](https://docs.sentry.io/platforms/python/guides/falcon/)
+- [Quart](https://docs.sentry.io/platforms/python/guides/quart/)
+- [Sanic](https://docs.sentry.io/platforms/python/guides/sanic/)
+- [Tornado](https://docs.sentry.io/platforms/python/guides/tornado/)
+- [Tryton](https://docs.sentry.io/platforms/python/guides/tryton/)
+- [Pyramid](https://docs.sentry.io/platforms/python/guides/pyramid/)
+- [Logging](https://docs.sentry.io/platforms/python/guides/logging/)
+- [Apache Airflow](https://docs.sentry.io/platforms/python/guides/airflow/)
+- [Apache Beam](https://docs.sentry.io/platforms/python/guides/beam/)
+- [Apache Spark](https://docs.sentry.io/platforms/python/guides/pyspark/)
+
+## Contributing to the SDK
+
+Please refer to [CONTRIBUTING.md](CONTRIBUTING.md).
+
+## Getting help/support
+
+If you need help setting up or configuring the Python SDK (or anything else in the Sentry universe) please head over to the [Sentry Community on Discord](https://discord.com/invite/Ww9hbqr). There is a ton of great people in our Discord community ready to help you!
+
+## Resources
-Please refer to [CONTRIBUTING.md](https://github.com/getsentry/sentry-python/blob/master/CONTRIBUTING.md).
+- [](https://docs.sentry.io/quickstart/)
+- [](https://forum.sentry.io/c/sdks)
+- [](https://discord.gg/Ww9hbqr)
+- [](http://stackoverflow.com/questions/tagged/sentry)
+- [](https://twitter.com/intent/follow?screen_name=getsentry)
-# License
+## License
-Licensed under the BSD license, see [`LICENSE`](https://github.com/getsentry/sentry-python/blob/master/LICENSE)
+Licensed under the BSD license, see [`LICENSE`](LICENSE)
From 372046679f5423eaac002e0969393a5dc42c0004 Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Wed, 9 Feb 2022 13:34:11 +0100
Subject: [PATCH 0281/2327] Pinning test requirements versions (#1330)
---
test-requirements.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test-requirements.txt b/test-requirements.txt
index f980aeee9c..e513d05d4c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,5 @@
-pytest
-pytest-forked
+pytest<7
+pytest-forked<=1.4.0
tox==3.7.0
Werkzeug
pytest-localserver==0.5.0
From 435e8567bccefc3fef85540c1b3449b005ba2d76 Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Wed, 9 Feb 2022 13:58:02 +0100
Subject: [PATCH 0282/2327] Add session tracking to ASGI integration (#1329)
* test(wsgi): Test for correct session aggregates in wsgi
* test(asgi): added failing test
* feat(asgi): auto session tracking
---
sentry_sdk/integrations/asgi.py | 64 ++++++++++++++--------------
tests/integrations/asgi/test_asgi.py | 42 +++++++++++++++++-
tests/integrations/wsgi/test_wsgi.py | 45 ++++++++++++++++++-
3 files changed, 118 insertions(+), 33 deletions(-)
diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py
index f73b856730..29812fce7c 100644
--- a/sentry_sdk/integrations/asgi.py
+++ b/sentry_sdk/integrations/asgi.py
@@ -12,6 +12,7 @@
from sentry_sdk._types import MYPY
from sentry_sdk.hub import Hub, _should_send_default_pii
from sentry_sdk.integrations._wsgi_common import _filter_headers
+from sentry_sdk.sessions import auto_session_tracking
from sentry_sdk.utils import (
ContextVar,
event_from_exception,
@@ -119,37 +120,38 @@ async def _run_app(self, scope, callback):
_asgi_middleware_applied.set(True)
try:
hub = Hub(Hub.current)
- with hub:
- with hub.configure_scope() as sentry_scope:
- sentry_scope.clear_breadcrumbs()
- sentry_scope._name = "asgi"
- processor = partial(self.event_processor, asgi_scope=scope)
- sentry_scope.add_event_processor(processor)
-
- ty = scope["type"]
-
- if ty in ("http", "websocket"):
- transaction = Transaction.continue_from_headers(
- self._get_headers(scope),
- op="{}.server".format(ty),
- )
- else:
- transaction = Transaction(op="asgi.server")
-
- transaction.name = _DEFAULT_TRANSACTION_NAME
- transaction.set_tag("asgi.type", ty)
-
- with hub.start_transaction(
- transaction, custom_sampling_context={"asgi_scope": scope}
- ):
- # XXX: Would be cool to have correct span status, but we
- # would have to wrap send(). That is a bit hard to do with
- # the current abstraction over ASGI 2/3.
- try:
- return await callback()
- except Exception as exc:
- _capture_exception(hub, exc)
- raise exc from None
+ with auto_session_tracking(hub, session_mode="request"):
+ with hub:
+ with hub.configure_scope() as sentry_scope:
+ sentry_scope.clear_breadcrumbs()
+ sentry_scope._name = "asgi"
+ processor = partial(self.event_processor, asgi_scope=scope)
+ sentry_scope.add_event_processor(processor)
+
+ ty = scope["type"]
+
+ if ty in ("http", "websocket"):
+ transaction = Transaction.continue_from_headers(
+ self._get_headers(scope),
+ op="{}.server".format(ty),
+ )
+ else:
+ transaction = Transaction(op="asgi.server")
+
+ transaction.name = _DEFAULT_TRANSACTION_NAME
+ transaction.set_tag("asgi.type", ty)
+
+ with hub.start_transaction(
+ transaction, custom_sampling_context={"asgi_scope": scope}
+ ):
+ # XXX: Would be cool to have correct span status, but we
+ # would have to wrap send(). That is a bit hard to do with
+ # the current abstraction over ASGI 2/3.
+ try:
+ return await callback()
+ except Exception as exc:
+ _capture_exception(hub, exc)
+ raise exc from None
finally:
_asgi_middleware_applied.set(False)
diff --git a/tests/integrations/asgi/test_asgi.py b/tests/integrations/asgi/test_asgi.py
index 9af224b41b..5383b1a308 100644
--- a/tests/integrations/asgi/test_asgi.py
+++ b/tests/integrations/asgi/test_asgi.py
@@ -1,7 +1,9 @@
+from collections import Counter
import sys
import pytest
from sentry_sdk import Hub, capture_message, last_event_id
+import sentry_sdk
from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
from starlette.applications import Starlette
from starlette.responses import PlainTextResponse
@@ -39,7 +41,7 @@ def test_sync_request_data(sentry_init, app, capture_events):
events = capture_events()
client = TestClient(app)
- response = client.get("/sync-message?foo=bar", headers={"Foo": u"ä"})
+ response = client.get("/sync-message?foo=bar", headers={"Foo": "ä"})
assert response.status_code == 200
@@ -292,3 +294,41 @@ def test_x_real_ip(sentry_init, app, capture_events):
(event,) = events
assert event["request"]["env"] == {"REMOTE_ADDR": "1.2.3.4"}
+
+
+def test_auto_session_tracking_with_aggregates(app, sentry_init, capture_envelopes):
+ """
+ Test for correct session aggregates in auto session tracking.
+ """
+
+ @app.route("/dogs/are/great/")
+ @app.route("/trigger/an/error/")
+ def great_dogs_handler(request):
+ if request["path"] != "/dogs/are/great/":
+ 1 / 0
+ return PlainTextResponse("dogs are great")
+
+ sentry_init(traces_sample_rate=1.0)
+ envelopes = capture_envelopes()
+
+ app = SentryAsgiMiddleware(app)
+ client = TestClient(app, raise_server_exceptions=False)
+ client.get("/dogs/are/great/")
+ client.get("/dogs/are/great/")
+ client.get("/trigger/an/error/")
+
+ sentry_sdk.flush()
+
+ count_item_types = Counter()
+ for envelope in envelopes:
+ count_item_types[envelope.items[0].type] += 1
+
+ assert count_item_types["transaction"] == 3
+ assert count_item_types["event"] == 1
+ assert count_item_types["sessions"] == 1
+ assert len(envelopes) == 5
+
+ session_aggregates = envelopes[-1].items[0].payload.json["aggregates"]
+ assert session_aggregates[0]["exited"] == 2
+ assert session_aggregates[0]["crashed"] == 1
+ assert len(session_aggregates) == 1
diff --git a/tests/integrations/wsgi/test_wsgi.py b/tests/integrations/wsgi/test_wsgi.py
index 010d0688a8..66cc1a1de7 100644
--- a/tests/integrations/wsgi/test_wsgi.py
+++ b/tests/integrations/wsgi/test_wsgi.py
@@ -3,6 +3,7 @@
import sentry_sdk
from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
+from collections import Counter
try:
from unittest import mock # python 3.3 and above
@@ -219,7 +220,6 @@ def app(environ, start_response):
traces_sampler = mock.Mock(return_value=True)
sentry_init(send_default_pii=True, traces_sampler=traces_sampler)
-
app = SentryWsgiMiddleware(app)
envelopes = capture_envelopes()
@@ -236,3 +236,46 @@ def app(environ, start_response):
aggregates = sess_event["aggregates"]
assert len(aggregates) == 1
assert aggregates[0]["exited"] == 1
+
+
+def test_auto_session_tracking_with_aggregates(sentry_init, capture_envelopes):
+ """
+ Test for correct session aggregates in auto session tracking.
+ """
+
+ def sample_app(environ, start_response):
+ if environ["REQUEST_URI"] != "/dogs/are/great/":
+ 1 / 0
+
+ start_response("200 OK", [])
+ return ["Go get the ball! Good dog!"]
+
+ traces_sampler = mock.Mock(return_value=True)
+ sentry_init(send_default_pii=True, traces_sampler=traces_sampler)
+ app = SentryWsgiMiddleware(sample_app)
+ envelopes = capture_envelopes()
+ assert len(envelopes) == 0
+
+ client = Client(app)
+ client.get("/dogs/are/great/")
+ client.get("/dogs/are/great/")
+ try:
+ client.get("/trigger/an/error/")
+ except ZeroDivisionError:
+ pass
+
+ sentry_sdk.flush()
+
+ count_item_types = Counter()
+ for envelope in envelopes:
+ count_item_types[envelope.items[0].type] += 1
+
+ assert count_item_types["transaction"] == 3
+ assert count_item_types["event"] == 1
+ assert count_item_types["sessions"] == 1
+ assert len(envelopes) == 5
+
+ session_aggregates = envelopes[-1].items[0].payload.json["aggregates"]
+ assert session_aggregates[0]["exited"] == 2
+ assert session_aggregates[0]["crashed"] == 1
+ assert len(session_aggregates) == 1
From 8df4e0581dcfbefb9e45eeb4045c3f48f1515ed8 Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Wed, 9 Feb 2022 15:14:16 +0100
Subject: [PATCH 0283/2327] feat(tooling): Enabled local linting (#1315)
* feat(tooling): Enabled local linting
---
.pre-commit-config.yaml | 24 ++++++++++++++++++++++++
linter-requirements.txt | 1 +
2 files changed, 25 insertions(+)
create mode 100644 .pre-commit-config.yaml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000000..753558186f
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,24 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v3.2.0
+ hooks:
+ - id: trailing-whitespace
+ - id: end-of-file-fixer
+
+- repo: https://github.com/psf/black
+ rev: stable
+ hooks:
+ - id: black
+
+- repo: https://gitlab.com/pycqa/flake8
+ rev: 4.0.1
+ hooks:
+ - id: flake8
+
+# Disabled for now, because it lists a lot of problems.
+#- repo: https://github.com/pre-commit/mirrors-mypy
+# rev: 'v0.931'
+# hooks:
+# - id: mypy
diff --git a/linter-requirements.txt b/linter-requirements.txt
index 812b929c97..8c7dd7d6e5 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -4,3 +4,4 @@ flake8-import-order==0.18.1
mypy==0.782
flake8-bugbear==21.4.3
pep8-naming==0.11.1
+pre-commit # local linting
\ No newline at end of file
From 9aaa856bbd8c3df6d8a77a21c5f159bc2d28def9 Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Fri, 11 Feb 2022 13:28:08 +0100
Subject: [PATCH 0284/2327] Updated changelog (#1332)
---
CHANGELOG.md | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e32a9590b6..1f9063e74e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,15 @@ sentry-sdk==1.5.0
A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+## 1.5.5
+
+- Add session tracking to ASGI integration (#1329)
+- Pinning test requirements versions (#1330)
+- Allow classes to short circuit serializer with `sentry_repr` (#1322)
+- Set default on json.dumps in compute_tracestate_value to ensure string conversion (#1318)
+
+Work in this release contributed by @tomchuk. Thank you for your contribution!
+
## 1.5.4
- Add Python 3.10 to test suite (#1309)
@@ -107,7 +116,7 @@ Work in this release contributed by @galuszkak, @kianmeng, @ahopkins, @razumeiko
This release contains a breaking change
- **BREAKING CHANGE**: Feat: Moved `auto_session_tracking` experimental flag to a proper option and removed explicitly setting experimental `session_mode` in favor of auto detecting its value, hence enabling release health by default #994
-- Fixed Django transaction name by setting the name to `request.path_info` rather than `request.path`
+- Fixed Django transaction name by setting the name to `request.path_info` rather than `request.path`
- Fix for tracing by getting HTTP headers from span rather than transaction when possible #1035
- Fix for Flask transactions missing request body in non errored transactions #1034
- Fix for honoring the `X-Forwarded-For` header #1037
@@ -128,7 +137,7 @@ This release contains a breaking change
## 0.20.0
- Fix for header extraction for AWS lambda/API extraction
-- Fix multiple **kwargs type hints # 967
+- Fix multiple \*\*kwargs type hints # 967
- Fix that corrects AWS lambda integration failure to detect the aws-lambda-ric 1.0 bootstrap #976
- Fix AWSLambda integration: variable "timeout_thread" referenced before assignment #977
- Use full git sha as release name #960
From a48424a1308ecf89be7530b0c47c08d595290ac4 Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Fri, 11 Feb 2022 12:28:43 +0000
Subject: [PATCH 0285/2327] release: 1.5.5
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index f1e6139bf4..89949dd041 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.5.4"
+release = "1.5.5"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index d9dc050f91..df6a9a747c 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.5.4"
+VERSION = "1.5.5"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index cd74a27d85..202ad69f01 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.5.4",
+ version="1.5.5",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 254b7e70cd59a4eae6592ea47695984d0d2b3fb0 Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya
Date: Mon, 14 Feb 2022 21:08:08 +0300
Subject: [PATCH 0286/2327] feat(flask): Add `sentry_trace()` template helper
(#1336)
To setup distributed tracing links between a Flask app and a front-end app, one needs to figure out how to get the current hub, safely get the traceparent and then properly pass it into a template and then finally use that properly in a `meta` tag. [The guide](https://docs.sentry.io/platforms/javascript/performance/connect-services/) is woefully inadequete and error-prone so this PR adds a built-in helper `sentry_trace()` to the Flask integration to simplfy this linking.
---
examples/tracing/templates/index.html | 12 ++------
sentry_sdk/integrations/flask.py | 20 ++++++++++++
tests/integrations/flask/test_flask.py | 42 ++++++++++++++++++++++++--
3 files changed, 63 insertions(+), 11 deletions(-)
diff --git a/examples/tracing/templates/index.html b/examples/tracing/templates/index.html
index 2aa95e789c..c4d8f06c51 100644
--- a/examples/tracing/templates/index.html
+++ b/examples/tracing/templates/index.html
@@ -1,4 +1,6 @@
-
+
+
+{{ sentry_trace }}
@@ -14,14 +16,6 @@
debug: true
});
-window.setTimeout(function() {
- const scope = Sentry.getCurrentHub().getScope();
- // TODO: Wait for Daniel's traceparent API
- scope.setSpan(scope.getSpan().constructor.fromTraceparent(
- "00-{{ traceparent['sentry-trace'].strip("-") }}-00"
- ));
-});
-
async function compute() {
const res = await fetch(
"/compute/" +
diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py
index e4008fcdbe..8883cbb724 100644
--- a/sentry_sdk/integrations/flask.py
+++ b/sentry_sdk/integrations/flask.py
@@ -27,6 +27,7 @@
try:
from flask import ( # type: ignore
+ Markup,
Request,
Flask,
_request_ctx_stack,
@@ -34,6 +35,7 @@
__version__ as FLASK_VERSION,
)
from flask.signals import (
+ before_render_template,
got_request_exception,
request_started,
)
@@ -77,6 +79,7 @@ def setup_once():
if version < (0, 10):
raise DidNotEnable("Flask 0.10 or newer is required.")
+ before_render_template.connect(_add_sentry_trace)
request_started.connect(_request_started)
got_request_exception.connect(_capture_exception)
@@ -94,6 +97,23 @@ def sentry_patched_wsgi_app(self, environ, start_response):
Flask.__call__ = sentry_patched_wsgi_app # type: ignore
+def _add_sentry_trace(sender, template, context, **extra):
+ # type: (Flask, Any, Dict[str, Any], **Any) -> None
+
+ if "sentry_trace" in context:
+ return
+
+ sentry_span = Hub.current.scope.span
+ context["sentry_trace"] = (
+ Markup(
+ ''
+ % (sentry_span.to_traceparent(),)
+ )
+ if sentry_span
+ else ""
+ )
+
+
def _request_started(sender, **kwargs):
# type: (Flask, **Any) -> None
hub = Hub.current
diff --git a/tests/integrations/flask/test_flask.py b/tests/integrations/flask/test_flask.py
index 6c173e223d..8723a35c86 100644
--- a/tests/integrations/flask/test_flask.py
+++ b/tests/integrations/flask/test_flask.py
@@ -6,7 +6,14 @@
flask = pytest.importorskip("flask")
-from flask import Flask, Response, request, abort, stream_with_context
+from flask import (
+ Flask,
+ Response,
+ request,
+ abort,
+ stream_with_context,
+ render_template_string,
+)
from flask.views import View
from flask_login import LoginManager, login_user
@@ -365,7 +372,7 @@ def index():
assert transaction_event["request"]["data"] == data
-@pytest.mark.parametrize("input_char", [u"a", b"a"])
+@pytest.mark.parametrize("input_char", ["a", b"a"])
def test_flask_too_large_raw_request(sentry_init, input_char, capture_events, app):
sentry_init(integrations=[flask_sentry.FlaskIntegration()], request_bodies="small")
@@ -737,3 +744,34 @@ def dispatch_request(self):
assert event["message"] == "hi"
assert event["transaction"] == "hello_class"
+
+
+def test_sentry_trace_context(sentry_init, app, capture_events):
+ sentry_init(integrations=[flask_sentry.FlaskIntegration()])
+ events = capture_events()
+
+ @app.route("/")
+ def index():
+ sentry_span = Hub.current.scope.span
+ capture_message(sentry_span.to_traceparent())
+ return render_template_string("{{ sentry_trace }}")
+
+ with app.test_client() as client:
+ response = client.get("/")
+ assert response.status_code == 200
+ assert response.data.decode(
+ "utf-8"
+ ) == '' % (events[0]["message"],)
+
+
+def test_dont_override_sentry_trace_context(sentry_init, app):
+ sentry_init(integrations=[flask_sentry.FlaskIntegration()])
+
+ @app.route("/")
+ def index():
+ return render_template_string("{{ sentry_trace }}", sentry_trace="hi")
+
+ with app.test_client() as client:
+ response = client.get("/")
+ assert response.status_code == 200
+ assert response.data == b"hi"
From 6649e229574e2586bfd734c2b66c0e4be6ab66ee Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Mon, 14 Feb 2022 19:36:23 +0100
Subject: [PATCH 0287/2327] meta: Remove black GH action (#1339)
---
.github/workflows/black.yml | 31 -------------------------------
1 file changed, 31 deletions(-)
delete mode 100644 .github/workflows/black.yml
diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
deleted file mode 100644
index b89bab82fe..0000000000
--- a/.github/workflows/black.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: black
-
-on: push
-
-jobs:
- format:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-python@v2
- with:
- python-version: "3.x"
-
- - name: Install Black
- run: pip install -r linter-requirements.txt
-
- - name: Run Black
- run: black tests examples sentry_sdk
-
- - name: Commit changes
- run: |
- if git diff-files --quiet; then
- echo "No changes"
- exit 0
- fi
-
- git config --global user.name 'sentry-bot'
- git config --global user.email 'markus+ghbot@sentry.io'
-
- git commit -am "fix: Formatting"
- git push
From 9ba2d5feec9b515ffc553095a6aa6e4d35e11a5d Mon Sep 17 00:00:00 2001
From: Chris Malek
Date: Mon, 14 Feb 2022 11:31:58 -0800
Subject: [PATCH 0288/2327] fix(aiohttp): AioHttpIntegration
sentry_app_handle() now ignores ConnectionResetError (#1331)
---
sentry_sdk/integrations/aiohttp.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py
index 95ca6d3d12..8a828b2fe3 100644
--- a/sentry_sdk/integrations/aiohttp.py
+++ b/sentry_sdk/integrations/aiohttp.py
@@ -112,7 +112,7 @@ async def sentry_app_handle(self, request, *args, **kwargs):
except HTTPException as e:
transaction.set_http_status(e.status_code)
raise
- except asyncio.CancelledError:
+ except (asyncio.CancelledError, ConnectionResetError):
transaction.set_status("cancelled")
raise
except Exception:
From 0c6241e09817d1001e74c19f107d411c8dbe4c8a Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya
Date: Mon, 14 Feb 2022 23:59:37 +0300
Subject: [PATCH 0289/2327] build(changelogs): Use automated changelogs from
Craft (#1340)
---
.craft.yml | 16 ++++++++--------
CHANGELOG.md | 22 +---------------------
README.md | 20 ++++++++++++++++++++
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/.craft.yml b/.craft.yml
index 864d689271..353b02f77e 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -1,27 +1,27 @@
-minVersion: 0.23.1
+minVersion: 0.28.1
targets:
- name: pypi
includeNames: /^sentry[_\-]sdk.*$/
- - name: github
- name: gh-pages
- name: registry
sdks:
pypi:sentry-sdk:
+ - name: github
- name: aws-lambda-layer
includeNames: /^sentry-python-serverless-\d+(\.\d+)*\.zip$/
layerName: SentryPythonServerlessSDK
compatibleRuntimes:
- name: python
versions:
- # The number of versions must be, at most, the maximum number of
- # runtimes AWS Lambda permits for a layer.
- # On the other hand, AWS Lambda does not support every Python runtime.
- # The supported runtimes are available in the following link:
- # https://docs.aws.amazon.com/lambda/latest/dg/lambda-python.html
+ # The number of versions must be, at most, the maximum number of
+ # runtimes AWS Lambda permits for a layer.
+ # On the other hand, AWS Lambda does not support every Python runtime.
+ # The supported runtimes are available in the following link:
+ # https://docs.aws.amazon.com/lambda/latest/dg/lambda-python.html
- python3.6
- python3.7
- python3.8
- python3.9
license: MIT
changelog: CHANGELOG.md
-changelogPolicy: simple
+changelogPolicy: auto
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f9063e74e..c5983a463e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,24 +1,4 @@
-# Changelog and versioning
-
-## Versioning Policy
-
-This project follows [semver](https://semver.org/), with three additions:
-
-- Semver says that major version `0` can include breaking changes at any time. Still, it is common practice to assume that only `0.x` releases (minor versions) can contain breaking changes while `0.x.y` releases (patch versions) are used for backwards-compatible changes (bugfixes and features). This project also follows that practice.
-
-- All undocumented APIs are considered internal. They are not part of this contract.
-
-- Certain features (e.g. integrations) may be explicitly called out as "experimental" or "unstable" in the documentation. They come with their own versioning policy described in the documentation.
-
-We recommend to pin your version requirements against `1.x.*` or `1.x.y`.
-Either one of the following is fine:
-
-```
-sentry-sdk>=1.0.0,<2.0.0
-sentry-sdk==1.5.0
-```
-
-A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+# Changelog
## 1.5.5
diff --git a/README.md b/README.md
index 65653155b6..1b53b46585 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,26 @@ This is the official Python SDK for [Sentry](http://sentry.io/)
---
+## Versioning Policy
+
+This project follows [semver](https://semver.org/), with three additions:
+
+- Semver says that major version `0` can include breaking changes at any time. Still, it is common practice to assume that only `0.x` releases (minor versions) can contain breaking changes while `0.x.y` releases (patch versions) are used for backwards-compatible changes (bugfixes and features). This project also follows that practice.
+
+- All undocumented APIs are considered internal. They are not part of this contract.
+
+- Certain features (e.g. integrations) may be explicitly called out as "experimental" or "unstable" in the documentation. They come with their own versioning policy described in the documentation.
+
+We recommend to pin your version requirements against `1.x.*` or `1.x.y`.
+Either one of the following is fine:
+
+```
+sentry-sdk>=1.0.0,<2.0.0
+sentry-sdk==1.5.0
+```
+
+A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+
## Migrate From sentry-raven
The old `raven-python` client has entered maintenance mode and was moved [here](https://github.com/getsentry/raven-python).
From c927d345b25544169231c2249e07b95f2a4dd994 Mon Sep 17 00:00:00 2001
From: "Michael P. Nitowski"
Date: Tue, 15 Feb 2022 06:36:04 -0500
Subject: [PATCH 0290/2327] Group captured warnings under separate issues
(#1324)
Prior to https://bugs.python.org/issue46557 being addressed, warnings
captured by logging.captureWarnings(True) were logged with
logger.warning("%s", s) which caused them to be grouped under the same
issue. This change adds special handling for creating separate issues
for captured warnings arriving with the %s format string by using
args[0] as the message instead of the msg arg.
---
sentry_sdk/integrations/logging.py | 22 ++++++++++++++-
tests/integrations/logging/test_logging.py | 31 ++++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
index 80524dbab2..31c7b874ba 100644
--- a/sentry_sdk/integrations/logging.py
+++ b/sentry_sdk/integrations/logging.py
@@ -222,7 +222,27 @@ def _emit(self, record):
event["level"] = _logging_to_event_level(record.levelname)
event["logger"] = record.name
- event["logentry"] = {"message": to_string(record.msg), "params": record.args}
+
+ # Log records from `warnings` module as separate issues
+ record_caputured_from_warnings_module = (
+ record.name == "py.warnings" and record.msg == "%s"
+ )
+ if record_caputured_from_warnings_module:
+ # use the actual message and not "%s" as the message
+ # this prevents grouping all warnings under one "%s" issue
+ msg = record.args[0] # type: ignore
+
+ event["logentry"] = {
+ "message": msg,
+ "params": (),
+ }
+
+ else:
+ event["logentry"] = {
+ "message": to_string(record.msg),
+ "params": record.args,
+ }
+
event["extra"] = _extra_from_record(record)
hub.capture_event(event, hint=hint)
diff --git a/tests/integrations/logging/test_logging.py b/tests/integrations/logging/test_logging.py
index 22ea14f8ae..73843cc6eb 100644
--- a/tests/integrations/logging/test_logging.py
+++ b/tests/integrations/logging/test_logging.py
@@ -2,6 +2,7 @@
import pytest
import logging
+import warnings
from sentry_sdk.integrations.logging import LoggingIntegration, ignore_logger
@@ -136,6 +137,36 @@ def filter(self, record):
assert event["logentry"]["message"] == "hi"
+def test_logging_captured_warnings(sentry_init, capture_events, recwarn):
+ sentry_init(
+ integrations=[LoggingIntegration(event_level="WARNING")],
+ default_integrations=False,
+ )
+ events = capture_events()
+
+ logging.captureWarnings(True)
+ warnings.warn("first")
+ warnings.warn("second")
+ logging.captureWarnings(False)
+
+ warnings.warn("third")
+
+ assert len(events) == 2
+
+ assert events[0]["level"] == "warning"
+ # Captured warnings start with the path where the warning was raised
+ assert "UserWarning: first" in events[0]["logentry"]["message"]
+ assert events[0]["logentry"]["params"] == []
+
+ assert events[1]["level"] == "warning"
+ assert "UserWarning: second" in events[1]["logentry"]["message"]
+ assert events[1]["logentry"]["params"] == []
+
+ # Using recwarn suppresses the "third" warning in the test output
+ assert len(recwarn) == 1
+ assert str(recwarn[0].message) == "third"
+
+
def test_ignore_logger(sentry_init, capture_events):
sentry_init(integrations=[LoggingIntegration()], default_integrations=False)
events = capture_events()
From 3b17b683665a6fc35260ac8d447ba2bb4bd04b7e Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Tue, 15 Feb 2022 17:13:49 +0100
Subject: [PATCH 0291/2327] fix(tests): Removed unsupported Django 1.6 from
tests to avoid confusion (#1338)
---
sentry_sdk/integrations/django/__init__.py | 4 ++--
tox.ini | 14 ++++----------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index ee7fbee0c7..e11d1ab651 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -100,8 +100,8 @@ def __init__(self, transaction_style="url", middleware_spans=True):
def setup_once():
# type: () -> None
- if DJANGO_VERSION < (1, 6):
- raise DidNotEnable("Django 1.6 or newer is required.")
+ if DJANGO_VERSION < (1, 8):
+ raise DidNotEnable("Django 1.8 or newer is required.")
install_sql_hook()
# Patch in our custom middleware.
diff --git a/tox.ini b/tox.ini
index 4a488cbffa..8650dd81ce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,13 +14,12 @@ envlist =
# General format is {pythonversion}-{integrationname}-{frameworkversion}
# 1 blank line between different integrations
# Each framework version should only be mentioned once. I.e:
- # {py2.7,py3.7}-django-{1.11}
- # {py3.7}-django-{2.2}
+ # {py3.7,py3.10}-django-{3.2}
+ # {py3.10}-django-{4.0}
# instead of:
- # {py2.7}-django-{1.11}
- # {py2.7,py3.7}-django-{1.11,2.2}
+ # {py3.7}-django-{3.2}
+ # {py3.7,py3.10}-django-{3.2,4.0}
- {pypy,py2.7}-django-{1.6,1.7}
{pypy,py2.7,py3.5}-django-{1.8,1.9,1.10}
{pypy,py2.7}-django-{1.8,1.9,1.10,1.11}
{py3.5,py3.6,py3.7}-django-{2.0,2.1}
@@ -100,13 +99,10 @@ deps =
{py3.7,py3.8,py3.9,py3.10}-django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: pytest-asyncio
{py2.7,py3.7,py3.8,py3.9,py3.10}-django-{1.11,2.2,3.0,3.1,3.2}: psycopg2-binary
- django-{1.6,1.7}: pytest-django<3.0
django-{1.8,1.9,1.10,1.11,2.0,2.1}: pytest-django<4.0
django-{2.2,3.0,3.1,3.2}: pytest-django>=4.0
django-{2.2,3.0,3.1,3.2}: Werkzeug<2.0
- django-1.6: Django>=1.6,<1.7
- django-1.7: Django>=1.7,<1.8
django-1.8: Django>=1.8,<1.9
django-1.9: Django>=1.9,<1.10
django-1.10: Django>=1.10,<1.11
@@ -306,8 +302,6 @@ basepython =
pypy: pypy
commands =
- django-{1.6,1.7}: pip install pytest<4
-
; https://github.com/pytest-dev/pytest/issues/5532
{py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12}: pip install pytest<5
{py3.6,py3.7,py3.8,py3.9}-flask-{0.11}: pip install Werkzeug<2
From 91b038757d5f79e77a4309e4a714d3dcd516be5d Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Wed, 16 Feb 2022 14:11:54 +0100
Subject: [PATCH 0292/2327] docs(readme): reordered content (#1343)
---
README.md | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/README.md b/README.md
index 1b53b46585..9fd37b3b01 100644
--- a/README.md
+++ b/README.md
@@ -16,26 +16,6 @@ This is the official Python SDK for [Sentry](http://sentry.io/)
---
-## Versioning Policy
-
-This project follows [semver](https://semver.org/), with three additions:
-
-- Semver says that major version `0` can include breaking changes at any time. Still, it is common practice to assume that only `0.x` releases (minor versions) can contain breaking changes while `0.x.y` releases (patch versions) are used for backwards-compatible changes (bugfixes and features). This project also follows that practice.
-
-- All undocumented APIs are considered internal. They are not part of this contract.
-
-- Certain features (e.g. integrations) may be explicitly called out as "experimental" or "unstable" in the documentation. They come with their own versioning policy described in the documentation.
-
-We recommend to pin your version requirements against `1.x.*` or `1.x.y`.
-Either one of the following is fine:
-
-```
-sentry-sdk>=1.0.0,<2.0.0
-sentry-sdk==1.5.0
-```
-
-A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
-
## Migrate From sentry-raven
The old `raven-python` client has entered maintenance mode and was moved [here](https://github.com/getsentry/raven-python).
@@ -110,6 +90,26 @@ Please refer to [CONTRIBUTING.md](CONTRIBUTING.md).
If you need help setting up or configuring the Python SDK (or anything else in the Sentry universe) please head over to the [Sentry Community on Discord](https://discord.com/invite/Ww9hbqr). There is a ton of great people in our Discord community ready to help you!
+## Versioning Policy
+
+This project follows [semver](https://semver.org/), with three additions:
+
+- Semver says that major version `0` can include breaking changes at any time. Still, it is common practice to assume that only `0.x` releases (minor versions) can contain breaking changes while `0.x.y` releases (patch versions) are used for backwards-compatible changes (bugfixes and features). This project also follows that practice.
+
+- All undocumented APIs are considered internal. They are not part of this contract.
+
+- Certain features (e.g. integrations) may be explicitly called out as "experimental" or "unstable" in the documentation. They come with their own versioning policy described in the documentation.
+
+We recommend to pin your version requirements against `1.x.*` or `1.x.y`.
+Either one of the following is fine:
+
+```
+sentry-sdk>=1.0.0,<2.0.0
+sentry-sdk==1.5.0
+```
+
+A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
+
## Resources
- [](https://docs.sentry.io/quickstart/)
From deade2d52a30c8e5f0d37376bb8f3e8da305691e Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Wed, 16 Feb 2022 16:08:08 +0100
Subject: [PATCH 0293/2327] Added default value for auto_session_tracking
* fix(asgi): Added default value for auto_session_tracking to make it work when `init()` is not called.
refs #1334
---
sentry_sdk/sessions.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/sentry_sdk/sessions.py b/sentry_sdk/sessions.py
index 06ad880d0f..4e4d21b89c 100644
--- a/sentry_sdk/sessions.py
+++ b/sentry_sdk/sessions.py
@@ -10,23 +10,27 @@
from sentry_sdk.utils import format_timestamp
if MYPY:
- from typing import Callable
- from typing import Optional
from typing import Any
+ from typing import Callable
from typing import Dict
- from typing import List
from typing import Generator
+ from typing import List
+ from typing import Optional
+ from typing import Union
def is_auto_session_tracking_enabled(hub=None):
- # type: (Optional[sentry_sdk.Hub]) -> bool
+ # type: (Optional[sentry_sdk.Hub]) -> Union[Any, bool, None]
"""Utility function to find out if session tracking is enabled."""
if hub is None:
hub = sentry_sdk.Hub.current
+
should_track = hub.scope._force_auto_session_tracking
+
if should_track is None:
client_options = hub.client.options if hub.client else {}
- should_track = client_options["auto_session_tracking"]
+ should_track = client_options.get("auto_session_tracking", False)
+
return should_track
From 3e11ce3b72299914526c6f73ae9cee6e7e9cbdd3 Mon Sep 17 00:00:00 2001
From: Vladan Paunovic
Date: Thu, 17 Feb 2022 16:10:54 +0100
Subject: [PATCH 0294/2327] chore: add bug issue template (#1345)
---
.github/ISSUE_TEMPLATE/bug.yml | 50 ++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/bug.yml
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 0000000000..f6e47929eb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,50 @@
+name: 🐞 Bug Report
+description: Tell us about something that's not working the way we (probably) intend.
+body:
+ - type: dropdown
+ id: type
+ attributes:
+ label: How do you use Sentry?
+ options:
+ - Sentry Saas (sentry.io)
+ - Self-hosted/on-premise
+ validations:
+ required: true
+ - type: input
+ id: version
+ attributes:
+ label: Version
+ description: Which SDK version?
+ placeholder: ex. 1.5.2
+ validations:
+ required: true
+ - type: textarea
+ id: repro
+ attributes:
+ label: Steps to Reproduce
+ description: How can we see what you're seeing? Specific is terrific.
+ placeholder: |-
+ 1. What
+ 2. you
+ 3. did.
+ validations:
+ required: true
+ - type: textarea
+ id: expected
+ attributes:
+ label: Expected Result
+ validations:
+ required: true
+ - type: textarea
+ id: actual
+ attributes:
+ label: Actual Result
+ description: Logs? Screenshots? Yes, please.
+ validations:
+ required: true
+ - type: markdown
+ attributes:
+ value: |-
+ ## Thanks 🙏
+ validations:
+ required: false
From 39ab78fb639ad3813cf69396558da70267da652d Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Mon, 21 Feb 2022 16:19:47 +0100
Subject: [PATCH 0295/2327] Update contribution guide (#1346)
* docs(python): Added 'how to create a release' to contribution guide.
* docs(python): added link to new integration checklist and moved migration section below integrations section
---
CONTRIBUTING.md | 59 ++++++++++++++++++++++++++++++++++++++++++-------
README.md | 34 +++++++---------------------
tox.ini | 6 +++++
3 files changed, 65 insertions(+), 34 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 732855150e..86b05d3f6d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -37,14 +37,20 @@ cd sentry-python
python -m venv .env
source .env/bin/activate
+```
+
+### Install `sentry-python` in editable mode
+```bash
pip install -e .
```
-**Hint:** Sometimes you need a sample project to run your new changes to sentry-python. In this case install the sample project in the same virtualenv and you should be good to go because the ` pip install -e .` from above installed your local sentry-python in editable mode. So you can just hack away!
+**Hint:** Sometimes you need a sample project to run your new changes to sentry-python. In this case install the sample project in the same virtualenv and you should be good to go because the ` pip install -e .` from above installed your local sentry-python in editable mode.
### Install coding style pre-commit hooks:
+This will make sure that your commits will have the correct coding style.
+
```bash
cd sentry-python
@@ -107,15 +113,52 @@ pytest -rs tests/integrations/flask/
## Releasing a new version
-We use [craft](https://github.com/getsentry/craft#python-package-index-pypi) to
-release new versions. You need credentials for the `getsentry` PyPI user, and
-must have `twine` installed globally.
+(only relevant for Sentry employees)
+
+Prerequisites:
+
+- All the changes that should be release must be in `master` branch.
+- Every commit should follow the [Commit Message Format](https://develop.sentry.dev/commit-messages/#commit-message-format) convention.
+- CHANGELOG.md is updated automatically. No human intervention necessary.
+
+Manual Process:
+
+- On GitHub in the `sentry-python` repository go to "Actions" select the "Release" workflow.
+- Click on "Run workflow" on the right side, make sure the `master` branch is selected.
+- Set "Version to release" input field. Here you decide if it is a major, minor or patch release. (See "Versioning Policy" below)
+- Click "Run Workflow"
+
+This will trigger [Craft](https://github.com/getsentry/craft) to prepare everything needed for a release. (For more information see [craft prepare](https://github.com/getsentry/craft#craft-prepare-preparing-a-new-release)) At the end of this process a release issue is created in the [Publish](https://github.com/getsentry/publish) repository. (Example release issue: https://github.com/getsentry/publish/issues/815)
+
+Now one of the persons with release privileges (most probably your engineering manager) will review this Issue and then add the `accepted` label to the issue.
+
+There are always two persons involved in a release.
-The usual release process goes like this:
+If you are in a hurry and the release should be out immediatly there is a Slack channel called `#proj-release-approval` where you can see your release issue and where you can ping people to please have a look immediatly.
+
+When the release issue is labeled `accepted` [Craft](https://github.com/getsentry/craft) is triggered again to publish the release to all the right platforms. (See [craft publish](https://github.com/getsentry/craft#craft-publish-publishing-the-release) for more information). At the end of this process the release issue on GitHub will be closed and the release is completed! Congratulations!
+
+There is a sequence diagram visualizing all this in the [README.md](https://github.com/getsentry/publish) of the `Publish` repository.
+
+### Versioning Policy
+
+This project follows [semver](https://semver.org/), with three additions:
+
+- Semver says that major version `0` can include breaking changes at any time. Still, it is common practice to assume that only `0.x` releases (minor versions) can contain breaking changes while `0.x.y` releases (patch versions) are used for backwards-compatible changes (bugfixes and features). This project also follows that practice.
+
+- All undocumented APIs are considered internal. They are not part of this contract.
+
+- Certain features (e.g. integrations) may be explicitly called out as "experimental" or "unstable" in the documentation. They come with their own versioning policy described in the documentation.
+
+We recommend to pin your version requirements against `1.x.*` or `1.x.y`.
+Either one of the following is fine:
+
+```
+sentry-sdk>=1.0.0,<2.0.0
+sentry-sdk==1.5.0
+```
-1. Go through git log and write new entry into `CHANGELOG.md`, commit to master
-2. `craft p a.b.c`
-3. `craft pp a.b.c`
+A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
## Adding a new integration (checklist)
diff --git a/README.md b/README.md
index 9fd37b3b01..64027a71df 100644
--- a/README.md
+++ b/README.md
@@ -16,12 +16,6 @@ This is the official Python SDK for [Sentry](http://sentry.io/)
---
-## Migrate From sentry-raven
-
-The old `raven-python` client has entered maintenance mode and was moved [here](https://github.com/getsentry/raven-python).
-
-If you're using `raven-python`, we recommend you to migrate to this new SDK. You can find the benefits of migrating and how to do it in our [migration guide](https://docs.sentry.io/platforms/python/migration/).
-
## Getting Started
### Install
@@ -60,6 +54,8 @@ raise ValueError() # Will also create an event in Sentry.
## Integrations
+(If you want to create a new integration have a look at the [Adding a new integration checklist](CONTRIBUTING.md#adding-a-new-integration-checklist).)
+
- [Django](https://docs.sentry.io/platforms/python/guides/django/)
- [Flask](https://docs.sentry.io/platforms/python/guides/flask/)
- [Bottle](https://docs.sentry.io/platforms/python/guides/bottle/)
@@ -82,6 +78,12 @@ raise ValueError() # Will also create an event in Sentry.
- [Apache Beam](https://docs.sentry.io/platforms/python/guides/beam/)
- [Apache Spark](https://docs.sentry.io/platforms/python/guides/pyspark/)
+## Migrate From sentry-raven
+
+The old `raven-python` client has entered maintenance mode and was moved [here](https://github.com/getsentry/raven-python).
+
+If you're using `raven-python`, we recommend you to migrate to this new SDK. You can find the benefits of migrating and how to do it in our [migration guide](https://docs.sentry.io/platforms/python/migration/).
+
## Contributing to the SDK
Please refer to [CONTRIBUTING.md](CONTRIBUTING.md).
@@ -90,26 +92,6 @@ Please refer to [CONTRIBUTING.md](CONTRIBUTING.md).
If you need help setting up or configuring the Python SDK (or anything else in the Sentry universe) please head over to the [Sentry Community on Discord](https://discord.com/invite/Ww9hbqr). There is a ton of great people in our Discord community ready to help you!
-## Versioning Policy
-
-This project follows [semver](https://semver.org/), with three additions:
-
-- Semver says that major version `0` can include breaking changes at any time. Still, it is common practice to assume that only `0.x` releases (minor versions) can contain breaking changes while `0.x.y` releases (patch versions) are used for backwards-compatible changes (bugfixes and features). This project also follows that practice.
-
-- All undocumented APIs are considered internal. They are not part of this contract.
-
-- Certain features (e.g. integrations) may be explicitly called out as "experimental" or "unstable" in the documentation. They come with their own versioning policy described in the documentation.
-
-We recommend to pin your version requirements against `1.x.*` or `1.x.y`.
-Either one of the following is fine:
-
-```
-sentry-sdk>=1.0.0,<2.0.0
-sentry-sdk==1.5.0
-```
-
-A major release `N` implies the previous release `N-1` will no longer receive updates. We generally do not backport bugfixes to older versions unless they are security relevant. However, feel free to ask for backports of specific commits on the bugtracker.
-
## Resources
- [](https://docs.sentry.io/quickstart/)
diff --git a/tox.ini b/tox.ini
index 8650dd81ce..cb158d7209 100644
--- a/tox.ini
+++ b/tox.ini
@@ -306,6 +306,12 @@ commands =
{py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12}: pip install pytest<5
{py3.6,py3.7,py3.8,py3.9}-flask-{0.11}: pip install Werkzeug<2
+ ; https://github.com/pallets/flask/issues/4455
+ {py3.7,py3.8,py3.9,py3.10}-flask-{0.11,0.12,1.0,1.1}: pip install "itsdangerous>=0.24,<2.0" "markupsafe<2.0.0"
+ ;"itsdangerous >= 0.24, < 2.0",
+;itsdangerous==1.1.0
+;markupsafe==1.1.1
+
; https://github.com/more-itertools/more-itertools/issues/578
py3.5-flask-{0.10,0.11,0.12}: pip install more-itertools<8.11.0
From f9ee416e8cada6028e12afb27978fd03975149db Mon Sep 17 00:00:00 2001
From: Vladan Paunovic
Date: Tue, 22 Feb 2022 10:10:34 +0100
Subject: [PATCH 0296/2327] Create feature.yml (#1350)
---
.github/ISSUE_TEMPLATE/feature.yml | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/feature.yml
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 0000000000..e462e3bae7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,30 @@
+name: 💡 Feature Request
+description: Create a feature request for sentry-python SDK.
+labels: 'enhancement'
+body:
+ - type: markdown
+ attributes:
+ value: Thanks for taking the time to file a feature request! Please fill out this form as completely as possible.
+ - type: textarea
+ id: problem
+ attributes:
+ label: Problem Statement
+ description: A clear and concise description of what you want and what your use case is.
+ placeholder: |-
+ I want to make whirled peas, but Sentry doesn't blend.
+ validations:
+ required: true
+ - type: textarea
+ id: expected
+ attributes:
+ label: Solution Brainstorm
+ description: We know you have bright ideas to share ... share away, friend.
+ placeholder: |-
+ Add a blender to Sentry.
+ validations:
+ required: true
+ - type: markdown
+ attributes:
+ value: |-
+ ## Thanks 🙏
+ Check our [triage docs](https://open.sentry.io/triage/) for what to expect next.
From 0ba75fef404f877f3c7fc1afcc6013eb9c4b986c Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Tue, 22 Feb 2022 10:19:45 +0000
Subject: [PATCH 0297/2327] release: 1.5.6
---
CHANGELOG.md | 16 ++++++++++++++++
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5983a463e..62aad5ad8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
# Changelog
+## 1.5.6
+
+### Various fixes & improvements
+
+- Create feature.yml (#1350) by @vladanpaunovic
+- Update contribution guide (#1346) by @antonpirker
+- chore: add bug issue template (#1345) by @vladanpaunovic
+- Added default value for auto_session_tracking (#1337) by @antonpirker
+- docs(readme): reordered content (#1343) by @antonpirker
+- fix(tests): Removed unsupported Django 1.6 from tests to avoid confusion (#1338) by @antonpirker
+- Group captured warnings under separate issues (#1324) by @mnito
+- build(changelogs): Use automated changelogs from Craft (#1340) by @BYK
+- fix(aiohttp): AioHttpIntegration sentry_app_handle() now ignores ConnectionResetError (#1331) by @cmalek
+- meta: Remove black GH action (#1339) by @sl0thentr0py
+- feat(flask): Add `sentry_trace()` template helper (#1336) by @BYK
+
## 1.5.5
- Add session tracking to ASGI integration (#1329)
diff --git a/docs/conf.py b/docs/conf.py
index 89949dd041..69d37e2fbc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.5.5"
+release = "1.5.6"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index df6a9a747c..44b88deaa3 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.5.5"
+VERSION = "1.5.6"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 202ad69f01..72acbf1462 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.5.5",
+ version="1.5.6",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From a14c12776b8414ae532d71d8c44b248112e47187 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Tue, 8 Mar 2022 11:37:31 +0100
Subject: [PATCH 0298/2327] fix(serializer): Make sentry_repr dunder method to
avoid mock problems (#1364)
---
sentry_sdk/serializer.py | 6 ++++--
tests/test_serializer.py | 15 +++++++++++++--
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/sentry_sdk/serializer.py b/sentry_sdk/serializer.py
index df6a9053c1..134528cd9a 100644
--- a/sentry_sdk/serializer.py
+++ b/sentry_sdk/serializer.py
@@ -273,6 +273,8 @@ def _serialize_node_impl(
if result is not NotImplemented:
return _flatten_annotated(result)
+ sentry_repr = getattr(type(obj), "__sentry_repr__", None)
+
if obj is None or isinstance(obj, (bool, number_types)):
if should_repr_strings or (
isinstance(obj, float) and (math.isinf(obj) or math.isnan(obj))
@@ -281,8 +283,8 @@ def _serialize_node_impl(
else:
return obj
- elif callable(getattr(obj, "sentry_repr", None)):
- return obj.sentry_repr()
+ elif callable(sentry_repr):
+ return sentry_repr(obj)
elif isinstance(obj, datetime):
return (
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
index 503bc14fb2..1cc20c4b4a 100644
--- a/tests/test_serializer.py
+++ b/tests/test_serializer.py
@@ -1,5 +1,4 @@
import sys
-
import pytest
from sentry_sdk.serializer import serialize
@@ -68,8 +67,20 @@ def test_serialize_sets(extra_normalizer):
def test_serialize_custom_mapping(extra_normalizer):
class CustomReprDict(dict):
- def sentry_repr(self):
+ def __sentry_repr__(self):
return "custom!"
result = extra_normalizer(CustomReprDict(one=1, two=2))
assert result == "custom!"
+
+
+def test_custom_mapping_doesnt_mess_with_mock(extra_normalizer):
+ """
+ Adding the __sentry_repr__ magic method check in the serializer
+ shouldn't mess with how mock works. This broke some stuff when we added
+ sentry_repr without the dunders.
+ """
+ mock = pytest.importorskip("unittest.mock")
+ m = mock.Mock()
+ extra_normalizer(m)
+ assert len(m.mock_calls) == 0
From c1ec408e3a72285bc943c10e9937cbab64a4c9e0 Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Tue, 8 Mar 2022 10:39:21 +0000
Subject: [PATCH 0299/2327] release: 1.5.7
---
CHANGELOG.md | 6 ++++++
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62aad5ad8e..8492b0326b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog
+## 1.5.7
+
+### Various fixes & improvements
+
+- fix(serializer): Make sentry_repr dunder method to avoid mock problems (#1364) by @sl0thentr0py
+
## 1.5.6
### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 69d37e2fbc..8a084fc1a5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.5.6"
+release = "1.5.7"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 44b88deaa3..0466164cae 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.5.6"
+VERSION = "1.5.7"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 72acbf1462..9969b83819 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.5.6",
+ version="1.5.7",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From c4051363d036b598c0ea35d098f077d504f0f739 Mon Sep 17 00:00:00 2001
From: Matt Fisher
Date: Thu, 10 Mar 2022 01:44:47 +1100
Subject: [PATCH 0300/2327] feat(django): Make django middleware expose more
wrapped attributes (#1202)
Include __name__, __module__, __qualname__
---
sentry_sdk/integrations/django/middleware.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/sentry_sdk/integrations/django/middleware.py b/sentry_sdk/integrations/django/middleware.py
index e6a1ca5bd9..c9001cdbf4 100644
--- a/sentry_sdk/integrations/django/middleware.py
+++ b/sentry_sdk/integrations/django/middleware.py
@@ -174,7 +174,12 @@ def __call__(self, *args, **kwargs):
with middleware_span:
return f(*args, **kwargs)
- if hasattr(middleware, "__name__"):
- SentryWrappingMiddleware.__name__ = middleware.__name__
+ for attr in (
+ "__name__",
+ "__module__",
+ "__qualname__",
+ ):
+ if hasattr(middleware, attr):
+ setattr(SentryWrappingMiddleware, attr, getattr(middleware, attr))
return SentryWrappingMiddleware
From a8f6af12bc8384d9922358cb46b30f904cf94660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Og=C3=B3rek?=
Date: Thu, 10 Mar 2022 17:06:03 +0100
Subject: [PATCH 0301/2327] chore(ci): Change stale GitHub workflow to run once
a day (#1367)
---
.github/workflows/stale.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 5054c94db5..bc092820a5 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,7 +1,7 @@
name: 'close stale issues/PRs'
on:
schedule:
- - cron: '* */3 * * *'
+ - cron: '0 0 * * *'
workflow_dispatch:
jobs:
stale:
From a6cec41a2f4889d54339d3249db1acbe0c680e46 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Mon, 14 Mar 2022 10:39:53 +0100
Subject: [PATCH 0302/2327] fix(perf): Fix transaction setter on scope to use
containing_transaction to match with getter (#1366)
---
sentry_sdk/scope.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
index fb3bee42f1..bcfbf5c166 100644
--- a/sentry_sdk/scope.py
+++ b/sentry_sdk/scope.py
@@ -173,9 +173,8 @@ def transaction(self, value):
# transaction name or transaction (self._span) depending on the type of
# the value argument.
self._transaction = value
- span = self._span
- if span and isinstance(span, Transaction):
- span.name = value
+ if self._span and self._span.containing_transaction:
+ self._span.containing_transaction.name = value
@_attr_setter
def user(self, value):
From de0bc5019c715ecbb2409a852037530f36255d75 Mon Sep 17 00:00:00 2001
From: Fofanko <38262754+Fofanko@users.noreply.github.com>
Date: Mon, 14 Mar 2022 18:59:56 +0300
Subject: [PATCH 0303/2327] fix(sqlalchemy): Change context manager type to
avoid race in threads (#1368)
---
sentry_sdk/integrations/django/__init__.py | 6 +-
sentry_sdk/integrations/sqlalchemy.py | 4 +-
sentry_sdk/tracing_utils.py | 96 ++++++++++++----------
3 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index e11d1ab651..db90918529 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -9,7 +9,7 @@
from sentry_sdk.hub import Hub, _should_send_default_pii
from sentry_sdk.scope import add_global_event_processor
from sentry_sdk.serializer import add_global_repr_processor
-from sentry_sdk.tracing_utils import record_sql_queries
+from sentry_sdk.tracing_utils import RecordSqlQueries
from sentry_sdk.utils import (
HAS_REAL_CONTEXTVARS,
CONTEXTVARS_ERROR_MESSAGE,
@@ -539,7 +539,7 @@ def execute(self, sql, params=None):
if hub.get_integration(DjangoIntegration) is None:
return real_execute(self, sql, params)
- with record_sql_queries(
+ with RecordSqlQueries(
hub, self.cursor, sql, params, paramstyle="format", executemany=False
):
return real_execute(self, sql, params)
@@ -550,7 +550,7 @@ def executemany(self, sql, param_list):
if hub.get_integration(DjangoIntegration) is None:
return real_executemany(self, sql, param_list)
- with record_sql_queries(
+ with RecordSqlQueries(
hub, self.cursor, sql, param_list, paramstyle="format", executemany=True
):
return real_executemany(self, sql, param_list)
diff --git a/sentry_sdk/integrations/sqlalchemy.py b/sentry_sdk/integrations/sqlalchemy.py
index 4b0207f5ec..6f776e40c8 100644
--- a/sentry_sdk/integrations/sqlalchemy.py
+++ b/sentry_sdk/integrations/sqlalchemy.py
@@ -3,7 +3,7 @@
from sentry_sdk._types import MYPY
from sentry_sdk.hub import Hub
from sentry_sdk.integrations import Integration, DidNotEnable
-from sentry_sdk.tracing_utils import record_sql_queries
+from sentry_sdk.tracing_utils import RecordSqlQueries
try:
from sqlalchemy.engine import Engine # type: ignore
@@ -50,7 +50,7 @@ def _before_cursor_execute(
if hub.get_integration(SqlalchemyIntegration) is None:
return
- ctx_mgr = record_sql_queries(
+ ctx_mgr = RecordSqlQueries(
hub,
cursor,
statement,
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
index faed37cbb7..d754da409c 100644
--- a/sentry_sdk/tracing_utils.py
+++ b/sentry_sdk/tracing_utils.py
@@ -1,5 +1,4 @@
import re
-import contextlib
import json
import math
@@ -106,6 +105,58 @@ def __iter__(self):
yield k[len(self.prefix) :]
+class RecordSqlQueries:
+ def __init__(
+ self,
+ hub, # type: sentry_sdk.Hub
+ cursor, # type: Any
+ query, # type: Any
+ params_list, # type: Any
+ paramstyle, # type: Optional[str]
+ executemany, # type: bool
+ ):
+ # type: (...) -> None
+ # TODO: Bring back capturing of params by default
+ self._hub = hub
+ if self._hub.client and self._hub.client.options["_experiments"].get(
+ "record_sql_params", False
+ ):
+ if not params_list or params_list == [None]:
+ params_list = None
+
+ if paramstyle == "pyformat":
+ paramstyle = "format"
+ else:
+ params_list = None
+ paramstyle = None
+
+ self._query = _format_sql(cursor, query)
+
+ self._data = {}
+ if params_list is not None:
+ self._data["db.params"] = params_list
+ if paramstyle is not None:
+ self._data["db.paramstyle"] = paramstyle
+ if executemany:
+ self._data["db.executemany"] = True
+
+ def __enter__(self):
+ # type: () -> Span
+ with capture_internal_exceptions():
+ self._hub.add_breadcrumb(
+ message=self._query, category="query", data=self._data
+ )
+
+ with self._hub.start_span(op="db", description=self._query) as span:
+ for k, v in self._data.items():
+ span.set_data(k, v)
+ return span
+
+ def __exit__(self, exc_type, exc_val, exc_tb):
+ # type: (Any, Any, Any) -> None
+ pass
+
+
def has_tracing_enabled(options):
# type: (Dict[str, Any]) -> bool
"""
@@ -150,49 +201,6 @@ def is_valid_sample_rate(rate):
return True
-@contextlib.contextmanager
-def record_sql_queries(
- hub, # type: sentry_sdk.Hub
- cursor, # type: Any
- query, # type: Any
- params_list, # type: Any
- paramstyle, # type: Optional[str]
- executemany, # type: bool
-):
- # type: (...) -> Generator[Span, None, None]
-
- # TODO: Bring back capturing of params by default
- if hub.client and hub.client.options["_experiments"].get(
- "record_sql_params", False
- ):
- if not params_list or params_list == [None]:
- params_list = None
-
- if paramstyle == "pyformat":
- paramstyle = "format"
- else:
- params_list = None
- paramstyle = None
-
- query = _format_sql(cursor, query)
-
- data = {}
- if params_list is not None:
- data["db.params"] = params_list
- if paramstyle is not None:
- data["db.paramstyle"] = paramstyle
- if executemany:
- data["db.executemany"] = True
-
- with capture_internal_exceptions():
- hub.add_breadcrumb(message=query, category="query", data=data)
-
- with hub.start_span(op="db", description=query) as span:
- for k, v in data.items():
- span.set_data(k, v)
- yield span
-
-
def maybe_create_breadcrumbs_from_span(hub, span):
# type: (sentry_sdk.Hub, Span) -> None
if span.op == "redis":
From 84015f915bef7c578c201c511c220c4a7e0153d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?=
Date: Thu, 17 Mar 2022 10:51:09 -0500
Subject: [PATCH 0304/2327] feat(asgi): Add support for setting transaction
name to path in FastAPI (#1349)
---
sentry_sdk/integrations/asgi.py | 35 ++++++++++++++-----
tests/integrations/asgi/test_fastapi.py | 46 +++++++++++++++++++++++++
tox.ini | 1 +
3 files changed, 73 insertions(+), 9 deletions(-)
create mode 100644 tests/integrations/asgi/test_fastapi.py
diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py
index 29812fce7c..5f7810732b 100644
--- a/sentry_sdk/integrations/asgi.py
+++ b/sentry_sdk/integrations/asgi.py
@@ -37,6 +37,8 @@
_DEFAULT_TRANSACTION_NAME = "generic ASGI request"
+TRANSACTION_STYLE_VALUES = ("endpoint", "url")
+
def _capture_exception(hub, exc):
# type: (Hub, Any) -> None
@@ -68,10 +70,10 @@ def _looks_like_asgi3(app):
class SentryAsgiMiddleware:
- __slots__ = ("app", "__call__")
+ __slots__ = ("app", "__call__", "transaction_style")
- def __init__(self, app, unsafe_context_data=False):
- # type: (Any, bool) -> None
+ def __init__(self, app, unsafe_context_data=False, transaction_style="endpoint"):
+ # type: (Any, bool, str) -> None
"""
Instrument an ASGI application with Sentry. Provides HTTP/websocket
data to sent events and basic handling for exceptions bubbling up
@@ -87,6 +89,12 @@ def __init__(self, app, unsafe_context_data=False):
"The ASGI middleware for Sentry requires Python 3.7+ "
"or the aiocontextvars package." + CONTEXTVARS_ERROR_MESSAGE
)
+ if transaction_style not in TRANSACTION_STYLE_VALUES:
+ raise ValueError(
+ "Invalid value for transaction_style: %s (must be in %s)"
+ % (transaction_style, TRANSACTION_STYLE_VALUES)
+ )
+ self.transaction_style = transaction_style
self.app = app
if _looks_like_asgi3(app):
@@ -179,12 +187,21 @@ def event_processor(self, event, hint, asgi_scope):
event.get("transaction", _DEFAULT_TRANSACTION_NAME)
== _DEFAULT_TRANSACTION_NAME
):
- endpoint = asgi_scope.get("endpoint")
- # Webframeworks like Starlette mutate the ASGI env once routing is
- # done, which is sometime after the request has started. If we have
- # an endpoint, overwrite our generic transaction name.
- if endpoint:
- event["transaction"] = transaction_from_function(endpoint)
+ if self.transaction_style == "endpoint":
+ endpoint = asgi_scope.get("endpoint")
+ # Webframeworks like Starlette mutate the ASGI env once routing is
+ # done, which is sometime after the request has started. If we have
+ # an endpoint, overwrite our generic transaction name.
+ if endpoint:
+ event["transaction"] = transaction_from_function(endpoint)
+ elif self.transaction_style == "url":
+ # FastAPI includes the route object in the scope to let Sentry extract the
+ # path from it for the transaction name
+ route = asgi_scope.get("route")
+ if route:
+ path = getattr(route, "path", None)
+ if path is not None:
+ event["transaction"] = path
event["request"] = request_info
diff --git a/tests/integrations/asgi/test_fastapi.py b/tests/integrations/asgi/test_fastapi.py
new file mode 100644
index 0000000000..518b8544b2
--- /dev/null
+++ b/tests/integrations/asgi/test_fastapi.py
@@ -0,0 +1,46 @@
+import sys
+
+import pytest
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+from sentry_sdk import capture_message
+from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
+
+
+@pytest.fixture
+def app():
+ app = FastAPI()
+
+ @app.get("/users/{user_id}")
+ async def get_user(user_id: str):
+ capture_message("hi", level="error")
+ return {"user_id": user_id}
+
+ app.add_middleware(SentryAsgiMiddleware, transaction_style="url")
+
+ return app
+
+
+@pytest.mark.skipif(sys.version_info < (3, 7), reason="requires python3.7 or higher")
+def test_fastapi_transaction_style(sentry_init, app, capture_events):
+ sentry_init(send_default_pii=True)
+ events = capture_events()
+
+ client = TestClient(app)
+ response = client.get("/users/rick")
+
+ assert response.status_code == 200
+
+ (event,) = events
+ assert event["transaction"] == "/users/{user_id}"
+ assert event["request"]["env"] == {"REMOTE_ADDR": "testclient"}
+ assert event["request"]["url"].endswith("/users/rick")
+ assert event["request"]["method"] == "GET"
+
+ # Assert that state is not leaked
+ events.clear()
+ capture_message("foo")
+ (event,) = events
+
+ assert "request" not in event
+ assert "transaction" not in event
diff --git a/tox.ini b/tox.ini
index cb158d7209..bc087ad23c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -212,6 +212,7 @@ deps =
asgi: starlette
asgi: requests
+ asgi: fastapi
sqlalchemy-1.2: sqlalchemy>=1.2,<1.3
sqlalchemy-1.3: sqlalchemy>=1.3,<1.4
From dba3d24cfbdf809b4f8d065381408c800dbace7a Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Fri, 18 Mar 2022 11:20:49 +0000
Subject: [PATCH 0305/2327] release: 1.5.8
---
CHANGELOG.md | 10 ++++++++++
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8492b0326b..b91831ca3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
# Changelog
+## 1.5.8
+
+### Various fixes & improvements
+
+- feat(asgi): Add support for setting transaction name to path in FastAPI (#1349) by @tiangolo
+- fix(sqlalchemy): Change context manager type to avoid race in threads (#1368) by @Fofanko
+- fix(perf): Fix transaction setter on scope to use containing_transaction to match with getter (#1366) by @sl0thentr0py
+- chore(ci): Change stale GitHub workflow to run once a day (#1367) by @kamilogorek
+- feat(django): Make django middleware expose more wrapped attributes (#1202) by @MattFisher
+
## 1.5.7
### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 8a084fc1a5..945a382f39 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.5.7"
+release = "1.5.8"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 0466164cae..fe3b2f05dc 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.5.7"
+VERSION = "1.5.8"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 9969b83819..9488b790ca 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.5.7",
+ version="1.5.8",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From d880f47add3876d5cedefb4178a1dcd4d85b5d1b Mon Sep 17 00:00:00 2001
From: Daniel Hahler
Date: Tue, 22 Mar 2022 14:31:59 +0100
Subject: [PATCH 0306/2327] fix: Remove obsolete MAX_FORMAT_PARAM_LENGTH
(#1375)
---
sentry_sdk/utils.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index a2bc528e7b..cc519a58a7 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -40,7 +40,6 @@
logger = logging.getLogger("sentry_sdk.errors")
MAX_STRING_LENGTH = 512
-MAX_FORMAT_PARAM_LENGTH = 128
BASE64_ALPHABET = re.compile(r"^[a-zA-Z0-9/+=]*$")
From c33cac9313a754b861aaffbd83b6ae849cdd41b0 Mon Sep 17 00:00:00 2001
From: Simon Schmidt
Date: Mon, 28 Mar 2022 10:39:40 +0300
Subject: [PATCH 0307/2327] Treat x-api-key header as sensitive (#1236)
Co-authored-by: Simon Schmidt
Co-authored-by: Anton Pirker
---
sentry_sdk/integrations/_wsgi_common.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/sentry_sdk/integrations/_wsgi_common.py b/sentry_sdk/integrations/_wsgi_common.py
index f874663883..f4cc7672e9 100644
--- a/sentry_sdk/integrations/_wsgi_common.py
+++ b/sentry_sdk/integrations/_wsgi_common.py
@@ -21,6 +21,7 @@
"HTTP_SET_COOKIE",
"HTTP_COOKIE",
"HTTP_AUTHORIZATION",
+ "HTTP_X_API_KEY",
"HTTP_X_FORWARDED_FOR",
"HTTP_X_REAL_IP",
)
From b449fff5a1d6646ff13082c4bb59bca7502dcd0c Mon Sep 17 00:00:00 2001
From: Katie Byers
Date: Mon, 28 Mar 2022 07:32:50 -0700
Subject: [PATCH 0308/2327] feat(testing): Add pytest-watch (#853)
* add pytest-watch
* use request fixture to ensure connection closure
* remove unnecessary lambda
* fixing Flask dependencies for tests to work.
Co-authored-by: Markus Unterwaditzer
Co-authored-by: Anton Pirker
---
pytest.ini | 7 +++++++
test-requirements.txt | 1 +
tests/integrations/gcp/test_gcp.py | 2 ++
tests/integrations/stdlib/test_httplib.py | 6 +++++-
tox.ini | 8 ++++----
5 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/pytest.ini b/pytest.ini
index c00b03296c..4e987c1a90 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -4,3 +4,10 @@ addopts = --tb=short
markers =
tests_internal_exceptions: Handle internal exceptions just as the SDK does, to test it. (Otherwise internal exceptions are recorded and reraised.)
only: A temporary marker, to make pytest only run the tests with the mark, similar to jest's `it.only`. To use, run `pytest -v -m only`.
+
+[pytest-watch]
+; Enable this to drop into pdb on errors
+; pdb = True
+
+verbose = True
+nobeep = True
diff --git a/test-requirements.txt b/test-requirements.txt
index e513d05d4c..ea8333ca16 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,6 @@
pytest<7
pytest-forked<=1.4.0
+pytest-watch==4.2.0
tox==3.7.0
Werkzeug
pytest-localserver==0.5.0
diff --git a/tests/integrations/gcp/test_gcp.py b/tests/integrations/gcp/test_gcp.py
index 893aad0086..78ac8f2746 100644
--- a/tests/integrations/gcp/test_gcp.py
+++ b/tests/integrations/gcp/test_gcp.py
@@ -143,6 +143,8 @@ def inner(code, subprocess_kwargs=()):
else:
continue
+ stream.close()
+
return envelope, event, return_value
return inner
diff --git a/tests/integrations/stdlib/test_httplib.py b/tests/integrations/stdlib/test_httplib.py
index cffe00b074..c90f9eb891 100644
--- a/tests/integrations/stdlib/test_httplib.py
+++ b/tests/integrations/stdlib/test_httplib.py
@@ -76,7 +76,7 @@ def before_breadcrumb(crumb, hint):
assert sys.getrefcount(response) == 2
-def test_httplib_misuse(sentry_init, capture_events):
+def test_httplib_misuse(sentry_init, capture_events, request):
"""HTTPConnection.getresponse must be called after every call to
HTTPConnection.request. However, if somebody does not abide by
this contract, we still should handle this gracefully and not
@@ -90,6 +90,10 @@ def test_httplib_misuse(sentry_init, capture_events):
events = capture_events()
conn = HTTPSConnection("httpbin.org", 443)
+
+ # make sure we release the resource, even if the test fails
+ request.addfinalizer(conn.close)
+
conn.request("GET", "/anything/foo")
with pytest.raises(Exception):
diff --git a/tox.ini b/tox.ini
index bc087ad23c..bd17e7fe58 100644
--- a/tox.ini
+++ b/tox.ini
@@ -93,6 +93,9 @@ deps =
# with the -r flag
-r test-requirements.txt
+ py3.4: colorama==0.4.1
+ py3.4: watchdog==0.10.7
+
django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: djangorestframework>=3.0.0,<4.0.0
{py3.7,py3.8,py3.9,py3.10}-django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: channels>2
@@ -308,10 +311,7 @@ commands =
{py3.6,py3.7,py3.8,py3.9}-flask-{0.11}: pip install Werkzeug<2
; https://github.com/pallets/flask/issues/4455
- {py3.7,py3.8,py3.9,py3.10}-flask-{0.11,0.12,1.0,1.1}: pip install "itsdangerous>=0.24,<2.0" "markupsafe<2.0.0"
- ;"itsdangerous >= 0.24, < 2.0",
-;itsdangerous==1.1.0
-;markupsafe==1.1.1
+ {py3.7,py3.8,py3.9,py3.10}-flask-{0.11,0.12,1.0,1.1}: pip install "itsdangerous>=0.24,<2.0" "markupsafe<2.0.0" "jinja2<3.1.1"
; https://github.com/more-itertools/more-itertools/issues/578
py3.5-flask-{0.10,0.11,0.12}: pip install more-itertools<8.11.0
From 67c0279f29271a5149c095d833366071bfe11142 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer
Date: Mon, 28 Mar 2022 17:08:32 +0200
Subject: [PATCH 0309/2327] fix: Auto-enabling Redis and Pyramid integration
(#737)
* fix: Auto-enabling Redis and Pyramid integration
* fix(tests): fixed getting right span
* fix(tests): Fixing check for redis, because it is a dependency for runnings tests and therefore always enabled
* fix(tests): Fix for Flask not pinning requirements
Co-authored-by: Anton Pirker
---
sentry_sdk/integrations/__init__.py | 2 ++
sentry_sdk/integrations/pyramid.py | 12 +++++++-----
sentry_sdk/integrations/redis.py | 7 +++++--
tests/integrations/celery/test_celery.py | 22 +++++++++++++---------
tests/test_basics.py | 6 ++++++
5 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/sentry_sdk/integrations/__init__.py b/sentry_sdk/integrations/__init__.py
index 777c363e14..114a3a1f41 100644
--- a/sentry_sdk/integrations/__init__.py
+++ b/sentry_sdk/integrations/__init__.py
@@ -62,6 +62,8 @@ def iter_default_integrations(with_auto_enabling_integrations):
"sentry_sdk.integrations.aiohttp.AioHttpIntegration",
"sentry_sdk.integrations.tornado.TornadoIntegration",
"sentry_sdk.integrations.sqlalchemy.SqlalchemyIntegration",
+ "sentry_sdk.integrations.redis.RedisIntegration",
+ "sentry_sdk.integrations.pyramid.PyramidIntegration",
"sentry_sdk.integrations.boto3.Boto3Integration",
)
diff --git a/sentry_sdk/integrations/pyramid.py b/sentry_sdk/integrations/pyramid.py
index a974d297a9..980d56bb6f 100644
--- a/sentry_sdk/integrations/pyramid.py
+++ b/sentry_sdk/integrations/pyramid.py
@@ -4,17 +4,20 @@
import sys
import weakref
-from pyramid.httpexceptions import HTTPException
-from pyramid.request import Request
-
from sentry_sdk.hub import Hub, _should_send_default_pii
from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
from sentry_sdk._compat import reraise, iteritems
-from sentry_sdk.integrations import Integration
+from sentry_sdk.integrations import Integration, DidNotEnable
from sentry_sdk.integrations._wsgi_common import RequestExtractor
from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
+try:
+ from pyramid.httpexceptions import HTTPException
+ from pyramid.request import Request
+except ImportError:
+ raise DidNotEnable("Pyramid not installed")
+
from sentry_sdk._types import MYPY
if MYPY:
@@ -64,7 +67,6 @@ def __init__(self, transaction_style="route_name"):
def setup_once():
# type: () -> None
from pyramid import router
- from pyramid.request import Request
old_call_view = router._call_view
diff --git a/sentry_sdk/integrations/redis.py b/sentry_sdk/integrations/redis.py
index 6475d15bf6..df7cbae7bb 100644
--- a/sentry_sdk/integrations/redis.py
+++ b/sentry_sdk/integrations/redis.py
@@ -2,7 +2,7 @@
from sentry_sdk import Hub
from sentry_sdk.utils import capture_internal_exceptions, logger
-from sentry_sdk.integrations import Integration
+from sentry_sdk.integrations import Integration, DidNotEnable
from sentry_sdk._types import MYPY
@@ -40,7 +40,10 @@ class RedisIntegration(Integration):
@staticmethod
def setup_once():
# type: () -> None
- import redis
+ try:
+ import redis
+ except ImportError:
+ raise DidNotEnable("Redis client not installed")
patch_redis_client(redis.StrictRedis)
diff --git a/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py
index bdf1706c59..a77ac1adb1 100644
--- a/tests/integrations/celery/test_celery.py
+++ b/tests/integrations/celery/test_celery.py
@@ -171,14 +171,14 @@ def dummy_task(x, y):
assert execution_event["spans"] == []
assert submission_event["spans"] == [
{
- u"description": u"dummy_task",
- u"op": "celery.submit",
- u"parent_span_id": submission_event["contexts"]["trace"]["span_id"],
- u"same_process_as_parent": True,
- u"span_id": submission_event["spans"][0]["span_id"],
- u"start_timestamp": submission_event["spans"][0]["start_timestamp"],
- u"timestamp": submission_event["spans"][0]["timestamp"],
- u"trace_id": text_type(transaction.trace_id),
+ "description": "dummy_task",
+ "op": "celery.submit",
+ "parent_span_id": submission_event["contexts"]["trace"]["span_id"],
+ "same_process_as_parent": True,
+ "span_id": submission_event["spans"][0]["span_id"],
+ "start_timestamp": submission_event["spans"][0]["start_timestamp"],
+ "timestamp": submission_event["spans"][0]["timestamp"],
+ "trace_id": text_type(transaction.trace_id),
}
]
@@ -338,7 +338,11 @@ def dummy_task(self):
submit_transaction = events.read_event()
assert submit_transaction["type"] == "transaction"
assert submit_transaction["transaction"] == "submit_celery"
- (span,) = submit_transaction["spans"]
+
+ assert len(
+ submit_transaction["spans"]
+ ), 4 # Because redis integration was auto enabled
+ span = submit_transaction["spans"][0]
assert span["op"] == "celery.submit"
assert span["description"] == "dummy_task"
diff --git a/tests/test_basics.py b/tests/test_basics.py
index 7991a58f75..e9ae6465c9 100644
--- a/tests/test_basics.py
+++ b/tests/test_basics.py
@@ -50,10 +50,16 @@ def error_processor(event, exc_info):
def test_auto_enabling_integrations_catches_import_error(sentry_init, caplog):
caplog.set_level(logging.DEBUG)
+ REDIS = 10 # noqa: N806
sentry_init(auto_enabling_integrations=True, debug=True)
for import_string in _AUTO_ENABLING_INTEGRATIONS:
+ # Ignore redis in the test case, because it is installed as a
+ # dependency for running tests, and therefore always enabled.
+ if _AUTO_ENABLING_INTEGRATIONS[REDIS] == import_string:
+ continue
+
assert any(
record.message.startswith(
"Did not import default integration {}:".format(import_string)
From 17ea78177d605683695352783750f24836c4e620 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Mar 2022 16:02:33 +0000
Subject: [PATCH 0310/2327] build(deps): bump sphinx from 4.1.1 to 4.5.0
(#1376)
Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 4.1.1 to 4.5.0.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/4.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v4.1.1...v4.5.0)
---
updated-dependencies:
- dependency-name: sphinx
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
docs-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs-requirements.txt b/docs-requirements.txt
index e66af3de2c..f80c689cbf 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx==4.1.1
+sphinx==4.5.0
sphinx-rtd-theme
sphinx-autodoc-typehints[type_comments]>=1.8.0
typing-extensions
From 9a82f7b8f32a11466da483ddf2172b65cfb07a69 Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Fri, 1 Apr 2022 11:59:44 +0200
Subject: [PATCH 0311/2327] Update black (#1379)
* Updated black
* Reformatted code with new black.
* fix(tests): pin werkzeug to a working version.
* fix(tests): pin flask version to have working tests.
---
linter-requirements.txt | 2 +-
sentry_sdk/client.py | 1 -
sentry_sdk/hub.py | 1 -
sentry_sdk/integrations/_wsgi_common.py | 4 +-
sentry_sdk/integrations/django/__init__.py | 3 +-
sentry_sdk/integrations/pyramid.py | 1 -
sentry_sdk/integrations/wsgi.py | 1 -
sentry_sdk/serializer.py | 6 +-
sentry_sdk/tracing.py | 38 +++++++-----
sentry_sdk/utils.py | 10 ++-
setup.py | 2 +-
test-requirements.txt | 2 +-
tests/conftest.py | 1 -
tests/integrations/bottle/test_bottle.py | 2 +-
tests/integrations/django/myapp/views.py | 1 -
tests/integrations/django/test_basic.py | 8 +--
tests/test_client.py | 4 +-
tests/test_serializer.py | 2 +
tests/utils/test_general.py | 72 ++++++++++------------
19 files changed, 78 insertions(+), 83 deletions(-)
diff --git a/linter-requirements.txt b/linter-requirements.txt
index 8c7dd7d6e5..744904fbc2 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -1,4 +1,4 @@
-black==21.7b0
+black==22.3.0
flake8==3.9.2
flake8-import-order==0.18.1
mypy==0.782
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 1720993c1a..efc8799c00 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -451,7 +451,6 @@ class get_options(ClientConstructor, Dict[str, Any]): # noqa: N801
class Client(ClientConstructor, _Client):
pass
-
else:
# Alias `get_options` for actual usage. Go through the lambda indirection
# to throw PyCharm off of the weakly typed signature (it would otherwise
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
index addca57417..22f3ff42fd 100644
--- a/sentry_sdk/hub.py
+++ b/sentry_sdk/hub.py
@@ -120,7 +120,6 @@ def _init(*args, **kwargs):
class init(ClientConstructor, ContextManager[Any]): # noqa: N801
pass
-
else:
# Alias `init` for actual usage. Go through the lambda indirection to throw
# PyCharm off of the weakly typed signature (it would otherwise discover
diff --git a/sentry_sdk/integrations/_wsgi_common.py b/sentry_sdk/integrations/_wsgi_common.py
index f4cc7672e9..4f253acc35 100644
--- a/sentry_sdk/integrations/_wsgi_common.py
+++ b/sentry_sdk/integrations/_wsgi_common.py
@@ -39,8 +39,8 @@ def request_body_within_bounds(client, content_length):
bodies = client.options["request_bodies"]
return not (
bodies == "never"
- or (bodies == "small" and content_length > 10 ** 3)
- or (bodies == "medium" and content_length > 10 ** 4)
+ or (bodies == "small" and content_length > 10**3)
+ or (bodies == "medium" and content_length > 10**4)
)
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index db90918529..7eb91887df 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -69,7 +69,6 @@ def is_authenticated(request_user):
# type: (Any) -> bool
return request_user.is_authenticated()
-
else:
def is_authenticated(request_user):
@@ -202,7 +201,7 @@ def _django_queryset_repr(value, hint):
# querysets. This might be surprising to the user but it's likely
# less annoying.
- return u"<%s from %s at 0x%x>" % (
+ return "<%s from %s at 0x%x>" % (
value.__class__.__name__,
value.__module__,
id(value),
diff --git a/sentry_sdk/integrations/pyramid.py b/sentry_sdk/integrations/pyramid.py
index 980d56bb6f..07142254d2 100644
--- a/sentry_sdk/integrations/pyramid.py
+++ b/sentry_sdk/integrations/pyramid.py
@@ -40,7 +40,6 @@ def authenticated_userid(request):
# type: (Request) -> Optional[Any]
return request.authenticated_userid
-
else:
# bw-compat for pyramid < 1.5
from pyramid.security import authenticated_userid # type: ignore
diff --git a/sentry_sdk/integrations/wsgi.py b/sentry_sdk/integrations/wsgi.py
index 4f274fa00c..803406fb6d 100644
--- a/sentry_sdk/integrations/wsgi.py
+++ b/sentry_sdk/integrations/wsgi.py
@@ -46,7 +46,6 @@ def wsgi_decoding_dance(s, charset="utf-8", errors="replace"):
# type: (str, str, str) -> str
return s.decode(charset, errors)
-
else:
def wsgi_decoding_dance(s, charset="utf-8", errors="replace"):
diff --git a/sentry_sdk/serializer.py b/sentry_sdk/serializer.py
index 134528cd9a..e657f6b2b8 100644
--- a/sentry_sdk/serializer.py
+++ b/sentry_sdk/serializer.py
@@ -66,11 +66,11 @@
# Can be overwritten if wanting to send more bytes, e.g. with a custom server.
# When changing this, keep in mind that events may be a little bit larger than
# this value due to attached metadata, so keep the number conservative.
-MAX_EVENT_BYTES = 10 ** 6
+MAX_EVENT_BYTES = 10**6
MAX_DATABAG_DEPTH = 5
MAX_DATABAG_BREADTH = 10
-CYCLE_MARKER = u""
+CYCLE_MARKER = ""
global_repr_processors = [] # type: List[ReprProcessor]
@@ -228,7 +228,7 @@ def _serialize_node(
capture_internal_exception(sys.exc_info())
if is_databag:
- return u""
+ return ""
return None
finally:
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 48050350fb..1b5b65e1af 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -132,14 +132,17 @@ def init_span_recorder(self, maxlen):
def __repr__(self):
# type: () -> str
- return "<%s(op=%r, description:%r, trace_id=%r, span_id=%r, parent_span_id=%r, sampled=%r)>" % (
- self.__class__.__name__,
- self.op,
- self.description,
- self.trace_id,
- self.span_id,
- self.parent_span_id,
- self.sampled,
+ return (
+ "<%s(op=%r, description:%r, trace_id=%r, span_id=%r, parent_span_id=%r, sampled=%r)>"
+ % (
+ self.__class__.__name__,
+ self.op,
+ self.description,
+ self.trace_id,
+ self.span_id,
+ self.parent_span_id,
+ self.sampled,
+ )
)
def __enter__(self):
@@ -515,14 +518,17 @@ def __init__(
def __repr__(self):
# type: () -> str
- return "<%s(name=%r, op=%r, trace_id=%r, span_id=%r, parent_span_id=%r, sampled=%r)>" % (
- self.__class__.__name__,
- self.name,
- self.op,
- self.trace_id,
- self.span_id,
- self.parent_span_id,
- self.sampled,
+ return (
+ "<%s(name=%r, op=%r, trace_id=%r, span_id=%r, parent_span_id=%r, sampled=%r)>"
+ % (
+ self.__class__.__name__,
+ self.name,
+ self.op,
+ self.trace_id,
+ self.span_id,
+ self.parent_span_id,
+ self.sampled,
+ )
)
@property
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index cc519a58a7..e22f6ae065 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -161,7 +161,7 @@ def __init__(self, value):
return
parts = urlparse.urlsplit(text_type(value))
- if parts.scheme not in (u"http", u"https"):
+ if parts.scheme not in ("http", "https"):
raise BadDsn("Unsupported scheme %r" % parts.scheme)
self.scheme = parts.scheme
@@ -280,7 +280,7 @@ def to_header(self, timestamp=None):
rv.append(("sentry_client", self.client))
if self.secret_key is not None:
rv.append(("sentry_secret", self.secret_key))
- return u"Sentry " + u", ".join("%s=%s" % (key, value) for key, value in rv)
+ return "Sentry " + ", ".join("%s=%s" % (key, value) for key, value in rv)
class AnnotatedValue(object):
@@ -440,8 +440,7 @@ def safe_repr(value):
return rv
except Exception:
# If e.g. the call to `repr` already fails
- return u""
-
+ return ""
else:
@@ -606,7 +605,6 @@ def walk_exception_chain(exc_info):
exc_value = cause
tb = getattr(cause, "__traceback__", None)
-
else:
def walk_exception_chain(exc_info):
@@ -772,7 +770,7 @@ def strip_string(value, max_length=None):
if length > max_length:
return AnnotatedValue(
- value=value[: max_length - 3] + u"...",
+ value=value[: max_length - 3] + "...",
metadata={
"len": length,
"rem": [["!limit", "x", max_length - 3, max_length]],
diff --git a/setup.py b/setup.py
index 9488b790ca..7db81e1308 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ def get_file_text(file_name):
license="BSD",
install_requires=["urllib3>=1.10.0", "certifi"],
extras_require={
- "flask": ["flask>=0.11", "blinker>=1.1"],
+ "flask": ["flask>=0.11,<2.1.0", "blinker>=1.1"],
"quart": ["quart>=0.16.1", "blinker>=1.1"],
"bottle": ["bottle>=0.12.13"],
"falcon": ["falcon>=1.4"],
diff --git a/test-requirements.txt b/test-requirements.txt
index ea8333ca16..746b10b9b4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@ pytest<7
pytest-forked<=1.4.0
pytest-watch==4.2.0
tox==3.7.0
-Werkzeug
+Werkzeug<2.1.0
pytest-localserver==0.5.0
pytest-cov==2.8.1
jsonschema==3.2.0
diff --git a/tests/conftest.py b/tests/conftest.py
index 692a274d71..61f25d98ee 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -39,7 +39,6 @@
def benchmark():
return lambda x: x()
-
else:
del pytest_benchmark
diff --git a/tests/integrations/bottle/test_bottle.py b/tests/integrations/bottle/test_bottle.py
index 16aacb55c5..ec133e4d75 100644
--- a/tests/integrations/bottle/test_bottle.py
+++ b/tests/integrations/bottle/test_bottle.py
@@ -196,7 +196,7 @@ def index():
assert len(event["request"]["data"]["foo"]) == 512
-@pytest.mark.parametrize("input_char", [u"a", b"a"])
+@pytest.mark.parametrize("input_char", ["a", b"a"])
def test_too_large_raw_request(
sentry_init, input_char, capture_events, app, get_client
):
diff --git a/tests/integrations/django/myapp/views.py b/tests/integrations/django/myapp/views.py
index cac881552c..02c67ca150 100644
--- a/tests/integrations/django/myapp/views.py
+++ b/tests/integrations/django/myapp/views.py
@@ -29,7 +29,6 @@ def rest_hello(request):
def rest_permission_denied_exc(request):
raise PermissionDenied("bye")
-
except ImportError:
pass
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index cc77c9a76a..6106131375 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -576,15 +576,15 @@ def test_template_exception(
if with_executing_integration:
assert filenames[-3:] == [
- (u"Parser.parse", u"django.template.base"),
+ ("Parser.parse", "django.template.base"),
(None, None),
- (u"Parser.invalid_block_tag", u"django.template.base"),
+ ("Parser.invalid_block_tag", "django.template.base"),
]
else:
assert filenames[-3:] == [
- (u"parse", u"django.template.base"),
+ ("parse", "django.template.base"),
(None, None),
- (u"invalid_block_tag", u"django.template.base"),
+ ("invalid_block_tag", "django.template.base"),
]
diff --git a/tests/test_client.py b/tests/test_client.py
index 9137f4115a..c8dd6955fe 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -496,7 +496,9 @@ def test_scope_initialized_before_client(sentry_init, capture_events):
def test_weird_chars(sentry_init, capture_events):
sentry_init()
events = capture_events()
+ # fmt: off
capture_message(u"föö".encode("latin1"))
+ # fmt: on
(event,) = events
assert json.loads(json.dumps(event)) == event
@@ -812,7 +814,7 @@ def __repr__(self):
"dsn",
[
"http://894b7d594095440f8dfea9b300e6f572@localhost:8000/2",
- u"http://894b7d594095440f8dfea9b300e6f572@localhost:8000/2",
+ "http://894b7d594095440f8dfea9b300e6f572@localhost:8000/2",
],
)
def test_init_string_types(dsn, sentry_init):
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
index 1cc20c4b4a..f5ecc7560e 100644
--- a/tests/test_serializer.py
+++ b/tests/test_serializer.py
@@ -50,7 +50,9 @@ def inner(message, **kwargs):
def test_bytes_serialization_decode(message_normalizer):
binary = b"abc123\x80\xf0\x9f\x8d\x95"
result = message_normalizer(binary, should_repr_strings=False)
+ # fmt: off
assert result == u"abc123\ufffd\U0001f355"
+ # fmt: on
@pytest.mark.xfail(sys.version_info < (3,), reason="Known safe_repr bugs in Py2.7")
diff --git a/tests/utils/test_general.py b/tests/utils/test_general.py
index 03be52ca17..b85975b4bb 100644
--- a/tests/utils/test_general.py
+++ b/tests/utils/test_general.py
@@ -31,19 +31,23 @@
def test_safe_repr_never_broken_for_strings(x):
r = safe_repr(x)
assert isinstance(r, text_type)
- assert u"broken repr" not in r
+ assert "broken repr" not in r
def test_safe_repr_regressions():
+ # fmt: off
assert u"лошадь" in safe_repr(u"лошадь")
+ # fmt: on
@pytest.mark.xfail(
sys.version_info < (3,),
reason="Fixing this in Python 2 would break other behaviors",
)
-@pytest.mark.parametrize("prefix", (u"", u"abcd", u"лошадь"))
+# fmt: off
+@pytest.mark.parametrize("prefix", ("", "abcd", u"лошадь"))
@pytest.mark.parametrize("character", u"\x00\x07\x1b\n")
+# fmt: on
def test_safe_repr_non_printable(prefix, character):
"""Check that non-printable characters are escaped"""
string = prefix + character
@@ -129,49 +133,38 @@ def test_parse_invalid_dsn(dsn):
@pytest.mark.parametrize("empty", [None, []])
def test_in_app(empty):
- assert (
- handle_in_app_impl(
- [{"module": "foo"}, {"module": "bar"}],
- in_app_include=["foo"],
- in_app_exclude=empty,
- )
- == [{"module": "foo", "in_app": True}, {"module": "bar"}]
- )
-
- assert (
- handle_in_app_impl(
- [{"module": "foo"}, {"module": "bar"}],
- in_app_include=["foo"],
- in_app_exclude=["foo"],
- )
- == [{"module": "foo", "in_app": True}, {"module": "bar"}]
- )
-
- assert (
- handle_in_app_impl(
- [{"module": "foo"}, {"module": "bar"}],
- in_app_include=empty,
- in_app_exclude=["foo"],
- )
- == [{"module": "foo", "in_app": False}, {"module": "bar", "in_app": True}]
- )
+ assert handle_in_app_impl(
+ [{"module": "foo"}, {"module": "bar"}],
+ in_app_include=["foo"],
+ in_app_exclude=empty,
+ ) == [{"module": "foo", "in_app": True}, {"module": "bar"}]
+
+ assert handle_in_app_impl(
+ [{"module": "foo"}, {"module": "bar"}],
+ in_app_include=["foo"],
+ in_app_exclude=["foo"],
+ ) == [{"module": "foo", "in_app": True}, {"module": "bar"}]
+
+ assert handle_in_app_impl(
+ [{"module": "foo"}, {"module": "bar"}],
+ in_app_include=empty,
+ in_app_exclude=["foo"],
+ ) == [{"module": "foo", "in_app": False}, {"module": "bar", "in_app": True}]
def test_iter_stacktraces():
- assert (
- set(
- iter_event_stacktraces(
- {
- "threads": {"values": [{"stacktrace": 1}]},
- "stacktrace": 2,
- "exception": {"values": [{"stacktrace": 3}]},
- }
- )
+ assert set(
+ iter_event_stacktraces(
+ {
+ "threads": {"values": [{"stacktrace": 1}]},
+ "stacktrace": 2,
+ "exception": {"values": [{"stacktrace": 3}]},
+ }
)
- == {1, 2, 3}
- )
+ ) == {1, 2, 3}
+# fmt: off
@pytest.mark.parametrize(
("original", "base64_encoded"),
[
@@ -191,6 +184,7 @@ def test_iter_stacktraces():
),
],
)
+# fmt: on
def test_successful_base64_conversion(original, base64_encoded):
# all unicode characters should be handled correctly
assert to_base64(original) == base64_encoded
From 4703bc35a9a5d65d6187ad1b0838a201e1c6e25d Mon Sep 17 00:00:00 2001
From: Taranjeet Singh <34231252+targhs@users.noreply.github.com>
Date: Fri, 1 Apr 2022 16:30:16 +0530
Subject: [PATCH 0312/2327] Update correct test command in contributing docs
(#1377)
Co-authored-by: Taranjeet
Co-authored-by: Anton Pirker
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 86b05d3f6d..48e9aacce2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -74,7 +74,7 @@ So the simplest way to run tests is:
```bash
cd sentry-python
-make tests
+make test
```
This will use [Tox](https://tox.wiki/en/latest/) to run our whole test suite
From 9a0c1330b287088c39f79ee5f1e1106edc8615b7 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Mon, 11 Apr 2022 08:57:13 +0200
Subject: [PATCH 0313/2327] fix(sqlalchemy): Use context instead of connection
in sqlalchemy integration (#1388)
* Revert "fix(sqlalchemy): Change context manager type to avoid race in threads (#1368)"
This reverts commit de0bc5019c715ecbb2409a852037530f36255d75.
This caused a regression (#1385) since the span finishes immediately in
__enter__ and so all db spans have wrong time durations.
* Use context instead of conn in sqlalchemy hooks
---
sentry_sdk/integrations/django/__init__.py | 6 +-
sentry_sdk/integrations/sqlalchemy.py | 27 +++---
sentry_sdk/tracing_utils.py | 96 ++++++++++------------
3 files changed, 62 insertions(+), 67 deletions(-)
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index 7eb91887df..d2ca12be4a 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -9,7 +9,7 @@
from sentry_sdk.hub import Hub, _should_send_default_pii
from sentry_sdk.scope import add_global_event_processor
from sentry_sdk.serializer import add_global_repr_processor
-from sentry_sdk.tracing_utils import RecordSqlQueries
+from sentry_sdk.tracing_utils import record_sql_queries
from sentry_sdk.utils import (
HAS_REAL_CONTEXTVARS,
CONTEXTVARS_ERROR_MESSAGE,
@@ -538,7 +538,7 @@ def execute(self, sql, params=None):
if hub.get_integration(DjangoIntegration) is None:
return real_execute(self, sql, params)
- with RecordSqlQueries(
+ with record_sql_queries(
hub, self.cursor, sql, params, paramstyle="format", executemany=False
):
return real_execute(self, sql, params)
@@ -549,7 +549,7 @@ def executemany(self, sql, param_list):
if hub.get_integration(DjangoIntegration) is None:
return real_executemany(self, sql, param_list)
- with RecordSqlQueries(
+ with record_sql_queries(
hub, self.cursor, sql, param_list, paramstyle="format", executemany=True
):
return real_executemany(self, sql, param_list)
diff --git a/sentry_sdk/integrations/sqlalchemy.py b/sentry_sdk/integrations/sqlalchemy.py
index 6f776e40c8..3d10f2041e 100644
--- a/sentry_sdk/integrations/sqlalchemy.py
+++ b/sentry_sdk/integrations/sqlalchemy.py
@@ -3,7 +3,7 @@
from sentry_sdk._types import MYPY
from sentry_sdk.hub import Hub
from sentry_sdk.integrations import Integration, DidNotEnable
-from sentry_sdk.tracing_utils import RecordSqlQueries
+from sentry_sdk.tracing_utils import record_sql_queries
try:
from sqlalchemy.engine import Engine # type: ignore
@@ -50,7 +50,7 @@ def _before_cursor_execute(
if hub.get_integration(SqlalchemyIntegration) is None:
return
- ctx_mgr = RecordSqlQueries(
+ ctx_mgr = record_sql_queries(
hub,
cursor,
statement,
@@ -58,29 +58,32 @@ def _before_cursor_execute(
paramstyle=context and context.dialect and context.dialect.paramstyle or None,
executemany=executemany,
)
- conn._sentry_sql_span_manager = ctx_mgr
+ context._sentry_sql_span_manager = ctx_mgr
span = ctx_mgr.__enter__()
if span is not None:
- conn._sentry_sql_span = span
+ context._sentry_sql_span = span
-def _after_cursor_execute(conn, cursor, statement, *args):
- # type: (Any, Any, Any, *Any) -> None
+def _after_cursor_execute(conn, cursor, statement, parameters, context, *args):
+ # type: (Any, Any, Any, Any, Any, *Any) -> None
ctx_mgr = getattr(
- conn, "_sentry_sql_span_manager", None
+ context, "_sentry_sql_span_manager", None
) # type: ContextManager[Any]
if ctx_mgr is not None:
- conn._sentry_sql_span_manager = None
+ context._sentry_sql_span_manager = None
ctx_mgr.__exit__(None, None, None)
def _handle_error(context, *args):
# type: (Any, *Any) -> None
- conn = context.connection
- span = getattr(conn, "_sentry_sql_span", None) # type: Optional[Span]
+ execution_context = context.execution_context
+ if execution_context is None:
+ return
+
+ span = getattr(execution_context, "_sentry_sql_span", None) # type: Optional[Span]
if span is not None:
span.set_status("internal_error")
@@ -89,9 +92,9 @@ def _handle_error(context, *args):
# from SQLAlchemy codebase it does seem like any error coming into this
# handler is going to be fatal.
ctx_mgr = getattr(
- conn, "_sentry_sql_span_manager", None
+ execution_context, "_sentry_sql_span_manager", None
) # type: ContextManager[Any]
if ctx_mgr is not None:
- conn._sentry_sql_span_manager = None
+ execution_context._sentry_sql_span_manager = None
ctx_mgr.__exit__(None, None, None)
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
index d754da409c..faed37cbb7 100644
--- a/sentry_sdk/tracing_utils.py
+++ b/sentry_sdk/tracing_utils.py
@@ -1,4 +1,5 @@
import re
+import contextlib
import json
import math
@@ -105,58 +106,6 @@ def __iter__(self):
yield k[len(self.prefix) :]
-class RecordSqlQueries:
- def __init__(
- self,
- hub, # type: sentry_sdk.Hub
- cursor, # type: Any
- query, # type: Any
- params_list, # type: Any
- paramstyle, # type: Optional[str]
- executemany, # type: bool
- ):
- # type: (...) -> None
- # TODO: Bring back capturing of params by default
- self._hub = hub
- if self._hub.client and self._hub.client.options["_experiments"].get(
- "record_sql_params", False
- ):
- if not params_list or params_list == [None]:
- params_list = None
-
- if paramstyle == "pyformat":
- paramstyle = "format"
- else:
- params_list = None
- paramstyle = None
-
- self._query = _format_sql(cursor, query)
-
- self._data = {}
- if params_list is not None:
- self._data["db.params"] = params_list
- if paramstyle is not None:
- self._data["db.paramstyle"] = paramstyle
- if executemany:
- self._data["db.executemany"] = True
-
- def __enter__(self):
- # type: () -> Span
- with capture_internal_exceptions():
- self._hub.add_breadcrumb(
- message=self._query, category="query", data=self._data
- )
-
- with self._hub.start_span(op="db", description=self._query) as span:
- for k, v in self._data.items():
- span.set_data(k, v)
- return span
-
- def __exit__(self, exc_type, exc_val, exc_tb):
- # type: (Any, Any, Any) -> None
- pass
-
-
def has_tracing_enabled(options):
# type: (Dict[str, Any]) -> bool
"""
@@ -201,6 +150,49 @@ def is_valid_sample_rate(rate):
return True
+@contextlib.contextmanager
+def record_sql_queries(
+ hub, # type: sentry_sdk.Hub
+ cursor, # type: Any
+ query, # type: Any
+ params_list, # type: Any
+ paramstyle, # type: Optional[str]
+ executemany, # type: bool
+):
+ # type: (...) -> Generator[Span, None, None]
+
+ # TODO: Bring back capturing of params by default
+ if hub.client and hub.client.options["_experiments"].get(
+ "record_sql_params", False
+ ):
+ if not params_list or params_list == [None]:
+ params_list = None
+
+ if paramstyle == "pyformat":
+ paramstyle = "format"
+ else:
+ params_list = None
+ paramstyle = None
+
+ query = _format_sql(cursor, query)
+
+ data = {}
+ if params_list is not None:
+ data["db.params"] = params_list
+ if paramstyle is not None:
+ data["db.paramstyle"] = paramstyle
+ if executemany:
+ data["db.executemany"] = True
+
+ with capture_internal_exceptions():
+ hub.add_breadcrumb(message=query, category="query", data=data)
+
+ with hub.start_span(op="db", description=query) as span:
+ for k, v in data.items():
+ span.set_data(k, v)
+ yield span
+
+
def maybe_create_breadcrumbs_from_span(hub, span):
# type: (sentry_sdk.Hub, Span) -> None
if span.op == "redis":
From c9a58b5f1f862b61fb994896d8a50c51b9d43fda Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Mon, 11 Apr 2022 12:45:29 +0000
Subject: [PATCH 0314/2327] release: 1.5.9
---
CHANGELOG.md | 13 +++++++++++++
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b91831ca3a..6902c3b4dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
# Changelog
+## 1.5.9
+
+### Various fixes & improvements
+
+- fix(sqlalchemy): Use context instead of connection in sqlalchemy integration (#1388) by @sl0thentr0py
+- Update correct test command in contributing docs (#1377) by @targhs
+- Update black (#1379) by @antonpirker
+- build(deps): bump sphinx from 4.1.1 to 4.5.0 (#1376) by @dependabot
+- fix: Auto-enabling Redis and Pyramid integration (#737) by @untitaker
+- feat(testing): Add pytest-watch (#853) by @lobsterkatie
+- Treat x-api-key header as sensitive (#1236) by @simonschmidt
+- fix: Remove obsolete MAX_FORMAT_PARAM_LENGTH (#1375) by @blueyed
+
## 1.5.8
### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 945a382f39..8aa1d16ffc 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.5.8"
+release = "1.5.9"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index fe3b2f05dc..71958cf2a5 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.5.8"
+VERSION = "1.5.9"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 7db81e1308..695ddb981c 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.5.8",
+ version="1.5.9",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 91436cdc582d1ea38e1a6280553b23f3a6d14cc7 Mon Sep 17 00:00:00 2001
From: Alexander Dinauer
Date: Tue, 12 Apr 2022 13:30:45 +0200
Subject: [PATCH 0315/2327] Change ordering of event drop mechanisms (#1390)
* Change ordering of event drop mechanisms
As requested by @mitsuhiko this PR shall serve as basis for discussing the ordering of event drop mechanisms and its implications.
We are planning for `sample_rate` to update the session counts despite dropping an event (see https://github.com/getsentry/develop/pull/551 and https://github.com/getsentry/develop/issues/537). Without changing the order of filtering mechanisms this would mean any event dropped by `sample_rate` would update the session even if it would be dropped by `ignore_errors` which should not update the session counts when dropping an event. By changing the order we would first drop `ignored_errors` and only then check `sample_rate`, so session counts would not be affected in the case mentioned before. The same reasoning could probably be applied to `event_processor` and `before_send` but we don't know why a developer decided to drop an event there. Was it because they don't care about the event (then session should not be updated) or to save quota (session should be updated)? Also these may be more expensive in terms of performance (developers can provide their own implementations for both of those on some SDKs). So moving them before `sample_rate` would execute `before_send` and `event_processor` for every event instead of only doing it for the sampled events.
Co-authored-by: Anton Pirker
---
sentry_sdk/client.py | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index efc8799c00..15cd94c3a1 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -224,17 +224,18 @@ def _is_ignored_error(self, event, hint):
if exc_info is None:
return False
- type_name = get_type_name(exc_info[0])
- full_name = "%s.%s" % (exc_info[0].__module__, type_name)
+ error = exc_info[0]
+ error_type_name = get_type_name(exc_info[0])
+ error_full_name = "%s.%s" % (exc_info[0].__module__, error_type_name)
- for errcls in self.options["ignore_errors"]:
+ for ignored_error in self.options["ignore_errors"]:
# String types are matched against the type name in the
# exception only
- if isinstance(errcls, string_types):
- if errcls == full_name or errcls == type_name:
+ if isinstance(ignored_error, string_types):
+ if ignored_error == error_full_name or ignored_error == error_type_name:
return True
else:
- if issubclass(exc_info[0], errcls):
+ if issubclass(error, ignored_error):
return True
return False
@@ -246,23 +247,28 @@ def _should_capture(
scope=None, # type: Optional[Scope]
):
# type: (...) -> bool
- if event.get("type") == "transaction":
- # Transactions are sampled independent of error events.
+ # Transactions are sampled independent of error events.
+ is_transaction = event.get("type") == "transaction"
+ if is_transaction:
return True
- if scope is not None and not scope._should_capture:
+ ignoring_prevents_recursion = scope is not None and not scope._should_capture
+ if ignoring_prevents_recursion:
return False
- if (
+ ignored_by_config_option = self._is_ignored_error(event, hint)
+ if ignored_by_config_option:
+ return False
+
+ not_in_sample_rate = (
self.options["sample_rate"] < 1.0
and random.random() >= self.options["sample_rate"]
- ):
- # record a lost event if we did not sample this.
+ )
+ if not_in_sample_rate:
+ # because we will not sample this event, record a "lost event".
if self.transport:
self.transport.record_lost_event("sample_rate", data_category="error")
- return False
- if self._is_ignored_error(event, hint):
return False
return True
From b73076b492ff1b19ca2da18c1ce494bd298c14bc Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Thu, 14 Apr 2022 14:47:35 +0200
Subject: [PATCH 0316/2327] WIP: try to remove Flask version contraint (#1395)
* Removed version constraint
* Removed Flask 0.10 from test suite
---
setup.py | 2 +-
tox.ini | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/setup.py b/setup.py
index 695ddb981c..c93e85da24 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ def get_file_text(file_name):
license="BSD",
install_requires=["urllib3>=1.10.0", "certifi"],
extras_require={
- "flask": ["flask>=0.11,<2.1.0", "blinker>=1.1"],
+ "flask": ["flask>=0.11", "blinker>=1.1"],
"quart": ["quart>=0.16.1", "blinker>=1.1"],
"bottle": ["bottle>=0.12.13"],
"falcon": ["falcon>=1.4"],
diff --git a/tox.ini b/tox.ini
index bd17e7fe58..2cdf8a45bf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@ envlist =
{py3.5,py3.6,py3.7}-django-{2.0,2.1}
{py3.7,py3.8,py3.9,py3.10}-django-{2.2,3.0,3.1,3.2}
- {pypy,py2.7,py3.4,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12,1.0}
+ {pypy,py2.7,py3.4,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.11,0.12,1.0}
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-flask-1.1
{py3.6,py3.8,py3.9,py3.10}-flask-2.0
@@ -118,7 +118,6 @@ deps =
django-3.2: Django>=3.2,<3.3
flask: flask-login
- flask-0.10: Flask>=0.10,<0.11
flask-0.11: Flask>=0.11,<0.12
flask-0.12: Flask>=0.12,<0.13
flask-1.0: Flask>=1.0,<1.1
@@ -307,14 +306,14 @@ basepython =
commands =
; https://github.com/pytest-dev/pytest/issues/5532
- {py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12}: pip install pytest<5
+ {py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.11,0.12}: pip install pytest<5
{py3.6,py3.7,py3.8,py3.9}-flask-{0.11}: pip install Werkzeug<2
; https://github.com/pallets/flask/issues/4455
{py3.7,py3.8,py3.9,py3.10}-flask-{0.11,0.12,1.0,1.1}: pip install "itsdangerous>=0.24,<2.0" "markupsafe<2.0.0" "jinja2<3.1.1"
; https://github.com/more-itertools/more-itertools/issues/578
- py3.5-flask-{0.10,0.11,0.12}: pip install more-itertools<8.11.0
+ py3.5-flask-{0.11,0.12}: pip install more-itertools<8.11.0
; use old pytest for old Python versions:
{py2.7,py3.4,py3.5}: pip install pytest-forked==1.1.3
From 2b1168a8bf67422c51341aba6a932968d62b7903 Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Thu, 14 Apr 2022 15:43:17 +0200
Subject: [PATCH 0317/2327] Nicer changelog text (#1397)
---
CHANGELOG.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6902c3b4dc..82e0cd4d8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+## 1.5.10
+
+### Various fixes & improvements
+
+- Remove Flask version contraint (#1395) by @antonpirker
+- Change ordering of event drop mechanisms (#1390) by @adinauer
+
## 1.5.9
### Various fixes & improvements
From 29c1b6284421dadde1a198aea221e4b2db41fcaa Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Thu, 14 Apr 2022 14:50:08 +0000
Subject: [PATCH 0318/2327] release: 1.5.10
---
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 8aa1d16ffc..4b32e0d619 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.5.9"
+release = "1.5.10"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 71958cf2a5..d5ac10405f 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.5.9"
+VERSION = "1.5.10"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index c93e85da24..0bbfe08138 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.5.9",
+ version="1.5.10",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 4cce4b5d9f5b34379879a332b320e870ce0ce1ad Mon Sep 17 00:00:00 2001
From: Alexander Dinauer
Date: Wed, 20 Apr 2022 16:58:26 +0200
Subject: [PATCH 0319/2327] fix(sessions): Update session also for non sampled
events and change filter order (#1394)
We want to update the session for dropped events in case the event is dropped by sampling. Events dropped by other mechanisms should not update the session. See https://github.com/getsentry/develop/pull/551
---
sentry_sdk/client.py | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 15cd94c3a1..628cb00ee3 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -260,6 +260,13 @@ def _should_capture(
if ignored_by_config_option:
return False
+ return True
+
+ def _should_sample_error(
+ self,
+ event, # type: Event
+ ):
+ # type: (...) -> bool
not_in_sample_rate = (
self.options["sample_rate"] < 1.0
and random.random() >= self.options["sample_rate"]
@@ -349,9 +356,13 @@ def capture_event(
if session:
self._update_session_from_event(session, event)
- attachments = hint.get("attachments")
is_transaction = event_opt.get("type") == "transaction"
+ if not is_transaction and not self._should_sample_error(event):
+ return None
+
+ attachments = hint.get("attachments")
+
# this is outside of the `if` immediately below because even if we don't
# use the value, we want to make sure we remove it before the event is
# sent
From 6a805fa781d770affa00459aa54796f105013b2b Mon Sep 17 00:00:00 2001
From: Taranjeet Singh <34231252+targhs@users.noreply.github.com>
Date: Tue, 26 Apr 2022 17:59:05 +0530
Subject: [PATCH 0320/2327] ref: Update error verbose for sentry init (#1361)
---
sentry_sdk/client.py | 3 +++
tests/test_client.py | 6 ++++++
2 files changed, 9 insertions(+)
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 628cb00ee3..63a1205f57 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -48,6 +48,9 @@ def _get_options(*args, **kwargs):
else:
dsn = None
+ if len(args) > 1:
+ raise TypeError("Only single positional argument is expected")
+
rv = dict(DEFAULT_OPTIONS)
options = dict(*args, **kwargs)
if dsn is not None and options.get("dsn") is None:
diff --git a/tests/test_client.py b/tests/test_client.py
index c8dd6955fe..ffdb831e39 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -887,3 +887,9 @@ def test_max_breadcrumbs_option(
capture_message("dogs are great")
assert len(events[0]["breadcrumbs"]["values"]) == expected_breadcrumbs
+
+
+def test_multiple_positional_args(sentry_init):
+ with pytest.raises(TypeError) as exinfo:
+ sentry_init(1, None)
+ assert "Only single positional argument is expected" in str(exinfo.value)
From 7417d9607eb87aa7308d8b3af5fb47ca51709105 Mon Sep 17 00:00:00 2001
From: asottile-sentry <103459774+asottile-sentry@users.noreply.github.com>
Date: Tue, 26 Apr 2022 14:34:44 -0400
Subject: [PATCH 0321/2327] fix: replace git.io links with redirect targets
(#1412)
see: https://github.blog/changelog/2022-04-25-git-io-deprecation/
Committed via https://github.com/asottile/all-repos
---
.github/workflows/codeql-analysis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index d4bf49c6b3..207ac53ecf 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -53,7 +53,7 @@ jobs:
uses: github/codeql-action/autobuild@v1
# ℹ️ Command-line programs to run using the OS shell.
- # 📚 https://git.io/JvXDl
+ # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
From 5eda9cf7f429f0aa67969062c93866827b0f282a Mon Sep 17 00:00:00 2001
From: Chad Whitacre
Date: Wed, 27 Apr 2022 08:17:46 -0400
Subject: [PATCH 0322/2327] meta(gha): Deploy action
enforce-license-compliance.yml (#1400)
---
.github/workflows/enforce-license-compliance.yml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 .github/workflows/enforce-license-compliance.yml
diff --git a/.github/workflows/enforce-license-compliance.yml b/.github/workflows/enforce-license-compliance.yml
new file mode 100644
index 0000000000..b331974711
--- /dev/null
+++ b/.github/workflows/enforce-license-compliance.yml
@@ -0,0 +1,16 @@
+name: Enforce License Compliance
+
+on:
+ push:
+ branches: [master, main, release/*]
+ pull_request:
+ branches: [master, main]
+
+jobs:
+ enforce-license-compliance:
+ runs-on: ubuntu-latest
+ steps:
+ - name: 'Enforce License Compliance'
+ uses: getsentry/action-enforce-license-compliance@main
+ with:
+ fossa_api_key: ${{ secrets.FOSSA_API_KEY }}
From 8501874fdae9f10a9e440fc3b0b36b98481243b0 Mon Sep 17 00:00:00 2001
From: Vladan Paunovic
Date: Tue, 3 May 2022 11:41:37 +0200
Subject: [PATCH 0323/2327] chore(issues): add link to Sentry support (#1420)
---
.github/ISSUE_TEMPLATE/config.yml | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/config.yml
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..7f40ddc56d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,6 @@
+blank_issues_enabled: false
+contact_links:
+ - name: Support Request
+ url: https://sentry.io/support
+ about: Use our dedicated support channel for paid accounts.
+
From 85208da360e3ab6fa4e38b202376353438e4f904 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Tue, 3 May 2022 14:27:53 +0200
Subject: [PATCH 0324/2327] chore: Bump mypy and fix abstract ContextManager
typing (#1421)
---
linter-requirements.txt | 7 +++++--
mypy.ini | 2 ++
sentry_sdk/hub.py | 2 +-
sentry_sdk/integrations/aws_lambda.py | 6 +++---
sentry_sdk/integrations/celery.py | 2 +-
sentry_sdk/integrations/excepthook.py | 5 +++--
sentry_sdk/integrations/flask.py | 2 +-
sentry_sdk/integrations/gcp.py | 2 +-
sentry_sdk/integrations/logging.py | 2 +-
sentry_sdk/integrations/sqlalchemy.py | 4 ++--
sentry_sdk/integrations/stdlib.py | 4 ++--
sentry_sdk/integrations/threading.py | 2 +-
sentry_sdk/integrations/tornado.py | 14 +++++++-------
sentry_sdk/utils.py | 5 ++++-
tox.ini | 2 +-
15 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/linter-requirements.txt b/linter-requirements.txt
index 744904fbc2..ec736a59c5 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -1,7 +1,10 @@
black==22.3.0
flake8==3.9.2
flake8-import-order==0.18.1
-mypy==0.782
+mypy==0.950
+types-certifi
+types-redis
+types-setuptools
flake8-bugbear==21.4.3
pep8-naming==0.11.1
-pre-commit # local linting
\ No newline at end of file
+pre-commit # local linting
diff --git a/mypy.ini b/mypy.ini
index 7e30dddb5b..2a15e45e49 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -61,3 +61,5 @@ ignore_missing_imports = True
disallow_untyped_defs = False
[mypy-celery.app.trace]
ignore_missing_imports = True
+[mypy-flask.signals]
+ignore_missing_imports = True
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
index 22f3ff42fd..d2b57a2e45 100644
--- a/sentry_sdk/hub.py
+++ b/sentry_sdk/hub.py
@@ -117,7 +117,7 @@ def _init(*args, **kwargs):
# Use `ClientConstructor` to define the argument types of `init` and
# `ContextManager[Any]` to tell static analyzers about the return type.
- class init(ClientConstructor, ContextManager[Any]): # noqa: N801
+ class init(ClientConstructor, _InitGuard): # noqa: N801
pass
else:
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
index 0eae710bff..10b5025abe 100644
--- a/sentry_sdk/integrations/aws_lambda.py
+++ b/sentry_sdk/integrations/aws_lambda.py
@@ -302,12 +302,12 @@ def get_lambda_bootstrap():
module = sys.modules["__main__"]
# python3.9 runtime
if hasattr(module, "awslambdaricmain") and hasattr(
- module.awslambdaricmain, "bootstrap" # type: ignore
+ module.awslambdaricmain, "bootstrap"
):
- return module.awslambdaricmain.bootstrap # type: ignore
+ return module.awslambdaricmain.bootstrap
elif hasattr(module, "bootstrap"):
# awslambdaric python module in container builds
- return module.bootstrap # type: ignore
+ return module.bootstrap
# python3.8 runtime
return module
diff --git a/sentry_sdk/integrations/celery.py b/sentry_sdk/integrations/celery.py
index 40a2dfbe39..743e2cfb50 100644
--- a/sentry_sdk/integrations/celery.py
+++ b/sentry_sdk/integrations/celery.py
@@ -23,7 +23,7 @@
try:
- from celery import VERSION as CELERY_VERSION # type: ignore
+ from celery import VERSION as CELERY_VERSION
from celery.exceptions import ( # type: ignore
SoftTimeLimitExceeded,
Retry,
diff --git a/sentry_sdk/integrations/excepthook.py b/sentry_sdk/integrations/excepthook.py
index 1e8597e13f..1f16ff0b06 100644
--- a/sentry_sdk/integrations/excepthook.py
+++ b/sentry_sdk/integrations/excepthook.py
@@ -10,11 +10,12 @@
from typing import Callable
from typing import Any
from typing import Type
+ from typing import Optional
from types import TracebackType
Excepthook = Callable[
- [Type[BaseException], BaseException, TracebackType],
+ [Type[BaseException], BaseException, Optional[TracebackType]],
Any,
]
@@ -43,7 +44,7 @@ def setup_once():
def _make_excepthook(old_excepthook):
# type: (Excepthook) -> Excepthook
def sentry_sdk_excepthook(type_, value, traceback):
- # type: (Type[BaseException], BaseException, TracebackType) -> None
+ # type: (Type[BaseException], BaseException, Optional[TracebackType]) -> None
hub = Hub.current
integration = hub.get_integration(ExcepthookIntegration)
diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py
index 8883cbb724..5aade50a94 100644
--- a/sentry_sdk/integrations/flask.py
+++ b/sentry_sdk/integrations/flask.py
@@ -94,7 +94,7 @@ def sentry_patched_wsgi_app(self, environ, start_response):
environ, start_response
)
- Flask.__call__ = sentry_patched_wsgi_app # type: ignore
+ Flask.__call__ = sentry_patched_wsgi_app
def _add_sentry_trace(sender, template, context, **extra):
diff --git a/sentry_sdk/integrations/gcp.py b/sentry_sdk/integrations/gcp.py
index e92422d8b9..118970e9d8 100644
--- a/sentry_sdk/integrations/gcp.py
+++ b/sentry_sdk/integrations/gcp.py
@@ -126,7 +126,7 @@ def __init__(self, timeout_warning=False):
@staticmethod
def setup_once():
# type: () -> None
- import __main__ as gcp_functions # type: ignore
+ import __main__ as gcp_functions
if not hasattr(gcp_functions, "worker_v1"):
logger.warning(
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
index 31c7b874ba..e9f3fe9dbb 100644
--- a/sentry_sdk/integrations/logging.py
+++ b/sentry_sdk/integrations/logging.py
@@ -78,7 +78,7 @@ def _handle_record(self, record):
@staticmethod
def setup_once():
# type: () -> None
- old_callhandlers = logging.Logger.callHandlers # type: ignore
+ old_callhandlers = logging.Logger.callHandlers
def sentry_patched_callhandlers(self, record):
# type: (Any, LogRecord) -> Any
diff --git a/sentry_sdk/integrations/sqlalchemy.py b/sentry_sdk/integrations/sqlalchemy.py
index 3d10f2041e..deb97c05ad 100644
--- a/sentry_sdk/integrations/sqlalchemy.py
+++ b/sentry_sdk/integrations/sqlalchemy.py
@@ -70,7 +70,7 @@ def _after_cursor_execute(conn, cursor, statement, parameters, context, *args):
# type: (Any, Any, Any, Any, Any, *Any) -> None
ctx_mgr = getattr(
context, "_sentry_sql_span_manager", None
- ) # type: ContextManager[Any]
+ ) # type: Optional[ContextManager[Any]]
if ctx_mgr is not None:
context._sentry_sql_span_manager = None
@@ -93,7 +93,7 @@ def _handle_error(context, *args):
# handler is going to be fatal.
ctx_mgr = getattr(
execution_context, "_sentry_sql_span_manager", None
- ) # type: ContextManager[Any]
+ ) # type: Optional[ContextManager[Any]]
if ctx_mgr is not None:
execution_context._sentry_sql_span_manager = None
diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py
index adea742b2d..9495d406dc 100644
--- a/sentry_sdk/integrations/stdlib.py
+++ b/sentry_sdk/integrations/stdlib.py
@@ -157,7 +157,7 @@ def sentry_patched_popen_init(self, *a, **kw):
hub = Hub.current
if hub.get_integration(StdlibIntegration) is None:
- return old_popen_init(self, *a, **kw) # type: ignore
+ return old_popen_init(self, *a, **kw)
# Convert from tuple to list to be able to set values.
a = list(a)
@@ -195,7 +195,7 @@ def sentry_patched_popen_init(self, *a, **kw):
if cwd:
span.set_data("subprocess.cwd", cwd)
- rv = old_popen_init(self, *a, **kw) # type: ignore
+ rv = old_popen_init(self, *a, **kw)
span.set_tag("subprocess.pid", self.pid)
return rv
diff --git a/sentry_sdk/integrations/threading.py b/sentry_sdk/integrations/threading.py
index b750257e2a..f29e5e8797 100644
--- a/sentry_sdk/integrations/threading.py
+++ b/sentry_sdk/integrations/threading.py
@@ -51,7 +51,7 @@ def sentry_start(self, *a, **kw):
new_run = _wrap_run(hub_, getattr(self.run, "__func__", self.run))
self.run = new_run # type: ignore
- return old_start(self, *a, **kw) # type: ignore
+ return old_start(self, *a, **kw)
Thread.start = sentry_start # type: ignore
diff --git a/sentry_sdk/integrations/tornado.py b/sentry_sdk/integrations/tornado.py
index f9796daca3..443ebefaa8 100644
--- a/sentry_sdk/integrations/tornado.py
+++ b/sentry_sdk/integrations/tornado.py
@@ -21,7 +21,7 @@
from sentry_sdk._compat import iteritems
try:
- from tornado import version_info as TORNADO_VERSION # type: ignore
+ from tornado import version_info as TORNADO_VERSION
from tornado.web import RequestHandler, HTTPError
from tornado.gen import coroutine
except ImportError:
@@ -58,7 +58,7 @@ def setup_once():
ignore_logger("tornado.access")
- old_execute = RequestHandler._execute # type: ignore
+ old_execute = RequestHandler._execute
awaitable = iscoroutinefunction(old_execute)
@@ -79,16 +79,16 @@ def sentry_execute_request_handler(self, *args, **kwargs): # type: ignore
result = yield from old_execute(self, *args, **kwargs)
return result
- RequestHandler._execute = sentry_execute_request_handler # type: ignore
+ RequestHandler._execute = sentry_execute_request_handler
old_log_exception = RequestHandler.log_exception
def sentry_log_exception(self, ty, value, tb, *args, **kwargs):
# type: (Any, type, BaseException, Any, *Any, **Any) -> Optional[Any]
_capture_exception(ty, value, tb)
- return old_log_exception(self, ty, value, tb, *args, **kwargs) # type: ignore
+ return old_log_exception(self, ty, value, tb, *args, **kwargs)
- RequestHandler.log_exception = sentry_log_exception # type: ignore
+ RequestHandler.log_exception = sentry_log_exception
@contextlib.contextmanager
@@ -105,7 +105,7 @@ def _handle_request_impl(self):
with Hub(hub) as hub:
with hub.configure_scope() as scope:
scope.clear_breadcrumbs()
- processor = _make_event_processor(weak_handler) # type: ignore
+ processor = _make_event_processor(weak_handler)
scope.add_event_processor(processor)
transaction = Transaction.continue_from_headers(
@@ -155,7 +155,7 @@ def tornado_processor(event, hint):
request = handler.request
with capture_internal_exceptions():
- method = getattr(handler, handler.request.method.lower()) # type: ignore
+ method = getattr(handler, handler.request.method.lower())
event["transaction"] = transaction_from_function(method)
with capture_internal_exceptions():
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index e22f6ae065..0a735a1e20 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -171,7 +171,7 @@ def __init__(self, value):
self.host = parts.hostname
if parts.port is None:
- self.port = self.scheme == "https" and 443 or 80
+ self.port = self.scheme == "https" and 443 or 80 # type: int
else:
self.port = parts.port
@@ -466,6 +466,9 @@ def filename_for_module(module, abs_path):
return os.path.basename(abs_path)
base_module_path = sys.modules[base_module].__file__
+ if not base_module_path:
+ return abs_path
+
return abs_path.split(base_module_path.rsplit(os.sep, 2)[0], 1)[-1].lstrip(
os.sep
)
diff --git a/tox.ini b/tox.ini
index 2cdf8a45bf..0ca43ab8a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -324,4 +324,4 @@ commands =
commands =
flake8 tests examples sentry_sdk
black --check tests examples sentry_sdk
- mypy examples sentry_sdk
+ mypy sentry_sdk
From e4ea11cad13f960c9c1d1faebfecd06a5414b63f Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Tue, 3 May 2022 13:45:50 +0000
Subject: [PATCH 0325/2327] release: 1.5.11
---
CHANGELOG.md | 10 ++++++++++
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82e0cd4d8b..cc9a6287ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
# Changelog
+## 1.5.11
+
+### Various fixes & improvements
+
+- chore: Bump mypy and fix abstract ContextManager typing (#1421) by @sl0thentr0py
+- chore(issues): add link to Sentry support (#1420) by @vladanpaunovic
+- fix: replace git.io links with redirect targets (#1412) by @asottile-sentry
+- ref: Update error verbose for sentry init (#1361) by @targhs
+- fix(sessions): Update session also for non sampled events and change filter order (#1394) by @adinauer
+
## 1.5.10
### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 4b32e0d619..2bf48078be 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.5.10"
+release = "1.5.11"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index d5ac10405f..1418081511 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -101,7 +101,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.5.10"
+VERSION = "1.5.11"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index 0bbfe08138..d814e5d4b5 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.5.10",
+ version="1.5.11",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 9609dbd2d53ffffdc664e59d6110ba31add3cad7 Mon Sep 17 00:00:00 2001
From: Marcel Petrick
Date: Wed, 4 May 2022 18:44:45 +0200
Subject: [PATCH 0326/2327] chore: conf.py removed double-spaces after period
(#1425)
---
docs/conf.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
index 2bf48078be..68374ceb33 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -89,7 +89,7 @@
html_theme = "alabaster"
# Theme options are theme-specific and customize the look and feel of a theme
-# further. For a list of options available for each theme, see the
+# further. For a list of options available for each theme, see the
# documentation.
#
# html_theme_options = {}
@@ -103,7 +103,7 @@
# to template names.
#
# The default sidebars (for documents that don't match any pattern) are
-# defined by theme itself. Builtin themes are using these templates by
+# defined by theme itself. Builtin themes are using these templates by
# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
# 'searchbox.html']``.
#
From b1bd070baaf27f91405b83577cd4c0664edd8fb6 Mon Sep 17 00:00:00 2001
From: Matt Johnson-Pint
Date: Wed, 4 May 2022 10:59:44 -0700
Subject: [PATCH 0327/2327] chore: Update logo for dark or light theme (#1426)
---
README.md | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 64027a71df..1aeddc819a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
-
-
+
+
+
+
+
+
From 0b32de6604257d3014b79c1a8d50d53eca876736 Mon Sep 17 00:00:00 2001
From: Naveen <172697+naveensrinivasan@users.noreply.github.com>
Date: Wed, 4 May 2022 15:21:39 -0500
Subject: [PATCH 0328/2327] chore: Set permissions for GitHub actions (#1422)
---
.github/workflows/ci.yml | 3 +++
.github/workflows/codeql-analysis.yml | 7 +++++++
.github/workflows/stale.yml | 6 ++++++
3 files changed, 16 insertions(+)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8850aaddc7..551043a528 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,9 @@ on:
pull_request:
+permissions:
+ contents: read
+
jobs:
dist:
name: distribution packages
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 207ac53ecf..8d3f127829 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -20,8 +20,15 @@ on:
schedule:
- cron: '18 18 * * 3'
+permissions:
+ contents: read
+
jobs:
analyze:
+ permissions:
+ actions: read # for github/codeql-action/init to get workflow details
+ contents: read # for actions/checkout to fetch code
+ security-events: write # for github/codeql-action/autobuild to send a status report
name: Analyze
runs-on: ubuntu-latest
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index bc092820a5..e70fc033a7 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -3,8 +3,14 @@ on:
schedule:
- cron: '0 0 * * *'
workflow_dispatch:
+permissions:
+ contents: read
+
jobs:
stale:
+ permissions:
+ issues: write # for actions/stale to close stale issues
+ pull-requests: write # for actions/stale to close stale PRs
runs-on: ubuntu-latest
steps:
- uses: actions/stale@87c2b794b9b47a9bec68ae03c01aeb572ffebdb1
From adbe26f09ecc78d9e4dee6473a44cb7612076ffe Mon Sep 17 00:00:00 2001
From: Naveen <172697+naveensrinivasan@users.noreply.github.com>
Date: Thu, 5 May 2022 05:22:54 -0500
Subject: [PATCH 0329/2327] chore: Included githubactions in the dependabot
config (#1427)
---
.github/dependabot.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 9c69247970..eadcd59879 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -41,3 +41,8 @@ updates:
schedule:
interval: weekly
open-pull-requests-limit: 10
+- package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: weekly
+ open-pull-requests-limit: 10
From e08e3f595727a8a86ff23feafb8dc869813229a6 Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya
Date: Thu, 5 May 2022 14:25:44 +0300
Subject: [PATCH 0330/2327] fix: Remove incorrect usage from flask helper
example (#1434)
---
examples/tracing/templates/index.html | 48 ++++++++++++---------------
1 file changed, 22 insertions(+), 26 deletions(-)
diff --git a/examples/tracing/templates/index.html b/examples/tracing/templates/index.html
index c4d8f06c51..5e930a720c 100644
--- a/examples/tracing/templates/index.html
+++ b/examples/tracing/templates/index.html
@@ -1,51 +1,47 @@
-
-
{{ sentry_trace }}
+
-
Decode your base64 string as a service (that calls another service)
- A base64 string
-
+ A base64 string
+
Output:
-
+
From 37ae664fc4f01c9d5031fd5361f6c57491ba8466 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 May 2022 12:21:44 +0000
Subject: [PATCH 0331/2327] build(deps): bump github/codeql-action from 1 to 2
(#1433)
---
.github/workflows/codeql-analysis.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 8d3f127829..69b0201212 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -46,7 +46,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@v1
+ uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -57,7 +57,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
- uses: github/codeql-action/autobuild@v1
+ uses: github/codeql-action/autobuild@v2
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -71,4 +71,4 @@ jobs:
# make release
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+ uses: github/codeql-action/analyze@v2
From 5ad4ba1e4e16ee4b4729bc9a15eca9af4a1000ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 May 2022 15:11:20 +0200
Subject: [PATCH 0332/2327] build(deps): bump actions/setup-python from 2 to 3
(#1432)
---
.github/workflows/ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 551043a528..2482013cc9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- - uses: actions/setup-python@v2
+ - uses: actions/setup-python@v3
with:
python-version: 3.9
@@ -43,7 +43,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- - uses: actions/setup-python@v2
+ - uses: actions/setup-python@v3
with:
python-version: 3.9
@@ -63,7 +63,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- - uses: actions/setup-python@v2
+ - uses: actions/setup-python@v3
with:
python-version: 3.9
@@ -124,7 +124,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- - uses: actions/setup-python@v2
+ - uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
From 1b0e6552325906382e7f10f24934511c85533fc5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 May 2022 13:50:30 +0000
Subject: [PATCH 0333/2327] build(deps): bump actions/checkout from 2 to 3
(#1429)
---
.github/workflows/ci.yml | 8 ++++----
.github/workflows/codeql-analysis.yml | 2 +-
.github/workflows/release.yml | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2482013cc9..00dc5b5359 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- uses: actions/setup-node@v1
- uses: actions/setup-python@v3
with:
@@ -41,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- uses: actions/setup-node@v1
- uses: actions/setup-python@v3
with:
@@ -62,7 +62,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: 3.9
@@ -122,7 +122,7 @@ jobs:
SENTRY_PYTHON_TEST_POSTGRES_NAME: ci_test
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- uses: actions/setup-node@v1
- uses: actions/setup-python@v3
with:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 69b0201212..1d88a97406 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -42,7 +42,7 @@ jobs:
steps:
- name: Checkout repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 493032b221..139fe29007 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
name: "Release a new version"
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
with:
token: ${{ secrets.GH_RELEASE_PAT }}
fetch-depth: 0
From e73b4178a2db8764a79728360f0b168b8172f88a Mon Sep 17 00:00:00 2001
From: Matt Johnson-Pint
Date: Thu, 5 May 2022 15:04:16 -0700
Subject: [PATCH 0334/2327] chore: Update logo in readme (again) (#1436)
---
README.md | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index 1aeddc819a..4871fdb2f4 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,7 @@
-
-
-
-
-
-
-
+
+
+
_Bad software is everywhere, and we're tired of it. Sentry is on a mission to help developers write better software faster, so we can get back to enjoying technology. If you want to join us [**Check out our open positions**](https://sentry.io/careers/)_
From 7a3b0e5b6bed2b1f68e3b065eca3df80386178bb Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Fri, 6 May 2022 11:16:39 +0200
Subject: [PATCH 0335/2327] feat(measurements): Add experimental
set_measurement api on transaction (#1359)
---
sentry_sdk/_types.py | 31 ++++++++++++++++++++++++++++
sentry_sdk/consts.py | 1 +
sentry_sdk/tracing.py | 40 ++++++++++++++++++++++++++-----------
sentry_sdk/tracing_utils.py | 7 +++++++
tests/tracing/test_misc.py | 28 ++++++++++++++++++++++++++
5 files changed, 95 insertions(+), 12 deletions(-)
diff --git a/sentry_sdk/_types.py b/sentry_sdk/_types.py
index 7ce7e9e4f6..59970ad60a 100644
--- a/sentry_sdk/_types.py
+++ b/sentry_sdk/_types.py
@@ -48,3 +48,34 @@
]
SessionStatus = Literal["ok", "exited", "crashed", "abnormal"]
EndpointType = Literal["store", "envelope"]
+
+ DurationUnit = Literal[
+ "nanosecond",
+ "microsecond",
+ "millisecond",
+ "second",
+ "minute",
+ "hour",
+ "day",
+ "week",
+ ]
+
+ InformationUnit = Literal[
+ "bit",
+ "byte",
+ "kilobyte",
+ "kibibyte",
+ "megabyte",
+ "mebibyte",
+ "gigabyte",
+ "gibibyte",
+ "terabyte",
+ "tebibyte",
+ "petabyte",
+ "pebibyte",
+ "exabyte",
+ "exbibyte",
+ ]
+
+ FractionUnit = Literal["ratio", "percent"]
+ MeasurementUnit = Union[DurationUnit, InformationUnit, FractionUnit, str]
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 1418081511..ae808c64ee 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -33,6 +33,7 @@
"record_sql_params": Optional[bool],
"smart_transaction_trimming": Optional[bool],
"propagate_tracestate": Optional[bool],
+ "custom_measurements": Optional[bool],
},
total=False,
)
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 1b5b65e1af..f6f625acc8 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -20,7 +20,7 @@
from typing import Tuple
from typing import Iterator
- from sentry_sdk._types import SamplingContext
+ from sentry_sdk._types import SamplingContext, MeasurementUnit
class _SpanRecorder(object):
@@ -487,6 +487,7 @@ class Transaction(Span):
"_sentry_tracestate",
# tracestate data from other vendors, of the form `dogs=yes,cats=maybe`
"_third_party_tracestate",
+ "_measurements",
)
def __init__(
@@ -515,6 +516,7 @@ def __init__(
# first time an event needs it for inclusion in the captured data
self._sentry_tracestate = sentry_tracestate
self._third_party_tracestate = third_party_tracestate
+ self._measurements = {} # type: Dict[str, Any]
def __repr__(self):
# type: () -> str
@@ -594,17 +596,30 @@ def finish(self, hub=None):
# to be garbage collected
self._span_recorder = None
- return hub.capture_event(
- {
- "type": "transaction",
- "transaction": self.name,
- "contexts": {"trace": self.get_trace_context()},
- "tags": self._tags,
- "timestamp": self.timestamp,
- "start_timestamp": self.start_timestamp,
- "spans": finished_spans,
- }
- )
+ event = {
+ "type": "transaction",
+ "transaction": self.name,
+ "contexts": {"trace": self.get_trace_context()},
+ "tags": self._tags,
+ "timestamp": self.timestamp,
+ "start_timestamp": self.start_timestamp,
+ "spans": finished_spans,
+ }
+
+ if has_custom_measurements_enabled():
+ event["measurements"] = self._measurements
+
+ return hub.capture_event(event)
+
+ def set_measurement(self, name, value, unit=""):
+ # type: (str, float, MeasurementUnit) -> None
+ if not has_custom_measurements_enabled():
+ logger.debug(
+ "[Tracing] Experimental custom_measurements feature is disabled"
+ )
+ return
+
+ self._measurements[name] = {"value": value, "unit": unit}
def to_json(self):
# type: () -> Dict[str, Any]
@@ -727,4 +742,5 @@ def _set_initial_sampling_decision(self, sampling_context):
has_tracing_enabled,
is_valid_sample_rate,
maybe_create_breadcrumbs_from_span,
+ has_custom_measurements_enabled,
)
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
index faed37cbb7..2d31b9903e 100644
--- a/sentry_sdk/tracing_utils.py
+++ b/sentry_sdk/tracing_utils.py
@@ -406,6 +406,13 @@ def has_tracestate_enabled(span=None):
return bool(options and options["_experiments"].get("propagate_tracestate"))
+def has_custom_measurements_enabled():
+ # type: () -> bool
+ client = sentry_sdk.Hub.current.client
+ options = client and client.options
+ return bool(options and options["_experiments"].get("custom_measurements"))
+
+
# Circular imports
if MYPY:
diff --git a/tests/tracing/test_misc.py b/tests/tracing/test_misc.py
index 5d6613cd28..43d9597f1b 100644
--- a/tests/tracing/test_misc.py
+++ b/tests/tracing/test_misc.py
@@ -246,3 +246,31 @@ def test_has_tracestate_enabled(sentry_init, tracestate_enabled):
assert has_tracestate_enabled() is True
else:
assert has_tracestate_enabled() is False
+
+
+def test_set_meaurement(sentry_init, capture_events):
+ sentry_init(traces_sample_rate=1.0, _experiments={"custom_measurements": True})
+
+ events = capture_events()
+
+ transaction = start_transaction(name="measuring stuff")
+
+ with pytest.raises(TypeError):
+ transaction.set_measurement()
+
+ with pytest.raises(TypeError):
+ transaction.set_measurement("metric.foo")
+
+ transaction.set_measurement("metric.foo", 123)
+ transaction.set_measurement("metric.bar", 456, unit="second")
+ transaction.set_measurement("metric.baz", 420.69, unit="custom")
+ transaction.set_measurement("metric.foobar", 12, unit="percent")
+ transaction.set_measurement("metric.foobar", 17.99, unit="percent")
+
+ transaction.finish()
+
+ (event,) = events
+ assert event["measurements"]["metric.foo"] == {"value": 123, "unit": ""}
+ assert event["measurements"]["metric.bar"] == {"value": 456, "unit": "second"}
+ assert event["measurements"]["metric.baz"] == {"value": 420.69, "unit": "custom"}
+ assert event["measurements"]["metric.foobar"] == {"value": 17.99, "unit": "percent"}
From a391e86336cad289100b7aec36bc4199ee6ca8dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 May 2022 12:08:32 +0000
Subject: [PATCH 0336/2327] build(deps): bump actions/stale from 3.0.14 to 5
(#1431)
---
.github/workflows/stale.yml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index e70fc033a7..e195d701a0 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -13,7 +13,7 @@ jobs:
pull-requests: write # for actions/stale to close stale PRs
runs-on: ubuntu-latest
steps:
- - uses: actions/stale@87c2b794b9b47a9bec68ae03c01aeb572ffebdb1
+ - uses: actions/stale@v5
with:
repo-token: ${{ github.token }}
days-before-stale: 21
@@ -34,7 +34,6 @@ jobs:
----
"A weed is but an unloved flower." ― _Ella Wheeler Wilcox_ 🥀
- skip-stale-issue-message: false
close-issue-label: ""
close-issue-message: ""
@@ -48,6 +47,5 @@ jobs:
----
"A weed is but an unloved flower." ― _Ella Wheeler Wilcox_ 🥀
- skip-stale-pr-message: false
close-pr-label:
close-pr-message: ""
From a6cfff8dc494f13aa4c50fe36035159bbbe1e9d7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 May 2022 15:27:19 +0200
Subject: [PATCH 0337/2327] build(deps): bump actions/setup-node from 1 to 3
(#1430)
---
.github/workflows/ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 00dc5b5359..2354700913 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- - uses: actions/setup-node@v1
+ - uses: actions/setup-node@v3
- uses: actions/setup-python@v3
with:
python-version: 3.9
@@ -42,7 +42,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- - uses: actions/setup-node@v1
+ - uses: actions/setup-node@v3
- uses: actions/setup-python@v3
with:
python-version: 3.9
@@ -123,7 +123,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- - uses: actions/setup-node@v1
+ - uses: actions/setup-node@v3
- uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
From 50ddda7b40c2d09b853b3fa2d595438c608a7eb0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 May 2022 14:06:30 +0000
Subject: [PATCH 0338/2327] build(deps): bump actions/upload-artifact from 2 to
3 (#1428)
---
.github/workflows/ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2354700913..4b6de8e4d6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
pip install virtualenv
make aws-lambda-layer-build
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v3
with:
name: ${{ github.sha }}
path: |
@@ -52,7 +52,7 @@ jobs:
make apidocs
cd docs/_build && zip -r gh-pages ./
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v3
with:
name: ${{ github.sha }}
path: docs/_build/gh-pages.zip
From e3bad629ea148edb2441c37c5e1558a2c0bc0cd3 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Tue, 10 May 2022 14:26:14 +0200
Subject: [PATCH 0339/2327] Pin fakeredis<1.7.4 (#1440)
https://github.com/dsoftwareinc/fakeredis-py/issues/3
---
tox.ini | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tox.ini b/tox.ini
index 0ca43ab8a2..570d13591f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -176,7 +176,7 @@ deps =
# https://github.com/jamesls/fakeredis/issues/245
rq-{0.6,0.7,0.8,0.9,0.10,0.11,0.12}: fakeredis<1.0
rq-{0.6,0.7,0.8,0.9,0.10,0.11,0.12}: redis<3.2.2
- rq-{0.13,1.0,1.1,1.2,1.3,1.4,1.5}: fakeredis>=1.0
+ rq-{0.13,1.0,1.1,1.2,1.3,1.4,1.5}: fakeredis>=1.0,<1.7.4
rq-0.6: rq>=0.6,<0.7
rq-0.7: rq>=0.7,<0.8
@@ -207,7 +207,7 @@ deps =
trytond-{4.6,4.8,5.0,5.2,5.4}: werkzeug<2.0
- redis: fakeredis
+ redis: fakeredis<1.7.4
rediscluster-1: redis-py-cluster>=1.0.0,<2.0.0
rediscluster-2: redis-py-cluster>=2.0.0,<3.0.0
From 647abda45840756d9fefac9eb781f6dcbf54584a Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Mon, 9 May 2022 16:00:16 +0000
Subject: [PATCH 0340/2327] release: 1.5.12
---
CHANGELOG.md | 16 ++++++++++++++++
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc9a6287ce..b129d6a1a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
# Changelog
+## 1.5.12
+
+### Various fixes & improvements
+
+- build(deps): bump actions/upload-artifact from 2 to 3 (#1428) by @dependabot
+- build(deps): bump actions/setup-node from 1 to 3 (#1430) by @dependabot
+- build(deps): bump actions/stale from 3.0.14 to 5 (#1431) by @dependabot
+- feat(measurements): Add experimental set_measurement api on transaction (#1359) by @sl0thentr0py
+- build(deps): bump actions/checkout from 2 to 3 (#1429) by @dependabot
+- build(deps): bump actions/setup-python from 2 to 3 (#1432) by @dependabot
+- build(deps): bump github/codeql-action from 1 to 2 (#1433) by @dependabot
+- fix: Remove incorrect usage from flask helper example (#1434) by @BYK
+- chore: Included githubactions in the dependabot config (#1427) by @naveensrinivasan
+- chore: Set permissions for GitHub actions (#1422) by @naveensrinivasan
+- chore: conf.py removed double-spaces after period (#1425) by @marcelpetrick
+
## 1.5.11
### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 68374ceb33..e6ceb8d4c9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.5.11"
+release = "1.5.12"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index ae808c64ee..34faec3c12 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -102,7 +102,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.5.11"
+VERSION = "1.5.12"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index d814e5d4b5..e7aeef2398 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.5.11",
+ version="1.5.12",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From eacafcc7f3908cf00dff5191835484af40a104c8 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Mon, 9 May 2022 18:03:35 +0200
Subject: [PATCH 0341/2327] Clean CHANGELOG
---
CHANGELOG.md | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b129d6a1a5..41a1dcb045 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,17 +4,8 @@
### Various fixes & improvements
-- build(deps): bump actions/upload-artifact from 2 to 3 (#1428) by @dependabot
-- build(deps): bump actions/setup-node from 1 to 3 (#1430) by @dependabot
-- build(deps): bump actions/stale from 3.0.14 to 5 (#1431) by @dependabot
- feat(measurements): Add experimental set_measurement api on transaction (#1359) by @sl0thentr0py
-- build(deps): bump actions/checkout from 2 to 3 (#1429) by @dependabot
-- build(deps): bump actions/setup-python from 2 to 3 (#1432) by @dependabot
-- build(deps): bump github/codeql-action from 1 to 2 (#1433) by @dependabot
- fix: Remove incorrect usage from flask helper example (#1434) by @BYK
-- chore: Included githubactions in the dependabot config (#1427) by @naveensrinivasan
-- chore: Set permissions for GitHub actions (#1422) by @naveensrinivasan
-- chore: conf.py removed double-spaces after period (#1425) by @marcelpetrick
## 1.5.11
From 3d3832966ec3c7087858d4524c9e367afa5df556 Mon Sep 17 00:00:00 2001
From: Rich Rauenzahn
Date: Thu, 2 Jun 2022 01:11:35 -0700
Subject: [PATCH 0342/2327] Use logging levelno instead of levelname.
Levelnames can be overridden (#1449)
Use logging levelno instead of levelname. Levelnames can be overridden. Fixes #1449
---
sentry_sdk/integrations/logging.py | 22 +++++++++---
tests/integrations/logging/test_logging.py | 40 ++++++++++++++++++++++
2 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
index e9f3fe9dbb..86cea09bd8 100644
--- a/sentry_sdk/integrations/logging.py
+++ b/sentry_sdk/integrations/logging.py
@@ -24,6 +24,16 @@
DEFAULT_LEVEL = logging.INFO
DEFAULT_EVENT_LEVEL = logging.ERROR
+LOGGING_TO_EVENT_LEVEL = {
+ logging.NOTSET: "notset",
+ logging.DEBUG: "debug",
+ logging.INFO: "info",
+ logging.WARN: "warning", # WARN is same a WARNING
+ logging.WARNING: "warning",
+ logging.ERROR: "error",
+ logging.FATAL: "fatal",
+ logging.CRITICAL: "fatal", # CRITICAL is same as FATAL
+}
# Capturing events from those loggers causes recursion errors. We cannot allow
# the user to unconditionally create events from those loggers under any
@@ -110,7 +120,7 @@ def _breadcrumb_from_record(record):
# type: (LogRecord) -> Dict[str, Any]
return {
"type": "log",
- "level": _logging_to_event_level(record.levelname),
+ "level": _logging_to_event_level(record),
"category": record.name,
"message": record.message,
"timestamp": datetime.datetime.utcfromtimestamp(record.created),
@@ -118,9 +128,11 @@ def _breadcrumb_from_record(record):
}
-def _logging_to_event_level(levelname):
- # type: (str) -> str
- return {"critical": "fatal"}.get(levelname.lower(), levelname.lower())
+def _logging_to_event_level(record):
+ # type: (LogRecord) -> str
+ return LOGGING_TO_EVENT_LEVEL.get(
+ record.levelno, record.levelname.lower() if record.levelname else ""
+ )
COMMON_RECORD_ATTRS = frozenset(
@@ -220,7 +232,7 @@ def _emit(self, record):
hint["log_record"] = record
- event["level"] = _logging_to_event_level(record.levelname)
+ event["level"] = _logging_to_event_level(record)
event["logger"] = record.name
# Log records from `warnings` module as separate issues
diff --git a/tests/integrations/logging/test_logging.py b/tests/integrations/logging/test_logging.py
index 73843cc6eb..de1c55e26f 100644
--- a/tests/integrations/logging/test_logging.py
+++ b/tests/integrations/logging/test_logging.py
@@ -1,3 +1,4 @@
+# coding: utf-8
import sys
import pytest
@@ -115,6 +116,45 @@ def test_logging_level(sentry_init, capture_events):
assert not events
+def test_custom_log_level_names(sentry_init, capture_events):
+ levels = {
+ logging.DEBUG: "debug",
+ logging.INFO: "info",
+ logging.WARN: "warning",
+ logging.WARNING: "warning",
+ logging.ERROR: "error",
+ logging.CRITICAL: "fatal",
+ logging.FATAL: "fatal",
+ }
+
+ # set custom log level names
+ # fmt: off
+ logging.addLevelName(logging.DEBUG, u"custom level debüg: ")
+ # fmt: on
+ logging.addLevelName(logging.INFO, "")
+ logging.addLevelName(logging.WARN, "custom level warn: ")
+ logging.addLevelName(logging.WARNING, "custom level warning: ")
+ logging.addLevelName(logging.ERROR, None)
+ logging.addLevelName(logging.CRITICAL, "custom level critical: ")
+ logging.addLevelName(logging.FATAL, "custom level 🔥: ")
+
+ for logging_level, sentry_level in levels.items():
+ logger.setLevel(logging_level)
+ sentry_init(
+ integrations=[LoggingIntegration(event_level=logging_level)],
+ default_integrations=False,
+ )
+ events = capture_events()
+
+ logger.log(logging_level, "Trying level %s", logging_level)
+ assert events
+ assert events[0]["level"] == sentry_level
+ assert events[0]["logentry"]["message"] == "Trying level %s"
+ assert events[0]["logentry"]["params"] == [logging_level]
+
+ del events[:]
+
+
def test_logging_filters(sentry_init, capture_events):
sentry_init(integrations=[LoggingIntegration()], default_integrations=False)
events = capture_events()
From 0352c790d4f51dded91d122fbca1bb5a9d6dea86 Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Tue, 21 Jun 2022 13:08:28 +0200
Subject: [PATCH 0343/2327] Serverless V2 (#1450)
* Build new Lambda extension (#1383)
* Use new GitHub action for creating Lambda layer zip.
* Use new GitHub action for creating zip.
* Replace original DSN host/port with localhost:3000 (#1414)
* Added script for locally building/release Lambda layer
* Added script to attach layer to function
Co-authored-by: Neel Shah
---
.github/workflows/ci.yml | 119 ++++++++++--------
.gitignore | 1 +
CONTRIBUTING-aws-lambda.md | 21 ++++
Makefile | 12 +-
.../aws-attach-layer-to-lambda-function.sh | 33 +++++
scripts/aws-delete-lamba-layer-versions.sh | 18 +++
scripts/aws-deploy-local-layer.sh | 65 ++++++++++
scripts/build_aws_lambda_layer.py | 72 +++++++++++
scripts/build_awslambda_layer.py | 117 -----------------
scripts/init_serverless_sdk.py | 11 +-
tests/integrations/aws_lambda/client.py | 6 +-
11 files changed, 295 insertions(+), 180 deletions(-)
create mode 100644 CONTRIBUTING-aws-lambda.md
create mode 100755 scripts/aws-attach-layer-to-lambda-function.sh
create mode 100755 scripts/aws-delete-lamba-layer-versions.sh
create mode 100755 scripts/aws-deploy-local-layer.sh
create mode 100644 scripts/build_aws_lambda_layer.py
delete mode 100644 scripts/build_awslambda_layer.py
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4b6de8e4d6..6a57c8ec1f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: ci
+name: CI
on:
push:
@@ -11,55 +11,16 @@ on:
permissions:
contents: read
-jobs:
- dist:
- name: distribution packages
- timeout-minutes: 10
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-node@v3
- - uses: actions/setup-python@v3
- with:
- python-version: 3.9
-
- - run: |
- pip install virtualenv
- make aws-lambda-layer-build
-
- - uses: actions/upload-artifact@v3
- with:
- name: ${{ github.sha }}
- path: |
- dist/*
- dist-serverless/*
-
- docs:
- timeout-minutes: 10
- name: build documentation
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-node@v3
- - uses: actions/setup-python@v3
- with:
- python-version: 3.9
-
- - run: |
- pip install virtualenv
- make apidocs
- cd docs/_build && zip -r gh-pages ./
-
- - uses: actions/upload-artifact@v3
- with:
- name: ${{ github.sha }}
- path: docs/_build/gh-pages.zip
+env:
+ BUILD_CACHE_KEY: ${{ github.sha }}
+ CACHED_BUILD_PATHS: |
+ ${{ github.workspace }}/dist-serverless
+jobs:
lint:
- timeout-minutes: 10
+ name: Lint Sources
runs-on: ubuntu-latest
+ timeout-minutes: 10
steps:
- uses: actions/checkout@v3
@@ -72,9 +33,10 @@ jobs:
tox -e linters
test:
- continue-on-error: true
- timeout-minutes: 45
+ name: Run Tests
runs-on: ${{ matrix.linux-version }}
+ timeout-minutes: 45
+ continue-on-error: true
strategy:
matrix:
linux-version: [ubuntu-latest]
@@ -128,7 +90,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- - name: setup
+ - name: Setup Test Env
env:
PGHOST: localhost
PGPASSWORD: sentry
@@ -137,7 +99,7 @@ jobs:
psql -c 'create database test_travis_ci_test;' -U postgres
pip install codecov tox
- - name: run tests
+ - name: Run Tests
env:
CI_PYTHON_VERSION: ${{ matrix.python-version }}
timeout-minutes: 45
@@ -147,3 +109,58 @@ jobs:
coverage combine .coverage*
coverage xml -i
codecov --file coverage.xml
+
+ build_lambda_layer:
+ name: Build AWS Lambda Layer
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-node@v1
+ - uses: actions/setup-python@v2
+ with:
+ python-version: 3.9
+ - name: Setup build cache
+ uses: actions/cache@v2
+ id: build_cache
+ with:
+ path: ${{ env.CACHED_BUILD_PATHS }}
+ key: ${{ env.BUILD_CACHE_KEY }}
+ - run: |
+ echo "Creating directory containing Python SDK Lambda Layer"
+ pip install virtualenv
+ make aws-lambda-layer
+
+ echo "Saving SDK_VERSION for later"
+ export SDK_VERSION=$(grep "VERSION = " sentry_sdk/consts.py | cut -f3 -d' ' | tr -d '"')
+ echo "SDK_VERSION=$SDK_VERSION"
+ echo "SDK_VERSION=$SDK_VERSION" >> $GITHUB_ENV
+ - uses: getsentry/action-build-aws-lambda-extension@v1
+ with:
+ artifact_name: ${{ github.sha }}
+ zip_file_name: sentry-python-serverless-${{ env.SDK_VERSION }}.zip
+ build_cache_paths: ${{ env.CACHED_BUILD_PATHS }}
+ build_cache_key: ${{ env.BUILD_CACHE_KEY }}
+
+ docs:
+ name: Build SDK API Doc
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-node@v1
+ - uses: actions/setup-python@v2
+ with:
+ python-version: 3.9
+
+ - run: |
+ pip install virtualenv
+ make apidocs
+ cd docs/_build && zip -r gh-pages ./
+
+ - uses: actions/upload-artifact@v2
+ with:
+ name: ${{ github.sha }}
+ path: docs/_build/gh-pages.zip
diff --git a/.gitignore b/.gitignore
index e23931921e..bd5df5dddd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ pip-log.txt
/build
/dist
/dist-serverless
+sentry-python-serverless*.zip
.cache
.idea
.eggs
diff --git a/CONTRIBUTING-aws-lambda.md b/CONTRIBUTING-aws-lambda.md
new file mode 100644
index 0000000000..7a6a158b45
--- /dev/null
+++ b/CONTRIBUTING-aws-lambda.md
@@ -0,0 +1,21 @@
+# Contributing to Sentry AWS Lambda Layer
+
+All the general terms of the [CONTRIBUTING.md](CONTRIBUTING.md) apply.
+
+## Development environment
+
+You need to have a AWS account and AWS CLI installed and setup.
+
+We put together two helper functions that can help you with development:
+
+- `./scripts/aws-deploy-local-layer.sh`
+
+ This script [scripts/aws-deploy-local-layer.sh](scripts/aws-deploy-local-layer.sh) will take the code you have checked out locally, create a Lambda layer out of it and deploy it to the `eu-central-1` region of your configured AWS account using `aws` CLI.
+
+ The Lambda layer will have the name `SentryPythonServerlessSDK-local-dev`
+
+- `./scripts/aws-attach-layer-to-lambda-function.sh`
+
+ You can use this script [scripts/aws-attach-layer-to-lambda-function.sh](scripts/aws-attach-layer-to-lambda-function.sh) to attach the Lambda layer you just deployed (using the first script) onto one of your existing Lambda functions. You will have to give the name of the Lambda function to attach onto as an argument. (See the script for details.)
+
+With this two helper scripts it should be easy to rapidly iterate your development on the Lambda layer.
diff --git a/Makefile b/Makefile
index 577dd58740..bf13e1117c 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ help:
@echo "make test: Run basic tests (not testing most integrations)"
@echo "make test-all: Run ALL tests (slow, closest to CI)"
@echo "make format: Run code formatters (destructive)"
- @echo "make aws-lambda-layer-build: Build serverless ZIP dist package"
+ @echo "make aws-lambda-layer: Build AWS Lambda layer directory for serverless integration"
@echo
@echo "Also make sure to read ./CONTRIBUTING.md"
@false
@@ -19,9 +19,8 @@ help:
$(VENV_PATH)/bin/pip install tox
dist: .venv
- rm -rf dist build
+ rm -rf dist dist-serverless build
$(VENV_PATH)/bin/python setup.py sdist bdist_wheel
-
.PHONY: dist
format: .venv
@@ -46,7 +45,6 @@ lint: .venv
echo "Bad formatting? Run: make format"; \
echo "================================"; \
false)
-
.PHONY: lint
apidocs: .venv
@@ -60,8 +58,8 @@ apidocs-hotfix: apidocs
@$(VENV_PATH)/bin/ghp-import -pf docs/_build
.PHONY: apidocs-hotfix
-aws-lambda-layer-build: dist
+aws-lambda-layer: dist
$(VENV_PATH)/bin/pip install urllib3
$(VENV_PATH)/bin/pip install certifi
- $(VENV_PATH)/bin/python -m scripts.build_awslambda_layer
-.PHONY: aws-lambda-layer-build
+ $(VENV_PATH)/bin/python -m scripts.build_aws_lambda_layer
+.PHONY: aws-lambda-layer
diff --git a/scripts/aws-attach-layer-to-lambda-function.sh b/scripts/aws-attach-layer-to-lambda-function.sh
new file mode 100755
index 0000000000..71e08c6318
--- /dev/null
+++ b/scripts/aws-attach-layer-to-lambda-function.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+#
+# Attaches the layer `SentryPythonServerlessSDK-local-dev` to a given lambda function.
+#
+
+set -euo pipefail
+
+# Check for argument
+if [ $# -eq 0 ]
+ then
+ SCRIPT_NAME=$(basename "$0")
+ echo "ERROR: No argument supplied. Please give the name of a Lambda function!"
+ echo ""
+ echo "Usage: $SCRIPT_NAME "
+ echo ""
+ exit 1
+fi
+
+FUNCTION_NAME=$1
+
+echo "Getting ARN of newest Sentry lambda layer..."
+LAYER_ARN=$(aws lambda list-layer-versions --layer-name SentryPythonServerlessSDK-local-dev --query "LayerVersions[0].LayerVersionArn" | tr -d '"')
+echo "Done getting ARN of newest Sentry lambda layer $LAYER_ARN."
+
+echo "Attaching Lamba layer to function $FUNCTION_NAME..."
+echo "Warning: This remove all other layers!"
+aws lambda update-function-configuration \
+ --function-name "$FUNCTION_NAME" \
+ --layers "$LAYER_ARN" \
+ --no-cli-pager
+echo "Done attaching Lamba layer to function '$FUNCTION_NAME'."
+
+echo "All done. Have a nice day!"
diff --git a/scripts/aws-delete-lamba-layer-versions.sh b/scripts/aws-delete-lamba-layer-versions.sh
new file mode 100755
index 0000000000..5e1ea38a85
--- /dev/null
+++ b/scripts/aws-delete-lamba-layer-versions.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+#
+# Deletes all versions of the layer specified in LAYER_NAME in one region.
+#
+
+set -euo pipefail
+
+# override default AWS region
+export AWS_REGION=eu-central-1
+
+LAYER_NAME=SentryPythonServerlessSDKLocalDev
+VERSION="0"
+
+while [[ $VERSION != "1" ]]
+do
+ VERSION=$(aws lambda list-layer-versions --layer-name $LAYER_NAME | jq '.LayerVersions[0].Version')
+ aws lambda delete-layer-version --layer-name $LAYER_NAME --version-number $VERSION
+done
diff --git a/scripts/aws-deploy-local-layer.sh b/scripts/aws-deploy-local-layer.sh
new file mode 100755
index 0000000000..9e2d7c795e
--- /dev/null
+++ b/scripts/aws-deploy-local-layer.sh
@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+#
+# Builds and deploys the Sentry AWS Lambda layer (including the Sentry SDK and the Sentry Lambda Extension)
+#
+# The currently checked out version of the SDK in your local directory is used.
+# The latest version of the Lambda Extension is fetched from the Sentry Release Registry.
+#
+
+set -euo pipefail
+
+# Creating Lambda layer
+echo "Creating Lambda layer in ./dist-serverless ..."
+make aws-lambda-layer
+echo "Done creating Lambda layer in ./dist-serverless."
+
+# IMPORTANT:
+# Please make sure that this part does the same as the GitHub action that
+# is building the Lambda layer in production!
+# see: https://github.com/getsentry/action-build-aws-lambda-extension/blob/main/action.yml#L23-L40
+
+echo "Downloading relay..."
+mkdir -p dist-serverless/relay
+curl -0 --silent \
+ --output dist-serverless/relay/relay \
+ "$(curl -s https://release-registry.services.sentry.io/apps/relay/latest | jq -r .files.\"relay-Linux-x86_64\".url)"
+chmod +x dist-serverless/relay/relay
+echo "Done downloading relay."
+
+echo "Creating start script..."
+mkdir -p dist-serverless/extensions
+cat > dist-serverless/extensions/sentry-lambda-extension << EOT
+#!/bin/bash
+set -euo pipefail
+exec /opt/relay/relay run \
+ --mode=proxy \
+ --shutdown-timeout=2 \
+ --upstream-dsn="\$SENTRY_DSN" \
+ --aws-runtime-api="\$AWS_LAMBDA_RUNTIME_API"
+EOT
+chmod +x dist-serverless/extensions/sentry-lambda-extension
+echo "Done creating start script."
+
+# Zip Lambda layer and included Lambda extension
+echo "Zipping Lambda layer and included Lambda extension..."
+cd dist-serverless/
+zip -r ../sentry-python-serverless-x.x.x-dev.zip \
+ . \
+ --exclude \*__pycache__\* --exclude \*.yml
+cd ..
+echo "Done Zipping Lambda layer and included Lambda extension to ./sentry-python-serverless-x.x.x-dev.zip."
+
+
+# Deploying zipped Lambda layer to AWS
+echo "Deploying zipped Lambda layer to AWS..."
+
+aws lambda publish-layer-version \
+ --layer-name "SentryPythonServerlessSDK-local-dev" \
+ --region "eu-central-1" \
+ --zip-file "fileb://sentry-python-serverless-x.x.x-dev.zip" \
+ --description "Local test build of SentryPythonServerlessSDK (can be deleted)" \
+ --no-cli-pager
+
+echo "Done deploying zipped Lambda layer to AWS as 'SentryPythonServerlessSDK-local-dev'."
+
+echo "All done. Have a nice day!"
diff --git a/scripts/build_aws_lambda_layer.py b/scripts/build_aws_lambda_layer.py
new file mode 100644
index 0000000000..d694d15ba7
--- /dev/null
+++ b/scripts/build_aws_lambda_layer.py
@@ -0,0 +1,72 @@
+import os
+import shutil
+import subprocess
+import tempfile
+
+from sentry_sdk.consts import VERSION as SDK_VERSION
+
+DIST_PATH = "dist" # created by "make dist" that is called by "make aws-lambda-layer"
+PYTHON_SITE_PACKAGES = "python" # see https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html#configuration-layers-path
+
+
+class LayerBuilder:
+ def __init__(
+ self,
+ base_dir, # type: str
+ ):
+ # type: (...) -> None
+ self.base_dir = base_dir
+ self.python_site_packages = os.path.join(self.base_dir, PYTHON_SITE_PACKAGES)
+
+ def make_directories(self):
+ # type: (...) -> None
+ os.makedirs(self.python_site_packages)
+
+ def install_python_packages(self):
+ # type: (...) -> None
+ sentry_python_sdk = os.path.join(
+ DIST_PATH,
+ f"sentry_sdk-{SDK_VERSION}-py2.py3-none-any.whl", # this is generated by "make dist" that is called by "make aws-lamber-layer"
+ )
+ subprocess.run(
+ [
+ "pip",
+ "install",
+ "--no-cache-dir", # always access PyPI
+ "--quiet",
+ sentry_python_sdk,
+ "--target",
+ self.python_site_packages,
+ ],
+ check=True,
+ )
+
+ def create_init_serverless_sdk_package(self):
+ # type: (...) -> None
+ """
+ Method that creates the init_serverless_sdk pkg in the
+ sentry-python-serverless zip
+ """
+ serverless_sdk_path = (
+ f"{self.python_site_packages}/sentry_sdk/"
+ f"integrations/init_serverless_sdk"
+ )
+ if not os.path.exists(serverless_sdk_path):
+ os.makedirs(serverless_sdk_path)
+ shutil.copy(
+ "scripts/init_serverless_sdk.py", f"{serverless_sdk_path}/__init__.py"
+ )
+
+
+def build_layer_dir():
+ with tempfile.TemporaryDirectory() as base_dir:
+ layer_builder = LayerBuilder(base_dir)
+ layer_builder.make_directories()
+ layer_builder.install_python_packages()
+ layer_builder.create_init_serverless_sdk_package()
+
+ shutil.copytree(base_dir, "dist-serverless")
+
+
+if __name__ == "__main__":
+ build_layer_dir()
diff --git a/scripts/build_awslambda_layer.py b/scripts/build_awslambda_layer.py
deleted file mode 100644
index 1fda06e79f..0000000000
--- a/scripts/build_awslambda_layer.py
+++ /dev/null
@@ -1,117 +0,0 @@
-import os
-import subprocess
-import tempfile
-import shutil
-
-from sentry_sdk.consts import VERSION as SDK_VERSION
-from sentry_sdk._types import MYPY
-
-if MYPY:
- from typing import Union
-
-
-class PackageBuilder:
- def __init__(
- self,
- base_dir, # type: str
- pkg_parent_dir, # type: str
- dist_rel_path, # type: str
- ):
- # type: (...) -> None
- self.base_dir = base_dir
- self.pkg_parent_dir = pkg_parent_dir
- self.dist_rel_path = dist_rel_path
- self.packages_dir = self.get_relative_path_of(pkg_parent_dir)
-
- def make_directories(self):
- # type: (...) -> None
- os.makedirs(self.packages_dir)
-
- def install_python_binaries(self):
- # type: (...) -> None
- wheels_filepath = os.path.join(
- self.dist_rel_path, f"sentry_sdk-{SDK_VERSION}-py2.py3-none-any.whl"
- )
- subprocess.run(
- [
- "pip",
- "install",
- "--no-cache-dir", # Disables the cache -> always accesses PyPI
- "-q", # Quiet
- wheels_filepath, # Copied to the target directory before installation
- "-t", # Target directory flag
- self.packages_dir,
- ],
- check=True,
- )
-
- def create_init_serverless_sdk_package(self):
- # type: (...) -> None
- """
- Method that creates the init_serverless_sdk pkg in the
- sentry-python-serverless zip
- """
- serverless_sdk_path = (
- f"{self.packages_dir}/sentry_sdk/" f"integrations/init_serverless_sdk"
- )
- if not os.path.exists(serverless_sdk_path):
- os.makedirs(serverless_sdk_path)
- shutil.copy(
- "scripts/init_serverless_sdk.py", f"{serverless_sdk_path}/__init__.py"
- )
-
- def zip(
- self, filename # type: str
- ):
- # type: (...) -> None
- subprocess.run(
- [
- "zip",
- "-q", # Quiet
- "-x", # Exclude files
- "**/__pycache__/*", # Files to be excluded
- "-r", # Recurse paths
- filename, # Output filename
- self.pkg_parent_dir, # Files to be zipped
- ],
- cwd=self.base_dir,
- check=True, # Raises CalledProcessError if exit status is non-zero
- )
-
- def get_relative_path_of(
- self, subfile # type: str
- ):
- # type: (...) -> str
- return os.path.join(self.base_dir, subfile)
-
-
-# Ref to `pkg_parent_dir` Top directory in the ZIP file.
-# Placing the Sentry package in `/python` avoids
-# creating a directory for a specific version. For more information, see
-# https://docs.aws.amazon.com/lambda/latest/dg/configuration-layers.html#configuration-layers-path
-def build_packaged_zip(
- dist_rel_path="dist", # type: str
- dest_zip_filename=f"sentry-python-serverless-{SDK_VERSION}.zip", # type: str
- pkg_parent_dir="python", # type: str
- dest_abs_path=None, # type: Union[str, None]
-):
- # type: (...) -> None
- if dest_abs_path is None:
- dest_abs_path = os.path.abspath(
- os.path.join(os.path.dirname(__file__), "..", dist_rel_path)
- )
- with tempfile.TemporaryDirectory() as tmp_dir:
- package_builder = PackageBuilder(tmp_dir, pkg_parent_dir, dist_rel_path)
- package_builder.make_directories()
- package_builder.install_python_binaries()
- package_builder.create_init_serverless_sdk_package()
- package_builder.zip(dest_zip_filename)
- if not os.path.exists(dist_rel_path):
- os.makedirs(dist_rel_path)
- shutil.copy(
- package_builder.get_relative_path_of(dest_zip_filename), dest_abs_path
- )
-
-
-if __name__ == "__main__":
- build_packaged_zip()
diff --git a/scripts/init_serverless_sdk.py b/scripts/init_serverless_sdk.py
index 7a414ff406..70e28c4d92 100644
--- a/scripts/init_serverless_sdk.py
+++ b/scripts/init_serverless_sdk.py
@@ -11,15 +11,24 @@
import sentry_sdk
from sentry_sdk._types import MYPY
+from sentry_sdk.utils import Dsn
from sentry_sdk.integrations.aws_lambda import AwsLambdaIntegration
if MYPY:
from typing import Any
+def extension_relay_dsn(original_dsn):
+ dsn = Dsn(original_dsn)
+ dsn.host = "localhost"
+ dsn.port = 3000
+ dsn.scheme = "http"
+ return str(dsn)
+
+
# Configure Sentry SDK
sentry_sdk.init(
- dsn=os.environ["SENTRY_DSN"],
+ dsn=extension_relay_dsn(os.environ["SENTRY_DSN"]),
integrations=[AwsLambdaIntegration(timeout_warning=True)],
traces_sample_rate=float(os.environ["SENTRY_TRACES_SAMPLE_RATE"]),
)
diff --git a/tests/integrations/aws_lambda/client.py b/tests/integrations/aws_lambda/client.py
index 784a4a9006..d8e430f3d7 100644
--- a/tests/integrations/aws_lambda/client.py
+++ b/tests/integrations/aws_lambda/client.py
@@ -25,11 +25,9 @@ def build_no_code_serverless_function_and_layer(
sdk by creating a layer containing the Python-sdk, and then creating a func
that uses that layer
"""
- from scripts.build_awslambda_layer import (
- build_packaged_zip,
- )
+ from scripts.build_aws_lambda_layer import build_layer_dir
- build_packaged_zip(dest_abs_path=tmpdir, dest_zip_filename="serverless-ball.zip")
+ build_layer_dir(dest_abs_path=tmpdir)
with open(os.path.join(tmpdir, "serverless-ball.zip"), "rb") as serverless_zip:
response = client.publish_layer_version(
From b58a192f9b4b04e30fa872521e35bf993fa7d75e Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Wed, 22 Jun 2022 09:48:14 +0200
Subject: [PATCH 0344/2327] Fix Deployment (#1474)
* Upload python packages for deployment to PyPi
* Added documentation to clarify what is happening
---
.github/workflows/ci.yml | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a57c8ec1f..38ec4b9834 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -111,7 +111,7 @@ jobs:
codecov --file coverage.xml
build_lambda_layer:
- name: Build AWS Lambda Layer
+ name: Build Package
runs-on: ubuntu-latest
timeout-minutes: 10
@@ -127,21 +127,30 @@ jobs:
with:
path: ${{ env.CACHED_BUILD_PATHS }}
key: ${{ env.BUILD_CACHE_KEY }}
- - run: |
+ - name: Build Packages
+ run: |
echo "Creating directory containing Python SDK Lambda Layer"
pip install virtualenv
+ # This will also trigger "make dist" that creates the Python packages
make aws-lambda-layer
echo "Saving SDK_VERSION for later"
export SDK_VERSION=$(grep "VERSION = " sentry_sdk/consts.py | cut -f3 -d' ' | tr -d '"')
echo "SDK_VERSION=$SDK_VERSION"
echo "SDK_VERSION=$SDK_VERSION" >> $GITHUB_ENV
- - uses: getsentry/action-build-aws-lambda-extension@v1
+ - name: Upload Python AWS Lambda Layer
+ uses: getsentry/action-build-aws-lambda-extension@v1
with:
artifact_name: ${{ github.sha }}
zip_file_name: sentry-python-serverless-${{ env.SDK_VERSION }}.zip
build_cache_paths: ${{ env.CACHED_BUILD_PATHS }}
build_cache_key: ${{ env.BUILD_CACHE_KEY }}
+ - name: Upload Python Packages
+ uses: actions/upload-artifact@v3
+ with:
+ name: ${{ github.sha }}
+ path: |
+ dist/*
docs:
name: Build SDK API Doc
From eb425d55676905f9d9bb7650f290abc1b6590bf7 Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Wed, 22 Jun 2022 07:50:57 +0000
Subject: [PATCH 0345/2327] release: 1.6.0
---
CHANGELOG.md | 8 ++++++++
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41a1dcb045..1261c08b68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
# Changelog
+## 1.6.0
+
+### Various fixes & improvements
+
+- Fix Deployment (#1474) by @antonpirker
+- Serverless V2 (#1450) by @antonpirker
+- Use logging levelno instead of levelname. Levelnames can be overridden (#1449) by @rrauenza
+
## 1.5.12
### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index e6ceb8d4c9..b9bff46a05 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "1.5.12"
+release = "1.6.0"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 34faec3c12..043740acd1 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -102,7 +102,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.5.12"
+VERSION = "1.6.0"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index e7aeef2398..e1d3972d28 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.5.12",
+ version="1.6.0",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 7f53ab3f70dcc48666d2182b8e2d9033da6daf01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 15:05:55 +0200
Subject: [PATCH 0346/2327] build(deps): bump actions/cache from 2 to 3 (#1478)
---
.github/workflows/ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 38ec4b9834..1f8ad34d98 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -122,7 +122,7 @@ jobs:
with:
python-version: 3.9
- name: Setup build cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
id: build_cache
with:
path: ${{ env.CACHED_BUILD_PATHS }}
From 8ce4194848165a51a15a5af09a2bdb912eef750b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 17:30:41 +0200
Subject: [PATCH 0347/2327] build(deps): bump mypy from 0.950 to 0.961 (#1464)
---
linter-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linter-requirements.txt b/linter-requirements.txt
index ec736a59c5..edabda68c3 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -1,7 +1,7 @@
black==22.3.0
flake8==3.9.2
flake8-import-order==0.18.1
-mypy==0.950
+mypy==0.961
types-certifi
types-redis
types-setuptools
From 8926abfe62841772ab9c45a36ab61ae68239fae5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 16:04:13 +0000
Subject: [PATCH 0348/2327] build(deps): bump actions/setup-python from 3 to 4
(#1465)
---
.github/workflows/ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f8ad34d98..8007cdaa7d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- - uses: actions/setup-python@v3
+ - uses: actions/setup-python@v4
with:
python-version: 3.9
@@ -86,7 +86,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- - uses: actions/setup-python@v3
+ - uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
@@ -118,7 +118,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- - uses: actions/setup-python@v2
+ - uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Setup build cache
@@ -160,7 +160,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- - uses: actions/setup-python@v2
+ - uses: actions/setup-python@v4
with:
python-version: 3.9
From b8f4eeece1692895d54efb94a889a6d2cd166728 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 19:03:03 +0200
Subject: [PATCH 0349/2327] build(deps): bump pep8-naming from 0.11.1 to 0.13.0
(#1457)
---
linter-requirements.txt | 2 +-
sentry_sdk/_queue.py | 26 +++++++++++++-------------
sentry_sdk/integrations/__init__.py | 2 +-
sentry_sdk/utils.py | 2 +-
sentry_sdk/worker.py | 6 +++---
tests/test_client.py | 14 +++++++-------
6 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/linter-requirements.txt b/linter-requirements.txt
index edabda68c3..53edc6477f 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -6,5 +6,5 @@ types-certifi
types-redis
types-setuptools
flake8-bugbear==21.4.3
-pep8-naming==0.11.1
+pep8-naming==0.13.0
pre-commit # local linting
diff --git a/sentry_sdk/_queue.py b/sentry_sdk/_queue.py
index e368da2229..fc845f70d1 100644
--- a/sentry_sdk/_queue.py
+++ b/sentry_sdk/_queue.py
@@ -21,15 +21,15 @@
if MYPY:
from typing import Any
-__all__ = ["Empty", "Full", "Queue"]
+__all__ = ["EmptyError", "FullError", "Queue"]
-class Empty(Exception):
+class EmptyError(Exception):
"Exception raised by Queue.get(block=0)/get_nowait()."
pass
-class Full(Exception):
+class FullError(Exception):
"Exception raised by Queue.put(block=0)/put_nowait()."
pass
@@ -134,16 +134,16 @@ def put(self, item, block=True, timeout=None):
If optional args 'block' is true and 'timeout' is None (the default),
block if necessary until a free slot is available. If 'timeout' is
a non-negative number, it blocks at most 'timeout' seconds and raises
- the Full exception if no free slot was available within that time.
+ the FullError exception if no free slot was available within that time.
Otherwise ('block' is false), put an item on the queue if a free slot
- is immediately available, else raise the Full exception ('timeout'
+ is immediately available, else raise the FullError exception ('timeout'
is ignored in that case).
"""
with self.not_full:
if self.maxsize > 0:
if not block:
if self._qsize() >= self.maxsize:
- raise Full()
+ raise FullError()
elif timeout is None:
while self._qsize() >= self.maxsize:
self.not_full.wait()
@@ -154,7 +154,7 @@ def put(self, item, block=True, timeout=None):
while self._qsize() >= self.maxsize:
remaining = endtime - time()
if remaining <= 0.0:
- raise Full
+ raise FullError()
self.not_full.wait(remaining)
self._put(item)
self.unfinished_tasks += 1
@@ -166,15 +166,15 @@ def get(self, block=True, timeout=None):
If optional args 'block' is true and 'timeout' is None (the default),
block if necessary until an item is available. If 'timeout' is
a non-negative number, it blocks at most 'timeout' seconds and raises
- the Empty exception if no item was available within that time.
+ the EmptyError exception if no item was available within that time.
Otherwise ('block' is false), return an item if one is immediately
- available, else raise the Empty exception ('timeout' is ignored
+ available, else raise the EmptyError exception ('timeout' is ignored
in that case).
"""
with self.not_empty:
if not block:
if not self._qsize():
- raise Empty()
+ raise EmptyError()
elif timeout is None:
while not self._qsize():
self.not_empty.wait()
@@ -185,7 +185,7 @@ def get(self, block=True, timeout=None):
while not self._qsize():
remaining = endtime - time()
if remaining <= 0.0:
- raise Empty()
+ raise EmptyError()
self.not_empty.wait(remaining)
item = self._get()
self.not_full.notify()
@@ -195,7 +195,7 @@ def put_nowait(self, item):
"""Put an item into the queue without blocking.
Only enqueue the item if a free slot is immediately available.
- Otherwise raise the Full exception.
+ Otherwise raise the FullError exception.
"""
return self.put(item, block=False)
@@ -203,7 +203,7 @@ def get_nowait(self):
"""Remove and return an item from the queue without blocking.
Only get an item if one is immediately available. Otherwise
- raise the Empty exception.
+ raise the EmptyError exception.
"""
return self.get(block=False)
diff --git a/sentry_sdk/integrations/__init__.py b/sentry_sdk/integrations/__init__.py
index 114a3a1f41..68445d3416 100644
--- a/sentry_sdk/integrations/__init__.py
+++ b/sentry_sdk/integrations/__init__.py
@@ -146,7 +146,7 @@ def setup_integrations(
return integrations
-class DidNotEnable(Exception):
+class DidNotEnable(Exception): # noqa: N818
"""
The integration could not be enabled due to a trivial user error like
`flask` not being installed for the `FlaskIntegration`.
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 0a735a1e20..38ba4d7857 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -931,7 +931,7 @@ def transaction_from_function(func):
disable_capture_event = ContextVar("disable_capture_event")
-class ServerlessTimeoutWarning(Exception):
+class ServerlessTimeoutWarning(Exception): # noqa: N818
"""Raised when a serverless method is about to reach its timeout."""
pass
diff --git a/sentry_sdk/worker.py b/sentry_sdk/worker.py
index a06fb8f0d1..310ba3bfb4 100644
--- a/sentry_sdk/worker.py
+++ b/sentry_sdk/worker.py
@@ -3,7 +3,7 @@
from time import sleep, time
from sentry_sdk._compat import check_thread_support
-from sentry_sdk._queue import Queue, Full
+from sentry_sdk._queue import Queue, FullError
from sentry_sdk.utils import logger
from sentry_sdk.consts import DEFAULT_QUEUE_SIZE
@@ -81,7 +81,7 @@ def kill(self):
if self._thread:
try:
self._queue.put_nowait(_TERMINATOR)
- except Full:
+ except FullError:
logger.debug("background worker queue full, kill failed")
self._thread = None
@@ -114,7 +114,7 @@ def submit(self, callback):
try:
self._queue.put_nowait(callback)
return True
- except Full:
+ except FullError:
return False
def _target(self):
diff --git a/tests/test_client.py b/tests/test_client.py
index ffdb831e39..5523647870 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -35,13 +35,13 @@
from collections.abc import Mapping
-class EventCaptured(Exception):
+class EventCapturedError(Exception):
pass
class _TestTransport(Transport):
def capture_event(self, event):
- raise EventCaptured(event)
+ raise EventCapturedError(event)
def test_transport_option(monkeypatch):
@@ -273,7 +273,7 @@ def e(exc):
e(ZeroDivisionError())
e(MyDivisionError())
- pytest.raises(EventCaptured, lambda: e(ValueError()))
+ pytest.raises(EventCapturedError, lambda: e(ValueError()))
def test_with_locals_enabled(sentry_init, capture_events):
@@ -400,8 +400,8 @@ def test_attach_stacktrace_disabled(sentry_init, capture_events):
def test_capture_event_works(sentry_init):
sentry_init(transport=_TestTransport())
- pytest.raises(EventCaptured, lambda: capture_event({}))
- pytest.raises(EventCaptured, lambda: capture_event({}))
+ pytest.raises(EventCapturedError, lambda: capture_event({}))
+ pytest.raises(EventCapturedError, lambda: capture_event({}))
@pytest.mark.parametrize("num_messages", [10, 20])
@@ -744,10 +744,10 @@ def test_errno_errors(sentry_init, capture_events):
sentry_init()
events = capture_events()
- class Foo(Exception):
+ class FooError(Exception):
errno = 69
- capture_exception(Foo())
+ capture_exception(FooError())
(event,) = events
From 5ea8d6bb55807ad2de17fff9b7547fedeaa6ca74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 13:12:58 +0000
Subject: [PATCH 0350/2327] build(deps): bump sphinx from 4.5.0 to 5.0.2
(#1470)
---
docs-requirements.txt | 2 +-
docs/conf.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs-requirements.txt b/docs-requirements.txt
index f80c689cbf..fdb9fe783f 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx==4.5.0
+sphinx==5.0.2
sphinx-rtd-theme
sphinx-autodoc-typehints[type_comments]>=1.8.0
typing-extensions
diff --git a/docs/conf.py b/docs/conf.py
index b9bff46a05..f11efb4023 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -67,7 +67,7 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
From 52e80f0c5c3b0ac9545e24eef0f06df9aaf9cbd0 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Fri, 8 Jul 2022 16:08:55 +0200
Subject: [PATCH 0351/2327] feat(tracing): Dynamic Sampling Context / Baggage
continuation (#1485)
* `Baggage` class implementing sentry/third party/mutable logic with parsing from header and serialization
* Parse incoming `baggage` header while starting transaction and store it on the transaction
* Extract `dynamic_sampling_context` fields and add to the `trace` field in the envelope header while sending the transaction
* Propagate the `baggage` header (only sentry fields / no third party as per spec)
[DSC Spec](https://develop.sentry.dev/sdk/performance/dynamic-sampling-context/)
---
docs/conf.py | 16 +--
sentry_sdk/client.py | 20 +++-
sentry_sdk/tracing.py | 33 ++++++-
sentry_sdk/tracing_utils.py | 114 +++++++++++++++++++---
tests/integrations/stdlib/test_httplib.py | 41 ++++++--
tests/tracing/test_baggage.py | 67 +++++++++++++
tests/tracing/test_integration_tests.py | 57 ++++++++---
7 files changed, 294 insertions(+), 54 deletions(-)
create mode 100644 tests/tracing/test_baggage.py
diff --git a/docs/conf.py b/docs/conf.py
index f11efb4023..c3ba844ec7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -25,9 +25,9 @@
# -- Project information -----------------------------------------------------
-project = u"sentry-python"
-copyright = u"2019, Sentry Team and Contributors"
-author = u"Sentry Team and Contributors"
+project = "sentry-python"
+copyright = "2019, Sentry Team and Contributors"
+author = "Sentry Team and Contributors"
release = "1.6.0"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
@@ -72,7 +72,7 @@
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = [u"_build", "Thumbs.db", ".DS_Store"]
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = None
@@ -140,8 +140,8 @@
(
master_doc,
"sentry-python.tex",
- u"sentry-python Documentation",
- u"Sentry Team and Contributors",
+ "sentry-python Documentation",
+ "Sentry Team and Contributors",
"manual",
)
]
@@ -151,7 +151,7 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
-man_pages = [(master_doc, "sentry-python", u"sentry-python Documentation", [author], 1)]
+man_pages = [(master_doc, "sentry-python", "sentry-python Documentation", [author], 1)]
# -- Options for Texinfo output ----------------------------------------------
@@ -163,7 +163,7 @@
(
master_doc,
"sentry-python",
- u"sentry-python Documentation",
+ "sentry-python Documentation",
author,
"sentry-python",
"One line description of project.",
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 63a1205f57..510225aa9a 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -373,6 +373,12 @@ def capture_event(
event_opt.get("contexts", {}).get("trace", {}).pop("tracestate", "")
)
+ dynamic_sampling_context = (
+ event_opt.get("contexts", {})
+ .get("trace", {})
+ .pop("dynamic_sampling_context", {})
+ )
+
# Transactions or events with attachments should go to the /envelope/
# endpoint.
if is_transaction or attachments:
@@ -382,11 +388,15 @@ def capture_event(
"sent_at": format_timestamp(datetime.utcnow()),
}
- tracestate_data = raw_tracestate and reinflate_tracestate(
- raw_tracestate.replace("sentry=", "")
- )
- if tracestate_data and has_tracestate_enabled():
- headers["trace"] = tracestate_data
+ if has_tracestate_enabled():
+ tracestate_data = raw_tracestate and reinflate_tracestate(
+ raw_tracestate.replace("sentry=", "")
+ )
+
+ if tracestate_data:
+ headers["trace"] = tracestate_data
+ elif dynamic_sampling_context:
+ headers["trace"] = dynamic_sampling_context
envelope = Envelope(headers=headers)
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index f6f625acc8..fe53386597 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -215,7 +215,7 @@ def continue_from_environ(
# type: (...) -> Transaction
"""
Create a Transaction with the given params, then add in data pulled from
- the 'sentry-trace' and 'tracestate' headers from the environ (if any)
+ the 'sentry-trace', 'baggage' and 'tracestate' headers from the environ (if any)
before returning the Transaction.
This is different from `continue_from_headers` in that it assumes header
@@ -238,7 +238,7 @@ def continue_from_headers(
# type: (...) -> Transaction
"""
Create a transaction with the given params (including any data pulled from
- the 'sentry-trace' and 'tracestate' headers).
+ the 'sentry-trace', 'baggage' and 'tracestate' headers).
"""
# TODO move this to the Transaction class
if cls is Span:
@@ -247,7 +247,17 @@ def continue_from_headers(
"instead of Span.continue_from_headers."
)
- kwargs.update(extract_sentrytrace_data(headers.get("sentry-trace")))
+ # TODO-neel move away from this kwargs stuff, it's confusing and opaque
+ # make more explicit
+ baggage = Baggage.from_incoming_header(headers.get("baggage"))
+ kwargs.update({"baggage": baggage})
+
+ sentrytrace_kwargs = extract_sentrytrace_data(headers.get("sentry-trace"))
+
+ if sentrytrace_kwargs is not None:
+ kwargs.update(sentrytrace_kwargs)
+ baggage.freeze
+
kwargs.update(extract_tracestate_data(headers.get("tracestate")))
transaction = Transaction(**kwargs)
@@ -258,7 +268,7 @@ def continue_from_headers(
def iter_headers(self):
# type: () -> Iterator[Tuple[str, str]]
"""
- Creates a generator which returns the span's `sentry-trace` and
+ Creates a generator which returns the span's `sentry-trace`, `baggage` and
`tracestate` headers.
If the span's containing transaction doesn't yet have a
@@ -274,6 +284,9 @@ def iter_headers(self):
if tracestate:
yield "tracestate", tracestate
+ if self.containing_transaction and self.containing_transaction._baggage:
+ yield "baggage", self.containing_transaction._baggage.serialize()
+
@classmethod
def from_traceparent(
cls,
@@ -460,7 +473,7 @@ def get_trace_context(self):
"parent_span_id": self.parent_span_id,
"op": self.op,
"description": self.description,
- }
+ } # type: Dict[str, Any]
if self.status:
rv["status"] = self.status
@@ -473,6 +486,12 @@ def get_trace_context(self):
if sentry_tracestate:
rv["tracestate"] = sentry_tracestate
+ # TODO-neel populate fresh if head SDK
+ if self.containing_transaction and self.containing_transaction._baggage:
+ rv[
+ "dynamic_sampling_context"
+ ] = self.containing_transaction._baggage.dynamic_sampling_context()
+
return rv
@@ -488,6 +507,7 @@ class Transaction(Span):
# tracestate data from other vendors, of the form `dogs=yes,cats=maybe`
"_third_party_tracestate",
"_measurements",
+ "_baggage",
)
def __init__(
@@ -496,6 +516,7 @@ def __init__(
parent_sampled=None, # type: Optional[bool]
sentry_tracestate=None, # type: Optional[str]
third_party_tracestate=None, # type: Optional[str]
+ baggage=None, # type: Optional[Baggage]
**kwargs # type: Any
):
# type: (...) -> None
@@ -517,6 +538,7 @@ def __init__(
self._sentry_tracestate = sentry_tracestate
self._third_party_tracestate = third_party_tracestate
self._measurements = {} # type: Dict[str, Any]
+ self._baggage = baggage
def __repr__(self):
# type: () -> str
@@ -734,6 +756,7 @@ def _set_initial_sampling_decision(self, sampling_context):
# Circular imports
from sentry_sdk.tracing_utils import (
+ Baggage,
EnvironHeaders,
compute_tracestate_entry,
extract_sentrytrace_data,
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
index 2d31b9903e..aff5fc1076 100644
--- a/sentry_sdk/tracing_utils.py
+++ b/sentry_sdk/tracing_utils.py
@@ -16,13 +16,15 @@
to_string,
from_base64,
)
-from sentry_sdk._compat import PY2
+from sentry_sdk._compat import PY2, iteritems
from sentry_sdk._types import MYPY
if PY2:
from collections import Mapping
+ from urllib import quote, unquote
else:
from collections.abc import Mapping
+ from urllib.parse import quote, unquote
if MYPY:
import typing
@@ -211,27 +213,29 @@ def maybe_create_breadcrumbs_from_span(hub, span):
def extract_sentrytrace_data(header):
- # type: (Optional[str]) -> typing.Mapping[str, Union[str, bool, None]]
+ # type: (Optional[str]) -> Optional[typing.Mapping[str, Union[str, bool, None]]]
"""
Given a `sentry-trace` header string, return a dictionary of data.
"""
- trace_id = parent_span_id = parent_sampled = None
+ if not header:
+ return None
- if header:
- if header.startswith("00-") and header.endswith("-00"):
- header = header[3:-3]
+ if header.startswith("00-") and header.endswith("-00"):
+ header = header[3:-3]
- match = SENTRY_TRACE_REGEX.match(header)
+ match = SENTRY_TRACE_REGEX.match(header)
+ if not match:
+ return None
- if match:
- trace_id, parent_span_id, sampled_str = match.groups()
+ trace_id, parent_span_id, sampled_str = match.groups()
+ parent_sampled = None
- if trace_id:
- trace_id = "{:032x}".format(int(trace_id, 16))
- if parent_span_id:
- parent_span_id = "{:016x}".format(int(parent_span_id, 16))
- if sampled_str:
- parent_sampled = sampled_str != "0"
+ if trace_id:
+ trace_id = "{:032x}".format(int(trace_id, 16))
+ if parent_span_id:
+ parent_span_id = "{:016x}".format(int(parent_span_id, 16))
+ if sampled_str:
+ parent_sampled = sampled_str != "0"
return {
"trace_id": trace_id,
@@ -413,6 +417,86 @@ def has_custom_measurements_enabled():
return bool(options and options["_experiments"].get("custom_measurements"))
+class Baggage(object):
+ __slots__ = ("sentry_items", "third_party_items", "mutable")
+
+ SENTRY_PREFIX = "sentry-"
+ SENTRY_PREFIX_REGEX = re.compile("^sentry-")
+
+ # DynamicSamplingContext
+ DSC_KEYS = [
+ "trace_id",
+ "public_key",
+ "sample_rate",
+ "release",
+ "environment",
+ "transaction",
+ "user_id",
+ "user_segment",
+ ]
+
+ def __init__(
+ self,
+ sentry_items, # type: Dict[str, str]
+ third_party_items="", # type: str
+ mutable=True, # type: bool
+ ):
+ self.sentry_items = sentry_items
+ self.third_party_items = third_party_items
+ self.mutable = mutable
+
+ @classmethod
+ def from_incoming_header(cls, header):
+ # type: (Optional[str]) -> Baggage
+ """
+ freeze if incoming header already has sentry baggage
+ """
+ sentry_items = {}
+ third_party_items = ""
+ mutable = True
+
+ if header:
+ for item in header.split(","):
+ item = item.strip()
+ key, val = item.split("=")
+ if Baggage.SENTRY_PREFIX_REGEX.match(key):
+ baggage_key = unquote(key.split("-")[1])
+ sentry_items[baggage_key] = unquote(val)
+ mutable = False
+ else:
+ third_party_items += ("," if third_party_items else "") + item
+
+ return Baggage(sentry_items, third_party_items, mutable)
+
+ def freeze(self):
+ # type: () -> None
+ self.mutable = False
+
+ def dynamic_sampling_context(self):
+ # type: () -> Dict[str, str]
+ header = {}
+
+ for key in Baggage.DSC_KEYS:
+ item = self.sentry_items.get(key)
+ if item:
+ header[key] = item
+
+ return header
+
+ def serialize(self, include_third_party=False):
+ # type: (bool) -> str
+ items = []
+
+ for key, val in iteritems(self.sentry_items):
+ item = Baggage.SENTRY_PREFIX + quote(key) + "=" + quote(val)
+ items.append(item)
+
+ if include_third_party:
+ items.append(self.third_party_items)
+
+ return ",".join(items)
+
+
# Circular imports
if MYPY:
diff --git a/tests/integrations/stdlib/test_httplib.py b/tests/integrations/stdlib/test_httplib.py
index c90f9eb891..e59b245863 100644
--- a/tests/integrations/stdlib/test_httplib.py
+++ b/tests/integrations/stdlib/test_httplib.py
@@ -23,6 +23,7 @@
import mock # python < 3.3
from sentry_sdk import capture_message, start_transaction
+from sentry_sdk.tracing import Transaction
from sentry_sdk.integrations.stdlib import StdlibIntegration
@@ -132,7 +133,17 @@ def test_outgoing_trace_headers(
sentry_init(traces_sample_rate=1.0)
+ headers = {}
+ headers["baggage"] = (
+ "other-vendor-value-1=foo;bar;baz, sentry-trace_id=771a43a4192642f0b136d5159a501700, "
+ "sentry-public_key=49d0f7386ad645858ae85020e393bef3, sentry-sample_rate=0.01337, "
+ "sentry-user_id=Am%C3%A9lie, other-vendor-value-2=foo;bar;"
+ )
+
+ transaction = Transaction.continue_from_headers(headers)
+
with start_transaction(
+ transaction=transaction,
name="/interactions/other-dogs/new-dog",
op="greeting.sniff",
trace_id="12312012123120121231201212312012",
@@ -140,14 +151,28 @@ def test_outgoing_trace_headers(
HTTPSConnection("www.squirrelchasers.com").request("GET", "/top-chasers")
- request_span = transaction._span_recorder.spans[-1]
+ (request_str,) = mock_send.call_args[0]
+ request_headers = {}
+ for line in request_str.decode("utf-8").split("\r\n")[1:]:
+ if line:
+ key, val = line.split(": ")
+ request_headers[key] = val
- expected_sentry_trace = (
- "sentry-trace: {trace_id}-{parent_span_id}-{sampled}".format(
- trace_id=transaction.trace_id,
- parent_span_id=request_span.span_id,
- sampled=1,
- )
+ request_span = transaction._span_recorder.spans[-1]
+ expected_sentry_trace = "{trace_id}-{parent_span_id}-{sampled}".format(
+ trace_id=transaction.trace_id,
+ parent_span_id=request_span.span_id,
+ sampled=1,
)
+ assert request_headers["sentry-trace"] == expected_sentry_trace
+
+ expected_outgoing_baggage_items = [
+ "sentry-trace_id=771a43a4192642f0b136d5159a501700",
+ "sentry-public_key=49d0f7386ad645858ae85020e393bef3",
+ "sentry-sample_rate=0.01337",
+ "sentry-user_id=Am%C3%A9lie",
+ ]
- mock_send.assert_called_with(StringContaining(expected_sentry_trace))
+ assert sorted(request_headers["baggage"].split(",")) == sorted(
+ expected_outgoing_baggage_items
+ )
diff --git a/tests/tracing/test_baggage.py b/tests/tracing/test_baggage.py
new file mode 100644
index 0000000000..3c46ed5c63
--- /dev/null
+++ b/tests/tracing/test_baggage.py
@@ -0,0 +1,67 @@
+# coding: utf-8
+from sentry_sdk.tracing_utils import Baggage
+
+
+def test_third_party_baggage():
+ header = "other-vendor-value-1=foo;bar;baz, other-vendor-value-2=foo;bar;"
+ baggage = Baggage.from_incoming_header(header)
+
+ assert baggage.mutable
+ assert baggage.sentry_items == {}
+ assert sorted(baggage.third_party_items.split(",")) == sorted(
+ "other-vendor-value-1=foo;bar;baz,other-vendor-value-2=foo;bar;".split(",")
+ )
+
+ assert baggage.dynamic_sampling_context() == {}
+ assert baggage.serialize() == ""
+ assert sorted(baggage.serialize(include_third_party=True).split(",")) == sorted(
+ "other-vendor-value-1=foo;bar;baz,other-vendor-value-2=foo;bar;".split(",")
+ )
+
+
+def test_mixed_baggage():
+ header = (
+ "other-vendor-value-1=foo;bar;baz, sentry-trace_id=771a43a4192642f0b136d5159a501700, "
+ "sentry-public_key=49d0f7386ad645858ae85020e393bef3, sentry-sample_rate=0.01337, "
+ "sentry-user_id=Am%C3%A9lie, other-vendor-value-2=foo;bar;"
+ )
+
+ baggage = Baggage.from_incoming_header(header)
+
+ assert not baggage.mutable
+
+ assert baggage.sentry_items == {
+ "public_key": "49d0f7386ad645858ae85020e393bef3",
+ "trace_id": "771a43a4192642f0b136d5159a501700",
+ "user_id": "Amélie",
+ "sample_rate": "0.01337",
+ }
+
+ assert (
+ baggage.third_party_items
+ == "other-vendor-value-1=foo;bar;baz,other-vendor-value-2=foo;bar;"
+ )
+
+ assert baggage.dynamic_sampling_context() == {
+ "public_key": "49d0f7386ad645858ae85020e393bef3",
+ "trace_id": "771a43a4192642f0b136d5159a501700",
+ "user_id": "Amélie",
+ "sample_rate": "0.01337",
+ }
+
+ assert sorted(baggage.serialize().split(",")) == sorted(
+ (
+ "sentry-trace_id=771a43a4192642f0b136d5159a501700,"
+ "sentry-public_key=49d0f7386ad645858ae85020e393bef3,"
+ "sentry-sample_rate=0.01337,sentry-user_id=Am%C3%A9lie"
+ ).split(",")
+ )
+
+ assert sorted(baggage.serialize(include_third_party=True).split(",")) == sorted(
+ (
+ "sentry-trace_id=771a43a4192642f0b136d5159a501700,"
+ "sentry-public_key=49d0f7386ad645858ae85020e393bef3,"
+ "sentry-sample_rate=0.01337,sentry-user_id=Am%C3%A9lie,"
+ "other-vendor-value-1=foo;bar;baz,other-vendor-value-2=foo;bar;"
+ ).split(",")
+ )
diff --git a/tests/tracing/test_integration_tests.py b/tests/tracing/test_integration_tests.py
index 486651c754..80a8ba7a0c 100644
--- a/tests/tracing/test_integration_tests.py
+++ b/tests/tracing/test_integration_tests.py
@@ -1,6 +1,6 @@
+# coding: utf-8
import weakref
import gc
-
import pytest
from sentry_sdk import (
@@ -49,13 +49,13 @@ def test_basic(sentry_init, capture_events, sample_rate):
@pytest.mark.parametrize("sampled", [True, False, None])
@pytest.mark.parametrize("sample_rate", [0.0, 1.0])
-def test_continue_from_headers(sentry_init, capture_events, sampled, sample_rate):
+def test_continue_from_headers(sentry_init, capture_envelopes, sampled, sample_rate):
"""
Ensure data is actually passed along via headers, and that they are read
correctly.
"""
sentry_init(traces_sample_rate=sample_rate)
- events = capture_events()
+ envelopes = capture_envelopes()
# make a parent transaction (normally this would be in a different service)
with start_transaction(
@@ -63,9 +63,17 @@ def test_continue_from_headers(sentry_init, capture_events, sampled, sample_rate
) as parent_transaction:
with start_span() as old_span:
old_span.sampled = sampled
- headers = dict(Hub.current.iter_trace_propagation_headers(old_span))
tracestate = parent_transaction._sentry_tracestate
+ headers = dict(Hub.current.iter_trace_propagation_headers(old_span))
+ headers["baggage"] = (
+ "other-vendor-value-1=foo;bar;baz, "
+ "sentry-trace_id=771a43a4192642f0b136d5159a501700, "
+ "sentry-public_key=49d0f7386ad645858ae85020e393bef3, "
+ "sentry-sample_rate=0.01337, sentry-user_id=Amelie, "
+ "other-vendor-value-2=foo;bar;"
+ )
+
# child transaction, to prove that we can read 'sentry-trace' and
# `tracestate` header data correctly
child_transaction = Transaction.continue_from_headers(headers, name="WRONG")
@@ -77,6 +85,16 @@ def test_continue_from_headers(sentry_init, capture_events, sampled, sample_rate
assert child_transaction.span_id != old_span.span_id
assert child_transaction._sentry_tracestate == tracestate
+ baggage = child_transaction._baggage
+ assert baggage
+ assert not baggage.mutable
+ assert baggage.sentry_items == {
+ "public_key": "49d0f7386ad645858ae85020e393bef3",
+ "trace_id": "771a43a4192642f0b136d5159a501700",
+ "user_id": "Amelie",
+ "sample_rate": "0.01337",
+ }
+
# add child transaction to the scope, to show that the captured message will
# be tagged with the trace id (since it happens while the transaction is
# open)
@@ -89,23 +107,36 @@ def test_continue_from_headers(sentry_init, capture_events, sampled, sample_rate
# in this case the child transaction won't be captured
if sampled is False or (sample_rate == 0 and sampled is None):
- trace1, message = events
+ trace1, message = envelopes
+ message_payload = message.get_event()
+ trace1_payload = trace1.get_transaction_event()
- assert trace1["transaction"] == "hi"
+ assert trace1_payload["transaction"] == "hi"
else:
- trace1, message, trace2 = events
+ trace1, message, trace2 = envelopes
+ trace1_payload = trace1.get_transaction_event()
+ message_payload = message.get_event()
+ trace2_payload = trace2.get_transaction_event()
- assert trace1["transaction"] == "hi"
- assert trace2["transaction"] == "ho"
+ assert trace1_payload["transaction"] == "hi"
+ assert trace2_payload["transaction"] == "ho"
assert (
- trace1["contexts"]["trace"]["trace_id"]
- == trace2["contexts"]["trace"]["trace_id"]
+ trace1_payload["contexts"]["trace"]["trace_id"]
+ == trace2_payload["contexts"]["trace"]["trace_id"]
== child_transaction.trace_id
- == message["contexts"]["trace"]["trace_id"]
+ == message_payload["contexts"]["trace"]["trace_id"]
)
- assert message["message"] == "hello"
+ assert trace2.headers["trace"] == baggage.dynamic_sampling_context()
+ assert trace2.headers["trace"] == {
+ "public_key": "49d0f7386ad645858ae85020e393bef3",
+ "trace_id": "771a43a4192642f0b136d5159a501700",
+ "user_id": "Amelie",
+ "sample_rate": "0.01337",
+ }
+
+ assert message_payload["message"] == "hello"
@pytest.mark.parametrize(
From 485a659b42e8830b8c8299c53fc51b36eb7be942 Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Fri, 8 Jul 2022 14:11:47 +0000
Subject: [PATCH 0352/2327] release: 1.7.0
---
CHANGELOG.md | 11 +++++++++++
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1261c08b68..e0fa08700b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
# Changelog
+## 1.7.0
+
+### Various fixes & improvements
+
+- feat(tracing): Dynamic Sampling Context / Baggage continuation (#1485) by @sl0thentr0py
+- build(deps): bump sphinx from 4.5.0 to 5.0.2 (#1470) by @dependabot
+- build(deps): bump pep8-naming from 0.11.1 to 0.13.0 (#1457) by @dependabot
+- build(deps): bump actions/setup-python from 3 to 4 (#1465) by @dependabot
+- build(deps): bump mypy from 0.950 to 0.961 (#1464) by @dependabot
+- build(deps): bump actions/cache from 2 to 3 (#1478) by @dependabot
+
## 1.6.0
### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index c3ba844ec7..b3eb881196 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = "2019, Sentry Team and Contributors"
author = "Sentry Team and Contributors"
-release = "1.6.0"
+release = "1.7.0"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 043740acd1..7ed88b674d 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -102,7 +102,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.6.0"
+VERSION = "1.7.0"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index e1d3972d28..ed766b6df5 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.6.0",
+ version="1.7.0",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 3fd8f12b90c338bda26316ce515c08e6340b1d39 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Fri, 8 Jul 2022 16:19:18 +0200
Subject: [PATCH 0353/2327] Edit changelog
---
CHANGELOG.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0fa08700b..6218e29ef7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,11 @@
### Various fixes & improvements
- feat(tracing): Dynamic Sampling Context / Baggage continuation (#1485) by @sl0thentr0py
-- build(deps): bump sphinx from 4.5.0 to 5.0.2 (#1470) by @dependabot
-- build(deps): bump pep8-naming from 0.11.1 to 0.13.0 (#1457) by @dependabot
-- build(deps): bump actions/setup-python from 3 to 4 (#1465) by @dependabot
-- build(deps): bump mypy from 0.950 to 0.961 (#1464) by @dependabot
-- build(deps): bump actions/cache from 2 to 3 (#1478) by @dependabot
+
+ The SDK now propagates the [W3C Baggage Header](https://www.w3.org/TR/baggage/) from
+ incoming transactions to outgoing requests. It also extracts
+ Sentry specific [sampling information](https://develop.sentry.dev/sdk/performance/dynamic-sampling-context/)
+ and adds it to the transaction headers to enable Dynamic Sampling in the product.
## 1.6.0
From 21f25afa5c298129bdf35ee31bcdf6b716b2bb54 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Fri, 8 Jul 2022 16:20:45 +0200
Subject: [PATCH 0354/2327] Newline
---
CHANGELOG.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6218e29ef7..427c7cd884 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,8 @@
- feat(tracing): Dynamic Sampling Context / Baggage continuation (#1485) by @sl0thentr0py
The SDK now propagates the [W3C Baggage Header](https://www.w3.org/TR/baggage/) from
- incoming transactions to outgoing requests. It also extracts
- Sentry specific [sampling information](https://develop.sentry.dev/sdk/performance/dynamic-sampling-context/)
+ incoming transactions to outgoing requests.
+ It also extracts Sentry specific [sampling information](https://develop.sentry.dev/sdk/performance/dynamic-sampling-context/)
and adds it to the transaction headers to enable Dynamic Sampling in the product.
## 1.6.0
From e71609731ae14f9829553bdddc5b11111ed3d4bc Mon Sep 17 00:00:00 2001
From: Rob Young
Date: Wed, 13 Jul 2022 13:23:29 +0100
Subject: [PATCH 0355/2327] Skip malformed baggage items (#1491)
We are seeing baggage headers coming in with a single comma. This is
obviously invalid but Sentry should error out.
---
sentry_sdk/tracing_utils.py | 2 ++
tests/tracing/test_baggage.py | 10 ++++++++++
2 files changed, 12 insertions(+)
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
index aff5fc1076..0b4e33c6ec 100644
--- a/sentry_sdk/tracing_utils.py
+++ b/sentry_sdk/tracing_utils.py
@@ -457,6 +457,8 @@ def from_incoming_header(cls, header):
if header:
for item in header.split(","):
+ if "=" not in item:
+ continue
item = item.strip()
key, val = item.split("=")
if Baggage.SENTRY_PREFIX_REGEX.match(key):
diff --git a/tests/tracing/test_baggage.py b/tests/tracing/test_baggage.py
index 3c46ed5c63..185a085bf6 100644
--- a/tests/tracing/test_baggage.py
+++ b/tests/tracing/test_baggage.py
@@ -65,3 +65,13 @@ def test_mixed_baggage():
"other-vendor-value-1=foo;bar;baz,other-vendor-value-2=foo;bar;"
).split(",")
)
+
+
+def test_malformed_baggage():
+ header = ","
+
+ baggage = Baggage.from_incoming_header(header)
+
+ assert baggage.sentry_items == {}
+ assert baggage.third_party_items == ""
+ assert baggage.mutable
From 0b2868c83d37f028a8223f775254309f1424bb5b Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Wed, 13 Jul 2022 12:24:58 +0000
Subject: [PATCH 0356/2327] release: 1.7.1
---
CHANGELOG.md | 6 ++++++
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 427c7cd884..c1e78cbed0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog
+## 1.7.1
+
+### Various fixes & improvements
+
+- Skip malformed baggage items (#1491) by @robyoung
+
## 1.7.0
### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index b3eb881196..3316c2b689 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = "2019, Sentry Team and Contributors"
author = "Sentry Team and Contributors"
-release = "1.7.0"
+release = "1.7.1"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 7ed88b674d..437f53655b 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -102,7 +102,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.7.0"
+VERSION = "1.7.1"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index ed766b6df5..d06e6c9de9 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.7.0",
+ version="1.7.1",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From b076a788d0e5b15f1fb2468b93d285c7a6e21ff0 Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Fri, 15 Jul 2022 10:49:41 +0200
Subject: [PATCH 0357/2327] Removed (unused) sentry_timestamp header (#1494)
Removed (unused) sentry_timestamp header
refs #1493
---
sentry_sdk/utils.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 38ba4d7857..ccac6e37e3 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -270,12 +270,10 @@ def get_api_url(
type,
)
- def to_header(self, timestamp=None):
- # type: (Optional[datetime]) -> str
+ def to_header(self):
+ # type: () -> str
"""Returns the auth header a string."""
rv = [("sentry_key", self.public_key), ("sentry_version", self.version)]
- if timestamp is not None:
- rv.append(("sentry_timestamp", str(to_timestamp(timestamp))))
if self.client is not None:
rv.append(("sentry_client", self.client))
if self.secret_key is not None:
From d4bc0f81b90f97525a7c39399ea25729949eae86 Mon Sep 17 00:00:00 2001
From: Anton Pirker
Date: Fri, 15 Jul 2022 13:38:39 +0200
Subject: [PATCH 0358/2327] feat(transactions): Transaction Source (#1490)
Added transaction source (plus tests) to the following Integrations:
Flask, ASGI, Bottle, Django, Celery, Falcon, Pyramid, Quart, Sanic, Tornado, AIOHTTP, Chalice, GCP, AWS Lambda,
---
.pre-commit-config.yaml | 6 +-
sentry_sdk/integrations/aiohttp.py | 7 +-
sentry_sdk/integrations/asgi.py | 64 ++++++++++-----
sentry_sdk/integrations/aws_lambda.py | 7 +-
sentry_sdk/integrations/bottle.py | 39 +++++----
sentry_sdk/integrations/celery.py | 8 +-
sentry_sdk/integrations/chalice.py | 7 +-
sentry_sdk/integrations/django/__init__.py | 56 ++++++++-----
sentry_sdk/integrations/falcon.py | 27 +++++--
sentry_sdk/integrations/flask.py | 65 +++++++--------
sentry_sdk/integrations/gcp.py | 7 +-
sentry_sdk/integrations/pyramid.py | 35 +++++---
sentry_sdk/integrations/quart.py | 35 +++++---
sentry_sdk/integrations/sanic.py | 14 +++-
sentry_sdk/integrations/tornado.py | 3 +-
sentry_sdk/scope.py | 30 ++++++-
sentry_sdk/tracing.py | 31 +++++++-
tests/integrations/aiohttp/test_aiohttp.py | 22 ++++-
tests/integrations/asgi/test_asgi.py | 93 ++++++++++++++++++++++
tests/integrations/aws_lambda/test_aws.py | 2 +
tests/integrations/bottle/test_bottle.py | 25 ++++--
tests/integrations/celery/test_celery.py | 4 +-
tests/integrations/chalice/test_chalice.py | 36 +++++++++
tests/integrations/django/test_basic.py | 14 +++-
tests/integrations/falcon/test_falcon.py | 26 +++++-
tests/integrations/flask/test_flask.py | 24 +++++-
tests/integrations/gcp/test_gcp.py | 1 +
tests/integrations/pyramid/test_pyramid.py | 33 ++++++--
tests/integrations/quart/test_quart.py | 26 +++++-
tests/integrations/sanic/test_sanic.py | 26 ++++++
tests/integrations/tornado/test_tornado.py | 6 ++
31 files changed, 613 insertions(+), 166 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 753558186f..3f7e548518 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,18 +2,18 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v3.2.0
+ rev: v4.3.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- repo: https://github.com/psf/black
- rev: stable
+ rev: 22.6.0
hooks:
- id: black
- repo: https://gitlab.com/pycqa/flake8
- rev: 4.0.1
+ rev: 3.9.2
hooks:
- id: flake8
diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py
index 8a828b2fe3..9f4a823b98 100644
--- a/sentry_sdk/integrations/aiohttp.py
+++ b/sentry_sdk/integrations/aiohttp.py
@@ -9,7 +9,7 @@
_filter_headers,
request_body_within_bounds,
)
-from sentry_sdk.tracing import Transaction
+from sentry_sdk.tracing import SOURCE_FOR_STYLE, Transaction
from sentry_sdk.utils import (
capture_internal_exceptions,
event_from_exception,
@@ -148,7 +148,10 @@ async def sentry_urldispatcher_resolve(self, request):
if name is not None:
with Hub.current.configure_scope() as scope:
- scope.transaction = name
+ scope.set_transaction_name(
+ name,
+ source=SOURCE_FOR_STYLE[integration.transaction_style],
+ )
return rv
diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py
index 5f7810732b..3aa9fcb572 100644
--- a/sentry_sdk/integrations/asgi.py
+++ b/sentry_sdk/integrations/asgi.py
@@ -13,6 +13,11 @@
from sentry_sdk.hub import Hub, _should_send_default_pii
from sentry_sdk.integrations._wsgi_common import _filter_headers
from sentry_sdk.sessions import auto_session_tracking
+from sentry_sdk.tracing import (
+ SOURCE_FOR_STYLE,
+ TRANSACTION_SOURCE_ROUTE,
+ TRANSACTION_SOURCE_UNKNOWN,
+)
from sentry_sdk.utils import (
ContextVar,
event_from_exception,
@@ -147,6 +152,7 @@ async def _run_app(self, scope, callback):
transaction = Transaction(op="asgi.server")
transaction.name = _DEFAULT_TRANSACTION_NAME
+ transaction.source = TRANSACTION_SOURCE_ROUTE
transaction.set_tag("asgi.type", ty)
with hub.start_transaction(
@@ -183,25 +189,7 @@ def event_processor(self, event, hint, asgi_scope):
if client and _should_send_default_pii():
request_info["env"] = {"REMOTE_ADDR": self._get_ip(asgi_scope)}
- if (
- event.get("transaction", _DEFAULT_TRANSACTION_NAME)
- == _DEFAULT_TRANSACTION_NAME
- ):
- if self.transaction_style == "endpoint":
- endpoint = asgi_scope.get("endpoint")
- # Webframeworks like Starlette mutate the ASGI env once routing is
- # done, which is sometime after the request has started. If we have
- # an endpoint, overwrite our generic transaction name.
- if endpoint:
- event["transaction"] = transaction_from_function(endpoint)
- elif self.transaction_style == "url":
- # FastAPI includes the route object in the scope to let Sentry extract the
- # path from it for the transaction name
- route = asgi_scope.get("route")
- if route:
- path = getattr(route, "path", None)
- if path is not None:
- event["transaction"] = path
+ self._set_transaction_name_and_source(event, self.transaction_style, asgi_scope)
event["request"] = request_info
@@ -213,6 +201,44 @@ def event_processor(self, event, hint, asgi_scope):
# data to your liking it's recommended to use the `before_send` callback
# for that.
+ def _set_transaction_name_and_source(self, event, transaction_style, asgi_scope):
+ # type: (Event, str, Any) -> None
+
+ transaction_name_already_set = (
+ event.get("transaction", _DEFAULT_TRANSACTION_NAME)
+ != _DEFAULT_TRANSACTION_NAME
+ )
+ if transaction_name_already_set:
+ return
+
+ name = ""
+
+ if transaction_style == "endpoint":
+ endpoint = asgi_scope.get("endpoint")
+ # Webframeworks like Starlette mutate the ASGI env once routing is
+ # done, which is sometime after the request has started. If we have
+ # an endpoint, overwrite our generic transaction name.
+ if endpoint:
+ name = transaction_from_function(endpoint) or ""
+
+ elif transaction_style == "url":
+ # FastAPI includes the route object in the scope to let Sentry extract the
+ # path from it for the transaction name
+ route = asgi_scope.get("route")
+ if route:
+ path = getattr(route, "path", None)
+ if path is not None:
+ name = path
+
+ if not name:
+ # If no transaction name can be found set an unknown source.
+ # This can happen when ASGI frameworks that are not yet supported well are used.
+ event["transaction_info"] = {"source": TRANSACTION_SOURCE_UNKNOWN}
+ return
+
+ event["transaction"] = name
+ event["transaction_info"] = {"source": SOURCE_FOR_STYLE[transaction_style]}
+
def _get_url(self, scope, default_scheme, host):
# type: (Dict[str, Any], Literal["ws", "http"], Optional[str]) -> str
"""
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
index 10b5025abe..8f41ce52cb 100644
--- a/sentry_sdk/integrations/aws_lambda.py
+++ b/sentry_sdk/integrations/aws_lambda.py
@@ -3,7 +3,7 @@
import sys
from sentry_sdk.hub import Hub, _should_send_default_pii
-from sentry_sdk.tracing import Transaction
+from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT, Transaction
from sentry_sdk._compat import reraise
from sentry_sdk.utils import (
AnnotatedValue,
@@ -139,7 +139,10 @@ def sentry_handler(aws_event, aws_context, *args, **kwargs):
if headers is None:
headers = {}
transaction = Transaction.continue_from_headers(
- headers, op="serverless.function", name=aws_context.function_name
+ headers,
+ op="serverless.function",
+ name=aws_context.function_name,
+ source=TRANSACTION_SOURCE_COMPONENT,
)
with hub.start_transaction(
transaction,
diff --git a/sentry_sdk/integrations/bottle.py b/sentry_sdk/integrations/bottle.py
index 4fa077e8f6..271fc150b1 100644
--- a/sentry_sdk/integrations/bottle.py
+++ b/sentry_sdk/integrations/bottle.py
@@ -1,6 +1,7 @@
from __future__ import absolute_import
from sentry_sdk.hub import Hub
+from sentry_sdk.tracing import SOURCE_FOR_STYLE
from sentry_sdk.utils import (
capture_internal_exceptions,
event_from_exception,
@@ -20,7 +21,7 @@
from typing import Optional
from bottle import FileUpload, FormsDict, LocalRequest # type: ignore
- from sentry_sdk._types import EventProcessor
+ from sentry_sdk._types import EventProcessor, Event
try:
from bottle import (
@@ -40,7 +41,7 @@
class BottleIntegration(Integration):
identifier = "bottle"
- transaction_style = None
+ transaction_style = ""
def __init__(self, transaction_style="endpoint"):
# type: (str) -> None
@@ -176,24 +177,34 @@ def size_of_file(self, file):
return file.content_length
+def _set_transaction_name_and_source(event, transaction_style, request):
+ # type: (Event, str, Any) -> None
+ name = ""
+
+ if transaction_style == "url":
+ name = request.route.rule or ""
+
+ elif transaction_style == "endpoint":
+ name = (
+ request.route.name
+ or transaction_from_function(request.route.callback)
+ or ""
+ )
+
+ event["transaction"] = name
+ event["transaction_info"] = {"source": SOURCE_FOR_STYLE[transaction_style]}
+
+
def _make_request_event_processor(app, request, integration):
# type: (Bottle, LocalRequest, BottleIntegration) -> EventProcessor
- def inner(event, hint):
- # type: (Dict[str, Any], Dict[str, Any]) -> Dict[str, Any]
- try:
- if integration.transaction_style == "endpoint":
- event["transaction"] = request.route.name or transaction_from_function(
- request.route.callback
- )
- elif integration.transaction_style == "url":
- event["transaction"] = request.route.rule
- except Exception:
- pass
+ def event_processor(event, hint):
+ # type: (Dict[str, Any], Dict[str, Any]) -> Dict[str, Any]
+ _set_transaction_name_and_source(event, integration.transaction_style, request)
with capture_internal_exceptions():
BottleRequestExtractor(request).extract_into_event(event)
return event
- return inner
+ return event_processor
diff --git a/sentry_sdk/integrations/celery.py b/sentry_sdk/integrations/celery.py
index 743e2cfb50..2a095ec8c6 100644
--- a/sentry_sdk/integrations/celery.py
+++ b/sentry_sdk/integrations/celery.py
@@ -3,7 +3,11 @@
import sys
from sentry_sdk.hub import Hub
-from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
+from sentry_sdk.tracing import TRANSACTION_SOURCE_TASK
+from sentry_sdk.utils import (
+ capture_internal_exceptions,
+ event_from_exception,
+)
from sentry_sdk.tracing import Transaction
from sentry_sdk._compat import reraise
from sentry_sdk.integrations import Integration, DidNotEnable
@@ -154,8 +158,8 @@ def _inner(*args, **kwargs):
args[3].get("headers") or {},
op="celery.task",
name="unknown celery task",
+ source=TRANSACTION_SOURCE_TASK,
)
-
transaction.name = task.name
transaction.set_status("ok")
diff --git a/sentry_sdk/integrations/chalice.py b/sentry_sdk/integrations/chalice.py
index 109862bd90..80069b2951 100644
--- a/sentry_sdk/integrations/chalice.py
+++ b/sentry_sdk/integrations/chalice.py
@@ -4,6 +4,7 @@
from sentry_sdk.hub import Hub
from sentry_sdk.integrations import Integration, DidNotEnable
from sentry_sdk.integrations.aws_lambda import _make_request_event_processor
+from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT
from sentry_sdk.utils import (
capture_internal_exceptions,
event_from_exception,
@@ -65,7 +66,11 @@ def wrapped_view_function(**function_args):
with hub.push_scope() as scope:
with capture_internal_exceptions():
configured_time = app.lambda_context.get_remaining_time_in_millis()
- scope.transaction = app.lambda_context.function_name
+ scope.set_transaction_name(
+ app.lambda_context.function_name,
+ source=TRANSACTION_SOURCE_COMPONENT,
+ )
+
scope.add_event_processor(
_make_request_event_processor(
app.current_request.to_dict(),
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index d2ca12be4a..6bd1dd2c0b 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -9,6 +9,7 @@
from sentry_sdk.hub import Hub, _should_send_default_pii
from sentry_sdk.scope import add_global_event_processor
from sentry_sdk.serializer import add_global_repr_processor
+from sentry_sdk.tracing import SOURCE_FOR_STYLE
from sentry_sdk.tracing_utils import record_sql_queries
from sentry_sdk.utils import (
HAS_REAL_CONTEXTVARS,
@@ -82,7 +83,7 @@ def is_authenticated(request_user):
class DjangoIntegration(Integration):
identifier = "django"
- transaction_style = None
+ transaction_style = ""
middleware_spans = None
def __init__(self, transaction_style="url", middleware_spans=True):
@@ -319,6 +320,32 @@ def _patch_django_asgi_handler():
patch_django_asgi_handler_impl(ASGIHandler)
+def _set_transaction_name_and_source(scope, transaction_style, request):
+ # type: (Scope, str, WSGIRequest) -> None
+ try:
+ transaction_name = ""
+ if transaction_style == "function_name":
+ fn = resolve(request.path).func
+ transaction_name = (
+ transaction_from_function(getattr(fn, "view_class", fn)) or ""
+ )
+
+ elif transaction_style == "url":
+ if hasattr(request, "urlconf"):
+ transaction_name = LEGACY_RESOLVER.resolve(
+ request.path_info, urlconf=request.urlconf
+ )
+ else:
+ transaction_name = LEGACY_RESOLVER.resolve(request.path_info)
+
+ scope.set_transaction_name(
+ transaction_name,
+ source=SOURCE_FOR_STYLE[transaction_style],
+ )
+ except Exception:
+ pass
+
+
def _before_get_response(request):
# type: (WSGIRequest) -> None
hub = Hub.current
@@ -330,24 +357,15 @@ def _before_get_response(request):
with hub.configure_scope() as scope:
# Rely on WSGI middleware to start a trace
- try:
- if integration.transaction_style == "function_name":
- fn = resolve(request.path).func
- scope.transaction = transaction_from_function(
- getattr(fn, "view_class", fn)
- )
- elif integration.transaction_style == "url":
- scope.transaction = LEGACY_RESOLVER.resolve(request.path_info)
- except Exception:
- pass
+ _set_transaction_name_and_source(scope, integration.transaction_style, request)
scope.add_event_processor(
_make_event_processor(weakref.ref(request), integration)
)
-def _attempt_resolve_again(request, scope):
- # type: (WSGIRequest, Scope) -> None
+def _attempt_resolve_again(request, scope, transaction_style):
+ # type: (WSGIRequest, Scope, str) -> None
"""
Some django middlewares overwrite request.urlconf
so we need to respect that contract,
@@ -356,13 +374,7 @@ def _attempt_resolve_again(request, scope):
if not hasattr(request, "urlconf"):
return
- try:
- scope.transaction = LEGACY_RESOLVER.resolve(
- request.path_info,
- urlconf=request.urlconf,
- )
- except Exception:
- pass
+ _set_transaction_name_and_source(scope, transaction_style, request)
def _after_get_response(request):
@@ -373,7 +385,7 @@ def _after_get_response(request):
return
with hub.configure_scope() as scope:
- _attempt_resolve_again(request, scope)
+ _attempt_resolve_again(request, scope, integration.transaction_style)
def _patch_get_response():
@@ -438,7 +450,7 @@ def _got_request_exception(request=None, **kwargs):
if request is not None and integration.transaction_style == "url":
with hub.configure_scope() as scope:
- _attempt_resolve_again(request, scope)
+ _attempt_resolve_again(request, scope, integration.transaction_style)
# If an integration is there, a client has to be there.
client = hub.client # type: Any
diff --git a/sentry_sdk/integrations/falcon.py b/sentry_sdk/integrations/falcon.py
index 8129fab46b..b38e4bd5b4 100644
--- a/sentry_sdk/integrations/falcon.py
+++ b/sentry_sdk/integrations/falcon.py
@@ -4,7 +4,11 @@
from sentry_sdk.integrations import Integration, DidNotEnable
from sentry_sdk.integrations._wsgi_common import RequestExtractor
from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
-from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
+from sentry_sdk.tracing import SOURCE_FOR_STYLE
+from sentry_sdk.utils import (
+ capture_internal_exceptions,
+ event_from_exception,
+)
from sentry_sdk._types import MYPY
@@ -87,7 +91,7 @@ def process_request(self, req, resp, *args, **kwargs):
class FalconIntegration(Integration):
identifier = "falcon"
- transaction_style = None
+ transaction_style = ""
def __init__(self, transaction_style="uri_template"):
# type: (str) -> None
@@ -197,19 +201,26 @@ def _exception_leads_to_http_5xx(ex):
return is_server_error or is_unhandled_error
+def _set_transaction_name_and_source(event, transaction_style, request):
+ # type: (Dict[str, Any], str, falcon.Request) -> None
+ name_for_style = {
+ "uri_template": request.uri_template,
+ "path": request.path,
+ }
+ event["transaction"] = name_for_style[transaction_style]
+ event["transaction_info"] = {"source": SOURCE_FOR_STYLE[transaction_style]}
+
+
def _make_request_event_processor(req, integration):
# type: (falcon.Request, FalconIntegration) -> EventProcessor
- def inner(event, hint):
+ def event_processor(event, hint):
# type: (Dict[str, Any], Dict[str, Any]) -> Dict[str, Any]
- if integration.transaction_style == "uri_template":
- event["transaction"] = req.uri_template
- elif integration.transaction_style == "path":
- event["transaction"] = req.path
+ _set_transaction_name_and_source(event, integration.transaction_style, req)
with capture_internal_exceptions():
FalconRequestExtractor(req).extract_into_event(event)
return event
- return inner
+ return event_processor
diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py
index 5aade50a94..0aa8d2f120 100644
--- a/sentry_sdk/integrations/flask.py
+++ b/sentry_sdk/integrations/flask.py
@@ -1,23 +1,23 @@
from __future__ import absolute_import
+from sentry_sdk._types import MYPY
from sentry_sdk.hub import Hub, _should_send_default_pii
-from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
-from sentry_sdk.integrations import Integration, DidNotEnable
-from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
+from sentry_sdk.integrations import DidNotEnable, Integration
from sentry_sdk.integrations._wsgi_common import RequestExtractor
-
-from sentry_sdk._types import MYPY
+from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
+from sentry_sdk.scope import Scope
+from sentry_sdk.tracing import SOURCE_FOR_STYLE
+from sentry_sdk.utils import (
+ capture_internal_exceptions,
+ event_from_exception,
+)
if MYPY:
- from sentry_sdk.integrations.wsgi import _ScopedResponse
- from typing import Any
- from typing import Dict
- from werkzeug.datastructures import ImmutableMultiDict
- from werkzeug.datastructures import FileStorage
- from typing import Union
- from typing import Callable
+ from typing import Any, Callable, Dict, Union
from sentry_sdk._types import EventProcessor
+ from sentry_sdk.integrations.wsgi import _ScopedResponse
+ from werkzeug.datastructures import FileStorage, ImmutableMultiDict
try:
@@ -26,14 +26,9 @@
flask_login = None
try:
- from flask import ( # type: ignore
- Markup,
- Request,
- Flask,
- _request_ctx_stack,
- _app_ctx_stack,
- __version__ as FLASK_VERSION,
- )
+ from flask import Flask, Markup, Request # type: ignore
+ from flask import __version__ as FLASK_VERSION
+ from flask import _app_ctx_stack, _request_ctx_stack
from flask.signals import (
before_render_template,
got_request_exception,
@@ -53,7 +48,7 @@
class FlaskIntegration(Integration):
identifier = "flask"
- transaction_style = None
+ transaction_style = ""
def __init__(self, transaction_style="endpoint"):
# type: (str) -> None
@@ -114,6 +109,21 @@ def _add_sentry_trace(sender, template, context, **extra):
)
+def _set_transaction_name_and_source(scope, transaction_style, request):
+ # type: (Scope, str, Request) -> None
+ try:
+ name_for_style = {
+ "url": request.url_rule.rule,
+ "endpoint": request.url_rule.endpoint,
+ }
+ scope.set_transaction_name(
+ name_for_style[transaction_style],
+ source=SOURCE_FOR_STYLE[transaction_style],
+ )
+ except Exception:
+ pass
+
+
def _request_started(sender, **kwargs):
# type: (Flask, **Any) -> None
hub = Hub.current
@@ -125,16 +135,9 @@ def _request_started(sender, **kwargs):
with hub.configure_scope() as scope:
request = _request_ctx_stack.top.request
- # Set the transaction name here, but rely on WSGI middleware to actually
- # start the transaction
- try:
- if integration.transaction_style == "endpoint":
- scope.transaction = request.url_rule.endpoint
- elif integration.transaction_style == "url":
- scope.transaction = request.url_rule.rule
- except Exception:
- pass
-
+ # Set the transaction name and source here,
+ # but rely on WSGI middleware to actually start the transaction
+ _set_transaction_name_and_source(scope, integration.transaction_style, request)
evt_processor = _make_request_event_processor(app, request, integration)
scope.add_event_processor(evt_processor)
diff --git a/sentry_sdk/integrations/gcp.py b/sentry_sdk/integrations/gcp.py
index 118970e9d8..e401daa9ca 100644
--- a/sentry_sdk/integrations/gcp.py
+++ b/sentry_sdk/integrations/gcp.py
@@ -3,7 +3,7 @@
import sys
from sentry_sdk.hub import Hub, _should_send_default_pii
-from sentry_sdk.tracing import Transaction
+from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT, Transaction
from sentry_sdk._compat import reraise
from sentry_sdk.utils import (
AnnotatedValue,
@@ -81,7 +81,10 @@ def sentry_func(functionhandler, gcp_event, *args, **kwargs):
if hasattr(gcp_event, "headers"):
headers = gcp_event.headers
transaction = Transaction.continue_from_headers(
- headers, op="serverless.function", name=environ.get("FUNCTION_NAME", "")
+ headers,
+ op="serverless.function",
+ name=environ.get("FUNCTION_NAME", ""),
+ source=TRANSACTION_SOURCE_COMPONENT,
)
sampling_context = {
"gcp_env": {
diff --git a/sentry_sdk/integrations/pyramid.py b/sentry_sdk/integrations/pyramid.py
index 07142254d2..1e234fcffd 100644
--- a/sentry_sdk/integrations/pyramid.py
+++ b/sentry_sdk/integrations/pyramid.py
@@ -5,7 +5,12 @@
import weakref
from sentry_sdk.hub import Hub, _should_send_default_pii
-from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
+from sentry_sdk.scope import Scope
+from sentry_sdk.tracing import SOURCE_FOR_STYLE
+from sentry_sdk.utils import (
+ capture_internal_exceptions,
+ event_from_exception,
+)
from sentry_sdk._compat import reraise, iteritems
from sentry_sdk.integrations import Integration, DidNotEnable
@@ -51,7 +56,7 @@ def authenticated_userid(request):
class PyramidIntegration(Integration):
identifier = "pyramid"
- transaction_style = None
+ transaction_style = ""
def __init__(self, transaction_style="route_name"):
# type: (str) -> None
@@ -76,14 +81,9 @@ def sentry_patched_call_view(registry, request, *args, **kwargs):
if integration is not None:
with hub.configure_scope() as scope:
- try:
- if integration.transaction_style == "route_name":
- scope.transaction = request.matched_route.name
- elif integration.transaction_style == "route_pattern":
- scope.transaction = request.matched_route.pattern
- except Exception:
- pass
-
+ _set_transaction_name_and_source(
+ scope, integration.transaction_style, request
+ )
scope.add_event_processor(
_make_event_processor(weakref.ref(request), integration)
)
@@ -156,6 +156,21 @@ def _capture_exception(exc_info):
hub.capture_event(event, hint=hint)
+def _set_transaction_name_and_source(scope, transaction_style, request):
+ # type: (Scope, str, Request) -> None
+ try:
+ name_for_style = {
+ "route_name": request.matched_route.name,
+ "route_pattern": request.matched_route.pattern,
+ }
+ scope.set_transaction_name(
+ name_for_style[transaction_style],
+ source=SOURCE_FOR_STYLE[transaction_style],
+ )
+ except Exception:
+ pass
+
+
class PyramidRequestExtractor(RequestExtractor):
def url(self):
# type: () -> str
diff --git a/sentry_sdk/integrations/quart.py b/sentry_sdk/integrations/quart.py
index 411817c708..1ccd982d0e 100644
--- a/sentry_sdk/integrations/quart.py
+++ b/sentry_sdk/integrations/quart.py
@@ -4,7 +4,12 @@
from sentry_sdk.integrations import DidNotEnable, Integration
from sentry_sdk.integrations._wsgi_common import _filter_headers
from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
-from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
+from sentry_sdk.scope import Scope
+from sentry_sdk.tracing import SOURCE_FOR_STYLE
+from sentry_sdk.utils import (
+ capture_internal_exceptions,
+ event_from_exception,
+)
from sentry_sdk._types import MYPY
@@ -44,7 +49,7 @@
class QuartIntegration(Integration):
identifier = "quart"
- transaction_style = None
+ transaction_style = ""
def __init__(self, transaction_style="endpoint"):
# type: (str) -> None
@@ -79,6 +84,22 @@ async def sentry_patched_asgi_app(self, scope, receive, send):
Quart.__call__ = sentry_patched_asgi_app
+def _set_transaction_name_and_source(scope, transaction_style, request):
+ # type: (Scope, str, Request) -> None
+
+ try:
+ name_for_style = {
+ "url": request.url_rule.rule,
+ "endpoint": request.url_rule.endpoint,
+ }
+ scope.set_transaction_name(
+ name_for_style[transaction_style],
+ source=SOURCE_FOR_STYLE[transaction_style],
+ )
+ except Exception:
+ pass
+
+
def _request_websocket_started(sender, **kwargs):
# type: (Quart, **Any) -> None
hub = Hub.current
@@ -95,13 +116,9 @@ def _request_websocket_started(sender, **kwargs):
# Set the transaction name here, but rely on ASGI middleware
# to actually start the transaction
- try:
- if integration.transaction_style == "endpoint":
- scope.transaction = request_websocket.url_rule.endpoint
- elif integration.transaction_style == "url":
- scope.transaction = request_websocket.url_rule.rule
- except Exception:
- pass
+ _set_transaction_name_and_source(
+ scope, integration.transaction_style, request_websocket
+ )
evt_processor = _make_request_event_processor(
app, request_websocket, integration
diff --git a/sentry_sdk/integrations/sanic.py b/sentry_sdk/integrations/sanic.py
index 4e20cc9ece..8892f93ed7 100644
--- a/sentry_sdk/integrations/sanic.py
+++ b/sentry_sdk/integrations/sanic.py
@@ -4,6 +4,7 @@
from sentry_sdk._compat import urlparse, reraise
from sentry_sdk.hub import Hub
+from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT
from sentry_sdk.utils import (
capture_internal_exceptions,
event_from_exception,
@@ -191,7 +192,9 @@ async def _set_transaction(request, route, **kwargs):
with capture_internal_exceptions():
with hub.configure_scope() as scope:
route_name = route.name.replace(request.app.name, "").strip(".")
- scope.transaction = route_name
+ scope.set_transaction_name(
+ route_name, source=TRANSACTION_SOURCE_COMPONENT
+ )
def _sentry_error_handler_lookup(self, exception, *args, **kwargs):
@@ -268,9 +271,14 @@ def _legacy_router_get(self, *args):
# Format: app_name.route_name
sanic_route = sanic_route[len(sanic_app_name) + 1 :]
- scope.transaction = sanic_route
+ scope.set_transaction_name(
+ sanic_route, source=TRANSACTION_SOURCE_COMPONENT
+ )
else:
- scope.transaction = rv[0].__name__
+ scope.set_transaction_name(
+ rv[0].__name__, source=TRANSACTION_SOURCE_COMPONENT
+ )
+
return rv
diff --git a/sentry_sdk/integrations/tornado.py b/sentry_sdk/integrations/tornado.py
index 443ebefaa8..af048fb5e0 100644
--- a/sentry_sdk/integrations/tornado.py
+++ b/sentry_sdk/integrations/tornado.py
@@ -3,7 +3,7 @@
from inspect import iscoroutinefunction
from sentry_sdk.hub import Hub, _should_send_default_pii
-from sentry_sdk.tracing import Transaction
+from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT, Transaction
from sentry_sdk.utils import (
HAS_REAL_CONTEXTVARS,
CONTEXTVARS_ERROR_MESSAGE,
@@ -157,6 +157,7 @@ def tornado_processor(event, hint):
with capture_internal_exceptions():
method = getattr(handler, handler.request.method.lower())
event["transaction"] = transaction_from_function(method)
+ event["transaction_info"] = {"source": TRANSACTION_SOURCE_COMPONENT}
with capture_internal_exceptions():
extractor = TornadoRequestExtractor(request)
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
index bcfbf5c166..e0a2dc7a8d 100644
--- a/sentry_sdk/scope.py
+++ b/sentry_sdk/scope.py
@@ -81,6 +81,7 @@ class Scope(object):
# note that for legacy reasons, _transaction is the transaction *name*,
# not a Transaction object (the object is stored in _span)
"_transaction",
+ "_transaction_info",
"_user",
"_tags",
"_contexts",
@@ -109,6 +110,7 @@ def clear(self):
self._level = None # type: Optional[str]
self._fingerprint = None # type: Optional[List[str]]
self._transaction = None # type: Optional[str]
+ self._transaction_info = {} # type: Dict[str, str]
self._user = None # type: Optional[Dict[str, Any]]
self._tags = {} # type: Dict[str, Any]
@@ -162,7 +164,10 @@ def transaction(self):
def transaction(self, value):
# type: (Any) -> None
# would be type: (Optional[str]) -> None, see https://github.com/python/mypy/issues/3004
- """When set this forces a specific transaction name to be set."""
+ """When set this forces a specific transaction name to be set.
+
+ Deprecated: use set_transaction_name instead."""
+
# XXX: the docstring above is misleading. The implementation of
# apply_to_event prefers an existing value of event.transaction over
# anything set in the scope.
@@ -172,10 +177,27 @@ def transaction(self, value):
# Without breaking version compatibility, we could make the setter set a
# transaction name or transaction (self._span) depending on the type of
# the value argument.
+
+ logger.warning(
+ "Assigning to scope.transaction directly is deprecated: use scope.set_transaction_name() instead."
+ )
self._transaction = value
if self._span and self._span.containing_transaction:
self._span.containing_transaction.name = value
+ def set_transaction_name(self, name, source=None):
+ # type: (str, Optional[str]) -> None
+ """Set the transaction name and optionally the transaction source."""
+ self._transaction = name
+
+ if self._span and self._span.containing_transaction:
+ self._span.containing_transaction.name = name
+ if source:
+ self._span.containing_transaction.source = source
+
+ if source:
+ self._transaction_info["source"] = source
+
@_attr_setter
def user(self, value):
# type: (Optional[Dict[str, Any]]) -> None
@@ -363,6 +385,9 @@ def _drop(event, cause, ty):
if event.get("transaction") is None and self._transaction is not None:
event["transaction"] = self._transaction
+ if event.get("transaction_info") is None and self._transaction_info is not None:
+ event["transaction_info"] = self._transaction_info
+
if event.get("fingerprint") is None and self._fingerprint is not None:
event["fingerprint"] = self._fingerprint
@@ -406,6 +431,8 @@ def update_from_scope(self, scope):
self._fingerprint = scope._fingerprint
if scope._transaction is not None:
self._transaction = scope._transaction
+ if scope._transaction_info is not None:
+ self._transaction_info.update(scope._transaction_info)
if scope._user is not None:
self._user = scope._user
if scope._tags:
@@ -452,6 +479,7 @@ def __copy__(self):
rv._name = self._name
rv._fingerprint = self._fingerprint
rv._transaction = self._transaction
+ rv._transaction_info = dict(self._transaction_info)
rv._user = self._user
rv._tags = dict(self._tags)
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index fe53386597..dd4b1a730d 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -23,6 +23,29 @@
from sentry_sdk._types import SamplingContext, MeasurementUnit
+# Transaction source
+# see https://develop.sentry.dev/sdk/event-payloads/transaction/#transaction-annotations
+TRANSACTION_SOURCE_CUSTOM = "custom"
+TRANSACTION_SOURCE_URL = "url"
+TRANSACTION_SOURCE_ROUTE = "route"
+TRANSACTION_SOURCE_VIEW = "view"
+TRANSACTION_SOURCE_COMPONENT = "component"
+TRANSACTION_SOURCE_TASK = "task"
+TRANSACTION_SOURCE_UNKNOWN = "unknown"
+
+SOURCE_FOR_STYLE = {
+ "endpoint": TRANSACTION_SOURCE_COMPONENT,
+ "function_name": TRANSACTION_SOURCE_COMPONENT,
+ "handler_name": TRANSACTION_SOURCE_COMPONENT,
+ "method_and_path_pattern": TRANSACTION_SOURCE_ROUTE,
+ "path": TRANSACTION_SOURCE_URL,
+ "route_name": TRANSACTION_SOURCE_COMPONENT,
+ "route_pattern": TRANSACTION_SOURCE_ROUTE,
+ "uri_template": TRANSACTION_SOURCE_ROUTE,
+ "url": TRANSACTION_SOURCE_ROUTE,
+}
+
+
class _SpanRecorder(object):
"""Limits the number of spans recorded in a transaction."""
@@ -498,6 +521,7 @@ def get_trace_context(self):
class Transaction(Span):
__slots__ = (
"name",
+ "source",
"parent_sampled",
# the sentry portion of the `tracestate` header used to transmit
# correlation context for server-side dynamic sampling, of the form
@@ -517,6 +541,7 @@ def __init__(
sentry_tracestate=None, # type: Optional[str]
third_party_tracestate=None, # type: Optional[str]
baggage=None, # type: Optional[Baggage]
+ source=TRANSACTION_SOURCE_UNKNOWN, # type: str
**kwargs # type: Any
):
# type: (...) -> None
@@ -531,6 +556,7 @@ def __init__(
name = kwargs.pop("transaction")
Span.__init__(self, **kwargs)
self.name = name
+ self.source = source
self.parent_sampled = parent_sampled
# if tracestate isn't inherited and set here, it will get set lazily,
# either the first time an outgoing request needs it for a header or the
@@ -543,7 +569,7 @@ def __init__(
def __repr__(self):
# type: () -> str
return (
- "<%s(name=%r, op=%r, trace_id=%r, span_id=%r, parent_span_id=%r, sampled=%r)>"
+ "<%s(name=%r, op=%r, trace_id=%r, span_id=%r, parent_span_id=%r, sampled=%r, source=%r)>"
% (
self.__class__.__name__,
self.name,
@@ -552,6 +578,7 @@ def __repr__(self):
self.span_id,
self.parent_span_id,
self.sampled,
+ self.source,
)
)
@@ -621,6 +648,7 @@ def finish(self, hub=None):
event = {
"type": "transaction",
"transaction": self.name,
+ "transaction_info": {"source": self.source},
"contexts": {"trace": self.get_trace_context()},
"tags": self._tags,
"timestamp": self.timestamp,
@@ -648,6 +676,7 @@ def to_json(self):
rv = super(Transaction, self).to_json()
rv["name"] = self.name
+ rv["source"] = self.source
rv["sampled"] = self.sampled
return rv
diff --git a/tests/integrations/aiohttp/test_aiohttp.py b/tests/integrations/aiohttp/test_aiohttp.py
index 5c590bcdfa..3375ee76ad 100644
--- a/tests/integrations/aiohttp/test_aiohttp.py
+++ b/tests/integrations/aiohttp/test_aiohttp.py
@@ -196,17 +196,30 @@ async def hello(request):
@pytest.mark.parametrize(
- "transaction_style,expected_transaction",
+ "url,transaction_style,expected_transaction,expected_source",
[
(
+ "/message",
"handler_name",
"tests.integrations.aiohttp.test_aiohttp.test_transaction_style..hello",
+ "component",
+ ),
+ (
+ "/message",
+ "method_and_path_pattern",
+ "GET /{var}",
+ "route",
),
- ("method_and_path_pattern", "GET /{var}"),
],
)
async def test_transaction_style(
- sentry_init, aiohttp_client, capture_events, transaction_style, expected_transaction
+ sentry_init,
+ aiohttp_client,
+ capture_events,
+ url,
+ transaction_style,
+ expected_transaction,
+ expected_source,
):
sentry_init(
integrations=[AioHttpIntegration(transaction_style=transaction_style)],
@@ -222,13 +235,14 @@ async def hello(request):
events = capture_events()
client = await aiohttp_client(app)
- resp = await client.get("/1")
+ resp = await client.get(url)
assert resp.status == 200
(event,) = events
assert event["type"] == "transaction"
assert event["transaction"] == expected_transaction
+ assert event["transaction_info"] == {"source": expected_source}
async def test_traces_sampler_gets_request_object_in_sampling_context(
diff --git a/tests/integrations/asgi/test_asgi.py b/tests/integrations/asgi/test_asgi.py
index 5383b1a308..aed2157612 100644
--- a/tests/integrations/asgi/test_asgi.py
+++ b/tests/integrations/asgi/test_asgi.py
@@ -35,6 +35,33 @@ async def hi2(request):
return app
+@pytest.fixture
+def transaction_app():
+ transaction_app = Starlette()
+
+ @transaction_app.route("/sync-message")
+ def hi(request):
+ capture_message("hi", level="error")
+ return PlainTextResponse("ok")
+
+ @transaction_app.route("/sync-message/{user_id:int}")
+ def hi_with_id(request):
+ capture_message("hi", level="error")
+ return PlainTextResponse("ok")
+
+ @transaction_app.route("/async-message")
+ async def async_hi(request):
+ capture_message("hi", level="error")
+ return PlainTextResponse("ok")
+
+ @transaction_app.route("/async-message/{user_id:int}")
+ async def async_hi_with_id(request):
+ capture_message("hi", level="error")
+ return PlainTextResponse("ok")
+
+ return transaction_app
+
+
@pytest.mark.skipif(sys.version_info < (3, 7), reason="requires python3.7 or higher")
def test_sync_request_data(sentry_init, app, capture_events):
sentry_init(send_default_pii=True)
@@ -230,6 +257,72 @@ def kangaroo_handler(request):
)
+@pytest.mark.parametrize(
+ "url,transaction_style,expected_transaction,expected_source",
+ [
+ (
+ "/sync-message",
+ "endpoint",
+ "tests.integrations.asgi.test_asgi.transaction_app..hi",
+ "component",
+ ),
+ (
+ "/sync-message",
+ "url",
+ "generic ASGI request", # the AsgiMiddleware can not extract routes from the Starlette framework used here for testing.
+ "unknown",
+ ),
+ (
+ "/sync-message/123456",
+ "endpoint",
+ "tests.integrations.asgi.test_asgi.transaction_app..hi_with_id",
+ "component",
+ ),
+ (
+ "/sync-message/123456",
+ "url",
+ "generic ASGI request", # the AsgiMiddleware can not extract routes from the Starlette framework used here for testing.
+ "unknown",
+ ),
+ (
+ "/async-message",
+ "endpoint",
+ "tests.integrations.asgi.test_asgi.transaction_app..async_hi",
+ "component",
+ ),
+ (
+ "/async-message",
+ "url",
+ "generic ASGI request", # the AsgiMiddleware can not extract routes from the Starlette framework used here for testing.
+ "unknown",
+ ),
+ ],
+)
+def test_transaction_style(
+ sentry_init,
+ transaction_app,
+ url,
+ transaction_style,
+ expected_transaction,
+ expected_source,
+ capture_events,
+):
+ sentry_init(send_default_pii=True)
+
+ transaction_app = SentryAsgiMiddleware(
+ transaction_app, transaction_style=transaction_style
+ )
+
+ events = capture_events()
+
+ client = TestClient(transaction_app)
+ client.get(url)
+
+ (event,) = events
+ assert event["transaction"] == expected_transaction
+ assert event["transaction_info"] == {"source": expected_source}
+
+
def test_traces_sampler_gets_scope_in_sampling_context(
app, sentry_init, DictionaryContaining # noqa: N803
):
diff --git a/tests/integrations/aws_lambda/test_aws.py b/tests/integrations/aws_lambda/test_aws.py
index c9084beb14..c6fb54b94f 100644
--- a/tests/integrations/aws_lambda/test_aws.py
+++ b/tests/integrations/aws_lambda/test_aws.py
@@ -362,6 +362,7 @@ def test_handler(event, context):
assert envelope["type"] == "transaction"
assert envelope["contexts"]["trace"]["op"] == "serverless.function"
assert envelope["transaction"].startswith("test_function_")
+ assert envelope["transaction_info"] == {"source": "component"}
assert envelope["transaction"] in envelope["request"]["url"]
@@ -390,6 +391,7 @@ def test_handler(event, context):
assert envelope["type"] == "transaction"
assert envelope["contexts"]["trace"]["op"] == "serverless.function"
assert envelope["transaction"].startswith("test_function_")
+ assert envelope["transaction_info"] == {"source": "component"}
assert envelope["transaction"] in envelope["request"]["url"]
diff --git a/tests/integrations/bottle/test_bottle.py b/tests/integrations/bottle/test_bottle.py
index ec133e4d75..0ef4339874 100644
--- a/tests/integrations/bottle/test_bottle.py
+++ b/tests/integrations/bottle/test_bottle.py
@@ -24,6 +24,11 @@ def hi():
capture_message("hi")
return "ok"
+ @app.route("/message/")
+ def hi_with_id(message_id):
+ capture_message("hi")
+ return "ok"
+
@app.route("/message-named-route", name="hi")
def named_hi():
capture_message("hi")
@@ -55,20 +60,21 @@ def test_has_context(sentry_init, app, capture_events, get_client):
@pytest.mark.parametrize(
- "url,transaction_style,expected_transaction",
+ "url,transaction_style,expected_transaction,expected_source",
[
- ("/message", "endpoint", "hi"),
- ("/message", "url", "/message"),
- ("/message-named-route", "endpoint", "hi"),
+ ("/message", "endpoint", "hi", "component"),
+ ("/message", "url", "/message", "route"),
+ ("/message/123456", "url", "/message/", "route"),
+ ("/message-named-route", "endpoint", "hi", "component"),
],
)
def test_transaction_style(
sentry_init,
- app,
- capture_events,
+ url,
transaction_style,
expected_transaction,
- url,
+ expected_source,
+ capture_events,
get_client,
):
sentry_init(
@@ -79,11 +85,14 @@ def test_transaction_style(
events = capture_events()
client = get_client()
- response = client.get("/message")
+ response = client.get(url)
assert response[1] == "200 OK"
(event,) = events
+ # We use endswith() because in Python 2.7 it is "test_bottle.hi"
+ # and in later Pythons "test_bottle.app..hi"
assert event["transaction"].endswith(expected_transaction)
+ assert event["transaction_info"] == {"source": expected_source}
@pytest.mark.parametrize("debug", (True, False), ids=["debug", "nodebug"])
diff --git a/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py
index a77ac1adb1..951f8ecb8c 100644
--- a/tests/integrations/celery/test_celery.py
+++ b/tests/integrations/celery/test_celery.py
@@ -155,9 +155,11 @@ def dummy_task(x, y):
assert error_event["exception"]["values"][0]["type"] == "ZeroDivisionError"
execution_event, submission_event = events
-
assert execution_event["transaction"] == "dummy_task"
+ assert execution_event["transaction_info"] == {"source": "task"}
+
assert submission_event["transaction"] == "submission"
+ assert submission_event["transaction_info"] == {"source": "unknown"}
assert execution_event["type"] == submission_event["type"] == "transaction"
assert execution_event["contexts"]["trace"]["trace_id"] == transaction.trace_id
diff --git a/tests/integrations/chalice/test_chalice.py b/tests/integrations/chalice/test_chalice.py
index 8bb33a5cb6..4162a55623 100644
--- a/tests/integrations/chalice/test_chalice.py
+++ b/tests/integrations/chalice/test_chalice.py
@@ -4,6 +4,7 @@
from chalice.local import LambdaContext, LocalGateway
from sentry_sdk.integrations.chalice import ChaliceIntegration
+from sentry_sdk import capture_message
from pytest_chalice.handlers import RequestHandler
@@ -41,6 +42,16 @@ def has_request():
def badrequest():
raise BadRequestError("bad-request")
+ @app.route("/message")
+ def hi():
+ capture_message("hi")
+ return {"status": "ok"}
+
+ @app.route("/message/{message_id}")
+ def hi_with_id(message_id):
+ capture_message("hi again")
+ return {"status": "ok"}
+
LocalGateway._generate_lambda_context = _generate_lambda_context
return app
@@ -109,3 +120,28 @@ def test_bad_reques(client: RequestHandler) -> None:
("Message", "BadRequestError: bad-request"),
]
)
+
+
+@pytest.mark.parametrize(
+ "url,expected_transaction,expected_source",
+ [
+ ("/message", "api_handler", "component"),
+ ("/message/123456", "api_handler", "component"),
+ ],
+)
+def test_transaction(
+ app,
+ client: RequestHandler,
+ capture_events,
+ url,
+ expected_transaction,
+ expected_source,
+):
+ events = capture_events()
+
+ response = client.get(url)
+ assert response.status_code == 200
+
+ (event,) = events
+ assert event["transaction"] == expected_transaction
+ assert event["transaction_info"] == {"source": expected_source}
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index 6106131375..6195811fe0 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -469,14 +469,19 @@ def test_django_connect_breadcrumbs(
@pytest.mark.parametrize(
- "transaction_style,expected_transaction",
+ "transaction_style,expected_transaction,expected_source",
[
- ("function_name", "tests.integrations.django.myapp.views.message"),
- ("url", "/message"),
+ ("function_name", "tests.integrations.django.myapp.views.message", "component"),
+ ("url", "/message", "route"),
],
)
def test_transaction_style(
- sentry_init, client, capture_events, transaction_style, expected_transaction
+ sentry_init,
+ client,
+ capture_events,
+ transaction_style,
+ expected_transaction,
+ expected_source,
):
sentry_init(
integrations=[DjangoIntegration(transaction_style=transaction_style)],
@@ -488,6 +493,7 @@ def test_transaction_style(
(event,) = events
assert event["transaction"] == expected_transaction
+ assert event["transaction_info"] == {"source": expected_source}
def test_request_body(sentry_init, client, capture_events):
diff --git a/tests/integrations/falcon/test_falcon.py b/tests/integrations/falcon/test_falcon.py
index 84e8d228f0..96aa0ee036 100644
--- a/tests/integrations/falcon/test_falcon.py
+++ b/tests/integrations/falcon/test_falcon.py
@@ -21,8 +21,14 @@ def on_get(self, req, resp):
sentry_sdk.capture_message("hi")
resp.media = "hi"
+ class MessageByIdResource:
+ def on_get(self, req, resp, message_id):
+ sentry_sdk.capture_message("hi")
+ resp.media = "hi"
+
app = falcon.API()
app.add_route("/message", MessageResource())
+ app.add_route("/message/{message_id:int}", MessageByIdResource())
return app
@@ -53,22 +59,34 @@ def test_has_context(sentry_init, capture_events, make_client):
@pytest.mark.parametrize(
- "transaction_style,expected_transaction",
- [("uri_template", "/message"), ("path", "/message")],
+ "url,transaction_style,expected_transaction,expected_source",
+ [
+ ("/message", "uri_template", "/message", "route"),
+ ("/message", "path", "/message", "url"),
+ ("/message/123456", "uri_template", "/message/{message_id:int}", "route"),
+ ("/message/123456", "path", "/message/123456", "url"),
+ ],
)
def test_transaction_style(
- sentry_init, make_client, capture_events, transaction_style, expected_transaction
+ sentry_init,
+ make_client,
+ capture_events,
+ url,
+ transaction_style,
+ expected_transaction,
+ expected_source,
):
integration = FalconIntegration(transaction_style=transaction_style)
sentry_init(integrations=[integration])
events = capture_events()
client = make_client()
- response = client.simulate_get("/message")
+ response = client.simulate_get(url)
assert response.status == falcon.HTTP_200
(event,) = events
assert event["transaction"] == expected_transaction
+ assert event["transaction_info"] == {"source": expected_source}
def test_unhandled_errors(sentry_init, capture_exceptions, capture_events):
diff --git a/tests/integrations/flask/test_flask.py b/tests/integrations/flask/test_flask.py
index 8723a35c86..d64e616b37 100644
--- a/tests/integrations/flask/test_flask.py
+++ b/tests/integrations/flask/test_flask.py
@@ -46,6 +46,11 @@ def hi():
capture_message("hi")
return "ok"
+ @app.route("/message/")
+ def hi_with_id(message_id):
+ capture_message("hi again")
+ return "ok"
+
return app
@@ -74,10 +79,22 @@ def test_has_context(sentry_init, app, capture_events):
@pytest.mark.parametrize(
- "transaction_style,expected_transaction", [("endpoint", "hi"), ("url", "/message")]
+ "url,transaction_style,expected_transaction,expected_source",
+ [
+ ("/message", "endpoint", "hi", "component"),
+ ("/message", "url", "/message", "route"),
+ ("/message/123456", "endpoint", "hi_with_id", "component"),
+ ("/message/123456", "url", "/message/", "route"),
+ ],
)
def test_transaction_style(
- sentry_init, app, capture_events, transaction_style, expected_transaction
+ sentry_init,
+ app,
+ capture_events,
+ url,
+ transaction_style,
+ expected_transaction,
+ expected_source,
):
sentry_init(
integrations=[
@@ -87,11 +104,12 @@ def test_transaction_style(
events = capture_events()
client = app.test_client()
- response = client.get("/message")
+ response = client.get(url)
assert response.status_code == 200
(event,) = events
assert event["transaction"] == expected_transaction
+ assert event["transaction_info"] == {"source": expected_source}
@pytest.mark.parametrize("debug", (True, False))
diff --git a/tests/integrations/gcp/test_gcp.py b/tests/integrations/gcp/test_gcp.py
index 78ac8f2746..5f41300bcb 100644
--- a/tests/integrations/gcp/test_gcp.py
+++ b/tests/integrations/gcp/test_gcp.py
@@ -255,6 +255,7 @@ def cloud_function(functionhandler, event):
assert envelope["type"] == "transaction"
assert envelope["contexts"]["trace"]["op"] == "serverless.function"
assert envelope["transaction"].startswith("Google Cloud function")
+ assert envelope["transaction_info"] == {"source": "component"}
assert envelope["transaction"] in envelope["request"]["url"]
diff --git a/tests/integrations/pyramid/test_pyramid.py b/tests/integrations/pyramid/test_pyramid.py
index 9c6fd51222..c49f8b4475 100644
--- a/tests/integrations/pyramid/test_pyramid.py
+++ b/tests/integrations/pyramid/test_pyramid.py
@@ -26,12 +26,19 @@ def hi(request):
return Response("hi")
+def hi_with_id(request):
+ capture_message("hi with id")
+ return Response("hi with id")
+
+
@pytest.fixture
def pyramid_config():
config = pyramid.testing.setUp()
try:
config.add_route("hi", "/message")
config.add_view(hi, route_name="hi")
+ config.add_route("hi_with_id", "/message/{message_id}")
+ config.add_view(hi_with_id, route_name="hi_with_id")
yield config
finally:
pyramid.testing.tearDown()
@@ -89,13 +96,13 @@ def test_has_context(route, get_client, sentry_init, capture_events):
sentry_init(integrations=[PyramidIntegration()])
events = capture_events()
- @route("/message/{msg}")
+ @route("/context_message/{msg}")
def hi2(request):
capture_message(request.matchdict["msg"])
return Response("hi")
client = get_client()
- client.get("/message/yoo")
+ client.get("/context_message/yoo")
(event,) = events
assert event["message"] == "yoo"
@@ -104,26 +111,38 @@ def hi2(request):
"headers": {"Host": "localhost"},
"method": "GET",
"query_string": "",
- "url": "http://localhost/message/yoo",
+ "url": "http://localhost/context_message/yoo",
}
assert event["transaction"] == "hi2"
@pytest.mark.parametrize(
- "transaction_style,expected_transaction",
- [("route_name", "hi"), ("route_pattern", "/message")],
+ "url,transaction_style,expected_transaction,expected_source",
+ [
+ ("/message", "route_name", "hi", "component"),
+ ("/message", "route_pattern", "/message", "route"),
+ ("/message/123456", "route_name", "hi_with_id", "component"),
+ ("/message/123456", "route_pattern", "/message/{message_id}", "route"),
+ ],
)
def test_transaction_style(
- sentry_init, get_client, capture_events, transaction_style, expected_transaction
+ sentry_init,
+ get_client,
+ capture_events,
+ url,
+ transaction_style,
+ expected_transaction,
+ expected_source,
):
sentry_init(integrations=[PyramidIntegration(transaction_style=transaction_style)])
events = capture_events()
client = get_client()
- client.get("/message")
+ client.get(url)
(event,) = events
assert event["transaction"] == expected_transaction
+ assert event["transaction_info"] == {"source": expected_source}
def test_large_json_request(sentry_init, capture_events, route, get_client):
diff --git a/tests/integrations/quart/test_quart.py b/tests/integrations/quart/test_quart.py
index d827b3c4aa..6d2c590a53 100644
--- a/tests/integrations/quart/test_quart.py
+++ b/tests/integrations/quart/test_quart.py
@@ -1,4 +1,5 @@
import pytest
+import pytest_asyncio
quart = pytest.importorskip("quart")
@@ -21,7 +22,7 @@
auth_manager = AuthManager()
-@pytest.fixture
+@pytest_asyncio.fixture
async def app():
app = Quart(__name__)
app.debug = True
@@ -35,6 +36,11 @@ async def hi():
capture_message("hi")
return "ok"
+ @app.route("/message/")
+ async def hi_with_id(message_id):
+ capture_message("hi with id")
+ return "ok with id"
+
return app
@@ -63,10 +69,22 @@ async def test_has_context(sentry_init, app, capture_events):
@pytest.mark.asyncio
@pytest.mark.parametrize(
- "transaction_style,expected_transaction", [("endpoint", "hi"), ("url", "/message")]
+ "url,transaction_style,expected_transaction,expected_source",
+ [
+ ("/message", "endpoint", "hi", "component"),
+ ("/message", "url", "/message", "route"),
+ ("/message/123456", "endpoint", "hi_with_id", "component"),
+ ("/message/123456", "url", "/message/", "route"),
+ ],
)
async def test_transaction_style(
- sentry_init, app, capture_events, transaction_style, expected_transaction
+ sentry_init,
+ app,
+ capture_events,
+ url,
+ transaction_style,
+ expected_transaction,
+ expected_source,
):
sentry_init(
integrations=[
@@ -76,7 +94,7 @@ async def test_transaction_style(
events = capture_events()
client = app.test_client()
- response = await client.get("/message")
+ response = await client.get(url)
assert response.status_code == 200
(event,) = events
diff --git a/tests/integrations/sanic/test_sanic.py b/tests/integrations/sanic/test_sanic.py
index b91f94bfe9..f8fdd696bc 100644
--- a/tests/integrations/sanic/test_sanic.py
+++ b/tests/integrations/sanic/test_sanic.py
@@ -30,6 +30,11 @@ def hi(request):
capture_message("hi")
return response.text("ok")
+ @app.route("/message/")
+ def hi_with_id(request, message_id):
+ capture_message("hi with id")
+ return response.text("ok with id")
+
return app
@@ -62,6 +67,27 @@ def test_request_data(sentry_init, app, capture_events):
assert "transaction" not in event
+@pytest.mark.parametrize(
+ "url,expected_transaction,expected_source",
+ [
+ ("/message", "hi", "component"),
+ ("/message/123456", "hi_with_id", "component"),
+ ],
+)
+def test_transaction(
+ sentry_init, app, capture_events, url, expected_transaction, expected_source
+):
+ sentry_init(integrations=[SanicIntegration()])
+ events = capture_events()
+
+ request, response = app.test_client.get(url)
+ assert response.status == 200
+
+ (event,) = events
+ assert event["transaction"] == expected_transaction
+ assert event["transaction_info"] == {"source": expected_source}
+
+
def test_errors(sentry_init, app, capture_events):
sentry_init(integrations=[SanicIntegration()])
events = capture_events()
diff --git a/tests/integrations/tornado/test_tornado.py b/tests/integrations/tornado/test_tornado.py
index 1c5137f2b2..f59781dc21 100644
--- a/tests/integrations/tornado/test_tornado.py
+++ b/tests/integrations/tornado/test_tornado.py
@@ -96,6 +96,7 @@ def test_basic(tornado_testcase, sentry_init, capture_events):
event["transaction"]
== "tests.integrations.tornado.test_tornado.CrashingHandler.get"
)
+ assert event["transaction_info"] == {"source": "component"}
with configure_scope() as scope:
assert not scope._tags
@@ -129,6 +130,9 @@ def test_transactions(tornado_testcase, sentry_init, capture_events, handler, co
assert client_tx["type"] == "transaction"
assert client_tx["transaction"] == "client"
+ assert client_tx["transaction_info"] == {
+ "source": "unknown"
+ } # because this is just the start_transaction() above.
if server_error is not None:
assert server_error["exception"]["values"][0]["type"] == "ZeroDivisionError"
@@ -136,6 +140,7 @@ def test_transactions(tornado_testcase, sentry_init, capture_events, handler, co
server_error["transaction"]
== "tests.integrations.tornado.test_tornado.CrashingHandler.post"
)
+ assert server_error["transaction_info"] == {"source": "component"}
if code == 200:
assert (
@@ -148,6 +153,7 @@ def test_transactions(tornado_testcase, sentry_init, capture_events, handler, co
== "tests.integrations.tornado.test_tornado.CrashingHandler.post"
)
+ assert server_tx["transaction_info"] == {"source": "component"}
assert server_tx["type"] == "transaction"
request = server_tx["request"]
From 555347c0af7bd4cb77b27ef8c65c4feb0346d433 Mon Sep 17 00:00:00 2001
From: getsentry-bot
Date: Fri, 15 Jul 2022 11:42:18 +0000
Subject: [PATCH 0359/2327] release: 1.7.2
---
CHANGELOG.md | 7 +++++++
docs/conf.py | 2 +-
sentry_sdk/consts.py | 2 +-
setup.py | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1e78cbed0..f90a02b269 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+## 1.7.2
+
+### Various fixes & improvements
+
+- feat(transactions): Transaction Source (#1490) by @antonpirker
+- Removed (unused) sentry_timestamp header (#1494) by @antonpirker
+
## 1.7.1
### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 3316c2b689..5bad71aa34 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,7 +29,7 @@
copyright = "2019, Sentry Team and Contributors"
author = "Sentry Team and Contributors"
-release = "1.7.1"
+release = "1.7.2"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 437f53655b..1624934b28 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -102,7 +102,7 @@ def _get_default_options():
del _get_default_options
-VERSION = "1.7.1"
+VERSION = "1.7.2"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff --git a/setup.py b/setup.py
index d06e6c9de9..d71f9f750a 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
setup(
name="sentry-sdk",
- version="1.7.1",
+ version="1.7.2",
author="Sentry Team and Contributors",
author_email="hello@sentry.io",
url="https://github.com/getsentry/sentry-python",
From 00590ed4a1a0e72c8709d8e0320a583276b66bd1 Mon Sep 17 00:00:00 2001
From: Tim Gates
Date: Mon, 18 Jul 2022 22:58:25 +1000
Subject: [PATCH 0360/2327] docs: fix simple typo, collecter -> collector
(#1505)
---
tests/tracing/test_misc.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/tracing/test_misc.py b/tests/tracing/test_misc.py
index 43d9597f1b..b51b5dcddb 100644
--- a/tests/tracing/test_misc.py
+++ b/tests/tracing/test_misc.py
@@ -173,7 +173,7 @@ def test_circular_references(monkeypatch, sentry_init, request):
# request.addfinalizer(lambda: gc.set_debug(~gc.DEBUG_LEAK))
#
# immediately after the initial collection below, so we can see what new
- # objects the garbage collecter has to clean up once `transaction.finish` is
+ # objects the garbage collector has to clean up once `transaction.finish` is
# called and the serializer runs.)
monkeypatch.setattr(
sentry_sdk.client,
From c57daaafe8c4fbb8ba7fb6b5ac8fedb021c31327 Mon Sep 17 00:00:00 2001
From: Marti Raudsepp
Date: Mon, 18 Jul 2022 22:59:06 +0300
Subject: [PATCH 0361/2327] fix: properly freeze Baggage object (#1508)
---
sentry_sdk/tracing.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index dd4b1a730d..39d7621b09 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -279,7 +279,7 @@ def continue_from_headers(
if sentrytrace_kwargs is not None:
kwargs.update(sentrytrace_kwargs)
- baggage.freeze
+ baggage.freeze()
kwargs.update(extract_tracestate_data(headers.get("tracestate")))
From bd48df2ec1f22284e497094edac0092906204aa7 Mon Sep 17 00:00:00 2001
From: Marti Raudsepp
Date: Mon, 18 Jul 2022 23:41:30 +0300
Subject: [PATCH 0362/2327] fix: avoid sending empty Baggage header (#1507)
According to W3C Working Draft spec, the Baggage header must contain at least one value, an empty value is invalid.
Co-authored-by: Neel Shah
---
sentry_sdk/tracing.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 39d7621b09..410b8c3ad4 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -308,7 +308,9 @@ def iter_headers(self):
yield "tracestate", tracestate
if self.containing_transaction and self.containing_transaction._baggage:
- yield "baggage", self.containing_transaction._baggage.serialize()
+ baggage = self.containing_transaction._baggage.serialize()
+ if baggage:
+ yield "baggage", baggage
@classmethod
def from_traceparent(
From fabba6967ad7e58f3e565ea6d544cc5252045131 Mon Sep 17 00:00:00 2001
From: Neel Shah
Date: Wed, 20 Jul 2022 16:23:49 +0200
Subject: [PATCH 0363/2327] feat(starlette): add Starlette integration (#1441)
Adds integrations for Starlette and FastAPI. The majority of functionaly is in the Starlette integration. The FastAPI integration is just setting transaction names because those are handled differently in Starlette and FastAPI.
---
mypy.ini | 4 +
pytest.ini | 3 +-
sentry_sdk/integrations/asgi.py | 36 +-
sentry_sdk/integrations/fastapi.py | 122 ++++
sentry_sdk/integrations/starlette.py | 459 ++++++++++++++
sentry_sdk/utils.py | 10 +
setup.py | 1 +
tests/integrations/asgi/test_asgi.py | 6 +-
tests/integrations/asgi/test_fastapi.py | 46 --
tests/integrations/fastapi/__init__.py | 3 +
tests/integrations/fastapi/test_fastapi.py | 142 +++++
tests/integrations/starlette/__init__.py | 3 +
tests/integrations/starlette/photo.jpg | Bin 0 -> 21014 bytes
.../integrations/starlette/test_starlette.py | 567 ++++++++++++++++++
tox.ini | 29 +-
15 files changed, 1359 insertions(+), 72 deletions(-)
create mode 100644 sentry_sdk/integrations/fastapi.py
create mode 100644 sentry_sdk/integrations/starlette.py
delete mode 100644 tests/integrations/asgi/test_fastapi.py
create mode 100644 tests/integrations/fastapi/__init__.py
create mode 100644 tests/integrations/fastapi/test_fastapi.py
create mode 100644 tests/integrations/starlette/__init__.py
create mode 100644 tests/integrations/starlette/photo.jpg
create mode 100644 tests/integrations/starlette/test_starlette.py
diff --git a/mypy.ini b/mypy.ini
index 2a15e45e49..8431faf86f 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -63,3 +63,7 @@ disallow_untyped_defs = False
ignore_missing_imports = True
[mypy-flask.signals]
ignore_missing_imports = True
+[mypy-starlette.*]
+ignore_missing_imports = True
+[mypy-fastapi.*]
+ignore_missing_imports = True
diff --git a/pytest.ini b/pytest.ini
index 4e987c1a90..f736c30496 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -3,7 +3,8 @@ DJANGO_SETTINGS_MODULE = tests.integrations.django.myapp.settings
addopts = --tb=short
markers =
tests_internal_exceptions: Handle internal exceptions just as the SDK does, to test it. (Otherwise internal exceptions are recorded and reraised.)
- only: A temporary marker, to make pytest only run the tests with the mark, similar to jest's `it.only`. To use, run `pytest -v -m only`.
+ only: A temporary marker, to make pytest only run the tests with the mark, similar to jests `it.only`. To use, run `pytest -v -m only`.
+asyncio_mode = strict
[pytest-watch]
; Enable this to drop into pdb on errors
diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py
index 3aa9fcb572..125aad5b61 100644
--- a/sentry_sdk/integrations/asgi.py
+++ b/sentry_sdk/integrations/asgi.py
@@ -16,14 +16,13 @@
from sentry_sdk.tracing import (
SOURCE_FOR_STYLE,
TRANSACTION_SOURCE_ROUTE,
- TRANSACTION_SOURCE_UNKNOWN,
)
from sentry_sdk.utils import (
ContextVar,
event_from_exception,
- transaction_from_function,
HAS_REAL_CONTEXTVARS,
CONTEXTVARS_ERROR_MESSAGE,
+ transaction_from_function,
)
from sentry_sdk.tracing import Transaction
@@ -45,15 +44,15 @@
TRANSACTION_STYLE_VALUES = ("endpoint", "url")
-def _capture_exception(hub, exc):
- # type: (Hub, Any) -> None
+def _capture_exception(hub, exc, mechanism_type="asgi"):
+ # type: (Hub, Any, str) -> None
# Check client here as it might have been unset while streaming response
if hub.client is not None:
event, hint = event_from_exception(
exc,
client_options=hub.client.options,
- mechanism={"type": "asgi", "handled": False},
+ mechanism={"type": mechanism_type, "handled": False},
)
hub.capture_event(event, hint=hint)
@@ -75,10 +74,16 @@ def _looks_like_asgi3(app):
class SentryAsgiMiddleware:
- __slots__ = ("app", "__call__", "transaction_style")
-
- def __init__(self, app, unsafe_context_data=False, transaction_style="endpoint"):
- # type: (Any, bool, str) -> None
+ __slots__ = ("app", "__call__", "transaction_style", "mechanism_type")
+
+ def __init__(
+ self,
+ app,
+ unsafe_context_data=False,
+ transaction_style="endpoint",
+ mechanism_type="asgi",
+ ):
+ # type: (Any, bool, str, str) -> None
"""
Instrument an ASGI application with Sentry. Provides HTTP/websocket
data to sent events and basic handling for exceptions bubbling up
@@ -100,6 +105,7 @@ def __init__(self, app, unsafe_context_data=False, transaction_style="endpoint")
% (transaction_style, TRANSACTION_STYLE_VALUES)
)
self.transaction_style = transaction_style
+ self.mechanism_type = mechanism_type
self.app = app
if _looks_like_asgi3(app):
@@ -127,7 +133,7 @@ async def _run_app(self, scope, callback):
try:
return await callback()
except Exception as exc:
- _capture_exception(Hub.current, exc)
+ _capture_exception(Hub.current, exc, mechanism_type=self.mechanism_type)
raise exc from None
_asgi_middleware_applied.set(True)
@@ -164,7 +170,9 @@ async def _run_app(self, scope, callback):
try:
return await callback()
except Exception as exc:
- _capture_exception(hub, exc)
+ _capture_exception(
+ hub, exc, mechanism_type=self.mechanism_type
+ )
raise exc from None
finally:
_asgi_middleware_applied.set(False)
@@ -203,7 +211,6 @@ def event_processor(self, event, hint, asgi_scope):
def _set_transaction_name_and_source(self, event, transaction_style, asgi_scope):
# type: (Event, str, Any) -> None
-
transaction_name_already_set = (
event.get("transaction", _DEFAULT_TRANSACTION_NAME)
!= _DEFAULT_TRANSACTION_NAME
@@ -231,9 +238,8 @@ def _set_transaction_name_and_source(self, event, transaction_style, asgi_scope)
name = path
if not name:
- # If no transaction name can be found set an unknown source.
- # This can happen when ASGI frameworks that are not yet supported well are used.
- event["transaction_info"] = {"source": TRANSACTION_SOURCE_UNKNOWN}
+ event["transaction"] = _DEFAULT_TRANSACTION_NAME
+ event["transaction_info"] = {"source": TRANSACTION_SOURCE_ROUTE}
return
event["transaction"] = name
diff --git a/sentry_sdk/integrations/fastapi.py b/sentry_sdk/integrations/fastapi.py
new file mode 100644
index 0000000000..cfeb0161f4
--- /dev/null
+++ b/sentry_sdk/integrations/fastapi.py
@@ -0,0 +1,122 @@
+from sentry_sdk._types import MYPY
+from sentry_sdk.hub import Hub
+from sentry_sdk.integrations import DidNotEnable
+from sentry_sdk.integrations.starlette import (
+ SentryStarletteMiddleware,
+ StarletteIntegration,
+)
+from sentry_sdk.tracing import SOURCE_FOR_STYLE, TRANSACTION_SOURCE_ROUTE
+from sentry_sdk.utils import transaction_from_function
+
+if MYPY:
+ from typing import Any, Callable, Dict
+
+ from sentry_sdk._types import Event
+
+try:
+ from fastapi.applications import FastAPI
+ from fastapi.requests import Request
+except ImportError:
+ raise DidNotEnable("FastAPI is not installed")
+
+try:
+ from starlette.types import ASGIApp, Receive, Scope, Send
+except ImportError:
+ raise DidNotEnable("Starlette is not installed")
+
+
+_DEFAULT_TRANSACTION_NAME = "generic FastApi request"
+
+
+class FastApiIntegration(StarletteIntegration):
+ identifier = "fastapi"
+
+ @staticmethod
+ def setup_once():
+ # type: () -> None
+ StarletteIntegration.setup_once()
+ patch_middlewares()
+
+
+def patch_middlewares():
+ # type: () -> None
+
+ old_build_middleware_stack = FastAPI.build_middleware_stack
+
+ def _sentry_build_middleware_stack(self):
+ # type: (FastAPI) -> Callable[..., Any]
+ """
+ Adds `SentryStarletteMiddleware` and `SentryFastApiMiddleware` to the
+ middleware stack of the FastAPI application.
+ """
+ app = old_build_middleware_stack(self)
+ app = SentryStarletteMiddleware(app=app)
+ app = SentryFastApiMiddleware(app=app)
+ return app
+
+ FastAPI.build_middleware_stack = _sentry_build_middleware_stack
+
+
+def _set_transaction_name_and_source(event, transaction_style, request):
+ # type: (Event, str, Any) -> None
+ name = ""
+
+ if transaction_style == "endpoint":
+ endpoint = request.scope.get("endpoint")
+ if endpoint:
+ name = transaction_from_function(endpoint) or ""
+
+ elif transaction_style == "url":
+ route = request.scope.get("route")
+ if route:
+ path = getattr(route, "path", None)
+ if path is not None:
+ name = path
+
+ if not name:
+ event["transaction"] = _DEFAULT_TRANSACTION_NAME
+ event["transaction_info"] = {"source": TRANSACTION_SOURCE_ROUTE}
+ return
+
+ event["transaction"] = name
+ event["transaction_info"] = {"source": SOURCE_FOR_STYLE[transaction_style]}
+
+
+class SentryFastApiMiddleware:
+ def __init__(self, app, dispatch=None):
+ # type: (ASGIApp, Any) -> None
+ self.app = app
+
+ async def __call__(self, scope, receive, send):
+ # type: (Scope, Receive, Send) -> Any
+ if scope["type"] != "http":
+ await self.app(scope, receive, send)
+ return
+
+ hub = Hub.current
+ integration = hub.get_integration(FastApiIntegration)
+ if integration is None:
+ return
+
+ with hub.configure_scope() as sentry_scope:
+ request = Request(scope, receive=receive, send=send)
+
+ def _make_request_event_processor(req, integration):
+ # type: (Any, Any) -> Callable[[Dict[str, Any], Dict[str, Any]], Dict[str, Any]]
+ def event_processor(event, hint):
+ # type: (Dict[str, Any], Dict[str, Any]) -> Dict[str, Any]
+
+ _set_transaction_name_and_source(
+ event, integration.transaction_style, req
+ )
+
+ return event
+
+ return event_processor
+
+ sentry_scope._name = FastApiIntegration.identifier
+ sentry_scope.add_event_processor(
+ _make_request_event_processor(request, integration)
+ )
+
+ await self.app(scope, receive, send)
diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
new file mode 100644
index 0000000000..9ddf21d3d4
--- /dev/null
+++ b/sentry_sdk/integrations/starlette.py
@@ -0,0 +1,459 @@
+from __future__ import absolute_import
+
+
+from sentry_sdk._compat import iteritems
+from sentry_sdk._types import MYPY
+from sentry_sdk.hub import Hub, _should_send_default_pii
+from sentry_sdk.integrations import DidNotEnable, Integration
+from sentry_sdk.integrations._wsgi_common import (
+ _is_json_content_type,
+ request_body_within_bounds,
+)
+from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
+from sentry_sdk.tracing import SOURCE_FOR_STYLE
+from sentry_sdk.utils import (
+ TRANSACTION_SOURCE_ROUTE,
+ AnnotatedValue,
+ event_from_exception,
+ transaction_from_function,
+)
+
+if MYPY:
+ from typing import Any, Awaitable, Callable, Dict, Optional, Union
+
+ from sentry_sdk._types import Event
+
+try:
+ from starlette.applications import Starlette
+ from starlette.datastructures import UploadFile
+ from starlette.middleware import Middleware
+ from starlette.middleware.authentication import AuthenticationMiddleware
+ from starlette.requests import Request
+ from starlette.routing import Match
+ from starlette.types import ASGIApp, Receive, Scope, Send
+except ImportError:
+ raise DidNotEnable("Starlette is not installed")
+
+try:
+ from starlette.middle.exceptions import ExceptionMiddleware # Starlette 0.20
+except ImportError:
+ from starlette.exceptions import ExceptionMiddleware # Startlette 0.19.1
+
+
+_DEFAULT_TRANSACTION_NAME = "generic Starlette request"
+
+TRANSACTION_STYLE_VALUES = ("endpoint", "url")
+
+
+class StarletteIntegration(Integration):
+ identifier = "starlette"
+
+ transaction_style = ""
+
+ def __init__(self, transaction_style="url"):
+ # type: (str) -> None
+ if transaction_style not in TRANSACTION_STYLE_VALUES:
+ raise ValueError(
+ "Invalid value for transaction_style: %s (must be in %s)"
+ % (transaction_style, TRANSACTION_STYLE_VALUES)
+ )
+ self.transaction_style = transaction_style
+
+ @staticmethod
+ def setup_once():
+ # type: () -> None
+ patch_middlewares()
+ patch_asgi_app()
+
+
+def _enable_span_for_middleware(middleware_class):
+ # type: (Any) -> type
+ old_call = middleware_class.__call__
+
+ async def _create_span_call(*args, **kwargs):
+ # type: (Any, Any) -> None
+ hub = Hub.current
+ integration = hub.get_integration(StarletteIntegration)
+ if integration is not None:
+ middleware_name = args[0].__class__.__name__
+ with hub.start_span(
+ op="starlette.middleware", description=middleware_name
+ ) as middleware_span:
+ middleware_span.set_tag("starlette.middleware_name", middleware_name)
+
+ await old_call(*args, **kwargs)
+
+ else:
+ await old_call(*args, **kwargs)
+
+ not_yet_patched = old_call.__name__ not in [
+ "_create_span_call",
+ "_sentry_authenticationmiddleware_call",
+ "_sentry_exceptionmiddleware_call",
+ ]
+
+ if not_yet_patched:
+ middleware_class.__call__ = _create_span_call
+
+ return middleware_class
+
+
+def _capture_exception(exception, handled=False):
+ # type: (BaseException, **Any) -> None
+ hub = Hub.current
+ if hub.get_integration(StarletteIntegration) is None:
+ return
+
+ event, hint = event_from_exception(
+ exception,
+ client_options=hub.client.options if hub.client else None,
+ mechanism={"type": StarletteIntegration.identifier, "handled": handled},
+ )
+
+ hub.capture_event(event, hint=hint)
+
+
+def patch_exception_middleware(middleware_class):
+ # type: (Any) -> None
+ """
+ Capture all exceptions in Starlette app and
+ also extract user information.
+ """
+ old_middleware_init = middleware_class.__init__
+
+ def _sentry_middleware_init(self, *args, **kwargs):
+ # type: (Any, Any, Any) -> None
+ old_middleware_init(self, *args, **kwargs)
+
+ # Patch existing exception handlers
+ for key in self._exception_handlers.keys():
+ old_handler = self._exception_handlers.get(key)
+
+ def _sentry_patched_exception_handler(self, *args, **kwargs):
+ # type: (Any, Any, Any) -> None
+ exp = args[0]
+ _capture_exception(exp, handled=True)
+ return old_handler(self, *args, **kwargs)
+
+ self._exception_handlers[key] = _sentry_patched_exception_handler
+
+ middleware_class.__init__ = _sentry_middleware_init
+
+ old_call = middleware_class.__call__
+
+ async def _sentry_exceptionmiddleware_call(self, scope, receive, send):
+ # type: (Dict[str, Any], Dict[str, Any], Callable[[], Awaitable[Dict[str, Any]]], Callable[[Dict[str, Any]], Awaitable[None]]) -> None
+ # Also add the user (that was eventually set by be Authentication middle
+ # that was called before this middleware). This is done because the authentication
+ # middleware sets the user in the scope and then (in the same function)
+ # calls this exception middelware. In case there is no exception (or no handler
+ # for the type of exception occuring) then the exception bubbles up and setting the
+ # user information into the sentry scope is done in auth middleware and the
+ # ASGI middleware will then send everything to Sentry and this is fine.
+ # But if there is an exception happening that the exception middleware here
+ # has a handler for, it will send the exception directly to Sentry, so we need
+ # the user information right now.
+ # This is why we do it here.
+ _add_user_to_sentry_scope(scope)
+ await old_call(self, scope, receive, send)
+
+ middleware_class.__call__ = _sentry_exceptionmiddleware_call
+
+
+def _add_user_to_sentry_scope(scope):
+ # type: (Dict[str, Any]) -> None
+ """
+ Extracts user information from the ASGI scope and
+ adds it to Sentry's scope.
+ """
+ if "user" not in scope:
+ return
+
+ if not _should_send_default_pii():
+ return
+
+ hub = Hub.current
+ if hub.get_integration(StarletteIntegration) is None:
+ return
+
+ with hub.configure_scope() as sentry_scope:
+ user_info = {} # type: Dict[str, Any]
+ starlette_user = scope["user"]
+
+ username = getattr(starlette_user, "username", None)
+ if username:
+ user_info.setdefault("username", starlette_user.username)
+
+ user_id = getattr(starlette_user, "id", None)
+ if user_id:
+ user_info.setdefault("id", starlette_user.id)
+
+ email = getattr(starlette_user, "email", None)
+ if email:
+ user_info.setdefault("email", starlette_user.email)
+
+ sentry_scope.user = user_info
+
+
+def patch_authentication_middleware(middleware_class):
+ # type: (Any) -> None
+ """
+ Add user information to Sentry scope.
+ """
+ old_call = middleware_class.__call__
+
+ async def _sentry_authenticationmiddleware_call(self, scope, receive, send):
+ # type: (Dict[str, Any], Dict[str, Any], Callable[[], Awaitable[Dict[str, Any]]], Callable[[Dict[str, Any]], Awaitable[None]]) -> None
+ await old_call(self, scope, receive, send)
+ _add_user_to_sentry_scope(scope)
+
+ middleware_class.__call__ = _sentry_authenticationmiddleware_call
+
+
+def patch_middlewares():
+ # type: () -> None
+ """
+ Patches Starlettes `Middleware` class to record
+ spans for every middleware invoked.
+ """
+ old_middleware_init = Middleware.__init__
+
+ def _sentry_middleware_init(self, cls, **options):
+ # type: (Any, Any, Any) -> None
+ span_enabled_cls = _enable_span_for_middleware(cls)
+ old_middleware_init(self, span_enabled_cls, **options)
+
+ if cls == AuthenticationMiddleware:
+ patch_authentication_middleware(cls)
+
+ if cls == ExceptionMiddleware:
+ patch_exception_middleware(cls)
+
+ Middleware.__init__ = _sentry_middleware_init
+
+ old_build_middleware_stack = Starlette.build_middleware_stack
+
+ def _sentry_build_middleware_stack(self):
+ # type: (Starlette) -> Callable[..., Any]
+ """
+ Adds `SentryStarletteMiddleware` to the
+ middleware stack of the Starlette application.
+ """
+ app = old_build_middleware_stack(self)
+ app = SentryStarletteMiddleware(app=app)
+ return app
+
+ Starlette.build_middleware_stack = _sentry_build_middleware_stack
+
+
+def patch_asgi_app():
+ # type: () -> None
+ """
+ Instrument Starlette ASGI app using the SentryAsgiMiddleware.
+ """
+ old_app = Starlette.__call__
+
+ async def _sentry_patched_asgi_app(self, scope, receive, send):
+ # type: (Starlette, Scope, Receive, Send) -> None
+ if Hub.current.get_integration(StarletteIntegration) is None:
+ return await old_app(self, scope, receive, send)
+
+ middleware = SentryAsgiMiddleware(
+ lambda *a, **kw: old_app(self, *a, **kw),
+ mechanism_type=StarletteIntegration.identifier,
+ )
+ middleware.__call__ = middleware._run_asgi3
+ return await middleware(scope, receive, send)
+
+ Starlette.__call__ = _sentry_patched_asgi_app
+
+
+class StarletteRequestExtractor:
+ """
+ Extracts useful information from the Starlette request
+ (like form data or cookies) and adds it to the Sentry event.
+ """
+
+ request = None # type: Request
+
+ def __init__(self, request):
+ # type: (StarletteRequestExtractor, Request) -> None
+ self.request = request
+
+ async def extract_request_info(self):
+ # type: (StarletteRequestExtractor) -> Optional[Dict[str, Any]]
+ client = Hub.current.client
+ if client is None:
+ return None
+
+ data = None # type: Union[Dict[str, Any], AnnotatedValue, None]
+
+ content_length = await self.content_length()
+ request_info = {} # type: Dict[str, Any]
+
+ if _should_send_default_pii():
+ request_info["cookies"] = self.cookies()
+
+ if not request_body_within_bounds(client, content_length):
+ data = AnnotatedValue(
+ "",
+ {"rem": [["!config", "x", 0, content_length]], "len": content_length},
+ )
+ else:
+ parsed_body = await self.parsed_body()
+ if parsed_body is not None:
+ data = parsed_body
+ elif await self.raw_data():
+ data = AnnotatedValue(
+ "",
+ {"rem": [["!raw", "x", 0, content_length]], "len": content_length},
+ )
+ else:
+ data = None
+
+ if data is not None:
+ request_info["data"] = data
+
+ return request_info
+
+ async def content_length(self):
+ # type: (StarletteRequestExtractor) -> int
+ raw_data = await self.raw_data()
+ if raw_data is None:
+ return 0
+ return len(raw_data)
+
+ def cookies(self):
+ # type: (StarletteRequestExtractor) -> Dict[str, Any]
+ return self.request.cookies
+
+ async def raw_data(self):
+ # type: (StarletteRequestExtractor) -> Any
+ return await self.request.body()
+
+ async def form(self):
+ # type: (StarletteRequestExtractor) -> Any
+ """
+ curl -X POST http://localhost:8000/upload/somethign -H "Content-Type: application/x-www-form-urlencoded" -d "username=kevin&password=welcome123"
+ curl -X POST http://localhost:8000/upload/somethign -F username=Julian -F password=hello123
+ """
+ return await self.request.form()
+
+ def is_json(self):
+ # type: (StarletteRequestExtractor) -> bool
+ return _is_json_content_type(self.request.headers.get("content-type"))
+
+ async def json(self):
+ # type: (StarletteRequestExtractor) -> Optional[Dict[str, Any]]
+ """
+ curl -X POST localhost:8000/upload/something -H 'Content-Type: application/json' -d '{"login":"my_login","password":"my_password"}'
+ """
+ if not self.is_json():
+ return None
+
+ return await self.request.json()
+
+ async def parsed_body(self):
+ # type: (StarletteRequestExtractor) -> Any
+ """
+ curl -X POST http://localhost:8000/upload/somethign -F username=Julian -F password=hello123 -F photo=@photo.jpg
+ """
+ form = await self.form()
+ if form:
+ data = {}
+ for key, val in iteritems(form):
+ if isinstance(val, UploadFile):
+ size = len(await val.read())
+ data[key] = AnnotatedValue(
+ "", {"len": size, "rem": [["!raw", "x", 0, size]]}
+ )
+ else:
+ data[key] = val
+
+ return data
+
+ json_data = await self.json()
+ return json_data
+
+
+def _set_transaction_name_and_source(event, transaction_style, request):
+ # type: (Event, str, Any) -> None
+ name = ""
+
+ if transaction_style == "endpoint":
+ endpoint = request.scope.get("endpoint")
+ if endpoint:
+ name = transaction_from_function(endpoint) or ""
+
+ elif transaction_style == "url":
+ router = request.scope["router"]
+ for route in router.routes:
+ match = route.matches(request.scope)
+
+ if match[0] == Match.FULL:
+ if transaction_style == "endpoint":
+ name = transaction_from_function(match[1]["endpoint"]) or ""
+ break
+ elif transaction_style == "url":
+ name = route.path
+ break
+
+ if not name:
+ event["transaction"] = _DEFAULT_TRANSACTION_NAME
+ event["transaction_info"] = {"source": TRANSACTION_SOURCE_ROUTE}
+ return
+
+ event["transaction"] = name
+ event["transaction_info"] = {"source": SOURCE_FOR_STYLE[transaction_style]}
+
+
+class SentryStarletteMiddleware:
+ def __init__(self, app, dispatch=None):
+ # type: (ASGIApp, Any) -> None
+ self.app = app
+
+ async def __call__(self, scope, receive, send):
+ # type: (Scope, Receive, Send) -> Any
+ if scope["type"] != "http":
+ await self.app(scope, receive, send)
+ return
+
+ hub = Hub.current
+ integration = hub.get_integration(StarletteIntegration)
+ if integration is None:
+ return
+
+ with hub.configure_scope() as sentry_scope:
+ request = Request(scope, receive=receive, send=send)
+
+ extractor = StarletteRequestExtractor(request)
+ info = await extractor.extract_request_info()
+
+ def _make_request_event_processor(req, integration):
+ # type: (Any, Any) -> Callable[[Dict[str, Any], Dict[str, Any]], Dict[str, Any]]
+ def event_processor(event, hint):
+ # type: (Dict[str, Any], Dict[str, Any]) -> Dict[str, Any]
+
+ # Extract information from request
+ request_info = event.get("request", {})
+ if info:
+ if "cookies" in info and _should_send_default_pii():
+ request_info["cookies"] = info["cookies"]
+ if "data" in info:
+ request_info["data"] = info["data"]
+ event["request"] = request_info
+
+ _set_transaction_name_and_source(
+ event, integration.transaction_style, req
+ )
+
+ return event
+
+ return event_processor
+
+ sentry_scope._name = StarletteIntegration.identifier
+ sentry_scope.add_event_processor(
+ _make_request_event_processor(request, integration)
+ )
+
+ await self.app(scope, receive, send)
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index ccac6e37e3..6307e6b6f9 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -42,6 +42,16 @@
MAX_STRING_LENGTH = 512
BASE64_ALPHABET = re.compile(r"^[a-zA-Z0-9/+=]*$")
+# Transaction source
+# see https://develop.sentry.dev/sdk/event-payloads/transaction/#transaction-annotations
+TRANSACTION_SOURCE_CUSTOM = "custom"
+TRANSACTION_SOURCE_URL = "url"
+TRANSACTION_SOURCE_ROUTE = "route"
+TRANSACTION_SOURCE_VIEW = "view"
+TRANSACTION_SOURCE_COMPONENT = "component"
+TRANSACTION_SOURCE_TASK = "task"
+TRANSACTION_SOURCE_UNKNOWN = "unknown"
+
def json_dumps(data):
# type: (Any) -> bytes
diff --git a/setup.py b/setup.py
index d71f9f750a..f0c6be9d97 100644
--- a/setup.py
+++ b/setup.py
@@ -55,6 +55,7 @@ def get_file_text(file_name):
"pure_eval": ["pure_eval", "executing", "asttokens"],
"chalice": ["chalice>=1.16.0"],
"httpx": ["httpx>=0.16.0"],
+ "starlette": ["starlette>=0.19.1"],
},
classifiers=[
"Development Status :: 5 - Production/Stable",
diff --git a/tests/integrations/asgi/test_asgi.py b/tests/integrations/asgi/test_asgi.py
index aed2157612..a5687f86ad 100644
--- a/tests/integrations/asgi/test_asgi.py
+++ b/tests/integrations/asgi/test_asgi.py
@@ -270,7 +270,7 @@ def kangaroo_handler(request):
"/sync-message",
"url",
"generic ASGI request", # the AsgiMiddleware can not extract routes from the Starlette framework used here for testing.
- "unknown",
+ "route",
),
(
"/sync-message/123456",
@@ -282,7 +282,7 @@ def kangaroo_handler(request):
"/sync-message/123456",
"url",
"generic ASGI request", # the AsgiMiddleware can not extract routes from the Starlette framework used here for testing.
- "unknown",
+ "route",
),
(
"/async-message",
@@ -294,7 +294,7 @@ def kangaroo_handler(request):
"/async-message",
"url",
"generic ASGI request", # the AsgiMiddleware can not extract routes from the Starlette framework used here for testing.
- "unknown",
+ "route",
),
],
)
diff --git a/tests/integrations/asgi/test_fastapi.py b/tests/integrations/asgi/test_fastapi.py
deleted file mode 100644
index 518b8544b2..0000000000
--- a/tests/integrations/asgi/test_fastapi.py
+++ /dev/null
@@ -1,46 +0,0 @@
-import sys
-
-import pytest
-from fastapi import FastAPI
-from fastapi.testclient import TestClient
-from sentry_sdk import capture_message
-from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
-
-
-@pytest.fixture
-def app():
- app = FastAPI()
-
- @app.get("/users/{user_id}")
- async def get_user(user_id: str):
- capture_message("hi", level="error")
- return {"user_id": user_id}
-
- app.add_middleware(SentryAsgiMiddleware, transaction_style="url")
-
- return app
-
-
-@pytest.mark.skipif(sys.version_info < (3, 7), reason="requires python3.7 or higher")
-def test_fastapi_transaction_style(sentry_init, app, capture_events):
- sentry_init(send_default_pii=True)
- events = capture_events()
-
- client = TestClient(app)
- response = client.get("/users/rick")
-
- assert response.status_code == 200
-
- (event,) = events
- assert event["transaction"] == "/users/{user_id}"
- assert event["request"]["env"] == {"REMOTE_ADDR": "testclient"}
- assert event["request"]["url"].endswith("/users/rick")
- assert event["request"]["method"] == "GET"
-
- # Assert that state is not leaked
- events.clear()
- capture_message("foo")
- (event,) = events
-
- assert "request" not in event
- assert "transaction" not in event
diff --git a/tests/integrations/fastapi/__init__.py b/tests/integrations/fastapi/__init__.py
new file mode 100644
index 0000000000..7f667e6f75
--- /dev/null
+++ b/tests/integrations/fastapi/__init__.py
@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("fastapi")
diff --git a/tests/integrations/fastapi/test_fastapi.py b/tests/integrations/fastapi/test_fastapi.py
new file mode 100644
index 0000000000..86f7db8cad
--- /dev/null
+++ b/tests/integrations/fastapi/test_fastapi.py
@@ -0,0 +1,142 @@
+import pytest
+from sentry_sdk.integrations.fastapi import FastApiIntegration
+
+fastapi = pytest.importorskip("fastapi")
+
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+from sentry_sdk import capture_message
+from sentry_sdk.integrations.starlette import StarletteIntegration
+from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
+
+
+def fastapi_app_factory():
+ app = FastAPI()
+
+ @app.get("/message")
+ async def _message():
+ capture_message("Hi")
+ return {"message": "Hi"}
+
+ @app.get("/message/{message_id}")
+ async def _message_with_id(message_id):
+ capture_message("Hi")
+ return {"message": "Hi"}
+
+ return app
+
+
+@pytest.mark.asyncio
+async def test_response(sentry_init, capture_events):
+ # FastAPI is heavily based on Starlette so we also need
+ # to enable StarletteIntegration.
+ # In the future this will be auto enabled.
+ sentry_init(
+ integrations=[StarletteIntegration(), FastApiIntegration()],
+ traces_sample_rate=1.0,
+ send_default_pii=True,
+ debug=True,
+ )
+
+ app = fastapi_app_factory()
+
+ events = capture_events()
+
+ client = TestClient(app)
+ response = client.get("/message")
+
+ assert response.json() == {"message": "Hi"}
+
+ assert len(events) == 2
+
+ (message_event, transaction_event) = events
+ assert message_event["message"] == "Hi"
+ assert transaction_event["transaction"] == "/message"
+
+
+@pytest.mark.parametrize(
+ "url,transaction_style,expected_transaction,expected_source",
+ [
+ (
+ "/message",
+ "url",
+ "/message",
+ "route",
+ ),
+ (
+ "/message",
+ "endpoint",
+ "tests.integrations.fastapi.test_fastapi.fastapi_app_factory.._message",
+ "component",
+ ),
+ (
+ "/message/123456",
+ "url",
+ "/message/{message_id}",
+ "route",
+ ),
+ (
+ "/message/123456",
+ "endpoint",
+ "tests.integrations.fastapi.test_fastapi.fastapi_app_factory.._message_with_id",
+ "component",
+ ),
+ ],
+)
+def test_transaction_style(
+ sentry_init,
+ capture_events,
+ url,
+ transaction_style,
+ expected_transaction,
+ expected_source,
+):
+ sentry_init(
+ integrations=[
+ StarletteIntegration(transaction_style=transaction_style),
+ FastApiIntegration(transaction_style=transaction_style),
+ ],
+ )
+ app = fastapi_app_factory()
+
+ events = capture_events()
+
+ client = TestClient(app)
+ client.get(url)
+
+ (event,) = events
+ assert event["transaction"] == expected_transaction
+ assert event["transaction_info"] == {"source": expected_source}
+
+ # Assert that state is not leaked
+ events.clear()
+ capture_message("foo")
+ (event,) = events
+
+ assert "request" not in event
+ assert "transaction" not in event
+
+
+def test_legacy_setup(
+ sentry_init,
+ capture_events,
+):
+ # Check that behaviour does not change
+ # if the user just adds the new Integrations
+ # and forgets to remove SentryAsgiMiddleware
+ sentry_init(
+ integrations=[
+ StarletteIntegration(),
+ FastApiIntegration(),
+ ],
+ )
+ app = fastapi_app_factory()
+ asgi_app = SentryAsgiMiddleware(app)
+
+ events = capture_events()
+
+ client = TestClient(asgi_app)
+ client.get("/message/123456")
+
+ (event,) = events
+ assert event["transaction"] == "/message/{message_id}"
diff --git a/tests/integrations/starlette/__init__.py b/tests/integrations/starlette/__init__.py
new file mode 100644
index 0000000000..c89ddf99a8
--- /dev/null
+++ b/tests/integrations/starlette/__init__.py
@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("starlette")
diff --git a/tests/integrations/starlette/photo.jpg b/tests/integrations/starlette/photo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..52fbeef721973389ab1d83fe7f81b511c07cb633
GIT binary patch
literal 21014
zcmb5VWmILc(l&T-hl9I2jXN|h2X}XO=*HdM-QB%$cXy|8m&T#-#u@H?-}z?N{F_St
z?46ygovc)<>Uk=ktDn07pfpGd1ONjA14w=qz~=@)6aWDZ{-63KkY5!F777Xy5(*v$
z1{xL-9uW}%9svOf84ZYpjEana0K@{KqGMoUVj`ko<6vRnpkZKQ{AUm_h_617P;gLC
za2QAkNErXW<#Pal3Jb;pc!2;z1%RW1L7;+t4gm-N05GWk{O$h{NC+qZG&mRx>{lxu
z7y#m{@&DBd00aM;0rclO01*NV01kuzehu)L8|@C{<_7A*X3Ltw=V&m{df4b@LGat*
znf_C>qy8Snm=T?M$vLglGHEoDZ%-n0^287Z4g*d-HvuCDC5Lv7Ya=nL{vaFK1_}3A
z+>$81W1D>@Y1LtU+QO(>q-zZc3*^N^h5<(=k7yKEw%+$DGE
zbq10rXS=5x2*oWoVpM2UL^26ed&h=11$amUXqCHb3gIENE*{jTUkhcCu?7PO8#
zfsv`ZbU)HwLvEF9)lfPXXSIQ%e0Ho=&P~HZEgC(hcD*y?y(8VTOv`UppK)nA>bBM>
zUN`2z$FVL6Xv)&9|E=nJTzh{LdswiO{nDzymH#tZo)w{9k#~f}<=Ego
zqrj`a_9|qZRdo!@E-L|=e7qx)jD4mxjSqos)}38!Vee_)oL+X8H6-HXgh|;SKK>?I
zULCN^l-|7B`MMKtD6M%@4=k$0Qa=8L-9$@j5@kd+JBQMHhcNpp`TZBS#+X;#U3=CU
zYRSXXTV$eZ+zMm)+=4K*64oF#?UK|a1@Zxy%tdBccD4X3NFBtMnN{;AwXE@ErHGd~o
zq~>SKY~m{JcTXLb9bo0$dvi`ajy$W8rPkYD8F8(37yL_TaES1w2#CbFYfe|g<$R7#ue-##$ZcRHJZLkVUTMh$N$W-05;D-gV=%3ch86PdQkfDFxK-$t7#
zSeK383||MVAGOyqZ`>{Zz_wYqpWNVmR;UP|oNs^O+X!oqwcAokD!L+6kW?$i`6WeL
znFr!66pO!?MB@AnSXMbRVV~A&yuVp|n1Jc93;T6{C#^`KO#5s>t%s6Szig|ud>8wt
zX;^twNw+Hz=45#>_ll*cNQlRzy!3olcOz$j;e|s_rD=8icL#Un7QtcEw%gzWFSA-X
zu1sXtWK!)6_iJJdp@o9*q+u-!o~j+05t2n!@K&Ye$VLs#zjzK9(%&|fNHb@!SrtDg
zB~K1L)h;^kUdj|W*8@_N1O<;yZvP4{o|S2EMSEgEyQpr*O1nvXn_7G8p4B?HiqsC}
z;&^94zN>b2v?{ClF^SBN-=?Y-(_Z=gju&O)g~tcqwqr%R&x*6H7x(tv(DBq>`XILx
zUXR>)JWN(T3!Sm7DLT_ZKBM?Y1A*bTOq06jA0^th*!D8+%>AA=FF^~!THPW&L^h<({fnh`Z3U2oJ^)+D5;c1-ILE*NwzVvjqz%&L
zpA+8H3c7#1D&LNJ$>7OqX;cZGDyk!0p~_EH>tD@k#_}lOcA_r$lK9eT$0rx|z}8{$YY@3M2or%(56}rKT2SYZ$^DUv`fnkSk|mDxI4r
z9qicv=w1oz{aR%+GlG)$UB1oBVlKr;9R$eW9;eFJz6o8@BcYAReX7Hv6&ROn_2TeL
zo{j6RDLOf}()J^_Le=w&L>A2}3%51z+vaP1ClWlF0pKuTQDO5Ycirsu>sUdhjybvV
zWOAjMnSJ4w&DMy<*<{PW=JXk=46ad$>Q_PD=U#yXhyn-(XEKNKT(G2>`_;EzJxpO<
zxarVFO>dkSIFJ1FqCP4(`4Gt*=^q5I?)=#Ex6u^=a{+Vy>6W}e5+Q`V(%L;A6h+q3
zm(&m?Y=)&Zd(xNY*L=HnQ_5Qcu%D&n0
z>b}CxvDT0Q&%`Zn^nJPK0-TNO{F+W4y#e}BUVA_p-YYBV7kcQ%|lcb-)2&J$z3EG)wwdJ&A{7*mD@z@B5hbK-w
zwe-aW9?$K@Iy;xiz+$?(p#Uy&9vl(0OmmC;G>n=Z&S{R*l>lt4IMFDhz7ru$5_@j+
zJny@|$Is_?MYUeH?-l_lLcch)r35&uL;@L=9D`Mowcu8oW@o!mn081tv!lr#r@Be4
zlU$~ylLD-&kDVBJ)9)n9ZdbSp&b$d{17*Jp6{wi-ORLd>!R5k;qg5~$Uq%q>3hZdo
zgL8}|TlLV?|B^mfn%cw2Ubr;GK%|zN)ZSt8DH&AYQe>%FhvN)oV^2cHg4eepfyiuC
z5N!Q<+{Poz3=U!L$+L+z1Akg0S(;c>X-|XT&!#Uoc*f)Oz)cB8BIH%P35Lv0=7~pU
zyeOz}aYv7t-k&c^w{}sfZs*uH7{jzhFi@6^Ed%afeoI%%&)&91H>giHZh=
zPD;iC#2{gYX2oP97pCA4VgGV{V81*fFevah#AbQ%qA{iIL8h4oqtICbz`+=)yT>r5
z*7oc#Hv~T2TC(U9g=A3iCm@6*jqJw0shRY0xHfUukv~Y7avL$u%3HZ%pMtJI#l7z)~
zX4wlfa41_8RX^@H;d%T%85dC5M~*gfJ9oCG$!my5=zi*Q77MJ@9H=mcQyw5xSRrrc
zS8jB-#_%yx~2RJO@a<`e&WB!WM|`Mp&Ozl4}oJtPC@wu=fg=
zlqGhO@87lw%kL1hUORHuYA`9?Qv2$%@Jqd7%@@5^HlYi>t@lumNJ`w{@cwy1QsY8!
zn|5@!}w1RG*963oRO{#7&B
zzGW$NZZtm>J^_5W