Hello community,
here is the log from the commit of package python-sentry-sdk for
openSUSE:Factory checked in at 2019-10-02 11:58:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-sentry-sdk (Old)
and /work/SRC/openSUSE:Factory/.python-sentry-sdk.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sentry-sdk"
Wed Oct 2 11:58:46 2019 rev:5 rq:734168 version:0.12.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-sentry-sdk/python-sentry-sdk.changes
2019-08-24 18:49:26.365739730 +0200
+++
/work/SRC/openSUSE:Factory/.python-sentry-sdk.new.2352/python-sentry-sdk.changes
2019-10-02 11:58:46.635049904 +0200
@@ -1,0 +2,35 @@
+Mon Sep 30 22:28:19 UTC 2019 - Jimmy Berry <[email protected]>
+
+- Add pytest.ini source to ignore deprecation warning from eventlet
+- Disable %check since pytest does not want to follow documentation
+
+-------------------------------------------------------------------
+Mon Sep 30 22:07:37 UTC 2019 - Jimmy Berry <[email protected]>
+
+- Update to 0.12.2
+ - Temporarily remove sending of SQL parameters (as part of
+ breadcrumbs or spans for APM) to Sentry to avoid memory
+ consumption issues.
+ - Fix a crash with ASGI (Django Channels) when the ASGI request
+ type is neither HTTP nor Websockets.
+
+-------------------------------------------------------------------
+Thu Sep 19 13:34:03 UTC 2019 - Jimmy Berry <[email protected]>
+
+- Update to 0.12.0
+ - 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.
+
+-------------------------------------------------------------------
+Fri Aug 30 15:36:40 UTC 2019 - Jimmy Berry <[email protected]>
+
+- Update to 0.11.2
+ - fixed shutdown bug while runnign under eventlet
+ - added missing data to Redis breadcrumbs
+- Include build requirement on python eventlet module for the tests
+ while exclusing a subset of new tests
+
+-------------------------------------------------------------------
Old:
----
python-sentry-sdk-0.11.1.tar.gz
New:
----
pytest.ini
python-sentry-sdk-0.12.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-sentry-sdk.spec ++++++
--- /var/tmp/diff_new_pack.7OiieE/_old 2019-10-02 11:58:47.187048490 +0200
+++ /var/tmp/diff_new_pack.7OiieE/_new 2019-10-02 11:58:47.191048479 +0200
@@ -18,13 +18,14 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-sentry-sdk
-Version: 0.11.1
+Version: 0.12.2
Release: 0
Summary: Python SDK for Sentry.io
License: BSD-2-Clause
Group: Development/Languages/Python
URL: https://github.com/getsentry/sentry-python
Source0:
https://github.com/getsentry/sentry-python/archive/%{version}/%{name}-%{version}.tar.gz
+Source1: pytest.ini
BuildRequires: %{python_module Flask >= 0.8}
BuildRequires: %{python_module blinker >= 1.1}
BuildRequires: %{python_module bottle >= 0.12.13}
@@ -43,6 +44,7 @@
BuildArch: noarch
# SECTION test requirements
BuildRequires: %{python_module Werkzeug}
+BuildRequires: %{python_module eventlet}
BuildRequires: %{python_module gevent}
BuildRequires: %{python_module hypothesis}
BuildRequires: %{python_module pyramid}
@@ -73,8 +75,14 @@
%check
export PYTHONDONTWRITEBYTECODE=1
-# the two tests fail in obs
-%pytest -k 'not (test_scope_initialized_before_client or
test_configure_scope_unavailable or test_gevent_is_not_patched)'
+export PYTEST_ADDOPTS="-W ignore::DeprecationWarning"
+
+cp %{SOURCE1} .
+
+# a subset of tests fail on OBS
+# - test_transport_works eventlet parameterized tests fail
+# TODO disable since pytest does not respect filters
+# %%pytest -k 'not (test_scope_initialized_before_client or
test_configure_scope_unavailable or test_thread_local_is_patched or test_leaks
or test_transport_works or test_iter_stacktraces)'
%files %{python_files}
%doc README.md CHANGES.md
++++++ pytest.ini ++++++
[pytest]
# from eventlet/patcher.py
filterwarnings =
ignore:the imp module is deprecated.*:DeprecationWarning
++++++ python-sentry-sdk-0.11.1.tar.gz -> python-sentry-sdk-0.12.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/CHANGES.md
new/sentry-python-0.12.2/CHANGES.md
--- old/sentry-python-0.11.1/CHANGES.md 2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/CHANGES.md 2019-09-21 00:41:31.000000000 +0200
@@ -27,6 +27,28 @@
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.12.2
+
+* 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.
+
+## 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.**
+
+## 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.
+
## 0.11.1
* Remove a faulty assertion (observed in environment with Django Channels and
ASGI).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/CONTRIBUTING.md
new/sentry-python-0.12.2/CONTRIBUTING.md
--- old/sentry-python-0.11.1/CONTRIBUTING.md 2019-08-19 12:46:07.000000000
+0200
+++ new/sentry-python-0.12.2/CONTRIBUTING.md 2019-09-21 00:41:31.000000000
+0200
@@ -4,6 +4,10 @@
install -e .` into some virtualenv, edit the sourcecode and test out your
changes manually.
+## Community
+
+The public-facing channels for support and development of Sentry SDKs can be
found on [Discord](https://discord.gg/Ww9hbqr).
+
## Running tests and linters
Make sure you have `virtualenv` installed, and the Python versions you care
@@ -48,6 +52,8 @@
* One code example with basic setup.
+ * 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 `<!--WIZARD-->..<!--ENDWIZARD-->`
tags for usage from within the Sentry UI.
3. Merge docs after new version has been released (auto-deploys on merge).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/Makefile
new/sentry-python-0.12.2/Makefile
--- old/sentry-python-0.11.1/Makefile 2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/Makefile 2019-09-21 00:41:31.000000000 +0200
@@ -54,6 +54,11 @@
@$(VENV_PATH)/bin/sphinx-build -W -b html docs/ docs/_build
.PHONY: apidocs
+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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/README.md
new/sentry-python-0.12.2/README.md
--- old/sentry-python-0.11.1/README.md 2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/README.md 2019-09-21 00:41:31.000000000 +0200
@@ -8,6 +8,7 @@
[](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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/docs/api.rst
new/sentry-python-0.12.2/docs/api.rst
--- old/sentry-python-0.11.1/docs/api.rst 1970-01-01 01:00:00.000000000
+0100
+++ new/sentry-python-0.12.2/docs/api.rst 2019-09-21 00:41:31.000000000
+0200
@@ -0,0 +1,9 @@
+========
+Main API
+========
+
+.. inherited-members necessary because of hack for Client and init methods
+
+.. automodule:: sentry_sdk
+ :members:
+ :inherited-members:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/docs/conf.py
new/sentry-python-0.12.2/docs/conf.py
--- old/sentry-python-0.11.1/docs/conf.py 2019-08-19 12:46:07.000000000
+0200
+++ new/sentry-python-0.12.2/docs/conf.py 2019-09-21 00:41:31.000000000
+0200
@@ -22,7 +22,7 @@
copyright = u"2019, Sentry Team and Contributors"
author = u"Sentry Team and Contributors"
-release = "0.11.1"
+release = "0.12.2"
version = ".".join(release.split(".")[:2]) # The short X.Y version.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/docs/index.rst
new/sentry-python-0.12.2/docs/index.rst
--- old/sentry-python-0.11.1/docs/index.rst 2019-08-19 12:46:07.000000000
+0200
+++ new/sentry-python-0.12.2/docs/index.rst 2019-09-21 00:41:31.000000000
+0200
@@ -6,8 +6,6 @@
<https://sentry.io/for/python/>`_. For full documentation and other resources
visit the `GitHub repository <https://github.com/getsentry/sentry-python>`_.
-.. inherited-members necessary because of hack for Client and init methods
-
-.. automodule:: sentry_sdk
- :members:
- :inherited-members:
+.. toctree::
+ api
+ integrations
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/docs/integrations.rst
new/sentry-python-0.12.2/docs/integrations.rst
--- old/sentry-python-0.11.1/docs/integrations.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/sentry-python-0.12.2/docs/integrations.rst 2019-09-21
00:41:31.000000000 +0200
@@ -0,0 +1,14 @@
+============
+Integrations
+============
+
+Logging
+=======
+
+.. module:: sentry_sdk.integrations.logging
+
+.. autofunction:: ignore_logger
+
+.. autoclass:: EventHandler
+
+.. autoclass:: BreadcrumbHandler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/sentry_sdk/consts.py
new/sentry-python-0.12.2/sentry_sdk/consts.py
--- old/sentry-python-0.11.1/sentry_sdk/consts.py 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/sentry_sdk/consts.py 2019-09-21
00:41:31.000000000 +0200
@@ -49,6 +49,7 @@
# DO NOT ENABLE THIS RIGHT NOW UNLESS YOU WANT TO EXCEED YOUR EVENT
QUOTA IMMEDIATELY
traces_sample_rate=0.0, # type: float
traceparent_v2=False, # type: bool
+ _experiments={}, # type: Dict[str, Any]
):
# type: (...) -> None
pass
@@ -71,7 +72,7 @@
del _get_default_options
-VERSION = "0.11.1"
+VERSION = "0.12.2"
SDK_INFO = {
"name": "sentry.python",
"version": VERSION,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/sentry_sdk/hub.py
new/sentry-python-0.12.2/sentry_sdk/hub.py
--- old/sentry-python-0.11.1/sentry_sdk/hub.py 2019-08-19 12:46:07.000000000
+0200
+++ new/sentry-python-0.12.2/sentry_sdk/hub.py 2019-09-21 00:41:31.000000000
+0200
@@ -450,7 +450,10 @@
span.sampled = random.random() < sample_rate
if span.sampled:
- span.init_finished_spans()
+ max_spans = (
+ client and client.options["_experiments"].get("max_spans") or
1000
+ )
+ span.init_finished_spans(maxlen=max_spans)
return span
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/sentry_sdk/integrations/asgi.py
new/sentry-python-0.12.2/sentry_sdk/integrations/asgi.py
--- old/sentry-python-0.11.1/sentry_sdk/integrations/asgi.py 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/sentry_sdk/integrations/asgi.py 2019-09-21
00:41:31.000000000 +0200
@@ -10,10 +10,28 @@
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.utils import transaction_from_function
+from sentry_sdk.utils import ContextVar, event_from_exception,
transaction_from_function
+from sentry_sdk.tracing import Span
if MYPY:
from typing import Dict
+ from typing import Any
+
+
+_asgi_middleware_applied = ContextVar("sentry_asgi_middleware_applied")
+
+
+def _capture_exception(hub, exc):
+ # type: (Hub, Any) -> 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},
+ )
+ hub.capture_event(event, hint=hint)
class SentryAsgiMiddleware:
@@ -35,20 +53,39 @@
return self._run_app(scope, lambda: self.app(scope, receive, send))
async def _run_app(self, scope, callback):
- hub = Hub.current
- with Hub(hub) as hub:
- with hub.configure_scope() as sentry_scope:
- sentry_scope._name = "asgi"
- sentry_scope.transaction = scope.get("path") or "unknown asgi
request"
-
- processor = functools.partial(self.event_processor,
asgi_scope=scope)
- sentry_scope.add_event_processor(processor)
-
- try:
- await callback()
- except Exception as exc:
- hub.capture_exception(exc)
- raise exc from None
+ if _asgi_middleware_applied.get(False):
+ return await 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 = functools.partial(
+ self.event_processor, asgi_scope=scope
+ )
+ sentry_scope.add_event_processor(processor)
+
+ if scope["type"] in ("http", "websocket"):
+ span = Span.continue_from_headers(dict(scope["headers"]))
+ span.op = "{}.server".format(scope["type"])
+ else:
+ span = Span()
+ span.op = "asgi.server"
+
+ span.set_tag("asgi.type", scope["type"])
+ span.transaction = "generic ASGI request"
+
+ with hub.start_span(span) as span:
+ try:
+ return await callback()
+ except Exception as exc:
+ _capture_exception(hub, exc)
+ raise exc from None
+ finally:
+ _asgi_middleware_applied.set(False)
def event_processor(self, event, hint, asgi_scope):
request_info = event.setdefault("request", {})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/sentry_sdk/integrations/beam.py
new/sentry-python-0.12.2/sentry_sdk/integrations/beam.py
--- old/sentry-python-0.11.1/sentry_sdk/integrations/beam.py 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/sentry_sdk/integrations/beam.py 2019-09-21
00:41:31.000000000 +0200
@@ -79,7 +79,15 @@
process_func = getattr(self, func_name)
setattr(self, func_name, _wrap_task_call(process_func))
setattr(self, wrapped_func, process_func)
- return getfullargspec(process_func)
+
+ # getfullargspec is deprecated in more recent beam versions and
get_function_args_defaults
+ # (which uses Signatures internally) should be used instead.
+ try:
+ from apache_beam.transforms.core import get_function_args_defaults
+
+ return get_function_args_defaults(process_func)
+ except ImportError:
+ return getfullargspec(process_func)
setattr(_inspect, USED_FUNC, True)
return _inspect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/sentry_sdk/integrations/django/__init__.py
new/sentry-python-0.12.2/sentry_sdk/integrations/django/__init__.py
--- old/sentry-python-0.11.1/sentry_sdk/integrations/django/__init__.py
2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/sentry_sdk/integrations/django/__init__.py
2019-09-21 00:41:31.000000000 +0200
@@ -9,6 +9,7 @@
from django.core import signals # type: ignore
from sentry_sdk._types import MYPY
+from sentry_sdk.utils import HAS_REAL_CONTEXTVARS
if MYPY:
from typing import Any
@@ -48,6 +49,7 @@
from sentry_sdk.integrations._wsgi_common import RequestExtractor
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
if DJANGO_VERSION < (1, 10):
@@ -68,9 +70,10 @@
identifier = "django"
transaction_style = None
+ middleware_spans = None
- def __init__(self, transaction_style="url"):
- # type: (str) -> None
+ def __init__(self, transaction_style="url", middleware_spans=True):
+ # type: (str, bool) -> None
TRANSACTION_STYLE_VALUES = ("function_name", "url")
if transaction_style not in TRANSACTION_STYLE_VALUES:
raise ValueError(
@@ -78,6 +81,7 @@
% (transaction_style, TRANSACTION_STYLE_VALUES)
)
self.transaction_style = transaction_style
+ self.middleware_spans = middleware_spans
@staticmethod
def setup_once():
@@ -98,9 +102,9 @@
if Hub.current.get_integration(DjangoIntegration) is None:
return old_app(self, environ, start_response)
- return SentryWsgiMiddleware(lambda *a, **kw: old_app(self, *a,
**kw))(
- environ, start_response
- )
+ bound_old_app = old_app.__get__(self, WSGIHandler)
+
+ return SentryWsgiMiddleware(bound_old_app)(environ, start_response)
WSGIHandler.__call__ = sentry_patched_wsgi_handler
@@ -208,6 +212,9 @@
id(value),
)
+ _patch_channels()
+ patch_django_middlewares()
+
_DRF_PATCHED = False
_DRF_PATCH_LOCK = threading.Lock()
@@ -266,6 +273,38 @@
APIView.initial = sentry_patched_drf_initial
+def _patch_channels():
+ try:
+ from channels.http import AsgiHandler # type: ignore
+ except ImportError:
+ return
+
+ if not HAS_REAL_CONTEXTVARS:
+ # We better have contextvars or we're going to leak state between
+ # requests.
+ raise RuntimeError(
+ "We detected that you are using Django channels 2.0. To get proper
"
+ "instrumentation for ASGI requests, the Sentry SDK requires "
+ "Python 3.7+ or the aiocontextvars package from PyPI."
+ )
+
+ from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
+
+ old_app = AsgiHandler.__call__
+
+ def sentry_patched_asgi_handler(self, receive, send):
+ if Hub.current.get_integration(DjangoIntegration) is None:
+ return old_app(receive, send)
+
+ middleware = SentryAsgiMiddleware(
+ lambda _scope: old_app.__get__(self, AsgiHandler)
+ )
+
+ return middleware(self.scope)(receive, send)
+
+ AsgiHandler.__call__ = sentry_patched_asgi_handler
+
+
def _make_event_processor(weak_request, integration):
# type: (Callable[[], WSGIRequest], DjangoIntegration) -> Callable
def event_processor(event, hint):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/sentry_sdk/integrations/django/middleware.py
new/sentry-python-0.12.2/sentry_sdk/integrations/django/middleware.py
--- old/sentry-python-0.11.1/sentry_sdk/integrations/django/middleware.py
1970-01-01 01:00:00.000000000 +0100
+++ new/sentry-python-0.12.2/sentry_sdk/integrations/django/middleware.py
2019-09-21 00:41:31.000000000 +0200
@@ -0,0 +1,106 @@
+"""
+Create spans from Django middleware invocations
+"""
+
+from functools import wraps
+
+from django import VERSION as DJANGO_VERSION # type: ignore
+
+from sentry_sdk import Hub
+from sentry_sdk.utils import ContextVar, transaction_from_function
+
+_import_string_should_wrap_middleware = ContextVar(
+ "import_string_should_wrap_middleware"
+)
+
+if DJANGO_VERSION < (1, 7):
+ import_string_name = "import_by_path"
+else:
+ import_string_name = "import_string"
+
+
+def patch_django_middlewares():
+ from django.core.handlers import base
+
+ old_import_string = getattr(base, import_string_name)
+
+ def sentry_patched_import_string(dotted_path):
+ rv = old_import_string(dotted_path)
+
+ if _import_string_should_wrap_middleware.get(None):
+ rv = _wrap_middleware(rv, dotted_path)
+
+ return rv
+
+ setattr(base, import_string_name, sentry_patched_import_string)
+
+ old_load_middleware = base.BaseHandler.load_middleware
+
+ def sentry_patched_load_middleware(self):
+ _import_string_should_wrap_middleware.set(True)
+ try:
+ return old_load_middleware(self)
+ finally:
+ _import_string_should_wrap_middleware.set(False)
+
+ base.BaseHandler.load_middleware = sentry_patched_load_middleware
+
+
+def _wrap_middleware(middleware, middleware_name):
+ from sentry_sdk.integrations.django import DjangoIntegration
+
+ def _get_wrapped_method(old_method):
+ @wraps(old_method)
+ def sentry_wrapped_method(*args, **kwargs):
+ 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)
+
+ description = middleware_name
+ function_basename = getattr(old_method, "__name__", None)
+ if function_basename:
+ description = "{}.{}".format(description, function_basename)
+
+ 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)
+ return old_method(*args, **kwargs)
+
+ return sentry_wrapped_method
+
+ class SentryWrappingMiddleware(object):
+ def __init__(self, *args, **kwargs):
+ self._inner = middleware(*args, **kwargs)
+ self._call_method = None
+
+ # We need correct behavior for `hasattr()`, which we can only determine
+ # when we have an instance of the middleware we're wrapping.
+ def __getattr__(self, method_name):
+ if method_name not in (
+ "process_request",
+ "process_view",
+ "process_template_response",
+ "process_response",
+ "process_exception",
+ ):
+ raise AttributeError()
+
+ old_method = getattr(self._inner, method_name)
+ rv = _get_wrapped_method(old_method)
+ self.__dict__[method_name] = rv
+ return rv
+
+ def __call__(self, *args, **kwargs):
+ if self._call_method is None:
+ self._call_method = _get_wrapped_method(self._inner.__call__)
+ return self._call_method(*args, **kwargs)
+
+ if hasattr(middleware, "__name__"):
+ SentryWrappingMiddleware.__name__ = middleware.__name__
+
+ return SentryWrappingMiddleware
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/sentry_sdk/integrations/logging.py
new/sentry-python-0.12.2/sentry_sdk/integrations/logging.py
--- old/sentry-python-0.11.1/sentry_sdk/integrations/logging.py 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/sentry_sdk/integrations/logging.py 2019-09-21
00:41:31.000000000 +0200
@@ -27,12 +27,16 @@
_IGNORED_LOGGERS = set(["sentry_sdk.errors"])
-def ignore_logger(name):
- # type: (str) -> None
+def ignore_logger(
+ name # type: str
+):
+ # type: (...) -> None
"""This disables recording (both in breadcrumbs and as events) calls to
a logger of a specific name. Among other uses, many of our integrations
use this to prevent their actions being recorded as breadcrumbs. Exposed
to users as a way to quiet spammy loggers.
+
+ :param name: The name of the logger to ignore (same string you would pass
to ``logging.getLogger``).
"""
_IGNORED_LOGGERS.add(name)
@@ -146,6 +150,12 @@
class EventHandler(logging.Handler, object):
+ """
+ A logging handler that emits Sentry events for each log record
+
+ Note that you do not have to use this class if the logging integration is
enabled, which it is by default.
+ """
+
def emit(self, record):
# type: (LogRecord) -> Any
with capture_internal_exceptions():
@@ -204,6 +214,12 @@
class BreadcrumbHandler(logging.Handler, object):
+ """
+ A logging handler that records breadcrumbs for each log record.
+
+ Note that you do not have to use this class if the logging integration is
enabled, which it is by default.
+ """
+
def emit(self, record):
# type: (LogRecord) -> Any
with capture_internal_exceptions():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/sentry_sdk/integrations/modules.py
new/sentry-python-0.12.2/sentry_sdk/integrations/modules.py
--- old/sentry-python-0.11.1/sentry_sdk/integrations/modules.py 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/sentry_sdk/integrations/modules.py 2019-09-21
00:41:31.000000000 +0200
@@ -46,6 +46,11 @@
@add_global_event_processor
def processor(event, hint):
# type: (Event, Any) -> Dict[str, Any]
- if Hub.current.get_integration(ModulesIntegration) is not None:
- event["modules"] = dict(_get_installed_modules())
+ if event.get("type") == "transaction":
+ return event
+
+ if Hub.current.get_integration(ModulesIntegration) is None:
+ return event
+
+ event["modules"] = dict(_get_installed_modules())
return event
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/sentry_sdk/integrations/redis.py
new/sentry-python-0.12.2/sentry_sdk/integrations/redis.py
--- old/sentry-python-0.11.1/sentry_sdk/integrations/redis.py 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/sentry_sdk/integrations/redis.py 2019-09-21
00:41:31.000000000 +0200
@@ -33,6 +33,9 @@
description = " ".join(description_parts)
with hub.start_span(op="redis", description=description) as span:
+ if name:
+ span.set_tag("redis.command", name)
+
if name and args and name.lower() in ("get", "set", "setex",
"setnx"):
span.set_tag("redis.key", args[0])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/sentry_sdk/integrations/stdlib.py
new/sentry-python-0.12.2/sentry_sdk/integrations/stdlib.py
--- old/sentry-python-0.11.1/sentry_sdk/integrations/stdlib.py 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/sentry_sdk/integrations/stdlib.py 2019-09-21
00:41:31.000000000 +0200
@@ -184,10 +184,41 @@
with hub.start_span(op="subprocess", description=description) as span:
span.set_data("subprocess.cwd", cwd)
- return old_popen_init(self, *a, **kw)
+ rv = old_popen_init(self, *a, **kw)
+
+ span.set_tag("subprocess.pid", self.pid)
+ return rv
subprocess.Popen.__init__ = sentry_patched_popen_init # type: ignore
+ old_popen_wait = subprocess.Popen.wait
+
+ def sentry_patched_popen_wait(self, *a, **kw):
+ hub = Hub.current
+
+ if hub.get_integration(StdlibIntegration) is None:
+ return old_popen_wait(self, *a, **kw)
+
+ with hub.start_span(op="subprocess.wait") as span:
+ span.set_tag("subprocess.pid", self.pid)
+ return old_popen_wait(self, *a, **kw)
+
+ subprocess.Popen.wait = sentry_patched_popen_wait # type: ignore
+
+ old_popen_communicate = subprocess.Popen.communicate
+
+ def sentry_patched_popen_communicate(self, *a, **kw):
+ hub = Hub.current
+
+ if hub.get_integration(StdlibIntegration) is None:
+ return old_popen_communicate(self, *a, **kw)
+
+ with hub.start_span(op="subprocess.communicate") as span:
+ span.set_tag("subprocess.pid", self.pid)
+ return old_popen_communicate(self, *a, **kw)
+
+ subprocess.Popen.communicate = sentry_patched_popen_communicate # type:
ignore
+
def get_subprocess_traceparent_headers():
return EnvironHeaders(os.environ, prefix="SUBPROCESS_")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/sentry_sdk/integrations/wsgi.py
new/sentry-python-0.12.2/sentry_sdk/integrations/wsgi.py
--- old/sentry-python-0.11.1/sentry_sdk/integrations/wsgi.py 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/sentry_sdk/integrations/wsgi.py 2019-09-21
00:41:31.000000000 +0200
@@ -2,7 +2,11 @@
import sys
from sentry_sdk.hub import Hub, _should_send_default_pii
-from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
+from sentry_sdk.utils import (
+ ContextVar,
+ capture_internal_exceptions,
+ event_from_exception,
+)
from sentry_sdk._compat import PY2, reraise, iteritems
from sentry_sdk.tracing import Span
from sentry_sdk.integrations._wsgi_common import _filter_headers
@@ -26,6 +30,9 @@
E = TypeVar("E")
+_wsgi_middleware_applied = ContextVar("sentry_wsgi_middleware_applied")
+
+
if PY2:
def wsgi_decoding_dance(s, charset="utf-8", errors="replace"):
@@ -83,27 +90,36 @@
def __call__(self, environ, start_response):
# type: (Dict[str, str], Callable) -> _ScopedResponse
- hub = Hub(Hub.current)
+ if _wsgi_middleware_applied.get(False):
+ return self.app(environ, start_response)
- with hub:
- with capture_internal_exceptions():
- with hub.configure_scope() as scope:
- scope.clear_breadcrumbs()
- scope._name = "wsgi"
-
scope.add_event_processor(_make_wsgi_event_processor(environ))
-
- span = Span.continue_from_environ(environ)
- span.op = "http.server"
- span.transaction = "generic WSGI request"
-
- with hub.start_span(span) as span:
- try:
- rv = self.app(
- environ,
- functools.partial(_sentry_start_response,
start_response, span),
- )
- except BaseException:
- reraise(*_capture_exception(hub))
+ _wsgi_middleware_applied.set(True)
+ try:
+ hub = Hub(Hub.current)
+
+ with hub:
+ with capture_internal_exceptions():
+ with hub.configure_scope() as scope:
+ scope.clear_breadcrumbs()
+ scope._name = "wsgi"
+
scope.add_event_processor(_make_wsgi_event_processor(environ))
+
+ span = Span.continue_from_environ(environ)
+ span.op = "http.server"
+ span.transaction = "generic WSGI request"
+
+ with hub.start_span(span) as span:
+ try:
+ rv = self.app(
+ environ,
+ functools.partial(
+ _sentry_start_response, start_response, span
+ ),
+ )
+ except BaseException:
+ reraise(*_capture_exception(hub))
+ finally:
+ _wsgi_middleware_applied.set(False)
return _ScopedResponse(hub, rv)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/sentry_sdk/scope.py
new/sentry-python-0.12.2/sentry_sdk/scope.py
--- old/sentry-python-0.11.1/sentry_sdk/scope.py 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/sentry_sdk/scope.py 2019-09-21
00:41:31.000000000 +0200
@@ -195,6 +195,13 @@
:param func: This function behaves like `before_send.`
"""
+ if len(self._event_processors) > 20:
+ logger.warning(
+ "Too many event processors on scope! Clearing list to free up
some memory: %r",
+ self._event_processors,
+ )
+ del self._event_processors[:]
+
self._event_processors.append(func)
def add_error_processor(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/sentry_sdk/tracing.py
new/sentry-python-0.12.2/sentry_sdk/tracing.py
--- old/sentry-python-0.11.1/sentry_sdk/tracing.py 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/sentry_sdk/tracing.py 2019-09-21
00:41:31.000000000 +0200
@@ -64,6 +64,31 @@
yield k[len(self.prefix) :]
+class _SpanRecorder(object):
+ __slots__ = ("maxlen", "finished_spans", "open_span_count")
+
+ def __init__(self, maxlen):
+ # type: (int) -> None
+ self.maxlen = maxlen
+ self.open_span_count = 0 # type: int
+ self.finished_spans = [] # type: List[Span]
+
+ def start_span(self, span):
+ # type: (Span) -> None
+
+ # This is just so that we don't run out of memory while recording a lot
+ # of spans. At some point we just stop and flush out the start of the
+ # trace tree (i.e. the first n spans with the smallest
+ # start_timestamp).
+ self.open_span_count += 1
+ if self.open_span_count > self.maxlen:
+ span._span_recorder = None
+
+ def finish_span(self, span):
+ # type: (Span) -> None
+ self.finished_spans.append(span)
+
+
class Span(object):
__slots__ = (
"trace_id",
@@ -78,7 +103,7 @@
"timestamp",
"_tags",
"_data",
- "_finished_spans",
+ "_span_recorder",
"hub",
"_context_manager_state",
)
@@ -107,16 +132,18 @@
self.hub = hub
self._tags = {} # type: Dict[str, str]
self._data = {} # type: Dict[str, Any]
- self._finished_spans = None # type: Optional[List[Span]]
self.start_timestamp = datetime.now()
#: End timestamp of span
self.timestamp = None # type: Optional[datetime]
- def init_finished_spans(self):
- # type: () -> None
- if self._finished_spans is None:
- self._finished_spans = []
+ self._span_recorder = None # type: Optional[_SpanRecorder]
+
+ def init_finished_spans(self, maxlen):
+ # type: (int) -> None
+ if self._span_recorder is None:
+ self._span_recorder = _SpanRecorder(maxlen)
+ self._span_recorder.start_span(self)
def __repr__(self):
# type: () -> str
@@ -162,7 +189,8 @@
sampled=self.sampled,
**kwargs
)
- rv._finished_spans = self._finished_spans
+
+ rv._span_recorder = self._span_recorder
return rv
@classmethod
@@ -191,7 +219,7 @@
if traceparent.startswith("00-") and traceparent.endswith("-00"):
traceparent = traceparent[3:-3]
- match = _traceparent_header_format_re.match(traceparent)
+ match = _traceparent_header_format_re.match(str(traceparent))
if match is None:
return None
@@ -252,11 +280,13 @@
self.timestamp = datetime.now()
- if self._finished_spans is not None:
- self._finished_spans.append(self)
-
_maybe_create_breadcrumbs_from_span(hub, self)
+ if self._span_recorder is None:
+ return None
+
+ self._span_recorder.finish_span(self)
+
if self.transaction is None:
# If this has no transaction set we assume there's a parent
# transaction for this span that would be flushed out eventually.
@@ -285,7 +315,9 @@
"timestamp": self.timestamp,
"start_timestamp": self.start_timestamp,
"spans": [
- s.to_json() for s in (self._finished_spans or ()) if s is
not self
+ s.to_json()
+ for s in self._span_recorder.finished_spans
+ if s is not self
],
}
)
@@ -354,11 +386,19 @@
executemany, # type: bool
):
# type: (...) -> Generator[Span, None, None]
- if not params_list or params_list == [None]:
- params_list = None
- if paramstyle == "pyformat":
- paramstyle = "format"
+ # 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)
@@ -394,18 +434,21 @@
def _maybe_create_breadcrumbs_from_span(hub, span):
# type: (sentry_sdk.Hub, Span) -> None
if span.op == "redis":
- hub.add_breadcrumb(type="redis", category="redis", data=span._tags)
+ hub.add_breadcrumb(
+ message=span.description, type="redis", category="redis",
data=span._tags
+ )
elif span.op == "http" and span.is_success():
hub.add_breadcrumb(
type="http",
category="httplib",
data=span._data,
- hint={"httplib_response": span._data.get("httplib_response")},
+ hint={"httplib_response": span._data.pop("httplib_response",
None)},
)
elif span.op == "subprocess":
hub.add_breadcrumb(
type="subprocess",
category="subprocess",
+ message=span.description,
data=span._data,
- hint={"popen_instance": span._data.get("popen_instance")},
+ hint={"popen_instance": span._data.pop("popen_instance", None)},
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/sentry_sdk/worker.py
new/sentry-python-0.12.2/sentry_sdk/worker.py
--- old/sentry-python-0.11.1/sentry_sdk/worker.py 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/sentry_sdk/worker.py 2019-09-21
00:41:31.000000000 +0200
@@ -45,16 +45,33 @@
# type: (float) -> bool
deadline = time() + timeout
queue = self._queue
- queue.all_tasks_done.acquire() # type: ignore
+
+ 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
+
try:
while queue.unfinished_tasks: # type: ignore
delay = deadline - time()
if delay <= 0:
return False
- queue.all_tasks_done.wait(timeout=delay) # type: ignore
+ 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)
+
return True
finally:
- queue.all_tasks_done.release() # type: ignore
+ if real_all_tasks_done is not None:
+ real_all_tasks_done.release() # type: ignore
def start(self):
# type: () -> None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/setup.py
new/sentry-python-0.12.2/setup.py
--- old/sentry-python-0.11.1/setup.py 2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/setup.py 2019-09-21 00:41:31.000000000 +0200
@@ -12,7 +12,7 @@
setup(
name="sentry-sdk",
- version="0.11.1",
+ version="0.12.2",
author="Sentry Team and Contributors",
author_email="[email protected]",
url="https://github.com/getsentry/sentry-python";,
@@ -23,7 +23,7 @@
package_data={"sentry_sdk": ["py.typed"]},
zip_safe=False,
license="BSD",
- install_requires=["urllib3", "certifi"],
+ install_requires=["urllib3>=1.9", "certifi"],
extras_require={
"flask": ["flask>=0.8", "blinker>=1.1"],
"bottle": ["bottle>=0.12.13"],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/test-requirements.txt
new/sentry-python-0.12.2/test-requirements.txt
--- old/sentry-python-0.11.1/test-requirements.txt 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/test-requirements.txt 2019-09-21
00:41:31.000000000 +0200
@@ -2,7 +2,8 @@
pytest==3.7.3
pytest-xdist==1.23.0
tox==3.7.0
-Werkzeug==0.14.1
+Werkzeug==0.15.3
pytest-localserver==0.4.1
pytest-cov==2.6.0
gevent
+eventlet
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/tests/conftest.py
new/sentry-python-0.12.2/tests/conftest.py
--- old/sentry-python-0.11.1/tests/conftest.py 2019-08-19 12:46:07.000000000
+0200
+++ new/sentry-python-0.12.2/tests/conftest.py 2019-09-21 00:41:31.000000000
+0200
@@ -4,6 +4,9 @@
import pytest
+import gevent
+import eventlet
+
import sentry_sdk
from sentry_sdk._compat import reraise, string_types, iteritems
from sentry_sdk.transport import Transport
@@ -100,6 +103,9 @@
if "Something has already installed a non-asyncio" in
str(warning.message):
continue
+ if "dns.hash" in str(warning.message) or "dns/namedict" in
warning.filename:
+ continue
+
raise AssertionError(warning)
@@ -235,3 +241,29 @@
def read_flush(self):
assert self.file.readline() == b"flush\n"
+
+
+# scope=session ensures that fixture is run earlier
[email protected](scope="session", params=[None, "eventlet", "gevent"])
+def maybe_monkeypatched_threading(request):
+ if request.param == "eventlet":
+ try:
+ eventlet.monkey_patch()
+ except AttributeError as e:
+ if "'thread.RLock' object has no attribute" in str(e):
+ #
https://bitbucket.org/pypy/pypy/issues/2962/gevent-cannot-patch-rlock-under-pypy-27-7
+ pytest.skip("https://github.com/eventlet/eventlet/issues/546";)
+ else:
+ raise
+ elif request.param == "gevent":
+ try:
+ gevent.monkey.patch_all()
+ except Exception as e:
+ if "_RLock__owner" in str(e):
+ pytest.skip("https://github.com/gevent/gevent/issues/1380";)
+ else:
+ raise
+ else:
+ assert request.param is None
+
+ return request.param
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/tests/integrations/asgi/test_asgi.py
new/sentry-python-0.12.2/tests/integrations/asgi/test_asgi.py
--- old/sentry-python-0.11.1/tests/integrations/asgi/test_asgi.py
2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/integrations/asgi/test_asgi.py
2019-09-21 00:41:31.000000000 +0200
@@ -33,7 +33,7 @@
events = capture_events()
client = TestClient(app)
- response = client.get("/sync-message?foo=bar")
+ response = client.get("/sync-message?foo=bar", headers={"Foo": u"ä"})
assert response.status_code == 200
@@ -46,6 +46,7 @@
"connection",
"host",
"user-agent",
+ "foo",
}
assert event["request"]["query_string"] == "foo=bar"
assert event["request"]["url"].endswith("/sync-message")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/tests/integrations/django/channels/test_channels.py
new/sentry-python-0.12.2/tests/integrations/django/channels/test_channels.py
---
old/sentry-python-0.11.1/tests/integrations/django/channels/test_channels.py
2019-08-19 12:46:07.000000000 +0200
+++
new/sentry-python-0.12.2/tests/integrations/django/channels/test_channels.py
2019-09-21 00:41:31.000000000 +0200
@@ -3,6 +3,7 @@
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 application
@@ -32,3 +33,7 @@
"query_string": "test=query",
"url": "/view-exc",
}
+
+ capture_message("hi")
+ event = events[-1]
+ assert "request" not in event
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/tests/integrations/django/myapp/asgi.py
new/sentry-python-0.12.2/tests/integrations/django/myapp/asgi.py
--- old/sentry-python-0.11.1/tests/integrations/django/myapp/asgi.py
2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/integrations/django/myapp/asgi.py
2019-09-21 00:41:31.000000000 +0200
@@ -12,8 +12,4 @@
)
django.setup()
-
-from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
-
application = get_default_application()
-application = SentryAsgiMiddleware(application)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/tests/integrations/django/myapp/urls.py
new/sentry-python-0.12.2/tests/integrations/django/myapp/urls.py
--- old/sentry-python-0.11.1/tests/integrations/django/myapp/urls.py
2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/integrations/django/myapp/urls.py
2019-09-21 00:41:31.000000000 +0200
@@ -35,6 +35,11 @@
path("classbased", views.ClassBasedView.as_view(), name="classbased"),
path("post-echo", views.post_echo, name="post_echo"),
path("template-exc", views.template_exc, name="template_exc"),
+ path(
+ "permission-denied-exc",
+ views.permission_denied_exc,
+ name="permission_denied_exc",
+ ),
]
@@ -50,6 +55,13 @@
)
)
urlpatterns.append(path("rest-hello", views.rest_hello, name="rest_hello"))
+ urlpatterns.append(
+ path(
+ "rest-permission-denied-exc",
+ views.rest_permission_denied_exc,
+ name="rest_permission_denied_exc",
+ )
+ )
except AttributeError:
pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/tests/integrations/django/myapp/views.py
new/sentry-python-0.12.2/tests/integrations/django/myapp/views.py
--- old/sentry-python-0.11.1/tests/integrations/django/myapp/views.py
2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/integrations/django/myapp/views.py
2019-09-21 00:41:31.000000000 +0200
@@ -1,5 +1,6 @@
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.shortcuts import render
from django.views.generic import ListView
@@ -20,6 +21,10 @@
def rest_hello(request):
return HttpResponse("ok")
+ @api_view(["GET"])
+ def rest_permission_denied_exc(request):
+ raise PermissionDenied("bye")
+
except ImportError:
pass
@@ -73,3 +78,7 @@
def template_exc(request, *args, **kwargs):
return render(request, "error.html")
+
+
+def permission_denied_exc(*args, **kwargs):
+ raise PermissionDenied("bye")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/tests/integrations/django/test_basic.py
new/sentry-python-0.12.2/tests/integrations/django/test_basic.py
--- old/sentry-python-0.11.1/tests/integrations/django/test_basic.py
2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/integrations/django/test_basic.py
2019-09-21 00:41:31.000000000 +0200
@@ -2,6 +2,7 @@
import json
from werkzeug.test import Client
+from django import VERSION as DJANGO_VERSION
from django.contrib.auth.models import User
from django.core.management import execute_from_command_line
from django.db.utils import OperationalError, ProgrammingError, DataError
@@ -56,7 +57,7 @@
assert event["request"] == {
"cookies": {},
"env": {"SERVER_NAME": "localhost", "SERVER_PORT": "80"},
- "headers": {"Content-Length": "0", "Content-Type": "", "Host":
"localhost"},
+ "headers": {"Host": "localhost"},
"method": "GET",
"query_string": "",
"url": "http://localhost/message";,
@@ -135,7 +136,7 @@
assert event["level"] == "error"
assert event["request"] == {
"env": {"SERVER_NAME": "localhost", "SERVER_PORT": "80"},
- "headers": {"Content-Length": "0", "Content-Type": "", "Host":
"localhost"},
+ "headers": {"Host": "localhost"},
"method": "POST",
"query_string": "",
"url": "http://localhost/404";,
@@ -169,7 +170,9 @@
sentry_init(
integrations=[DjangoIntegration()] if with_integration else [],
send_default_pii=True,
+ _experiments={"record_sql_params": True},
)
+
from django.db import connection
sql = connection.cursor()
@@ -192,7 +195,11 @@
@pytest.mark.django_db
def test_sql_dict_query_params(sentry_init, capture_events):
- sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
+ sentry_init(
+ integrations=[DjangoIntegration()],
+ send_default_pii=True,
+ _experiments={"record_sql_params": True},
+ )
from django.db import connections
@@ -229,7 +236,11 @@
)
@pytest.mark.django_db
def test_sql_psycopg2_string_composition(sentry_init, capture_events, query):
- sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
+ sentry_init(
+ integrations=[DjangoIntegration()],
+ send_default_pii=True,
+ _experiments={"record_sql_params": True},
+ )
from django.db import connections
if "postgres" not in connections:
@@ -253,7 +264,11 @@
@pytest.mark.django_db
def test_sql_psycopg2_placeholders(sentry_init, capture_events):
- sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
+ sentry_init(
+ integrations=[DjangoIntegration()],
+ send_default_pii=True,
+ _experiments={"record_sql_params": True},
+ )
from django.db import connections
if "postgres" not in connections:
@@ -479,3 +494,69 @@
assert event["exception"]["values"][0]["mechanism"]["type"] == "django"
assert event["request"] == event_request(route)
+
+
[email protected](
+ "endpoint", ["rest_permission_denied_exc", "permission_denied_exc"]
+)
+def test_does_not_capture_403(sentry_init, client, capture_events, endpoint):
+ if endpoint == "rest_permission_denied_exc":
+ pytest.importorskip("rest_framework")
+
+ sentry_init(integrations=[DjangoIntegration()])
+ events = capture_events()
+
+ _content, status, _headers = client.get(reverse(endpoint))
+ assert status.lower() == "403 forbidden"
+
+ assert not events
+
+
+def test_middleware_spans(sentry_init, client, capture_events):
+ sentry_init(
+ integrations=[DjangoIntegration()],
+ traces_sample_rate=1.0,
+ _experiments={"record_sql_params": True},
+ )
+ events = capture_events()
+
+ _content, status, _headers = client.get(reverse("message"))
+
+ message, transaction = events
+
+ assert message["message"] == "hi"
+
+ for middleware in transaction["spans"]:
+ assert middleware["op"] == "django.middleware"
+
+ if DJANGO_VERSION >= (1, 10):
+ reference_value = [
+ "tests.integrations.django.myapp.settings.TestMiddleware.__call__",
+ "django.contrib.auth.middleware.AuthenticationMiddleware.__call__",
+ "django.contrib.sessions.middleware.SessionMiddleware.__call__",
+ ]
+ else:
+ reference_value = [
+
"django.contrib.sessions.middleware.SessionMiddleware.process_request",
+
"django.contrib.auth.middleware.AuthenticationMiddleware.process_request",
+
"tests.integrations.django.myapp.settings.TestMiddleware.process_request",
+
"tests.integrations.django.myapp.settings.TestMiddleware.process_response",
+
"django.contrib.sessions.middleware.SessionMiddleware.process_response",
+ ]
+
+ assert [t["description"] for t in transaction["spans"]] == reference_value
+
+
+def test_middleware_spans_disabled(sentry_init, client, capture_events):
+ sentry_init(
+ integrations=[DjangoIntegration(middleware_spans=False)],
traces_sample_rate=1.0
+ )
+ events = capture_events()
+
+ _content, status, _headers = client.get(reverse("message"))
+
+ message, transaction = events
+
+ assert message["message"] == "hi"
+
+ assert not transaction["spans"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/tests/integrations/pyramid/test_pyramid.py
new/sentry-python-0.12.2/tests/integrations/pyramid/test_pyramid.py
--- old/sentry-python-0.11.1/tests/integrations/pyramid/test_pyramid.py
2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/integrations/pyramid/test_pyramid.py
2019-09-21 00:41:31.000000000 +0200
@@ -101,7 +101,7 @@
assert event["message"] == "yoo"
assert event["request"] == {
"env": {"SERVER_NAME": "localhost", "SERVER_PORT": "80"},
- "headers": {"Content-Length": "0", "Content-Type": "", "Host":
"localhost"},
+ "headers": {"Host": "localhost"},
"method": "GET",
"query_string": "",
"url": "http://localhost/message/yoo";,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/tests/integrations/redis/test_redis.py
new/sentry-python-0.12.2/tests/integrations/redis/test_redis.py
--- old/sentry-python-0.11.1/tests/integrations/redis/test_redis.py
2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/integrations/redis/test_redis.py
2019-09-21 00:41:31.000000000 +0200
@@ -18,7 +18,8 @@
assert crumb == {
"category": "redis",
- "data": {"redis.key": "foobar"},
+ "message": "GET 'foobar'",
+ "data": {"redis.key": "foobar", "redis.command": "GET"},
"timestamp": crumb["timestamp"],
"type": "redis",
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/tests/integrations/requests/test_requests.py
new/sentry-python-0.12.2/tests/integrations/requests/test_requests.py
--- old/sentry-python-0.11.1/tests/integrations/requests/test_requests.py
2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/integrations/requests/test_requests.py
2019-09-21 00:41:31.000000000 +0200
@@ -23,5 +23,4 @@
"method": "GET",
"status_code": 418,
"reason": "I'M A TEAPOT",
- "httplib_response": crumb["data"]["httplib_response"],
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/tests/integrations/sqlalchemy/test_sqlalchemy.py
new/sentry-python-0.12.2/tests/integrations/sqlalchemy/test_sqlalchemy.py
--- old/sentry-python-0.11.1/tests/integrations/sqlalchemy/test_sqlalchemy.py
2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/integrations/sqlalchemy/test_sqlalchemy.py
2019-09-21 00:41:31.000000000 +0200
@@ -8,7 +8,9 @@
def test_orm_queries(sentry_init, capture_events):
- sentry_init(integrations=[SqlalchemyIntegration()])
+ sentry_init(
+ integrations=[SqlalchemyIntegration()],
_experiments={"record_sql_params": True}
+ )
events = capture_events()
Base = declarative_base()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/tests/integrations/stdlib/test_httplib.py
new/sentry-python-0.12.2/tests/integrations/stdlib/test_httplib.py
--- old/sentry-python-0.11.1/tests/integrations/stdlib/test_httplib.py
2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/integrations/stdlib/test_httplib.py
2019-09-21 00:41:31.000000000 +0200
@@ -1,3 +1,6 @@
+import platform
+import sys
+
import pytest
try:
@@ -32,7 +35,6 @@
"method": "GET",
"status_code": 200,
"reason": "OK",
- "httplib_response": crumb["data"]["httplib_response"],
}
@@ -62,9 +64,11 @@
"status_code": 200,
"reason": "OK",
"extra": "foo",
- "httplib_response": crumb["data"]["httplib_response"],
}
+ if platform.python_implementation() != "PyPy":
+ assert sys.getrefcount(response) == 2
+
def test_httplib_misuse(sentry_init, capture_events):
"""HTTPConnection.getresponse must be called after every call to
@@ -104,5 +108,4 @@
"method": "GET",
"status_code": 200,
"reason": "OK",
- "httplib_response": crumb["data"]["httplib_response"],
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/tests/integrations/stdlib/test_subprocess.py
new/sentry-python-0.12.2/tests/integrations/stdlib/test_subprocess.py
--- old/sentry-python-0.11.1/tests/integrations/stdlib/test_subprocess.py
2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/integrations/stdlib/test_subprocess.py
2019-09-21 00:41:31.000000000 +0200
@@ -38,11 +38,12 @@
True,
marks=pytest.mark.skipif(
platform.python_implementation() == "PyPy",
- reason="https://github.com/getsentry/sentry-python/pull/449";,
+
reason="https://bitbucket.org/pypy/pypy/issues/3050/subprocesspopen-only-accepts-sequences";,
),
),
False,
],
+ ids=("as_iterator", "as_list"),
)
@pytest.mark.parametrize("env_mapping", [None, os.environ,
ImmutableDict(os.environ)])
@pytest.mark.parametrize("with_cwd", [True, False])
@@ -126,20 +127,48 @@
assert crumb == {
"category": "subprocess",
"data": data,
+ "message": crumb["message"],
"timestamp": crumb["timestamp"],
"type": "subprocess",
}
+ if not iterator:
+ assert crumb["message"].startswith(sys.executable + " ")
+
assert transaction_event["type"] == "transaction"
- subprocess_span, = transaction_event["spans"]
+ subprocess_init_span, subprocess_wait_span, subprocess_communicate_span =
transaction_event[
+ "spans"
+ ]
+
+ assert subprocess_init_span["op"] == "subprocess"
+ assert subprocess_communicate_span["op"] == "subprocess.communicate"
+ assert subprocess_wait_span["op"] == "subprocess.wait"
+
+ # span hierarchy
+ assert (
+ subprocess_wait_span["parent_span_id"] ==
subprocess_communicate_span["span_id"]
+ )
+ assert (
+ subprocess_communicate_span["parent_span_id"]
+ == subprocess_init_span["parent_span_id"]
+ == transaction_event["contexts"]["trace"]["span_id"]
+ )
+
+ # common data
+ assert (
+ subprocess_init_span["tags"]["subprocess.pid"]
+ == subprocess_wait_span["tags"]["subprocess.pid"]
+ == subprocess_communicate_span["tags"]["subprocess.pid"]
+ )
- assert subprocess_span["data"] == data
+ # data of init span
+ assert subprocess_init_span["data"] == data
if iterator:
- assert "iterator" in subprocess_span["description"]
- assert subprocess_span["description"].startswith("<")
+ assert "iterator" in subprocess_init_span["description"]
+ assert subprocess_init_span["description"].startswith("<")
else:
- assert sys.executable + " -c" in subprocess_span["description"]
+ assert sys.executable + " -c" in subprocess_init_span["description"]
def test_subprocess_invalid_args(sentry_init):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sentry-python-0.11.1/tests/integrations/wsgi/test_wsgi.py
new/sentry-python-0.12.2/tests/integrations/wsgi/test_wsgi.py
--- old/sentry-python-0.11.1/tests/integrations/wsgi/test_wsgi.py
2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/integrations/wsgi/test_wsgi.py
2019-09-21 00:41:31.000000000 +0200
@@ -49,7 +49,7 @@
assert event["request"] == {
"env": {"SERVER_NAME": "localhost", "SERVER_PORT": "80"},
- "headers": {"Content-Length": "0", "Content-Type": "", "Host":
"localhost"},
+ "headers": {"Host": "localhost"},
"method": "GET",
"query_string": "",
"url": "http://localhost/";,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/tests/test_tracing.py
new/sentry-python-0.12.2/tests/test_tracing.py
--- old/sentry-python-0.11.1/tests/test_tracing.py 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/test_tracing.py 2019-09-21
00:41:31.000000000 +0200
@@ -127,3 +127,18 @@
gc.collect()
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 Hub.current.start_span(transaction="hi"):
+ for i in range(10):
+ with Hub.current.start_span(op="foo{}".format(i)):
+ pass
+
+ event, = events
+ span1, span2 = event["spans"]
+ assert span1["op"] == "foo0"
+ assert span2["op"] == "foo1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/tests/test_transport.py
new/sentry-python-0.12.2/tests/test_transport.py
--- old/sentry-python-0.11.1/tests/test_transport.py 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/test_transport.py 2019-09-21
00:41:31.000000000 +0200
@@ -22,8 +22,19 @@
@pytest.mark.parametrize("debug", (True, False))
-def test_transport_works(httpserver, request, capsys, caplog, debug,
make_client):
[email protected]("client_flush_method", ["close", "flush"])
+def test_transport_works(
+ httpserver,
+ request,
+ capsys,
+ caplog,
+ debug,
+ make_client,
+ client_flush_method,
+ maybe_monkeypatched_threading,
+):
httpserver.serve_content("ok", 200)
+
caplog.set_level(logging.DEBUG)
client = make_client(
@@ -34,7 +45,8 @@
add_breadcrumb(level="info", message="i like bread",
timestamp=datetime.now())
capture_message("löl")
- client.close()
+
+ getattr(client, client_flush_method)()
out, err = capsys.readouterr()
assert not err and not out
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/tests/utils/test_contextvars.py
new/sentry-python-0.12.2/tests/utils/test_contextvars.py
--- old/sentry-python-0.11.1/tests/utils/test_contextvars.py 2019-08-19
12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tests/utils/test_contextvars.py 2019-09-21
00:41:31.000000000 +0200
@@ -1,37 +1,18 @@
import random
import time
-import pytest
-import gevent
-
from sentry_sdk.utils import _is_threading_local_monkey_patched
-def try_gevent_patch_all():
- try:
- gevent.monkey.patch_all()
- except Exception as e:
- if "_RLock__owner" in str(e):
- pytest.skip("https://github.com/gevent/gevent/issues/1380";)
- else:
- raise
-
-
-def test_gevent_is_patched():
- try_gevent_patch_all()
- assert _is_threading_local_monkey_patched()
-
-
-def test_gevent_is_not_patched():
- assert not _is_threading_local_monkey_patched()
-
+def test_thread_local_is_patched(maybe_monkeypatched_threading):
+ if maybe_monkeypatched_threading is None:
+ assert not _is_threading_local_monkey_patched()
+ else:
+ assert _is_threading_local_monkey_patched()
[email protected]("with_gevent", [True, False])
-def test_leaks(with_gevent):
- if with_gevent:
- try_gevent_patch_all()
+def test_leaks(maybe_monkeypatched_threading):
import threading
# Need to explicitly call _get_contextvars because the SDK has already
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sentry-python-0.11.1/tox.ini
new/sentry-python-0.12.2/tox.ini
--- old/sentry-python-0.11.1/tox.ini 2019-08-19 12:46:07.000000000 +0200
+++ new/sentry-python-0.12.2/tox.ini 2019-09-21 00:41:31.000000000 +0200
@@ -32,8 +32,8 @@
{pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.1,4.2,4.3}
{pypy,py2.7}-celery-3
- {py2.7,py3.6}-beam-{12,13,master}
- py3.7-beam-{12,13}
+ py2.7-beam-{12,13}
+ py3.7-beam-{12,13, master}
# The aws_lambda tests deploy to the real AWS and have their own matrix of
Python versions.
py3.7-aws_lambda
