From 9a0c1330b287088c39f79ee5f1e1106edc8615b7 Mon Sep 17 00:00:00 2001 From: Neel Shah Date: Mon, 11 Apr 2022 08:57:13 +0200 Subject: [PATCH 001/209] 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 002/209] 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 003/209] 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 004/209] 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 005/209] 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 006/209] 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 007/209] 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 008/209] 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 009/209] 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 010/209] 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 011/209] 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 012/209] 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 013/209] 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 014/209] 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 015/209] 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 @@

- - + + + + + Sentry +

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 016/209] 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 017/209] 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 018/209] 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 019/209] 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 020/209] 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 021/209] 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 022/209] 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 @@
 

-    
-        
-            
-            
-            Sentry
-        
-    
+  
+    Sentry
+  
 

 
 _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 023/209] 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 024/209] 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 025/209] 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 026/209] 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 027/209] 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 028/209] 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 029/209] 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 030/209] 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 031/209] 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 032/209] 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 033/209] 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 034/209] 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 035/209] 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 036/209] 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 037/209] 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 038/209] 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 039/209] 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 040/209] 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 041/209] 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 042/209] 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 043/209] 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 044/209] 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 045/209] 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 046/209] 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 047/209] 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 048/209] 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 049/209] 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 050/209] 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 051/209] 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^_5W6_gG78c*v}4msz>7yE%^Hr
ztz#X~0u@LTR1$_%9+8hMGBlD{Fjyz5oj3zkB1*$$J?OimmHjdY-qIdoBmmw5vl|rq
z!%O5pm^>tkaiwy=7LryQD6|DQK-H3w`@;tko%Fez6~s(9tHElxVCqQ?5=P$Gx832d
z33XYz*k?mAaT~AZJW>!lkpv*4D74X3vVZc@hi1skrmk#%iW22<1{01!&!Q*$3@YQX
zvx!iW{2tix4HVxXliClaGs$sN#T@9&3kcfDCsJkQfUUJlEKdiutpX_J!+f;joQk3=
zVHqO44X4#(M5@<&<*4@^^xP8gWTUro#X*>s6AZeK0(#K}G2p}Wu?;+?gXduce}>U$
z!iEl>ZXV4JUJXa#pk)Qo-dzm@nAYEaE*ARKa1r!$0dPJ6wB)yQeZctoQ{%DIUCrwn
z5Klv2+@?lD$Rvpny-DCZLJu5tGIHG(U}-sw{3)*BAw4{-B1R(aA8`AeXz!I3;(1h7
z%-TwW@?gAIc<-?OmlkNIcN%|>8flJSU#HqiLUZ{_=&r8sFq=hO6vLYIHRpnSn@6-_
z3A127T$aQAEvCWY7odvNQ}TVNox6%~hj353L_Tr--ItQnp23%3;I|g@(>}taGj>7P
zxBZ3_nDN6g{iv{lpmx!rZqR{bYR%UDRcoTUet>wxr{LTOSAB!wjZo9qsWd-
z(p3))wU$iIQ88|6oo_NOy=i(wtcB7FlNrP`grXfvKLT%}ySrGVUkggsCse(p(39G}
z4wVwWin)pC(Fun01VM#7(a5Mfj&aGh_?7DktP4VC+qF?FIYpa{v?bg=LWJ6R$P(!bcT{@k*=2AvM^`bY=e6+~9%W8MN
zxSQt=syUg$?bRdy?mqfu>G(8wsXEKUCqUbIi5nL?qN=dkMWe5lNp5TNqA-aZp?zX7
zt?II;MzB}IfF}#KG-rIx4qCGFrrx?%r)q!89(n>;hNc>r_*|*ryni^sPXvB|Oz~ma
zi`;T680+|=e<>ghevJHPYgXvCPlKsm+*W!zu*#Nld`x+>+{AD2nh}5iYuJwneE-kdfU#&
zTcQ)A#F$=E+y^cr`;#X(-rSx`OcDe~>`o`gBPV0jx1oMW9-Xz{Qh1(awNR{d(^czb
zR{W$c?NO3V^e{Ww2|{gs*~doOXS#yw3sa+c%Q=)w^>dm!d#fJ|)Uu)pbaU57Gf_aE
z8}X8fJtA#GAr<5pJgC5S6PF1NX@Vklu+8DvD`F>n$}H&HXwy9Xp4e<~b#DySYs+25
zkv*5Ql&xGjlA)xgnZENu2x48Wmz|LGH@Ddi(lICpopKk`Cy~ltl*Go-@kc$UbJpFY
z^eyEcWsNjm<4RpE8v}AT(&UhZ2lADJ)D+*d(9R6OED|!y054PhJX&Ai8}Z;_54G3d
zmkX53+N3AH^4{pYt*m_m?CVcJzkb=riC}cHFT{1;tHUS2RWR-C8&M^~?qrA{Eu-L2
z950_wKpAWmA}C!_&Y74Stq%q5#wc6n6Yxt{pB4_$Bg7CAT+;+K{CdC!M?mN|OC|eA
zA^PE3?KWjv3j!<(cw`sC(>4=EC<|`0GN14-Luvv=BG#C+o3N-MK24+jOlrIDX1ojr
zSgRk}0C6C>t}(Nyr+gqjN-vbCbbr4!WqBNn+qe7}L-w+N>69fV=;=3GEmrBNxo?)ZWTFdppb9Q)RpxbfAf99qKsQW)D`L}C*`l`W(fu6F}Xmmi{b%0Q|f!PLNHV+aV;zy!)?i5PNOtEb*Wi$rEcEfF6<_vBq`27|1ZIP4L@TS(-DLLhFo
zC`uP(Gzeb1m+OIuq0^y`sh$+iHh8whVI7(Ounge*wlz-H!ylLOG>ZS?`tMu&mOZQN
z?#Y9{iLfb(?c%H31yh^kt@n3Vkf`yDiC9BmHuhoO0o?7Im%}C=ydhb`4I)g`5LLme
z5uSirXB;#0cUZVP^lvC|-Z`1}AFkB1*MC0&x{!z1Nu-=oIR<3&@?Ec9
z1f7ko!U|dfXwg_lDndG!HxGv!wd*jNcxFkv+_bhNPhpm>ueK}81*MLju#X!BQ4vIR
zq#F#Ei>)uwglxr#I*U47+yY&y=NSCGhfRW7VReC%+)3fn-GaXgTI9f8cScl{S(uvC
z_D8^6h5mi*)~HsXg)H+R7)B@#Jr>Te#R6wL*!Y{62?1X%Ljt+6#bq@Yc4M?K+fPgTk8Q8V{B74&sgmwR^`aD!Q3b
zNl8JVM+{v|F!;Nn2-jPvp5_P@Ic4sohZ1GrP~O5d9zF{wBqDHUFOPi}Z!SI_Pc`C;
z%lgmDq{9jND6*4z9de8Khy2p1{vF#-z>PWAYp3@3Ce<|k0TvZ
zr0eM4(var*!Y?^6Vzz^LblS&p8Z-e(=L!l^^5H^aRO~D4pj___;2N6Q)3Cx|?#U!uw>nS*-
z?OScpgm9R$oSvC0ek{1LC5~DWk
z#p=0ioxXXSP0^WKEc&3ylOd^2?V
zG+41sCdQX?(_~6gxEhKxnoQjVaz8&%usV;7^$jx|a>fbMivIM3p6eUM4Qd`!PAxcmHN?0`ihQ*t
z#i{MCk-s)5G2_n;LJ^Nq$$V8XR!VS0o%jSOMnMEp-e>tgW7&(2nekf4o)n@em1+$o
zZ)=&d;+oyBqmLgje*&bPZ&7V<7J1Kru%Wq}YzQvw>1kTE;3q9+8fi8zug7hDU~&l~qc
zV*GFL4J`5+{v+BUNfJLO8W~M1ixV~)}?yz
zEmpAy<~Qxfz*1oJWsHcEui_Od1M{{T>5dC>hI)CEVYy|6u~!I-9Ly%R6=Yzsm?MUH
zJhNOh-vdXVbyUQYR&n`r_OW9l3^%cu(UFH*++#WUeYwLFDwq7jDri(PSdY7M8&|W<
zx{{v~Vl%{Q;&`0*+xd!@4ybmYcehYf)gr#TNj2al@UjbjdG<{ATFtJn2(L!<6QJBv
z8R(;7JMlr%kj$(SE+CO4P0i7r=EPTttG|LG9=2ujs76Pq6aX*$`pZKblWGG#SfFBN
z5UQ|QtdfWGayN4>MMCyj04o#0bzZUatbAa%yAbpQmQ0`Jy=rTK+77i)wK~&}Wjo_~&GO>vQlUSRt>*15f&Sj`
z6+$%@MyJBw?U1IC52RN)?!LCfxR)yZcxuJ9tjO3JEFK4^0ZC0MiEE)2V^p4cV#r4FXofX^_U2vXa1U~US&8!M?)`S
z9;mYMtQX0$ZS6o+wX{tumA7Vlo=4H8i++@lS;@${C&6XPyWPuH~wpMZPdjZhzhoY~g1bGiN4
zJ2MTpNsAlK4?68r;ICmbt&ZGHdwFDIhH#QHp6RJe>3QuQp2E-;d?R=*cTIlONez4{
z1OZFlvhSePkX0PjA}}*=AIy?ACA1ZVHT;pp0cWkVV{uyJsXaAFA@$332=i4f{qLdQ
zn6-wf=9lgN@U-ETu^TmMVtkkt=-=Gy&E|;@a5+EapgDZ>t~*82^d(|KN+uS#rfbsr
zl%Iq?Zm8Yr$BGz2Fd0;u^kt)3e|M~mhWf6CNvCSlWTzi4YuRGN`WLXOxWPvhk@l5oR0b2DaT4x?IatMH?r$pfZCH$X`O4Arrz9S
z{72~UmN=kx9dN5=U0`WYd-dAGR?MUR>iz!5i5*E6Z-~8elf5hq>{S=Gem5@r72k+j5LQA1wD&8H
zo~~Z=DseX@7i*-;0{ZaasS-RdI?%FiVI4-tce&b174lz9=c$*na
zB&NF~#8KG&(-1{aR0_D&-I1^vBG1=gT~oua$3Z1yKY3W*GL<3X!P+chZAjD
z4$m%yY7)ZA;8a45f9LG7CtT6nWBq$;T+`PlA>p>9T{Vw%;zzT!d)Ox~Cx6ebsG}CH
z%GR8u7-m^K;CA_Y_D;5I(wIf+hhCIqhDI9I)WTxoI(
z@PB3nxlQ+qyNZd;VR_LSdl;qWxR!4~U26Z-8=l_TJjrtI7oML0;4ympeS^8^dPk9q
z94>v>)T=Z1DhFSFSn_Hq{RH6K{%l8~{8y&9*3IP`R$MjvJ51us=+FSajLesSL4MKR
z|A|-tUu-xji?EUr&>J#*Pq14
zlRtV=6uDQcH!En25-&yvqu3b@CG@TCDSWNlBP@C&k8y(`7%-@aq0)vPU97DJXPp67
zpMb5>2)3o%WTGFMqWC0dk<2D2(QEKI;gJzzQ@;UwNv&C&D_sM@o;9bOs_2}
zdFO+cbRgK9g)>;~LZ^^FV$Yf|fH@CN4UkG@p8%LAL#@PF`4x=`Br{?eL_F9)L5#^u
z+Rkx(Q(CWIE%NIPh>P86*-1ek-|IKn5LZQo<4P}ng%!|alr`c!S?>w+
z%&keXRE+M|n0CSJPoyXG81G@ck5VQiBQI<18A!881^1EtAT4NZmM!+4vw_=jRlevK
zjGQt;G(o%J7&ckR(|Hga_Fd8mzP&NJQY~WYsR3uQq+@<&Ee{X6o0f&y9KFgHm58j9
z+t(mD2x>eUu#o47go7fP?{}O`O)s^l^Eb58$Kj*jBkyqc*}?uff>U5(0i+@#x>Y)&lhBbTjJiY4yf
zh|MOZ+>YE^Q-x-c-ezx6FM^a^8kOC{Ouv@+4*#{7QOvpK*N^8TM1Or_Pu9D4ufhPs
zNeQ5iIYLZ?IG1j&+nTO~hT!=5A7dsR-sr1$`y{=>8-+Y|Lsn@36$BKmLaVg%zai
zU>FsVQ3l%So-YtHI-?v8q(nenlt+J70|lLH?b62zBpZjj$mT}d1^*L^TapuHmz^hG
z`!Qvr)d*nFTWCSiqyrTP^`@?s-%1tSju-Y+^_$E
zIQK+9sVA$1Fic@OxHS_bxTGtHs5wnogn8!_NkRupgtElxr0&y#HgknP@ePS;%<&Tt
z$*gxc%&e;wa4?)_mc8G)O#fPx!-dGs{xfq1xO0bw0+Fk7-?kmK`TwlXUfD!75o{4hqip1|M+v%1ndec0s7IAIBH-byt?+r^mtOnB`>rj3
z;}ZBO#|CmbUNwSBlwl_H7!5R&%IQLq-{RVmU7r99zT@W#h}FOZiiu%f56Iujm36>L(1*9fHY!z2v;=IC;I>DHCJKWh>n#uU|R9^@3vqV2$#Fh0|qD`0vvFQu(@
z;=-Sz{$oU&oo(>2d+*x_o;NQ_lspxEBf-Ek?ZwS(zb3$bsI(I=jcUY67B^$!wp_uqK=hQcE^Aj|X9eXT2C0`(y`>IUE^O3q5V>eK(EU;^gT^|N
zV>Q+D#&N*rbsMaV%UJ7#MK6)#wlyjS+=;ErVcONwHtK^@beB)AsWl{h5CNH1H;V-Q})c>=G1>WRW4Fwts?y
z6_^oo{U*9|#{2go)21wE?nWxuw_sw0&zrw-)%)XD<*G%-x!BGoGlRpwz4rg3AAh5o
z@sTJN+6bFYl4-H!ck+#W!>Px$9hQBz5g<-*a(u-M9KUrDH}$ch2mOVd-V~M!&pj`E
zU9zvm?PT)274JK3%xL&IEg1X>K&8|HyW}#-e`@vUPHWHOWcR?Bc6=_L2oe@A`pKyW
zyJkj8E7Fe*iIh%65BMEbqfP5{OCmiN{8T;-C`(zey1A$~kGr7TRnMYGzr~OJh^#u&LUh_4_!yMiXq_}9V=VnM@PVfY=AkRGERA+il$q9V
znqzir^JX!haAI-1fKk}rF>qSmAqRD5yamd&r5)I00~I`4Ps_X~>tU3pmq!o%X-}`g
zmeI|Y3A})~tXCc_Z>#5ItQ}|va5kxAh&e|w@wSmw9;@}ms8b2L>|oiezTt@yueTL~
zXZ%vgq)CceQ5$J9xv4h4FvSFb;;lMsD;_vz8|cJO;5)PEg8exRU#LzjFiA(F0=VmN
zu0}aluJYb%bMAZpB;$~ui_u0VFbt?qmfjAsaHXhH(cKsst`rt+dPQL|!X33Clhr?)
zzN8XoKF7HYCmLItMyi;>?sYtvF70elGpOQZJYXw8WyCT{Dp3zBl?eQ1W5PsoBy>=CkRQ
zl(JNlmyJ;B3q+};eJUUt&f>oxNV)}%tm6yJmyqyFP)&b@-BpOX3zmF8A2_1j<#YOc
zO9qr8weV~mSO|6PO(M}izVv)Ft69jp8id&^zTfl7jgg~ZbCYxUvB4>2f^XURL38q3ucXhJ&1(aAwaku~Xka0eUZcbHJ2QA-#}c
z^dmYlL3XyvPXOImye%j2seEV^W`C@o7@MNK*Gd|?hw&Sld!6{!w==~Yx-i93jgyRe
z+@%m*eThgNmItJp9kpeDA^Ek}r7}AWILmtWJ)YI~G*pQTBjQdx%1|bxvhC{tL?<@N
z{)SLOs|qYd=-_lWXujXGN7Se+2Vn~(u%a<+#Pmf1RK1qCsKdD+>tMr@Qko~qqev0x
zn-YnPceN>cm_028EcwtL4bjf1o3xb6I@m^6QhgL^OnJq-t0#^FO-^Gm8=
zd}Z=T8?b+A+nSJi>vzno(7-g=l5sx3WJOz@C!{>PgfF<3mPb`N$qY#55}e?J4nXKq
z=968Rjl%>G?S*B0TsoFz#OWQ(B}N8QnUl^dSa)ZdSC8a-NOsq!Vu=Y*C~#iR!PEN3
zbhTxK^vPA*Hvo^A(uHa|Xd6t3@lQa2rq_lHx3y#4PHbZ>$%`31ex79jfsKwm3*jbu
zcRU=-yEVhdT)zMC;M!PP9`l4*^KY~*yT2eOo4JC))%FX*hYqbGtQU!!`k2nJPS!tE
zHIe+%f>&jTF8sL&d@O-jCauHt7QK^BqY5>{n0x)d(+ekBGf3et&`nL=#FxQGgI8nt
zDSp=Y{G!#oEZ#~3s{1Ni{>a8(tF>OC(%NWeh2)MJy9=^%@G}1<-X@yM&
zIGe1Zx1SsPz4UYAMb=1-(E#BbBDU-2mg>VNaCApqcCkm!F=(Jz#rlm#eE
zqU2!29FR~@fBoOs^gmo0@NJUbh}GGj$A|eCe>bVf;^OIVVNxo>Aim%Ve=xB0HlBzD
zKaN3v=XXv{ODQWM(-977T-n>K{4)`kQ5R|)OH`E85KK%EIz^X`;aI}$!2Ebc-a)D-
zQWyGEKo>nHQZ08A0OL1)MvIG
zH&kBF{Oxvsz8J0e?paE#ycVW3xZkz>2)AoDmXsH4{XTzyoN-bugmrdbR;@-1rW7Td
znDovjmFo~HuSK7~cVuu3heU>ZJS_rpbS~rRxNcchi{!br(TAa9fam<>A!kPl&vvAr
zvMhZhm73UaDE*-~wL2Ss`1cAsKwHLE$F40!lR)4`3FTIPLDlapL)}=rfJoK}b)A;gOgG@@%7@y7xVT33smBBIsD@`_js%?kvibL-DwiJetSrt@wtAwL(jz4!dn9W`Hu8R-}QKsLF?3mA_?gRrO(#S
zia4PYYy*OR?A>$cw=F~WWlO`(@8?zoShT4-?=A+r!Hwq(?*s^gKInCPww@d@YHy;{
zn{$iSL;}j-1gDFayL~zG*lpLprFgQ<|KelIid~WRj;6qzI5!i_=kMKvK#No8uDT(A
zdg56pje{CT7oVTv))wncE|+T|8{5a28II5RS$aJn2XG}Ah_HMmH&?M{C5>5
zTv^~Prndtiv!H+mBJBLIU=LiZXw*rC)CJ_$A3Mdt-q_d4M2WdZ+vF>A24b(XVl1x^
z5lE;KrD-8|b_35xcgyHbQz^X^9`zffF6sHPA;)&BJE|Ra!xw?*Lm_o>QJ}u$dqI8x
zLmxhIUBFypb_l`Po0LA$kd-dG)r8<}3-a_M_Iw
zpR`q&LSl8HP;JOw<#S}7R0C>X#Ln(!6sZ0*vDL|8{7#6ABK{k5&yT&y6#sX)e~sg_
zT2HVt(4!@9v!@n6bPZ=D@~-x(ar8Z$^-QQ4-#~l=TC{hl#L>HrI7q37mg+-n=Kxj(3&y@X%bLeDt9wTKhZ7k83r?miTJs
zLgMxbGEi|X8nW4%x`WpX^mt|R_u+jE48c1BV86T
z(CZ|Fc9VGXiz)Aw#ple6&AJIjfe=i~!mcAGd8TKb-{(C;XFWjJ9f;kC)zoELT)IpK
z__{6FC0YFGYu#VE5f5M9b)Emgy20++|7z4?y#X38O^R-(mA}<(!u?`>u|5H@TIclt
zf+hFJhl_Hv&IuDp^cybA^{IJy-e1h#ry7Hve;&UDC2SZ?mg<98euXrpTnOdykQfVe
z6Rc$!`=M|9N;X9+thGEhAZ#2KYjWNC9ce2seC4S+5fyIF;*)FnVe-4}gbN}Kza^@(
zKBLDIxBe4y&vZIWNDEu6KU~fAoBhdbmx+pgL`Xiz(!LkOr`eN4x%}JlB#(&;tLxbo
z&LfxjL_iUSVs{fCamTdHgV?4uYu2_)0`}C+yjrEzQ}^%94I$Jx$t<#rs9>j2^D_l~
z9sdtpwkex^<_AxthEG5gq3dw$QC5}Fx93zT$T(VCI*oyXeNCJGU
zOg`PWxf>x?)@ePD)i)A_q_cIZJ9m+C|cVNYFx
zC|@>!9QDh_|8MzUjPn0u1O96Q{=@SE|1nt7LK48m^uUX+0Juecfr{J!WNo>&pATIX
zV#TOZ%A$<21>i>S`GunBBIto1XlN>s_I|9%Celu^==XA`tr4z?xJcx7UDJ||_^?b2
z$eQrUWW)#BA1cUerNQG?>&(JWlOpQZ5CnNVZtMxD-JdpA@0uMmDB0O$Znpwf
zsdTzHQF0UKSt>PDS>L@Men6}oo=61g56N6#G3+R{l(4ldtZ*D3OxMB*2U{AVcVBs+ENuk%yq&iUuj}5A=N&R|BCF9}6ta$0Xl%9~=p?PK{BK
zR53jT9#HgIgj?SLqJ@+nPW)kwI94|sGCVK%7)}5^88C;4EK7_7E-68tOj>>{q%)A^
z;7Opc2dP^ez6j^>Ls^PrEl=0Ub`s12@P*>rZA1q>9o8vh5H2_d1n8rsORn$GLhdq)
zu*L@
z70B-*60)2lr;1M$+e--bV2)!tJUqz{_dYJv3%J(@1`wf5z}EMj3|$hVq6N$u4!{A(
z5FFT=N?=KZl53)6hP+K-jhujz3JkICu>IQ7V15JcB7n2C&LvV(+j!}4FWkYep4ec
z4%z3WLRh+v%3n!234z1@tPrD}Pa6|8u|HY=eO%Dh&z{s@x^l?_$^4ctN4_AB!S#Nf
z5rglF1`lTRlJIa73m!vBevYz2I;o@>&cn8cYYZ;qp}j(D4%hE0QZS&H9o$GW%gU_B
zK@9GWo;`cB18eaU620Qr`Rk$8d#5}Mq+Nay0YVx-t^|JXwLS8PlWypwj3ELfZ09>mUQeDY&8eoxzH5$a0MLJq`DrMOuZ;ffm9|bIhcqZ
z>@GOqDB?&fB?1H)6ao&(-FIoqui}x)DEVN3B$SY8z6mUl?v^is1nCpv11vmUNfeYd
zPmE!ZMgcStw5ESx=k1pXmUUeQ^ngLxdt(q&;C;X}0D7bqSB)YCY^X;ue71)bRPCSo
z>Gyl@V%nOYu>Hmh@g2fXAIAyD7I%K
zG1#&PwaH2B+UdvTV6Dm5aZB}IN(c-B;_Dvde;J|wLkT$~1QgWw&tC)g{wIO$E9+kn
zn2sH}7g@#fmNc#1(f+XQqCg4*J~(6h&r+3gke6PuuJ2eR=jfMVv4K-(-D8ukFAy%cs9xKt5J=b7rjUNfC&;>Fbag?|4rWXeC(dPVR%
za7&*a%Lz-8;sl7ba;f16oWJO3t~4Z2Lh+EdtH|wPk)z>~*(tM}rd7BfQ(AxDq{t&P
zs|mf;Ln4KSXobv~VJ>`+n))*|+3+f73PnvOx0|#u9lHsf&vt-=Yy=Bu(bw9J5n;#MWh~%9^1qK8*z3dCFMW~DR
z(4RoO`8ygi#0(v{CQF;2%m3<8m(<iV;X+I(4BS!$U6?te;_|>|Ytx>v8{3
z{Y!;qM2e{Kq5RGRGO>R&($2JGjqypY=N};?K@rHec?*-oKOVU)mM)Man0+7vz2}<|
zOE?&J67cVFy`mASB=sNJ6lQo(DLDT~G7f3H`Po&qzF)(v^!ZcZ1dacCzp|n1lSwC0
z6EMM;t8|rRBO9ce+PUX*F@}!{ZrB~?$rH(3
zpLFDfL45U|vpq}?S`t?=z3#tcz7nu*qGvvgNUD_vSV=OEjE+bwAF9p-p}{kV&d@@a
z0A5rFzhMEgy^cazc1Q*#4Dap~!O!!EyVPxAH@)H{5X|bxjA7k>uBbkc(e%wo4!yg0
z?LZ<*akI>h+TbMa^+qMfFNMh0`pFQr4lC0ixP(ykO){TKLXcbwsp$(|T4RKwYkV7z
zeX!`KFXpRV-j_G!U|OF-ZJ%ahdu%}b4vC%q5}6e%J32C7Ed7rnEBO31v+L&MO+o%X
z+H}s*BsW=jAW&{9FDjB0XcVy0$WDW!l`%JTyj{ujO*6Zv8D5eHbLibqyKZb8iHLU#
zJU#TFv;Sx^5ZchkkFfiRlOoZJg}A+{CW|V7^~kr*xk!JWIf=e&mLpLa_vj=H#`B*4
zqHuzD^~QqQ?*IWQK&~5}+o%B%bvrW>fY{d_3r=tqcw0RL2b0H6!!K!4t5zhNyD1QZ
zPipS^ef(c_u&v`>?utrHzJh61lHLpLxclbVfJaz232Fci&2#Y(t>KUhucEzB5(V$pC$0{8n=plQdOa7GmebO-wMC&>-e|K(P&{{>Co33pU-rz=
zuarm9miFjTp6Sf__(a)^(T!$izC;cu<)0eRRK0@*jUi@Hh)+kJ%l)X++`C;pQeX*Q
zqjeQ|iA1=k_&+-7Wk-)nZ6uK&!bYD>V(pFBkV%qH|9Z;CAby8_n|&hlT5*sh#e?Cf
z-!)^q)1|Ld5I!|5f&i{`D>D=B{(=`p+qz^h9Mwio=tq65%U_4hi<{1BqKEWWI7(wP
zrTqjDCHIjWVuRO*s7k?UDn(S_SvC;VSHnW2d2t9E2jZsEiJA+>(30Kr6fed`&0
z;HuYXAbHFfF1Vg5#d9T1JI~ltj)FYp8ShPFsq~fQ-_6ZnQ4_1bZqCKJmtIf`q?*~6
z_f6abIc_Bj0|K34>8An-nlDeyDcm2*GUd5Ngt^21a-s|+DC(;;v*Au6DItonkD(@&
z0MT?H$-h^xb1GzZK_grBN7vwl^J+1pc%Iq6X*eigfK4*bSp?ef*1PkKB-D0$YI+b6
z^>$kU@izh+8^%f8F3%O}gbKk3`=mK)lEi%aiP;;y^_vr^;3~CD+IDFMeMDz7gEl4p
zj^~b4i+C%eS$u!bDi=bwFnm=H6#5zZcAqJPLiWR>+R-#)iKI_KhrH6Zn3}OBW0NdN
z6&^-PJ>gsBuf%j7bGm$KUa~~pX_#o<{aM<-W(4)yBk4qV#(jvsw!<;kal=u-vD<&=
zCWoE`TP|Q|;m*Z#7LY36`&^cht=h<3@>l$}ZIhU^+g4oTkEo}$)L+2^F1!Kbxfd+>
znNp^a?KVGlWbn=@#%Ahytk9*5B>%{FJir^X$vm-43UcBGt0NRx?&lL>DLdikM^0;W2a=Amb=Dn4LhtjbK^|IQcSo#=sRw%b
zmNufM3+Xw!)`anXk1-c$CCADnsP>+mb2JGZ
zQ*0)FW3*N%Nf|=aX
z%!ZuT3DzeEZY!)D2vkf1$<@|lHd!4c#3g$eJ*!XDY~3J~2~>ucDROf$Oqxzsz>IVS
zM26g%tYqgA8;`{TUPIlbFyn}V%_mc})i*KST#JTcfWYc=ic2s#-6A7FoB_ygn4yOg
zV5nF|Wj{(kzyaA1`H`*!92Q5v(f2N2CIWWmD(Vtu%#5n2gNWTVA0mv({ppY7U`@?7
z_z)S>&)DlwnFy0T+zs=ZQ2_;jgP471;>cjbK?XnvV_&TUrv~OB`DTvTXBHO69@N%r
z3uhcIw)`*ggfN;toE{XeJfWOc%uda
z9#CR>{%hE>BnK0qC7$If3PtW7UVqvz9s}fK2g~nGut}UpnzZ}Zr9kbm
zuWCf`%AxfwoaEWSK8nFM5h*_Z0BUR*Whf%dNsOxWt^x^84_h;cMkLJHx)SL5sZ4TE
zsr%GJgo>pANyHDnic=goeA7`17!@@mSBU~0-jos!L^C#2L>WG>?@EMqW*Hpo=H?L@
z2Fb>KD^!|TB#b)Nsw8Nb5+DHkRpR>!3C$AJRItSHudlTLc|n}^S09UwtYiQ-?vXLC
zii>JzW7x*WwT8&%=tr;LF;XT_m^iTvE%7Sn2Hq4heM8fVTrGP5(q=_SoDYgQdQxMu
zDD8_Vp-E6VgJn_}VT9Lc#ZrD|SjK`UrC7np#`@G&M0g>wL4(Z>z3Vn0d_B``mJDwM
z0}x70$&55Os4;;hc$kQy(H&md$?evwd{AKTb`FJ%%>WQ2;>HtarjDuoBhNCP
z4A2%3kqGdB%umO90AbXnh?isxY6GD_AqYef2NmE=WP=@>Fieoi=uh6r0K+LT_@gf-
z0!N^T#gs+F78(L@TroBSy$V$vMqeUn3p?kDpu0
zK7i+$@6UTLfyLFsQC-Tg%3EMu_qf1lgr`W2dsi|HSu=1($^nOVnwc<%pEex1M71^#9{kf>H10guTZO?IpxQ~1
zm!!3fHfKvXyK6CN(#{k_M)8Zc)ta*}r{0y-E`_M*``sIXGaYBwbybIRDjf$k$Yf)y
zMJG8j*15NF?NAIRbWIb|f3{N*c%>l+g6{D2_(-}Q%iw0PeJ=-h?LUW2XNNjYd
z0wHsyk%CFMQep&jslfq>WuV4$zG(+{nbTMbt`nhUSscEIJoQaL@S1?FB3%M
zO4Guy3B?cuk_MM?P{askeW?;<1oo;@MkfVXa&mvV>Mu4
z0J;hP01KNqOd}qYbS7pHi!I5zGJ`NwBq1Un7C?d|!5n;3N|HqaTtoXdK-UPn$o|nvp-AO%|sWU}FqAF-8W_=f}k(
z1SJ{bh8-AE*FL%#(i#dWioBzx-w3JJW+1~Vjo1=D}+a?n-W)kvr}{j62wzXA^n|ECQdX4>hpBk;>~ebisT+Ytv9jIHG$|F8=@&MA96yM1&>?EY?Ju<}1&+yfIN>j!Q9_
zVhYu>R6-1D3NtbR0AvGgO4-dxOhP^QrL;qFQXXO|7JXD;E1D1H685qf)m&nq$ry|@
zAf=P*)T$!~7IE^jgMyPK$4yj~tQ2B*{!~EZ)ZD1$o#J|21%ZmPFe496ZbBIW97lS$
zOr_e;2uE{p$q|^L(?_+79bdwLG6Tm#>ZC3*wRxA`Op$|~*oCPq3^?&gGC-%ZU{#)(9v42vCMU!7r^O0q)kZSaH(#ks7MDS@ohy
zGQ$U&76BN+jh+6T>+mNK*E1zyoY58znXojM7CTgggWk>&j_ry*rE_7yQgFjSf2$Ib
zb27voTeNo0$AEy^Q_5OPQc_vY9eY_Ya#_zbPLPOZ$fBLhP+UNKrpppx8nVW{DF9Q0Y>ngvm1I
zvtl9_rt%Hep=0E0j0KN>EbF!0s!H7>Q?wuMdL5m}QJUY|9d27bO%Jh?3`d_NZkL
z<7c%}O(gu%LSb1&)eWeN80WnkEK
zOjOJWq(@@$Uhcwz_Bq{YEbbDdX79^1R2}$N;zc1tB#Z699*=M
z5XonWCqqyY2bIk>S)3KwCue^Ysh~O;Zqz~NGyq^|owd9$cIL!|kUm48KBa=efH6hb
zGE8@_i4&43G)$%q?xWEiLp31-V_@vM<5i$M2nWA300VGoq6!fsfQCjPiHFgv;$*s}
zFcG9Zssa%ufS_Y0h2YMs^8i?a!~+o!T+X}Dg$(48uc&+$Xe`Mn!IZ?wN8>0LLX3=r
zn8gDiMY*lqsun12f^0FKy#>uBtV%wRtVCu|aPwhm9D=2Uum>}k7j9PUlH}6Vox(%r
zmLfV6Rr07zDp;|I7@rgv3YkfnqZvb_{IyIEVToGjFnV9TWQ;pmq=qmRygUP+m(%Y;
zv6S~pbz3BC_o$*scC1JuOQA>ta^Yv#md6Tf&vW9d1bgH<*cxa16mSB_4!QAXL$p`S
z#KtE@P$jc7GiD6gh)&c{2_h48^Kl`DW$aUqn(0J&Hde+gM?$hpu;$3bk%>qX>14^u
z;{^R_&@srWK5+#D0JxY(P28wPpMau5OO93b%>mFfI6r$_q>kd8q=@vX#1Z9J@1=<#
z1AJigOnmcES&mt3jDxDop)gFgC4+8wx`DP{2d92wofsx8g9F|wCS%FFE|2r#UzESE
z!+3eTJm0JKyS!h3`hSamoAEE-`d_d9l=vTJ>GQv*-tzGMZlBB#f%v~5y1X~#FT?vU
R$o+56eGlcU$KL$w|Ji#B2Ydhk

literal 0
HcmV?d00001

diff --git a/tests/integrations/starlette/test_starlette.py b/tests/integrations/starlette/test_starlette.py
new file mode 100644
index 0000000000..16c1dfb67b
--- /dev/null
+++ b/tests/integrations/starlette/test_starlette.py
@@ -0,0 +1,567 @@
+import asyncio
+import base64
+import json
+import os
+
+import pytest
+
+from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
+
+try:
+    from unittest import mock  # python 3.3 and above
+except ImportError:
+    import mock  # python < 3.3
+
+from sentry_sdk import capture_message
+from sentry_sdk.integrations.starlette import (
+    StarletteIntegration,
+    StarletteRequestExtractor,
+)
+from sentry_sdk.utils import AnnotatedValue
+
+starlette = pytest.importorskip("starlette")
+from starlette.authentication import (
+    AuthCredentials,
+    AuthenticationBackend,
+    AuthenticationError,
+    SimpleUser,
+)
+from starlette.middleware import Middleware
+from starlette.middleware.authentication import AuthenticationMiddleware
+from starlette.testclient import TestClient
+
+PICTURE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "photo.jpg")
+
+BODY_JSON = {"some": "json", "for": "testing", "nested": {"numbers": 123}}
+
+BODY_FORM = """--fd721ef49ea403a6\r\nContent-Disposition: form-data; name="username"\r\n\r\nJane\r\n--fd721ef49ea403a6\r\nContent-Disposition: form-data; name="password"\r\n\r\nhello123\r\n--fd721ef49ea403a6\r\nContent-Disposition: form-data; name="photo"; filename="photo.jpg"\r\nContent-Type: image/jpg\r\nContent-Transfer-Encoding: base64\r\n\r\n{{image_data}}\r\n--fd721ef49ea403a6--\r\n""".replace(
+    "{{image_data}}", str(base64.b64encode(open(PICTURE, "rb").read()))
+)
+
+PARSED_FORM = starlette.datastructures.FormData(
+    [
+        ("username", "Jane"),
+        ("password", "hello123"),
+        (
+            "photo",
+            starlette.datastructures.UploadFile(
+                filename="photo.jpg",
+                file=open(PICTURE, "rb"),
+                content_type="image/jpeg",
+            ),
+        ),
+    ]
+)
+PARSED_BODY = {
+    "username": "Jane",
+    "password": "hello123",
+    "photo": AnnotatedValue(
+        "", {"len": 28023, "rem": [["!raw", "x", 0, 28023]]}
+    ),  # size of photo.jpg read above
+}
+
+# Dummy ASGI scope for creating mock Starlette requests
+SCOPE = {
+    "client": ("172.29.0.10", 34784),
+    "headers": [
+        [b"host", b"example.com"],
+        [b"user-agent", b"Mozilla/5.0 Gecko/20100101 Firefox/60.0"],
+        [b"content-type", b"application/json"],
+        [b"accept-language", b"en-US,en;q=0.5"],
+        [b"accept-encoding", b"gzip, deflate, br"],
+        [b"upgrade-insecure-requests", b"1"],
+        [b"cookie", b"yummy_cookie=choco; tasty_cookie=strawberry"],
+    ],
+    "http_version": "0.0",
+    "method": "GET",
+    "path": "/path",
+    "query_string": b"qs=hello",
+    "scheme": "http",
+    "server": ("172.28.0.10", 8000),
+    "type": "http",
+}
+
+
+def starlette_app_factory(middleware=None):
+    async def _homepage(request):
+        1 / 0
+        return starlette.responses.JSONResponse({"status": "ok"})
+
+    async def _custom_error(request):
+        raise Exception("Too Hot")
+
+    async def _message(request):
+        capture_message("hi")
+        return starlette.responses.JSONResponse({"status": "ok"})
+
+    async def _message_with_id(request):
+        capture_message("hi")
+        return starlette.responses.JSONResponse({"status": "ok"})
+
+    app = starlette.applications.Starlette(
+        debug=True,
+        routes=[
+            starlette.routing.Route("/some_url", _homepage),
+            starlette.routing.Route("/custom_error", _custom_error),
+            starlette.routing.Route("/message", _message),
+            starlette.routing.Route("/message/{message_id}", _message_with_id),
+        ],
+        middleware=middleware,
+    )
+
+    return app
+
+
+def async_return(result):
+    f = asyncio.Future()
+    f.set_result(result)
+    return f
+
+
+class BasicAuthBackend(AuthenticationBackend):
+    async def authenticate(self, conn):
+        if "Authorization" not in conn.headers:
+            return
+
+        auth = conn.headers["Authorization"]
+        try:
+            scheme, credentials = auth.split()
+            if scheme.lower() != "basic":
+                return
+            decoded = base64.b64decode(credentials).decode("ascii")
+        except (ValueError, UnicodeDecodeError):
+            raise AuthenticationError("Invalid basic auth credentials")
+
+        username, _, password = decoded.partition(":")
+
+        # TODO: You'd want to verify the username and password here.
+
+        return AuthCredentials(["authenticated"]), SimpleUser(username)
+
+
+class AsyncIterator:
+    def __init__(self, data):
+        self.iter = iter(bytes(data, "utf-8"))
+
+    def __aiter__(self):
+        return self
+
+    async def __anext__(self):
+        try:
+            return bytes([next(self.iter)])
+        except StopIteration:
+            raise StopAsyncIteration
+
+
+@pytest.mark.asyncio
+async def test_starlettrequestextractor_content_length(sentry_init):
+    with mock.patch(
+        "starlette.requests.Request.stream",
+        return_value=AsyncIterator(json.dumps(BODY_JSON)),
+    ):
+        starlette_request = starlette.requests.Request(SCOPE)
+        extractor = StarletteRequestExtractor(starlette_request)
+
+        assert await extractor.content_length() == len(json.dumps(BODY_JSON))
+
+
+@pytest.mark.asyncio
+async def test_starlettrequestextractor_cookies(sentry_init):
+    starlette_request = starlette.requests.Request(SCOPE)
+    extractor = StarletteRequestExtractor(starlette_request)
+
+    assert extractor.cookies() == {
+        "tasty_cookie": "strawberry",
+        "yummy_cookie": "choco",
+    }
+
+
+@pytest.mark.asyncio
+async def test_starlettrequestextractor_json(sentry_init):
+    with mock.patch(
+        "starlette.requests.Request.stream",
+        return_value=AsyncIterator(json.dumps(BODY_JSON)),
+    ):
+        starlette_request = starlette.requests.Request(SCOPE)
+        extractor = StarletteRequestExtractor(starlette_request)
+
+        assert extractor.is_json()
+        assert await extractor.json() == BODY_JSON
+
+
+@pytest.mark.asyncio
+async def test_starlettrequestextractor_parsed_body_json(sentry_init):
+    with mock.patch(
+        "starlette.requests.Request.stream",
+        return_value=AsyncIterator(json.dumps(BODY_JSON)),
+    ):
+        starlette_request = starlette.requests.Request(SCOPE)
+        extractor = StarletteRequestExtractor(starlette_request)
+
+        parsed_body = await extractor.parsed_body()
+        assert parsed_body == BODY_JSON
+
+
+@pytest.mark.asyncio
+async def test_starlettrequestextractor_parsed_body_form(sentry_init):
+    scope = SCOPE.copy()
+    scope["headers"] = [
+        [b"content-type", b"multipart/form-data; boundary=fd721ef49ea403a6"],
+    ]
+    with mock.patch(
+        "starlette.requests.Request.stream",
+        return_value=AsyncIterator(BODY_FORM),
+    ):
+        starlette_request = starlette.requests.Request(scope)
+        extractor = StarletteRequestExtractor(starlette_request)
+
+        parsed_body = await extractor.parsed_body()
+        assert parsed_body.keys() == PARSED_BODY.keys()
+        assert parsed_body["username"] == PARSED_BODY["username"]
+        assert parsed_body["password"] == PARSED_BODY["password"]
+        assert parsed_body["photo"].metadata == PARSED_BODY["photo"].metadata
+
+
+@pytest.mark.asyncio
+async def test_starlettrequestextractor_form(sentry_init):
+    scope = SCOPE.copy()
+    scope["headers"] = [
+        [b"content-type", b"multipart/form-data; boundary=fd721ef49ea403a6"],
+    ]
+    # TODO add test for content-type: "application/x-www-form-urlencoded"
+
+    with mock.patch(
+        "starlette.requests.Request.stream",
+        return_value=AsyncIterator(BODY_FORM),
+    ):
+        starlette_request = starlette.requests.Request(scope)
+        extractor = StarletteRequestExtractor(starlette_request)
+
+        form_data = await extractor.form()
+        assert form_data.keys() == PARSED_FORM.keys()
+        assert form_data["username"] == PARSED_FORM["username"]
+        assert form_data["password"] == PARSED_FORM["password"]
+        assert form_data["photo"].filename == PARSED_FORM["photo"].filename
+
+
+@pytest.mark.asyncio
+async def test_starlettrequestextractor_raw_data(sentry_init):
+    with mock.patch(
+        "starlette.requests.Request.stream",
+        return_value=AsyncIterator(json.dumps(BODY_JSON)),
+    ):
+        starlette_request = starlette.requests.Request(SCOPE)
+        extractor = StarletteRequestExtractor(starlette_request)
+
+        assert await extractor.raw_data() == bytes(json.dumps(BODY_JSON), "utf-8")
+
+
+@pytest.mark.asyncio
+async def test_starlettrequestextractor_extract_request_info_too_big(sentry_init):
+    sentry_init(
+        send_default_pii=True,
+        integrations=[StarletteIntegration()],
+    )
+    scope = SCOPE.copy()
+    scope["headers"] = [
+        [b"content-type", b"multipart/form-data; boundary=fd721ef49ea403a6"],
+        [b"cookie", b"yummy_cookie=choco; tasty_cookie=strawberry"],
+    ]
+    with mock.patch(
+        "starlette.requests.Request.stream",
+        return_value=AsyncIterator(BODY_FORM),
+    ):
+        starlette_request = starlette.requests.Request(scope)
+        extractor = StarletteRequestExtractor(starlette_request)
+
+        request_info = await extractor.extract_request_info()
+
+        assert request_info
+        assert request_info["cookies"] == {
+            "tasty_cookie": "strawberry",
+            "yummy_cookie": "choco",
+        }
+        # Because request is too big only the AnnotatedValue is extracted.
+        assert request_info["data"].metadata == {
+            "rem": [["!config", "x", 0, 28355]],
+            "len": 28355,
+        }
+
+
+@pytest.mark.asyncio
+async def test_starlettrequestextractor_extract_request_info(sentry_init):
+    sentry_init(
+        send_default_pii=True,
+        integrations=[StarletteIntegration()],
+    )
+    scope = SCOPE.copy()
+    scope["headers"] = [
+        [b"content-type", b"application/json"],
+        [b"cookie", b"yummy_cookie=choco; tasty_cookie=strawberry"],
+    ]
+
+    with mock.patch(
+        "starlette.requests.Request.stream",
+        return_value=AsyncIterator(json.dumps(BODY_JSON)),
+    ):
+        starlette_request = starlette.requests.Request(scope)
+        extractor = StarletteRequestExtractor(starlette_request)
+
+        request_info = await extractor.extract_request_info()
+
+        assert request_info
+        assert request_info["cookies"] == {
+            "tasty_cookie": "strawberry",
+            "yummy_cookie": "choco",
+        }
+        assert request_info["data"] == BODY_JSON
+
+
+@pytest.mark.asyncio
+async def test_starlettrequestextractor_extract_request_info_no_pii(sentry_init):
+    sentry_init(
+        send_default_pii=False,
+        integrations=[StarletteIntegration()],
+    )
+    scope = SCOPE.copy()
+    scope["headers"] = [
+        [b"content-type", b"application/json"],
+        [b"cookie", b"yummy_cookie=choco; tasty_cookie=strawberry"],
+    ]
+
+    with mock.patch(
+        "starlette.requests.Request.stream",
+        return_value=AsyncIterator(json.dumps(BODY_JSON)),
+    ):
+        starlette_request = starlette.requests.Request(scope)
+        extractor = StarletteRequestExtractor(starlette_request)
+
+        request_info = await extractor.extract_request_info()
+
+        assert request_info
+        assert "cookies" not in request_info
+        assert request_info["data"] == BODY_JSON
+
+
+@pytest.mark.parametrize(
+    "url,transaction_style,expected_transaction,expected_source",
+    [
+        (
+            "/message",
+            "url",
+            "/message",
+            "route",
+        ),
+        (
+            "/message",
+            "endpoint",
+            "tests.integrations.starlette.test_starlette.starlette_app_factory.._message",
+            "component",
+        ),
+        (
+            "/message/123456",
+            "url",
+            "/message/{message_id}",
+            "route",
+        ),
+        (
+            "/message/123456",
+            "endpoint",
+            "tests.integrations.starlette.test_starlette.starlette_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)],
+    )
+    starlette_app = starlette_app_factory()
+
+    events = capture_events()
+
+    client = TestClient(starlette_app)
+    client.get(url)
+
+    (event,) = events
+    assert event["transaction"] == expected_transaction
+    assert event["transaction_info"] == {"source": expected_source}
+
+
+@pytest.mark.parametrize(
+    "test_url,expected_error,expected_message",
+    [
+        ("/some_url", ZeroDivisionError, "division by zero"),
+        ("/custom_error", Exception, "Too Hot"),
+    ],
+)
+def test_catch_exceptions(
+    sentry_init,
+    capture_exceptions,
+    capture_events,
+    test_url,
+    expected_error,
+    expected_message,
+):
+    sentry_init(integrations=[StarletteIntegration()])
+    starlette_app = starlette_app_factory()
+    exceptions = capture_exceptions()
+    events = capture_events()
+
+    client = TestClient(starlette_app)
+    try:
+        client.get(test_url)
+    except Exception:
+        pass
+
+    (exc,) = exceptions
+    assert isinstance(exc, expected_error)
+    assert str(exc) == expected_message
+
+    (event,) = events
+    assert event["exception"]["values"][0]["mechanism"]["type"] == "starlette"
+
+
+def test_user_information_error(sentry_init, capture_events):
+    sentry_init(
+        send_default_pii=True,
+        integrations=[StarletteIntegration()],
+    )
+    starlette_app = starlette_app_factory(
+        middleware=[Middleware(AuthenticationMiddleware, backend=BasicAuthBackend())]
+    )
+    events = capture_events()
+
+    client = TestClient(starlette_app, raise_server_exceptions=False)
+    try:
+        client.get("/custom_error", auth=("Gabriela", "hello123"))
+    except Exception:
+        pass
+
+    (event,) = events
+    user = event.get("user", None)
+    assert user
+    assert "username" in user
+    assert user["username"] == "Gabriela"
+
+
+def test_user_information_error_no_pii(sentry_init, capture_events):
+    sentry_init(
+        send_default_pii=False,
+        integrations=[StarletteIntegration()],
+    )
+    starlette_app = starlette_app_factory(
+        middleware=[Middleware(AuthenticationMiddleware, backend=BasicAuthBackend())]
+    )
+    events = capture_events()
+
+    client = TestClient(starlette_app, raise_server_exceptions=False)
+    try:
+        client.get("/custom_error", auth=("Gabriela", "hello123"))
+    except Exception:
+        pass
+
+    (event,) = events
+    assert "user" not in event
+
+
+def test_user_information_transaction(sentry_init, capture_events):
+    sentry_init(
+        traces_sample_rate=1.0,
+        send_default_pii=True,
+        integrations=[StarletteIntegration()],
+    )
+    starlette_app = starlette_app_factory(
+        middleware=[Middleware(AuthenticationMiddleware, backend=BasicAuthBackend())]
+    )
+    events = capture_events()
+
+    client = TestClient(starlette_app, raise_server_exceptions=False)
+    client.get("/message", auth=("Gabriela", "hello123"))
+
+    (_, transaction_event) = events
+    user = transaction_event.get("user", None)
+    assert user
+    assert "username" in user
+    assert user["username"] == "Gabriela"
+
+
+def test_user_information_transaction_no_pii(sentry_init, capture_events):
+    sentry_init(
+        traces_sample_rate=1.0,
+        send_default_pii=False,
+        integrations=[StarletteIntegration()],
+    )
+    starlette_app = starlette_app_factory(
+        middleware=[Middleware(AuthenticationMiddleware, backend=BasicAuthBackend())]
+    )
+    events = capture_events()
+
+    client = TestClient(starlette_app, raise_server_exceptions=False)
+    client.get("/message", auth=("Gabriela", "hello123"))
+
+    (_, transaction_event) = events
+    assert "user" not in transaction_event
+
+
+def test_middleware_spans(sentry_init, capture_events):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[StarletteIntegration()],
+    )
+    starlette_app = starlette_app_factory(
+        middleware=[Middleware(AuthenticationMiddleware, backend=BasicAuthBackend())]
+    )
+    events = capture_events()
+
+    client = TestClient(starlette_app, raise_server_exceptions=False)
+    try:
+        client.get("/message", auth=("Gabriela", "hello123"))
+    except Exception:
+        pass
+
+    (_, transaction_event) = events
+
+    expected = [
+        "ServerErrorMiddleware",
+        "AuthenticationMiddleware",
+        "ExceptionMiddleware",
+    ]
+
+    idx = 0
+    for span in transaction_event["spans"]:
+        if span["op"] == "starlette.middleware":
+            assert span["description"] == expected[idx]
+            assert span["tags"]["starlette.middleware_name"] == expected[idx]
+            idx += 1
+
+
+def test_legacy_setup(
+    sentry_init,
+    capture_events,
+):
+    # Check that behaviour does not change
+    # if the user just adds the new Integration
+    # and forgets to remove SentryAsgiMiddleware
+    sentry_init(
+        integrations=[
+            StarletteIntegration(),
+        ],
+    )
+    app = starlette_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/tox.ini b/tox.ini
index 570d13591f..d4e0e456cf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,6 +29,12 @@ envlist =
     {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,py3.10}-asgi
+
+    {py3.7,py3.8,py3.9,py3.10}-starlette-{0.19.1,0.20}
+
+    {py3.7,py3.8,py3.9,py3.10}-fastapi
+
     {py3.7,py3.8,py3.9,py3.10}-quart
 
     {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-bottle-0.12
@@ -73,11 +79,8 @@ envlist =
     {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,3.10}-asgi
-
     {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,py3.10}-pure_eval
 
     {py3.6,py3.7,py3.8}-chalice-{1.16,1.17,1.18,1.19,1.20}
@@ -128,6 +131,20 @@ deps =
     quart: quart-auth
     quart: pytest-asyncio
 
+    asgi: requests
+    asgi: starlette
+
+    starlette: pytest-asyncio
+    starlette: python-multipart
+    starlette: requests
+    starlette-0.19.1: starlette==0.19.1
+    starlette-0.20: starlette>=0.20.0,<0.21.0
+
+    fastapi: fastapi
+    fastapi: pytest-asyncio
+    fastapi: python-multipart
+    fastapi: requests
+
     bottle-0.12: bottle>=0.12,<0.13
 
     falcon-1.4: falcon>=1.4,<1.5
@@ -212,10 +229,6 @@ deps =
     rediscluster-1: redis-py-cluster>=1.0.0,<2.0.0
     rediscluster-2: redis-py-cluster>=2.0.0,<3.0.0
 
-    asgi: starlette
-    asgi: requests
-    asgi: fastapi
-
     sqlalchemy-1.2: sqlalchemy>=1.2,<1.3
     sqlalchemy-1.3: sqlalchemy>=1.3,<1.4
 
@@ -265,6 +278,8 @@ setenv =
     redis: TESTPATH=tests/integrations/redis
     rediscluster: TESTPATH=tests/integrations/rediscluster
     asgi: TESTPATH=tests/integrations/asgi
+    starlette:  TESTPATH=tests/integrations/starlette
+    fastapi:  TESTPATH=tests/integrations/fastapi
     sqlalchemy: TESTPATH=tests/integrations/sqlalchemy
     pure_eval: TESTPATH=tests/integrations/pure_eval
     chalice: TESTPATH=tests/integrations/chalice

From 11f3eb16a607c389b18e4ee3dedb8a184a915ffb Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 21 Jul 2022 14:02:54 +0200
Subject: [PATCH 052/209] Update to FastAPI (#1513)

* Fixed FastAPI naming.
* Made ignoring imports in mypy more explicit.
---
 mypy.ini                             |  4 ----
 sentry_sdk/integrations/fastapi.py   |  8 ++++----
 sentry_sdk/integrations/starlette.py | 20 +++++++++++---------
 setup.py                             |  1 +
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/mypy.ini b/mypy.ini
index 8431faf86f..2a15e45e49 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -63,7 +63,3 @@ 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/sentry_sdk/integrations/fastapi.py b/sentry_sdk/integrations/fastapi.py
index cfeb0161f4..c5fa4e84e2 100644
--- a/sentry_sdk/integrations/fastapi.py
+++ b/sentry_sdk/integrations/fastapi.py
@@ -14,18 +14,18 @@
     from sentry_sdk._types import Event
 
 try:
-    from fastapi.applications import FastAPI
-    from fastapi.requests import Request
+    from fastapi import FastAPI  # type: ignore
+    from fastapi import Request
 except ImportError:
     raise DidNotEnable("FastAPI is not installed")
 
 try:
-    from starlette.types import ASGIApp, Receive, Scope, Send
+    from starlette.types import ASGIApp, Receive, Scope, Send  # type: ignore
 except ImportError:
     raise DidNotEnable("Starlette is not installed")
 
 
-_DEFAULT_TRANSACTION_NAME = "generic FastApi request"
+_DEFAULT_TRANSACTION_NAME = "generic FastAPI request"
 
 
 class FastApiIntegration(StarletteIntegration):
diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index 9ddf21d3d4..5fa8719e75 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -24,20 +24,22 @@
     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
+    from starlette.applications import Starlette  # type: ignore
+    from starlette.datastructures import UploadFile  # type: ignore
+    from starlette.middleware import Middleware  # type: ignore
+    from starlette.middleware.authentication import AuthenticationMiddleware  # type: ignore
+    from starlette.requests import Request  # type: ignore
+    from starlette.routing import Match  # type: ignore
+    from starlette.types import ASGIApp, Receive, Scope, Send  # type: ignore
 except ImportError:
     raise DidNotEnable("Starlette is not installed")
 
 try:
-    from starlette.middle.exceptions import ExceptionMiddleware  # Starlette 0.20
+    # Starlette 0.20
+    from starlette.middleware.exceptions import ExceptionMiddleware  # type: ignore
 except ImportError:
-    from starlette.exceptions import ExceptionMiddleware  # Startlette 0.19.1
+    # Startlette 0.19.1
+    from starlette.exceptions import ExceptionMiddleware  # type: ignore
 
 
 _DEFAULT_TRANSACTION_NAME = "generic Starlette request"
diff --git a/setup.py b/setup.py
index f0c6be9d97..6b40f49fde 100644
--- a/setup.py
+++ b/setup.py
@@ -56,6 +56,7 @@ def get_file_text(file_name):
         "chalice": ["chalice>=1.16.0"],
         "httpx": ["httpx>=0.16.0"],
         "starlette": ["starlette>=0.19.1"],
+        "fastapi": ["fastapi>=0.79.0"],
     },
     classifiers=[
         "Development Status :: 5 - Production/Stable",

From e5fea3b7216f6e6a6b15a095a857dc388ff5c2c6 Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Thu, 21 Jul 2022 12:08:26 +0000
Subject: [PATCH 053/209] release: 1.8.0

---
 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 f90a02b269..e362ec5b31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.8.0
+
+### Various fixes & improvements
+
+- Update to FastAPI (#1513) by @antonpirker
+- feat(starlette): add Starlette integration (#1441) by @sl0thentr0py
+- fix: avoid sending empty Baggage header (#1507) by @intgr
+- fix: properly freeze Baggage object (#1508) by @intgr
+- docs: fix simple typo, collecter -> collector (#1505) by @timgates42
+
 ## 1.7.2
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 5bad71aa34..633b1438f8 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.2"
+release = "1.8.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 1624934b28..8dc4d16d63 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.2"
+VERSION = "1.8.0"
 SDK_INFO = {
     "name": "sentry.python",
     "version": VERSION,
diff --git a/setup.py b/setup.py
index 6b40f49fde..e476f0caf8 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.7.2",
+    version="1.8.0",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From 6aecffd74084146cd428df08886e2b41da599cf8 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 21 Jul 2022 14:09:47 +0200
Subject: [PATCH 054/209] Added usage

Some code snippets on how to use the new integrations.
---
 CHANGELOG.md | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e362ec5b31..f0da51b620 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,45 @@
 
 ### Various fixes & improvements
 
-- Update to FastAPI (#1513) by @antonpirker
 - feat(starlette): add Starlette integration (#1441) by @sl0thentr0py
+    
+    **Important:** Remove manual usage of `SentryAsgiMiddleware`! This is now done by the Starlette integration.
+    
+    Usage:
+    
+    ```python
+    from starlette.applications import Starlette
+    
+    from sentry_sdk.integrations.starlette import StarletteIntegration
+    
+    sentry_sdk.init(
+        dsn="...", 
+        integrations=[StarletteIntegration()],
+    )
+    
+    app = Starlette(debug=True, routes=[...])
+    ```
+- feat(fastapi): add FastAPI integration (#829) by @antonpirker
+    
+    **Important:** Remove manual usage of `SentryAsgiMiddleware`! This is now done by the FastAPI integration.
+    
+    Usage:
+    
+    ```python
+    from fastapi import FastAPI
+    
+    from sentry_sdk.integrations.starlette import StarletteIntegration
+    from sentry_sdk.integrations.fastapi import FastApiIntegration
+
+    sentry_sdk.init(
+        dsn="...", 
+        integrations=[StarletteIntegration(), FastApiIntegration()],
+    )
+    
+    app = FastAPI()
+    ```
+    
+    Yes, you have to add both, the `StarletteIntegration` **AND** the `FastApiIntegration`!
 - fix: avoid sending empty Baggage header (#1507) by @intgr
 - fix: properly freeze Baggage object (#1508) by @intgr
 - docs: fix simple typo, collecter -> collector (#1505) by @timgates42

From 9857bc97ff5f8c34cbc667f7bfde35323f0531a9 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Fri, 22 Jul 2022 20:01:05 +0200
Subject: [PATCH 055/209] Fixed problem with broken response and
 python-multipart (#1516)

* Fixed problem with broken response when only FastApiIntegration() is enabled.
* Fixed problem when python-multipart is not installed
---
 sentry_sdk/integrations/fastapi.py   |  1 +
 sentry_sdk/integrations/starlette.py | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/sentry_sdk/integrations/fastapi.py b/sentry_sdk/integrations/fastapi.py
index c5fa4e84e2..2ec4800b19 100644
--- a/sentry_sdk/integrations/fastapi.py
+++ b/sentry_sdk/integrations/fastapi.py
@@ -96,6 +96,7 @@ async def __call__(self, scope, receive, send):
         hub = Hub.current
         integration = hub.get_integration(FastApiIntegration)
         if integration is None:
+            await self.app(scope, receive, send)
             return
 
         with hub.configure_scope() as sentry_scope:
diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index 5fa8719e75..e2c5366ae2 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -1,6 +1,5 @@
 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
@@ -41,6 +40,12 @@
     # Startlette 0.19.1
     from starlette.exceptions import ExceptionMiddleware  # type: ignore
 
+try:
+    # Optional dependency of Starlette to parse form data.
+    import multipart  # type: ignore # noqa: F401
+except ImportError:
+    multipart = None
+
 
 _DEFAULT_TRANSACTION_NAME = "generic Starlette request"
 
@@ -339,6 +344,9 @@ async def form(self):
         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
         """
+        if multipart is None:
+            return None
+
         return await self.request.form()
 
     def is_json(self):
@@ -423,6 +431,7 @@ async def __call__(self, scope, receive, send):
         hub = Hub.current
         integration = hub.get_integration(StarletteIntegration)
         if integration is None:
+            await self.app(scope, receive, send)
             return
 
         with hub.configure_scope() as sentry_scope:

From f9ad69c5196c53ab1fd5a0136ab5b95cfc5a39a6 Mon Sep 17 00:00:00 2001
From: Daniel Szoke 
Date: Thu, 28 Jul 2022 03:52:22 -0700
Subject: [PATCH 056/209] feat(profiler): Add experimental profiler under
 experiments.enable_profiling

* Works with single threaded servers for now
* No-ops for multi-threaded servers when `signal.signal` fails on a non-main thread
  see https://docs.python.org/3/library/signal.html#signal.signal
---
 sentry_sdk/client.py                 |   4 +
 sentry_sdk/consts.py                 |   1 +
 sentry_sdk/envelope.py               |   6 +
 sentry_sdk/integrations/wsgi.py      |   3 +-
 sentry_sdk/profiler.py               | 212 +++++++++++++++++++++++++++
 sentry_sdk/tracing.py                |  26 ++++
 tests/integrations/wsgi/test_wsgi.py |  40 +++++
 7 files changed, 291 insertions(+), 1 deletion(-)
 create mode 100644 sentry_sdk/profiler.py

diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 510225aa9a..449cf5624e 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -401,6 +401,10 @@ def capture_event(
             envelope = Envelope(headers=headers)
 
             if is_transaction:
+                if "profile" in event_opt:
+                    event_opt["profile"]["transaction_id"] = event_opt["event_id"]
+                    event_opt["profile"]["version_name"] = event_opt["release"]
+                    envelope.add_profile(event_opt.pop("profile"))
                 envelope.add_transaction(event_opt)
             else:
                 envelope.add_event(event_opt)
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 8dc4d16d63..8ea1eaaad2 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -34,6 +34,7 @@
             "smart_transaction_trimming": Optional[bool],
             "propagate_tracestate": Optional[bool],
             "custom_measurements": Optional[bool],
+            "enable_profiling": Optional[bool],
         },
         total=False,
     )
diff --git a/sentry_sdk/envelope.py b/sentry_sdk/envelope.py
index 928c691cdd..f8d895d0bf 100644
--- a/sentry_sdk/envelope.py
+++ b/sentry_sdk/envelope.py
@@ -62,6 +62,12 @@ def add_transaction(
         # type: (...) -> None
         self.add_item(Item(payload=PayloadRef(json=transaction), type="transaction"))
 
+    def add_profile(
+        self, profile  # type: Any
+    ):
+        # type: (...) -> None
+        self.add_item(Item(payload=PayloadRef(json=profile), type="profile"))
+
     def add_session(
         self, session  # type: Union[Session, Any]
     ):
diff --git a/sentry_sdk/integrations/wsgi.py b/sentry_sdk/integrations/wsgi.py
index 803406fb6d..32bba51cd2 100644
--- a/sentry_sdk/integrations/wsgi.py
+++ b/sentry_sdk/integrations/wsgi.py
@@ -11,6 +11,7 @@
 from sentry_sdk.tracing import Transaction
 from sentry_sdk.sessions import auto_session_tracking
 from sentry_sdk.integrations._wsgi_common import _filter_headers
+from sentry_sdk.profiler import profiling
 
 from sentry_sdk._types import MYPY
 
@@ -127,7 +128,7 @@ def __call__(self, environ, start_response):
 
                     with hub.start_transaction(
                         transaction, custom_sampling_context={"wsgi_environ": environ}
-                    ):
+                    ), profiling(transaction, hub):
                         try:
                             rv = self.app(
                                 environ,
diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
new file mode 100644
index 0000000000..f499a5eac2
--- /dev/null
+++ b/sentry_sdk/profiler.py
@@ -0,0 +1,212 @@
+"""
+This file is originally based on code from https://github.com/nylas/nylas-perftools, which is published under the following license:
+
+The MIT License (MIT)
+
+Copyright (c) 2014 Nylas
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+"""
+
+import atexit
+import signal
+import time
+from contextlib import contextmanager
+
+import sentry_sdk
+from sentry_sdk._compat import PY2
+from sentry_sdk.utils import logger
+
+if PY2:
+    import thread  # noqa
+else:
+    import threading
+
+from sentry_sdk._types import MYPY
+
+if MYPY:
+    import typing
+    from typing import Generator
+    from typing import Optional
+    import sentry_sdk.tracing
+
+
+if PY2:
+
+    def thread_id():
+        # type: () -> int
+        return thread.get_ident()
+
+    def nanosecond_time():
+        # type: () -> int
+        return int(time.clock() * 1e9)
+
+else:
+
+    def thread_id():
+        # type: () -> int
+        return threading.get_ident()
+
+    def nanosecond_time():
+        # type: () -> int
+        return int(time.perf_counter() * 1e9)
+
+
+class FrameData:
+    def __init__(self, frame):
+        # type: (typing.Any) -> None
+        self.function_name = frame.f_code.co_name
+        self.module = frame.f_globals["__name__"]
+
+        # Depending on Python version, frame.f_code.co_filename either stores just the file name or the entire absolute path.
+        self.file_name = frame.f_code.co_filename
+        self.line_number = frame.f_code.co_firstlineno
+
+    @property
+    def _attribute_tuple(self):
+        # type: () -> typing.Tuple[str, str, str, int]
+        """Returns a tuple of the attributes used in comparison"""
+        return (self.function_name, self.module, self.file_name, self.line_number)
+
+    def __eq__(self, other):
+        # type: (typing.Any) -> bool
+        if isinstance(other, FrameData):
+            return self._attribute_tuple == other._attribute_tuple
+        return False
+
+    def __hash__(self):
+        # type: () -> int
+        return hash(self._attribute_tuple)
+
+
+class StackSample:
+    def __init__(self, top_frame, profiler_start_time, frame_indices):
+        # type: (typing.Any, int, typing.Dict[FrameData, int]) -> None
+        self.sample_time = nanosecond_time() - profiler_start_time
+        self.stack = []  # type: typing.List[int]
+        self._add_all_frames(top_frame, frame_indices)
+
+    def _add_all_frames(self, top_frame, frame_indices):
+        # type: (typing.Any, typing.Dict[FrameData, int]) -> None
+        frame = top_frame
+        while frame is not None:
+            frame_data = FrameData(frame)
+            if frame_data not in frame_indices:
+                frame_indices[frame_data] = len(frame_indices)
+            self.stack.append(frame_indices[frame_data])
+            frame = frame.f_back
+        self.stack = list(reversed(self.stack))
+
+
+class Sampler(object):
+    """
+    A simple stack sampler for low-overhead CPU profiling: samples the call
+    stack every `interval` seconds and keeps track of counts by frame. Because
+    this uses signals, it only works on the main thread.
+    """
+
+    def __init__(self, transaction, interval=0.01):
+        # type: (sentry_sdk.tracing.Transaction, float) -> None
+        self.interval = interval
+        self.stack_samples = []  # type: typing.List[StackSample]
+        self._frame_indices = dict()  # type: typing.Dict[FrameData, int]
+        self._transaction = transaction
+        self.duration = 0  # This value will only be correct after the profiler has been started and stopped
+        transaction._profile = self
+
+    def __enter__(self):
+        # type: () -> None
+        self.start()
+
+    def __exit__(self, *_):
+        # type: (*typing.List[typing.Any]) -> None
+        self.stop()
+
+    def start(self):
+        # type: () -> None
+        self._start_time = nanosecond_time()
+        self.stack_samples = []
+        self._frame_indices = dict()
+        try:
+            signal.signal(signal.SIGVTALRM, self._sample)
+        except ValueError:
+            logger.error(
+                "Profiler failed to run because it was started from a non-main thread"
+            )
+            return
+
+        signal.setitimer(signal.ITIMER_VIRTUAL, self.interval)
+        atexit.register(self.stop)
+
+    def _sample(self, _, frame):
+        # type: (typing.Any, typing.Any) -> None
+        self.stack_samples.append(
+            StackSample(frame, self._start_time, self._frame_indices)
+        )
+        signal.setitimer(signal.ITIMER_VIRTUAL, self.interval)
+
+    def to_json(self):
+        # type: () -> typing.Any
+        """
+        Exports this object to a JSON format compatible with Sentry's profiling visualizer.
+        Returns dictionary which can be serialized to JSON.
+        """
+        return {
+            "samples": [
+                {
+                    "frames": sample.stack,
+                    "relative_timestamp_ns": sample.sample_time,
+                    "thread_id": thread_id(),
+                }
+                for sample in self.stack_samples
+            ],
+            "frames": [
+                {
+                    "name": frame.function_name,
+                    "file": frame.file_name,
+                    "line": frame.line_number,
+                }
+                for frame in self.frame_list()
+            ],
+        }
+
+    def frame_list(self):
+        # type: () -> typing.List[FrameData]
+        # Build frame array from the frame indices
+        frames = [None] * len(self._frame_indices)  # type: typing.List[typing.Any]
+        for frame, index in self._frame_indices.items():
+            frames[index] = frame
+        return frames
+
+    def stop(self):
+        # type: () -> None
+        self.duration = nanosecond_time() - self._start_time
+        signal.setitimer(signal.ITIMER_VIRTUAL, 0)
+
+    @property
+    def transaction_name(self):
+        # type: () -> str
+        return self._transaction.name
+
+
+def has_profiling_enabled(hub=None):
+    # type: (Optional[sentry_sdk.Hub]) -> bool
+    if hub is None:
+        hub = sentry_sdk.Hub.current
+
+    options = hub.client and hub.client.options
+    return bool(options and options["_experiments"].get("enable_profiling"))
+
+
+@contextmanager
+def profiling(transaction, hub=None):
+    # type: (sentry_sdk.tracing.Transaction, Optional[sentry_sdk.Hub]) -> Generator[None, None, None]
+    if has_profiling_enabled(hub):
+        with Sampler(transaction):
+            yield
+    else:
+        yield
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 410b8c3ad4..fa95b6ec6f 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -1,11 +1,13 @@
 import uuid
 import random
 import time
+import platform
 
 from datetime import datetime, timedelta
 
 import sentry_sdk
 
+from sentry_sdk.profiler import has_profiling_enabled
 from sentry_sdk.utils import logger
 from sentry_sdk._types import MYPY
 
@@ -19,6 +21,7 @@
     from typing import List
     from typing import Tuple
     from typing import Iterator
+    from sentry_sdk.profiler import Sampler
 
     from sentry_sdk._types import SamplingContext, MeasurementUnit
 
@@ -533,6 +536,7 @@ class Transaction(Span):
         # tracestate data from other vendors, of the form `dogs=yes,cats=maybe`
         "_third_party_tracestate",
         "_measurements",
+        "_profile",
         "_baggage",
     )
 
@@ -566,6 +570,7 @@ def __init__(
         self._sentry_tracestate = sentry_tracestate
         self._third_party_tracestate = third_party_tracestate
         self._measurements = {}  # type: Dict[str, Any]
+        self._profile = None  # type: Optional[Sampler]
         self._baggage = baggage
 
     def __repr__(self):
@@ -658,6 +663,27 @@ def finish(self, hub=None):
             "spans": finished_spans,
         }
 
+        if (
+            has_profiling_enabled(hub)
+            and hub.client is not None
+            and self._profile is not None
+        ):
+            event["profile"] = {
+                "device_os_name": platform.system(),
+                "device_os_version": platform.release(),
+                "duration_ns": self._profile.duration,
+                "environment": hub.client.options["environment"],
+                "platform": "python",
+                "platform_version": platform.python_version(),
+                "profile_id": uuid.uuid4().hex,
+                "profile": self._profile.to_json(),
+                "trace_id": self.trace_id,
+                "transaction_id": None,  # Gets added in client.py
+                "transaction_name": self.name,
+                "version_code": "",  # TODO: Determine appropriate value. Currently set to empty string so profile will not get rejected.
+                "version_name": None,  # Gets added in client.py
+            }
+
         if has_custom_measurements_enabled():
             event["measurements"] = self._measurements
 
diff --git a/tests/integrations/wsgi/test_wsgi.py b/tests/integrations/wsgi/test_wsgi.py
index 66cc1a1de7..a45b6fa154 100644
--- a/tests/integrations/wsgi/test_wsgi.py
+++ b/tests/integrations/wsgi/test_wsgi.py
@@ -279,3 +279,43 @@ def sample_app(environ, start_response):
     assert session_aggregates[0]["exited"] == 2
     assert session_aggregates[0]["crashed"] == 1
     assert len(session_aggregates) == 1
+
+
+def test_profile_sent_when_profiling_enabled(capture_envelopes, sentry_init):
+    def test_app(environ, start_response):
+        start_response("200 OK", [])
+        return ["Go get the ball! Good dog!"]
+
+    sentry_init(traces_sample_rate=1.0, _experiments={"enable_profiling": True})
+    app = SentryWsgiMiddleware(test_app)
+    envelopes = capture_envelopes()
+
+    client = Client(app)
+    client.get("/")
+
+    profile_sent = False
+    for item in envelopes[0].items:
+        if item.headers["type"] == "profile":
+            profile_sent = True
+            break
+    assert profile_sent
+
+
+def test_profile_not_sent_when_profiling_disabled(capture_envelopes, sentry_init):
+    def test_app(environ, start_response):
+        start_response("200 OK", [])
+        return ["Go get the ball! Good dog!"]
+
+    sentry_init(traces_sample_rate=1.0)
+    app = SentryWsgiMiddleware(test_app)
+    envelopes = capture_envelopes()
+
+    client = Client(app)
+    client.get("/")
+
+    profile_sent = False
+    for item in envelopes[0].items:
+        if item.headers["type"] == "profile":
+            profile_sent = True
+            break
+    assert not profile_sent

From 1cf1bbb4eeb8dad70cab72eebba6f78f0eb3fc0b Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Thu, 28 Jul 2022 10:54:58 +0000
Subject: [PATCH 057/209] release: 1.9.0

---
 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 f0da51b620..6ff922b23b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.9.0
+
+### Various fixes & improvements
+
+- feat(profiler): Add experimental profiler under experiments.enable_profiling (#1481) by @szokeasaurusrex
+- Fixed problem with broken response and python-multipart (#1516) by @antonpirker
+
 ## 1.8.0
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 633b1438f8..4856f57486 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.8.0"
+release = "1.9.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 8ea1eaaad2..df42f150fe 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -103,7 +103,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.8.0"
+VERSION = "1.9.0"
 SDK_INFO = {
     "name": "sentry.python",
     "version": VERSION,
diff --git a/setup.py b/setup.py
index e476f0caf8..1876fb1bd2 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.8.0",
+    version="1.9.0",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From 424a8b907b1792339b7fe5c005786b4f3fee1302 Mon Sep 17 00:00:00 2001
From: Neel Shah 
Date: Thu, 28 Jul 2022 17:01:33 +0200
Subject: [PATCH 058/209] fix(django): Send correct "url" transaction source if
 Django resolver fails to resolve (#1525)

---
 sentry_sdk/integrations/django/__init__.py    | 16 ++++++++++------
 .../integrations/django/transactions.py       |  4 ++--
 tests/integrations/django/test_basic.py       | 19 ++++++++++++++-----
 .../integrations/django/test_transactions.py  |  2 +-
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index 6bd1dd2c0b..8403ad36e0 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 SOURCE_FOR_STYLE
+from sentry_sdk.tracing import SOURCE_FOR_STYLE, TRANSACTION_SOURCE_URL
 from sentry_sdk.tracing_utils import record_sql_queries
 from sentry_sdk.utils import (
     HAS_REAL_CONTEXTVARS,
@@ -323,12 +323,10 @@ def _patch_django_asgi_handler():
 def _set_transaction_name_and_source(scope, transaction_style, request):
     # type: (Scope, str, WSGIRequest) -> None
     try:
-        transaction_name = ""
+        transaction_name = None
         if transaction_style == "function_name":
             fn = resolve(request.path).func
-            transaction_name = (
-                transaction_from_function(getattr(fn, "view_class", fn)) or ""
-            )
+            transaction_name = transaction_from_function(getattr(fn, "view_class", fn))
 
         elif transaction_style == "url":
             if hasattr(request, "urlconf"):
@@ -338,9 +336,15 @@ def _set_transaction_name_and_source(scope, transaction_style, request):
             else:
                 transaction_name = LEGACY_RESOLVER.resolve(request.path_info)
 
+        if transaction_name is None:
+            transaction_name = request.path_info
+            source = TRANSACTION_SOURCE_URL
+        else:
+            source = SOURCE_FOR_STYLE[transaction_style]
+
         scope.set_transaction_name(
             transaction_name,
-            source=SOURCE_FOR_STYLE[transaction_style],
+            source=source,
         )
     except Exception:
         pass
diff --git a/sentry_sdk/integrations/django/transactions.py b/sentry_sdk/integrations/django/transactions.py
index b0f88e916a..8b6fc95f99 100644
--- a/sentry_sdk/integrations/django/transactions.py
+++ b/sentry_sdk/integrations/django/transactions.py
@@ -127,10 +127,10 @@ def resolve(
         path,  # type: str
         urlconf=None,  # type: Union[None, Tuple[URLPattern, URLPattern, URLResolver], Tuple[URLPattern]]
     ):
-        # type: (...) -> str
+        # type: (...) -> Optional[str]
         resolver = get_resolver(urlconf)
         match = self._resolve(resolver, path)
-        return match or path
+        return match
 
 
 LEGACY_RESOLVER = RavenResolver()
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index 6195811fe0..329fc04f9c 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -469,10 +469,17 @@ def test_django_connect_breadcrumbs(
 
 
 @pytest.mark.parametrize(
-    "transaction_style,expected_transaction,expected_source",
+    "transaction_style,client_url,expected_transaction,expected_source,expected_response",
     [
-        ("function_name", "tests.integrations.django.myapp.views.message", "component"),
-        ("url", "/message", "route"),
+        (
+            "function_name",
+            "/message",
+            "tests.integrations.django.myapp.views.message",
+            "component",
+            b"ok",
+        ),
+        ("url", "/message", "/message", "route", b"ok"),
+        ("url", "/404", "/404", "url", b"404"),
     ],
 )
 def test_transaction_style(
@@ -480,16 +487,18 @@ def test_transaction_style(
     client,
     capture_events,
     transaction_style,
+    client_url,
     expected_transaction,
     expected_source,
+    expected_response,
 ):
     sentry_init(
         integrations=[DjangoIntegration(transaction_style=transaction_style)],
         send_default_pii=True,
     )
     events = capture_events()
-    content, status, headers = client.get(reverse("message"))
-    assert b"".join(content) == b"ok"
+    content, status, headers = client.get(client_url)
+    assert b"".join(content) == expected_response
 
     (event,) = events
     assert event["transaction"] == expected_transaction
diff --git a/tests/integrations/django/test_transactions.py b/tests/integrations/django/test_transactions.py
index a87dc621a9..6f16d88cec 100644
--- a/tests/integrations/django/test_transactions.py
+++ b/tests/integrations/django/test_transactions.py
@@ -30,7 +30,7 @@
 def test_legacy_resolver_no_match():
     resolver = RavenResolver()
     result = resolver.resolve("/foo/bar", example_url_conf)
-    assert result == "/foo/bar"
+    assert result is None
 
 
 def test_legacy_resolver_complex_match():

From c910d06433bc3329c71d59601516fc2005191d46 Mon Sep 17 00:00:00 2001
From: Neel Shah 
Date: Fri, 29 Jul 2022 15:19:05 +0200
Subject: [PATCH 059/209] chore: Remove ancient examples from tracing prototype
 (#1528)

---
 examples/basic.py                     |  35 --
 examples/tracing/README.md            |  14 -
 examples/tracing/events               |  10 -
 examples/tracing/events.svg           | 439 ----------------------
 examples/tracing/static/tracing.js    | 519 --------------------------
 examples/tracing/templates/index.html |  47 ---
 examples/tracing/traceviewer.py       |  61 ---
 examples/tracing/tracing.py           |  72 ----
 tox.ini                               |   4 +-
 9 files changed, 2 insertions(+), 1199 deletions(-)
 delete mode 100644 examples/basic.py
 delete mode 100644 examples/tracing/README.md
 delete mode 100644 examples/tracing/events
 delete mode 100644 examples/tracing/events.svg
 delete mode 100644 examples/tracing/static/tracing.js
 delete mode 100644 examples/tracing/templates/index.html
 delete mode 100644 examples/tracing/traceviewer.py
 delete mode 100644 examples/tracing/tracing.py

diff --git a/examples/basic.py b/examples/basic.py
deleted file mode 100644
index e6d928bbed..0000000000
--- a/examples/basic.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import sentry_sdk
-from sentry_sdk.integrations.excepthook import ExcepthookIntegration
-from sentry_sdk.integrations.atexit import AtexitIntegration
-from sentry_sdk.integrations.dedupe import DedupeIntegration
-from sentry_sdk.integrations.stdlib import StdlibIntegration
-
-
-sentry_sdk.init(
-    dsn="https://@sentry.io/",
-    default_integrations=False,
-    integrations=[
-        ExcepthookIntegration(),
-        AtexitIntegration(),
-        DedupeIntegration(),
-        StdlibIntegration(),
-    ],
-    environment="Production",
-    release="1.0.0",
-    send_default_pii=False,
-    max_breadcrumbs=5,
-)
-
-with sentry_sdk.push_scope() as scope:
-    scope.user = {"email": "john.doe@example.com"}
-    scope.set_tag("page_locale", "de-at")
-    scope.set_extra("request", {"id": "d5cf8a0fd85c494b9c6453c4fba8ab17"})
-    scope.level = "warning"
-    sentry_sdk.capture_message("Something went wrong!")
-
-sentry_sdk.add_breadcrumb(category="auth", message="Authenticated user", level="info")
-
-try:
-    1 / 0
-except Exception as e:
-    sentry_sdk.capture_exception(e)
diff --git a/examples/tracing/README.md b/examples/tracing/README.md
deleted file mode 100644
index ae7b79724a..0000000000
--- a/examples/tracing/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-To run this app:
-
-1. Have a Redis on the Redis default port (if you have Sentry running locally,
-   you probably already have this)
-2. `pip install sentry-sdk flask rq`
-3. `FLASK_APP=tracing flask run`
-4. `FLASK_APP=tracing flask worker`
-5. Go to `http://localhost:5000/` and enter a base64-encoded string (one is prefilled)
-6. Hit submit, wait for heavy computation to end
-7. `cat events | python traceviewer.py | dot -T svg > events.svg`
-8. `open events.svg`
-
-The last two steps are for viewing the traces. Nothing gets sent to Sentry
-right now because Sentry does not deal with this data yet.
diff --git a/examples/tracing/events b/examples/tracing/events
deleted file mode 100644
index 4e486f79a4..0000000000
--- a/examples/tracing/events
+++ /dev/null
@@ -1,10 +0,0 @@
-{"start_timestamp": "2019-06-14T14:01:38Z", "transaction": "index", "server_name": "apfeltasche.local", "extra": {"sys.argv": ["/Users/untitaker/projects/sentry-python/.venv/bin/flask", "run", "--reload"]}, "contexts": {"trace": {"trace_id": "a0fa8803753e40fd8124b21eeb2986b5", "span_id": "968cff94913ebb07"}}, "timestamp": "2019-06-14T14:01:38Z", "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/", "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": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "Upgrade-Insecure-Requests": "1", "Connection": "keep-alive", "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": "f9f4b21dd9da4c389426c1ffd2b62410", "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:38Z", "transaction": "static", "server_name": "apfeltasche.local", "extra": {"sys.argv": ["/Users/untitaker/projects/sentry-python/.venv/bin/flask", "run", "--reload"]}, "contexts": {"trace": {"trace_id": "8eb30d5ae5f3403ba3a036e696111ec3", "span_id": "97e894108ff7a8cd"}}, "timestamp": "2019-06-14T14:01:38Z", "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/static/tracing.js", "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": "*/*", "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:67.0) Gecko/20100101 Firefox/67.0", "Connection": "keep-alive", "Referer": "http://127.0.0.1:5000/", "Pragma": "no-cache", "Cache-Control": "no-cache"}}, "event_id": "1c71c7cb32934550bb49f05b6c2d4052", "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:38Z", "transaction": "index", "server_name": "apfeltasche.local", "extra": {"sys.argv": ["/Users/untitaker/projects/sentry-python/.venv/bin/flask", "run", "--reload"]}, "contexts": {"trace": {"trace_id": "b7627895a90b41718be82d3ad21ab2f4", "span_id": "9fa95b4ffdcbe177"}}, "timestamp": "2019-06-14T14:01:38Z", "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/", "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": "*/*", "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:67.0) Gecko/20100101 Firefox/67.0", "Connection": "keep-alive", "Pragma": "no-cache", "Cache-Control": "no-cache"}}, "event_id": "1430ad5b0a0d45dca3f02c10271628f9", "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:38Z", "transaction": "static", "server_name": "apfeltasche.local", "extra": {"sys.argv": ["/Users/untitaker/projects/sentry-python/.venv/bin/flask", "run", "--reload"]}, "contexts": {"trace": {"trace_id": "1636fdb33db84e7c9a4e606c1b176971", "span_id": "b682a29ead55075f"}}, "timestamp": "2019-06-14T14:01:38Z", "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/static/tracing.js.map", "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": "*/*", "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:67.0) Gecko/20100101 Firefox/67.0", "Connection": "keep-alive"}}, "event_id": "72b1224307294e0fb6d6b1958076c4cc", "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": "compute", "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": "946edde6ee421874"}}, "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/compute/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": "c72fd945c1174140a00bdbf6f6ed8fc5", "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": "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", "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/examples/tracing/events.svg b/examples/tracing/events.svg
deleted file mode 100644
index 33f9c98f00..0000000000
--- a/examples/tracing/events.svg
+++ /dev/null
@@ -1,439 +0,0 @@
-
-
-
-
-
-
-mytrace
-
-
-
-213977312221895837199412816265326724789
-
-trace:index (a0fa8803753e40fd8124b21eeb2986b5)
-
-
-
-10848326615985732359
-
-span:index (968cff94913ebb07)
-
-
-
-213977312221895837199412816265326724789->10848326615985732359
-
-
-
-
-
-10695730148961032308
-
-span:compute (946edde6ee421874)
-
-
-
-213977312221895837199412816265326724789->10695730148961032308
-
-
-
-
-
-13788869053623754394
-
-span:wait (bf5be759039ede9a)
-
-
-
-213977312221895837199412816265326724789->13788869053623754394
-
-
-
-
-
-12886313978623292199
-
-span:wait (b2d56249f7fdf327)
-
-
-
-213977312221895837199412816265326724789->12886313978623292199
-
-
-
-
-
-12421771694198418854
-
-span:wait (ac62ff8ae1b2eda6)
-
-
-
-213977312221895837199412816265326724789->12421771694198418854
-
-
-
-
-
-10129474377767673784
-
-span:http://httpbin.org/base64/aGVsbG8gd29ybGQK GET (8c931f4740435fb8)
-
-
-
-213977312221895837199412816265326724789->10129474377767673784
-
-
-
-
-
-11252927259328145570
-
-span:tracing.decode_base64 (9c2a6db8c79068a2)
-
-
-
-213977312221895837199412816265326724789->11252927259328145570
-
-
-
-
-
-11354074206287318022
-
-span:wait (9d91c6558b2e4c06)
-
-
-
-213977312221895837199412816265326724789->11354074206287318022
-
-
-
-
-
-189680067412161401408211119957991300803
-
-trace:static (8eb30d5ae5f3403ba3a036e696111ec3)
-
-
-
-10946161693179750605
-
-span:static (97e894108ff7a8cd)
-
-
-
-189680067412161401408211119957991300803->10946161693179750605
-
-
-
-
-
-243760014067241244567037757667822711540
-
-trace:index (b7627895a90b41718be82d3ad21ab2f4)
-
-
-
-11504827122213183863
-
-span:index (9fa95b4ffdcbe177)
-
-
-
-243760014067241244567037757667822711540->11504827122213183863
-
-
-
-
-
-29528545588201242414770090507008174449
-
-trace:static (1636fdb33db84e7c9a4e606c1b176971)
-
-
-
-13151252664271832927
-
-span:static (b682a29ead55075f)
-
-
-
-29528545588201242414770090507008174449->13151252664271832927
-
-
-
-
-
-10695730148961032308->10848326615985732359
-
-
-
-
-
-10695730148961032308->10946161693179750605
-
-
-
-
-
-10695730148961032308->11504827122213183863
-
-
-
-
-
-10695730148961032308->13151252664271832927
-
-
-
-
-
-10695730148961032308->11252927259328145570
-
-
-
-
-
-13610234804785734989
-
-13610234804785734989
-
-
-
-13610234804785734989->10695730148961032308
-
-
-
-
-
-13610234804785734989->13788869053623754394
-
-
-
-
-
-13610234804785734989->12886313978623292199
-
-
-
-
-
-13610234804785734989->12421771694198418854
-
-
-
-
-
-13610234804785734989->11354074206287318022
-
-
-
-
-
-13788869053623754394->10848326615985732359
-
-
-
-
-
-13788869053623754394->10946161693179750605
-
-
-
-
-
-13788869053623754394->11504827122213183863
-
-
-
-
-
-13788869053623754394->13151252664271832927
-
-
-
-
-
-12886313978623292199->10848326615985732359
-
-
-
-
-
-12886313978623292199->10946161693179750605
-
-
-
-
-
-12886313978623292199->11504827122213183863
-
-
-
-
-
-12886313978623292199->13151252664271832927
-
-
-
-
-
-12421771694198418854->10848326615985732359
-
-
-
-
-
-12421771694198418854->10946161693179750605
-
-
-
-
-
-12421771694198418854->11504827122213183863
-
-
-
-
-
-12421771694198418854->13151252664271832927
-
-
-
-
-
-12421771694198418854->10695730148961032308
-
-
-
-
-
-12421771694198418854->13788869053623754394
-
-
-
-
-
-12421771694198418854->12886313978623292199
-
-
-
-
-
-10129474377767673784->10848326615985732359
-
-
-
-
-
-10129474377767673784->10946161693179750605
-
-
-
-
-
-10129474377767673784->11504827122213183863
-
-
-
-
-
-10129474377767673784->13151252664271832927
-
-
-
-
-
-10129474377767673784->10695730148961032308
-
-
-
-
-
-10129474377767673784->13788869053623754394
-
-
-
-
-
-10129474377767673784->12886313978623292199
-
-
-
-
-
-11252927259328145570->10848326615985732359
-
-
-
-
-
-11252927259328145570->10946161693179750605
-
-
-
-
-
-11252927259328145570->11504827122213183863
-
-
-
-
-
-11252927259328145570->13151252664271832927
-
-
-
-
-
-11252927259328145570->10129474377767673784
-
-
-
-
-
-11354074206287318022->10848326615985732359
-
-
-
-
-
-11354074206287318022->10946161693179750605
-
-
-
-
-
-11354074206287318022->11504827122213183863
-
-
-
-
-
-11354074206287318022->13151252664271832927
-
-
-
-
-
-11354074206287318022->10695730148961032308
-
-
-
-
-
-11354074206287318022->13788869053623754394
-
-
-
-
-
-11354074206287318022->12886313978623292199
-
-
-
-
-
diff --git a/examples/tracing/static/tracing.js b/examples/tracing/static/tracing.js
deleted file mode 100644
index ad4dc9a822..0000000000
--- a/examples/tracing/static/tracing.js
+++ /dev/null
@@ -1,519 +0,0 @@
-(function (__window) {
-var exports = {};
-Object.defineProperty(exports, '__esModule', { value: true });
-
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-/* global Reflect, Promise */
-
-var extendStatics = function(d, b) {
-    extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-};
-
-function __extends(d, b) {
-    extendStatics(d, b);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-}
-
-var __assign = function() {
-    __assign = Object.assign || function __assign(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-
-function __read(o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-}
-
-function __spread() {
-    for (var ar = [], i = 0; i < arguments.length; i++)
-        ar = ar.concat(__read(arguments[i]));
-    return ar;
-}
-
-/** An error emitted by Sentry SDKs and related utilities. */
-var SentryError = /** @class */ (function (_super) {
-    __extends(SentryError, _super);
-    function SentryError(message) {
-        var _newTarget = this.constructor;
-        var _this = _super.call(this, message) || this;
-        _this.message = message;
-        // tslint:disable:no-unsafe-any
-        _this.name = _newTarget.prototype.constructor.name;
-        Object.setPrototypeOf(_this, _newTarget.prototype);
-        return _this;
-    }
-    return SentryError;
-}(Error));
-
-/**
- * Checks whether given value's type is one of a few Error or Error-like
- * {@link isError}.
- *
- * @param wat A value to be checked.
- * @returns A boolean representing the result.
- */
-/**
- * Checks whether given value's type is an regexp
- * {@link isRegExp}.
- *
- * @param wat A value to be checked.
- * @returns A boolean representing the result.
- */
-function isRegExp(wat) {
-    return Object.prototype.toString.call(wat) === '[object RegExp]';
-}
-
-/**
- * Requires a module which is protected _against bundler minification.
- *
- * @param request The module path to resolve
- */
-/**
- * Checks whether we're in the Node.js or Browser environment
- *
- * @returns Answer to given question
- */
-function isNodeEnv() {
-    // tslint:disable:strict-type-predicates
-    return Object.prototype.toString.call(typeof process !== 'undefined' ? process : 0) === '[object process]';
-}
-var fallbackGlobalObject = {};
-/**
- * Safely get global scope object
- *
- * @returns Global scope object
- */
-function getGlobalObject() {
-    return (isNodeEnv()
-        ? global
-        : typeof window !== 'undefined'
-            ? window
-            : typeof self !== 'undefined'
-                ? self
-                : fallbackGlobalObject);
-}
-/** JSDoc */
-function consoleSandbox(callback) {
-    var global = getGlobalObject();
-    var levels = ['debug', 'info', 'warn', 'error', 'log', 'assert'];
-    if (!('console' in global)) {
-        return callback();
-    }
-    var originalConsole = global.console;
-    var wrappedLevels = {};
-    // Restore all wrapped console methods
-    levels.forEach(function (level) {
-        if (level in global.console && originalConsole[level].__sentry__) {
-            wrappedLevels[level] = originalConsole[level].__sentry_wrapped__;
-            originalConsole[level] = originalConsole[level].__sentry_original__;
-        }
-    });
-    // Perform callback manipulations
-    var result = callback();
-    // Revert restoration to wrapped state
-    Object.keys(wrappedLevels).forEach(function (level) {
-        originalConsole[level] = wrappedLevels[level];
-    });
-    return result;
-}
-
-// TODO: Implement different loggers for different environments
-var global$1 = getGlobalObject();
-/** Prefix for logging strings */
-var PREFIX = 'Sentry Logger ';
-/** JSDoc */
-var Logger = /** @class */ (function () {
-    /** JSDoc */
-    function Logger() {
-        this._enabled = false;
-    }
-    /** JSDoc */
-    Logger.prototype.disable = function () {
-        this._enabled = false;
-    };
-    /** JSDoc */
-    Logger.prototype.enable = function () {
-        this._enabled = true;
-    };
-    /** JSDoc */
-    Logger.prototype.log = function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        if (!this._enabled) {
-            return;
-        }
-        consoleSandbox(function () {
-            global$1.console.log(PREFIX + "[Log]: " + args.join(' ')); // tslint:disable-line:no-console
-        });
-    };
-    /** JSDoc */
-    Logger.prototype.warn = function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        if (!this._enabled) {
-            return;
-        }
-        consoleSandbox(function () {
-            global$1.console.warn(PREFIX + "[Warn]: " + args.join(' ')); // tslint:disable-line:no-console
-        });
-    };
-    /** JSDoc */
-    Logger.prototype.error = function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
-        if (!this._enabled) {
-            return;
-        }
-        consoleSandbox(function () {
-            global$1.console.error(PREFIX + "[Error]: " + args.join(' ')); // tslint:disable-line:no-console
-        });
-    };
-    return Logger;
-}());
-// Ensure we only have a single logger instance, even if multiple versions of @sentry/utils are being used
-global$1.__SENTRY__ = global$1.__SENTRY__ || {};
-var logger = global$1.__SENTRY__.logger || (global$1.__SENTRY__.logger = new Logger());
-
-// tslint:disable:no-unsafe-any
-
-/**
- * Wrap a given object method with a higher-order function
- *
- * @param source An object that contains a method to be wrapped.
- * @param name A name of method to be wrapped.
- * @param replacement A function that should be used to wrap a given method.
- * @returns void
- */
-function fill(source, name, replacement) {
-    if (!(name in source)) {
-        return;
-    }
-    var original = source[name];
-    var wrapped = replacement(original);
-    // Make sure it's a function first, as we need to attach an empty prototype for `defineProperties` to work
-    // otherwise it'll throw "TypeError: Object.defineProperties called on non-object"
-    // tslint:disable-next-line:strict-type-predicates
-    if (typeof wrapped === 'function') {
-        try {
-            wrapped.prototype = wrapped.prototype || {};
-            Object.defineProperties(wrapped, {
-                __sentry__: {
-                    enumerable: false,
-                    value: true,
-                },
-                __sentry_original__: {
-                    enumerable: false,
-                    value: original,
-                },
-                __sentry_wrapped__: {
-                    enumerable: false,
-                    value: wrapped,
-                },
-            });
-        }
-        catch (_Oo) {
-            // This can throw if multiple fill happens on a global object like XMLHttpRequest
-            // Fixes https://github.com/getsentry/sentry-javascript/issues/2043
-        }
-    }
-    source[name] = wrapped;
-}
-
-// Slightly modified (no IE8 support, ES6) and transcribed to TypeScript
-
-/**
- * Checks if the value matches a regex or includes the string
- * @param value The string value to be checked against
- * @param pattern Either a regex or a string that must be contained in value
- */
-function isMatchingPattern(value, pattern) {
-    if (isRegExp(pattern)) {
-        return pattern.test(value);
-    }
-    if (typeof pattern === 'string') {
-        return value.includes(pattern);
-    }
-    return false;
-}
-
-/**
- * Tells whether current environment supports Fetch API
- * {@link supportsFetch}.
- *
- * @returns Answer to the given question.
- */
-function supportsFetch() {
-    if (!('fetch' in getGlobalObject())) {
-        return false;
-    }
-    try {
-        // tslint:disable-next-line:no-unused-expression
-        new Headers();
-        // tslint:disable-next-line:no-unused-expression
-        new Request('');
-        // tslint:disable-next-line:no-unused-expression
-        new Response();
-        return true;
-    }
-    catch (e) {
-        return false;
-    }
-}
-/**
- * Tells whether current environment supports Fetch API natively
- * {@link supportsNativeFetch}.
- *
- * @returns Answer to the given question.
- */
-function supportsNativeFetch() {
-    if (!supportsFetch()) {
-        return false;
-    }
-    var global = getGlobalObject();
-    return global.fetch.toString().indexOf('native') !== -1;
-}
-
-/** SyncPromise internal states */
-var States;
-(function (States) {
-    /** Pending */
-    States["PENDING"] = "PENDING";
-    /** Resolved / OK */
-    States["RESOLVED"] = "RESOLVED";
-    /** Rejected / Error */
-    States["REJECTED"] = "REJECTED";
-})(States || (States = {}));
-
-/**
- * Tracing Integration
- */
-var Tracing = /** @class */ (function () {
-    /**
-     * Constructor for Tracing
-     *
-     * @param _options TracingOptions
-     */
-    function Tracing(_options) {
-        if (_options === void 0) { _options = {}; }
-        this._options = _options;
-        /**
-         * @inheritDoc
-         */
-        this.name = Tracing.id;
-        if (!Array.isArray(_options.tracingOrigins) || _options.tracingOrigins.length === 0) {
-            consoleSandbox(function () {
-                var defaultTracingOrigins = ['localhost', /^\//];
-                // @ts-ignore
-                console.warn('Sentry: You need to define `tracingOrigins` in the options. Set an array of urls or patterns to trace.');
-                // @ts-ignore
-                console.warn("Sentry: We added a reasonable default for you: " + defaultTracingOrigins);
-                _options.tracingOrigins = defaultTracingOrigins;
-            });
-        }
-    }
-    /**
-     * @inheritDoc
-     */
-    Tracing.prototype.setupOnce = function (_, getCurrentHub) {
-        if (this._options.traceXHR !== false) {
-            this._traceXHR(getCurrentHub);
-        }
-        if (this._options.traceFetch !== false) {
-            this._traceFetch(getCurrentHub);
-        }
-        if (this._options.autoStartOnDomReady !== false) {
-            getGlobalObject().addEventListener('DOMContentLoaded', function () {
-                Tracing.startTrace(getCurrentHub(), getGlobalObject().location.href);
-            });
-            getGlobalObject().document.onreadystatechange = function () {
-                if (document.readyState === 'complete') {
-                    Tracing.startTrace(getCurrentHub(), getGlobalObject().location.href);
-                }
-            };
-        }
-    };
-    /**
-     * Starts a new trace
-     * @param hub The hub to start the trace on
-     * @param transaction Optional transaction
-     */
-    Tracing.startTrace = function (hub, transaction) {
-        hub.configureScope(function (scope) {
-            scope.startSpan();
-            scope.setTransaction(transaction);
-        });
-    };
-    /**
-     * JSDoc
-     */
-    Tracing.prototype._traceXHR = function (getCurrentHub) {
-        if (!('XMLHttpRequest' in getGlobalObject())) {
-            return;
-        }
-        var xhrproto = XMLHttpRequest.prototype;
-        fill(xhrproto, 'open', function (originalOpen) {
-            return function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                // @ts-ignore
-                var self = getCurrentHub().getIntegration(Tracing);
-                if (self) {
-                    self._xhrUrl = args[1];
-                }
-                // tslint:disable-next-line: no-unsafe-any
-                return originalOpen.apply(this, args);
-            };
-        });
-        fill(xhrproto, 'send', function (originalSend) {
-            return function () {
-                var _this = this;
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                // @ts-ignore
-                var self = getCurrentHub().getIntegration(Tracing);
-                if (self && self._xhrUrl && self._options.tracingOrigins) {
-                    var url_1 = self._xhrUrl;
-                    var headers_1 = getCurrentHub().traceHeaders();
-                    // tslint:disable-next-line: prefer-for-of
-                    var isWhitelisted = self._options.tracingOrigins.some(function (origin) {
-                        return isMatchingPattern(url_1, origin);
-                    });
-                    if (isWhitelisted && this.setRequestHeader) {
-                        Object.keys(headers_1).forEach(function (key) {
-                            _this.setRequestHeader(key, headers_1[key]);
-                        });
-                    }
-                }
-                // tslint:disable-next-line: no-unsafe-any
-                return originalSend.apply(this, args);
-            };
-        });
-    };
-    /**
-     * JSDoc
-     */
-    Tracing.prototype._traceFetch = function (getCurrentHub) {
-        if (!supportsNativeFetch()) {
-            return;
-        }
-
-        console.log("PATCHING FETCH");
-
-        // tslint:disable: only-arrow-functions
-        fill(getGlobalObject(), 'fetch', function (originalFetch) {
-            return function () {
-                var args = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    args[_i] = arguments[_i];
-                }
-                // @ts-ignore
-                var self = getCurrentHub().getIntegration(Tracing);
-                if (self && self._options.tracingOrigins) {
-                    console.log("blafalseq");
-                    var url_2 = args[0];
-                    var options = args[1] = args[1] || {};
-                    var whiteListed_1 = false;
-                    self._options.tracingOrigins.forEach(function (whiteListUrl) {
-                        if (!whiteListed_1) {
-                            whiteListed_1 = isMatchingPattern(url_2, whiteListUrl);
-                            console.log('a', url_2, whiteListUrl);
-                        }
-                    });
-                    if (whiteListed_1) {
-                        console.log('aaaaaa', options, whiteListed_1);
-                        if (options.headers) {
-
-                            if (Array.isArray(options.headers)) {
-                                options.headers = __spread(options.headers, Object.entries(getCurrentHub().traceHeaders()));
-                            }
-                            else {
-                                options.headers = __assign({}, options.headers, getCurrentHub().traceHeaders());
-                            }
-                        }
-                        else {
-                            options.headers = getCurrentHub().traceHeaders();
-                        }
-
-                        console.log(options.headers);
-                    }
-                }
-
-                args[1] = options;
-                // tslint:disable-next-line: no-unsafe-any
-                return originalFetch.apply(getGlobalObject(), args);
-            };
-        });
-        // tslint:enable: only-arrow-functions
-    };
-    /**
-     * @inheritDoc
-     */
-    Tracing.id = 'Tracing';
-    return Tracing;
-}());
-
-exports.Tracing = Tracing;
-
-
-  __window.Sentry = __window.Sentry || {};
-  __window.Sentry.Integrations = __window.Sentry.Integrations || {};
-  Object.assign(__window.Sentry.Integrations, exports);
-
-
-
-
-
-
-
-
-
-
-
-
-}(window));
-//# sourceMappingURL=tracing.js.map
diff --git a/examples/tracing/templates/index.html b/examples/tracing/templates/index.html
deleted file mode 100644
index 5e930a720c..0000000000
--- a/examples/tracing/templates/index.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{{ sentry_trace }}
-
-
-
-
-
-
-
Decode your base64 string as a service (that calls another service)

-
- A base64 string

-
-
-
Output:

-
diff --git a/examples/tracing/traceviewer.py b/examples/tracing/traceviewer.py
deleted file mode 100644
index 9c1435ff88..0000000000
--- a/examples/tracing/traceviewer.py
+++ /dev/null
@@ -1,61 +0,0 @@
-import json
-import sys
-
-print("digraph mytrace {")
-print("rankdir=LR")
-
-all_spans = []
-
-for line in sys.stdin:
-    event = json.loads(line)
-    if event.get("type") != "transaction":
-        continue
-
-    trace_ctx = event["contexts"]["trace"]
-    trace_span = dict(trace_ctx)  # fake a span entry from transaction event
-    trace_span["description"] = event["transaction"]
-    trace_span["start_timestamp"] = event["start_timestamp"]
-    trace_span["timestamp"] = event["timestamp"]
-
-    if "parent_span_id" not in trace_ctx:
-        print(
-            '{} [label="trace:{} ({})"];'.format(
-                int(trace_ctx["trace_id"], 16),
-                event["transaction"],
-                trace_ctx["trace_id"],
-            )
-        )
-
-    for span in event["spans"] + [trace_span]:
-        print(
-            '{} [label="span:{} ({})"];'.format(
-                int(span["span_id"], 16), span["description"], span["span_id"]
-            )
-        )
-        if "parent_span_id" in span:
-            print(
-                "{} -> {};".format(
-                    int(span["parent_span_id"], 16), int(span["span_id"], 16)
-                )
-            )
-
-        print(
-            "{} -> {} [style=dotted];".format(
-                int(span["trace_id"], 16), int(span["span_id"], 16)
-            )
-        )
-
-        all_spans.append(span)
-
-
-for s1 in all_spans:
-    for s2 in all_spans:
-        if s1["start_timestamp"] > s2["timestamp"]:
-            print(
-                '{} -> {} [color="#efefef"];'.format(
-                    int(s1["span_id"], 16), int(s2["span_id"], 16)
-                )
-            )
-
-
-print("}")
diff --git a/examples/tracing/tracing.py b/examples/tracing/tracing.py
deleted file mode 100644
index b5ed98044d..0000000000
--- a/examples/tracing/tracing.py
+++ /dev/null
@@ -1,72 +0,0 @@
-import json
-import flask
-import os
-import redis
-import rq
-import sentry_sdk
-import time
-import urllib3
-
-from sentry_sdk.integrations.flask import FlaskIntegration
-from sentry_sdk.integrations.rq import RqIntegration
-
-
-app = flask.Flask(__name__)
-redis_conn = redis.Redis()
-http = urllib3.PoolManager()
-queue = rq.Queue(connection=redis_conn)
-
-
-def write_event(event):
-    with open("events", "a") as f:
-        f.write(json.dumps(event))
-        f.write("\n")
-
-
-sentry_sdk.init(
-    integrations=[FlaskIntegration(), RqIntegration()],
-    traces_sample_rate=1.0,
-    debug=True,
-    transport=write_event,
-)
-
-
-def decode_base64(encoded, redis_key):
-    time.sleep(1)
-    r = http.request("GET", "http://httpbin.org/base64/{}".format(encoded))
-    redis_conn.set(redis_key, r.data)
-
-
-@app.route("/")
-def index():
-    return flask.render_template(
-        "index.html",
-        sentry_dsn=os.environ["SENTRY_DSN"],
-        traceparent=dict(sentry_sdk.Hub.current.iter_trace_propagation_headers()),
-    )
-
-
-@app.route("/compute/")
-def compute(input):
-    redis_key = "sentry-python-tracing-example-result:{}".format(input)
-    redis_conn.delete(redis_key)
-    queue.enqueue(decode_base64, encoded=input, redis_key=redis_key)
-
-    return redis_key
-
-
-@app.route("/wait/")
-def wait(redis_key):
-    result = redis_conn.get(redis_key)
-    if result is None:
-        return "NONE"
-    else:
-        redis_conn.delete(redis_key)
-        return "RESULT: {}".format(result)
-
-
-@app.cli.command("worker")
-def run_worker():
-    print("WORKING")
-    worker = rq.Worker([queue], connection=queue.connection)
-    worker.work()
diff --git a/tox.ini b/tox.ini
index d4e0e456cf..3eec4a7a11 100644
--- a/tox.ini
+++ b/tox.ini
@@ -337,6 +337,6 @@ commands =
 
 [testenv:linters]
 commands =
-    flake8 tests examples sentry_sdk
-    black --check tests examples sentry_sdk
+    flake8 tests sentry_sdk
+    black --check tests sentry_sdk
     mypy sentry_sdk

From 056286b82e6f2d8228a622309503a0deef6472bb Mon Sep 17 00:00:00 2001
From: Phil Jones 
Date: Tue, 2 Aug 2022 09:57:22 +0100
Subject: [PATCH 060/209] Update Flask and Quart integrations (#1520)

Flask and Quart are deprecating and removing the ``_xxx_ctx_stack``s
and adopting a more direct usage of ContextVars. The previous code
will therefore break for the latest version of Quart and start to warn
for Flask and then break.

This fix should work with any version of Flask or Quart, and hence is
a more robust version. There is an extra indirection, however I don't
think this is on any hot path.

Co-authored-by: Anton Pirker 
---
 sentry_sdk/integrations/flask.py |  8 +++-----
 sentry_sdk/integrations/quart.py | 18 +++++++++---------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py
index 0aa8d2f120..52cce0b4b4 100644
--- a/sentry_sdk/integrations/flask.py
+++ b/sentry_sdk/integrations/flask.py
@@ -28,7 +28,7 @@
 try:
     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 import request as flask_request
     from flask.signals import (
         before_render_template,
         got_request_exception,
@@ -124,19 +124,17 @@ def _set_transaction_name_and_source(scope, transaction_style, request):
         pass
 
 
-def _request_started(sender, **kwargs):
+def _request_started(app, **kwargs):
     # type: (Flask, **Any) -> None
     hub = Hub.current
     integration = hub.get_integration(FlaskIntegration)
     if integration is None:
         return
 
-    app = _app_ctx_stack.top.app
     with hub.configure_scope() as scope:
-        request = _request_ctx_stack.top.request
-
         # Set the transaction name and source here,
         # but rely on WSGI middleware to actually start the transaction
+        request = flask_request._get_current_object()
         _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/quart.py b/sentry_sdk/integrations/quart.py
index 1ccd982d0e..e1d4228651 100644
--- a/sentry_sdk/integrations/quart.py
+++ b/sentry_sdk/integrations/quart.py
@@ -27,11 +27,12 @@
 
 try:
     from quart import (  # type: ignore
+        has_request_context,
+        has_websocket_context,
         Request,
         Quart,
-        _request_ctx_stack,
-        _websocket_ctx_stack,
-        _app_ctx_stack,
+        request,
+        websocket,
     )
     from quart.signals import (  # type: ignore
         got_background_exception,
@@ -100,19 +101,18 @@ def _set_transaction_name_and_source(scope, transaction_style, request):
         pass
 
 
-def _request_websocket_started(sender, **kwargs):
+def _request_websocket_started(app, **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
+        if has_request_context():
+            request_websocket = request._get_current_object()
+        if has_websocket_context():
+            request_websocket = websocket._get_current_object()
 
         # Set the transaction name here, but rely on ASGI middleware
         # to actually start the transaction

From b7c0dc412a1505fff382732f567952c8a9572b60 Mon Sep 17 00:00:00 2001
From: Mike Fiedler 
Date: Tue, 2 Aug 2022 08:15:02 -0400
Subject: [PATCH 061/209] chore(deps): update urllib3 minimum version with
 environment markers (#1312)

Uses environment markers according to PEP 508.

The current constraint expresses at least urllib3 version 1.10.0,
which has at least 5 CVEs open.

Projects relying on `sentry-sdk` will get an optimistic version of
the latest, so current test suites are already using the latest version
which patches these vulnerabilities.

Refs:

- https://github.com/advisories/GHSA-www2-v7xj-xrc6 (critical)
- https://github.com/advisories/GHSA-mh33-7rrq-662w (high)
- https://github.com/advisories/GHSA-hmv2-79q8-fv6g (high)
- https://github.com/advisories/GHSA-wqvq-5m8c-6g24 (moderate)
- https://github.com/advisories/GHSA-5phf-pp7p-vc2r (moderate)
---
 setup.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 1876fb1bd2..22bbdd177d 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,12 @@ def get_file_text(file_name):
     package_data={"sentry_sdk": ["py.typed"]},
     zip_safe=False,
     license="BSD",
-    install_requires=["urllib3>=1.10.0", "certifi"],
+    install_requires=[
+        'urllib3>=1.25.7; python_version<="3.4"',
+        'urllib3>=1.26.9; python_version>="3.5"',
+        'urllib3>=1.26.11"; python_version >="3.6"',
+        "certifi",
+    ],
     extras_require={
         "flask": ["flask>=0.11", "blinker>=1.1"],
         "quart": ["quart>=0.16.1", "blinker>=1.1"],

From 7815a5e0eb19a6d5f8f7b342fccce2d17f9bdabd Mon Sep 17 00:00:00 2001
From: Arne de Laat 
Date: Thu, 4 Aug 2022 12:19:10 +0200
Subject: [PATCH 062/209] Replace Travis CI badge with GitHub Actions badge
 (#1538)

---
 .github/workflows/ci.yml | 2 --
 README.md                | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8007cdaa7d..772caeb12f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,8 +95,6 @@ jobs:
           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
diff --git a/README.md b/README.md
index 4871fdb2f4..131ae57b25 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ _Bad software is everywhere, and we're tired of it. Sentry is on a mission to he
 
 # Official Sentry SDK for Python
 
-[![Build Status](https://travis-ci.com/getsentry/sentry-python.svg?branch=master)](https://travis-ci.com/getsentry/sentry-python)
+[![Build Status](https://github.com/getsentry/sentry-python/actions/workflows/ci.yml/badge.svg)](https://github.com/getsentry/sentry-python/actions/workflows/ci.yml)
 [![PyPi page link -- version](https://img.shields.io/pypi/v/sentry-sdk.svg)](https://pypi.python.org/pypi/sentry-sdk)
 [![Discord](https://img.shields.io/discord/621778831602221064)](https://discord.gg/cWnMQeA)
 

From 8b1e8ce5f69265016ccc640b86ea1573749e23aa Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 4 Aug 2022 14:41:50 +0200
Subject: [PATCH 063/209] Fast tests (#1504)

* Run Tox in parallel
---
 scripts/runtox.sh                        | 3 ++-
 tests/integrations/celery/test_celery.py | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/runtox.sh b/scripts/runtox.sh
index 01f29c7dd1..cb6292bf8a 100755
--- a/scripts/runtox.sh
+++ b/scripts/runtox.sh
@@ -26,4 +26,5 @@ elif [ -n "$AZURE_PYTHON_VERSION" ]; then
     fi
 fi
 
-exec $TOXPATH -e $($TOXPATH -l | grep "$searchstring" | tr $'\n' ',') -- "${@:2}"
+export TOX_PARALLEL_NO_SPINNER=1
+exec $TOXPATH --parallel auto -e $($TOXPATH -l | grep "$searchstring" | tr $'\n' ',') -- "${@:2}"
diff --git a/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py
index 951f8ecb8c..f72b896f53 100644
--- a/tests/integrations/celery/test_celery.py
+++ b/tests/integrations/celery/test_celery.py
@@ -313,6 +313,8 @@ def dummy_task(self):
         assert e["type"] == "ZeroDivisionError"
 
 
+# TODO: This test is hanging when running test with `tox --parallel auto`. Find out why and fix it!
+@pytest.mark.skip
 @pytest.mark.forked
 def test_redis_backend_trace_propagation(init_celery, capture_events_forksafe, tmpdir):
     celery = init_celery(traces_sample_rate=1.0, backend="redis", debug=True)

From 67144c94f423e055d9242aa9dd7f4b998b555af9 Mon Sep 17 00:00:00 2001
From: Neel Shah 
Date: Thu, 4 Aug 2022 16:40:13 +0200
Subject: [PATCH 064/209] Add deprecation warning for 3.4, 3.5 (#1541)

---
 sentry_sdk/hub.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
index d2b57a2e45..3fd084ba27 100644
--- a/sentry_sdk/hub.py
+++ b/sentry_sdk/hub.py
@@ -96,6 +96,20 @@ def __exit__(self, exc_type, exc_value, tb):
             c.close()
 
 
+def _check_python_deprecations():
+    # type: () -> None
+    version = sys.version_info[:2]
+
+    if version == (3, 4) or version == (3, 5):
+        logger.warning(
+            "sentry-sdk 2.0.0 will drop support for Python %s.",
+            "{}.{}".format(*version),
+        )
+        logger.warning(
+            "Please upgrade to the latest version to continue receiving upgrades and bugfixes."
+        )
+
+
 def _init(*args, **kwargs):
     # type: (*Optional[str], **Any) -> ContextManager[Any]
     """Initializes the SDK and optionally integrations.
@@ -104,6 +118,7 @@ def _init(*args, **kwargs):
     """
     client = Client(*args, **kwargs)  # type: ignore
     Hub.current.bind_client(client)
+    _check_python_deprecations()
     rv = _InitGuard(client)
     return rv
 

From d9e384391ff7870d7f1c3638164a47681fd7f574 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Fri, 5 Aug 2022 14:46:30 +0200
Subject: [PATCH 065/209] Fix FastAPI issues (#1532) ( #1514)

* Fixed patching of middlewares to fix the 'coroutine' error for non existent routes.

* Only capture server errors

* Fixed form POST in FastApiIntegration.

* Fixed form uploads on starlette projects

* Fixed error while handling 404 errors.

* Fix error during handling of form validation error.

* Find the correct handler (for classes with parent classes

* Do not call starlette integration, because it needs to be set in the init()
---
 sentry_sdk/integrations/fastapi.py   | 107 +++++-------
 sentry_sdk/integrations/starlette.py | 246 ++++++++++++++++++---------
 2 files changed, 213 insertions(+), 140 deletions(-)

diff --git a/sentry_sdk/integrations/fastapi.py b/sentry_sdk/integrations/fastapi.py
index 2ec4800b19..1c21196b76 100644
--- a/sentry_sdk/integrations/fastapi.py
+++ b/sentry_sdk/integrations/fastapi.py
@@ -1,9 +1,9 @@
 from sentry_sdk._types import MYPY
-from sentry_sdk.hub import Hub
+from sentry_sdk.hub import Hub, _should_send_default_pii
 from sentry_sdk.integrations import DidNotEnable
 from sentry_sdk.integrations.starlette import (
-    SentryStarletteMiddleware,
     StarletteIntegration,
+    StarletteRequestExtractor,
 )
 from sentry_sdk.tracing import SOURCE_FOR_STYLE, TRANSACTION_SOURCE_ROUTE
 from sentry_sdk.utils import transaction_from_function
@@ -14,16 +14,10 @@
     from sentry_sdk._types import Event
 
 try:
-    from fastapi import FastAPI  # type: ignore
-    from fastapi import Request
+    import fastapi  # type: ignore
 except ImportError:
     raise DidNotEnable("FastAPI is not installed")
 
-try:
-    from starlette.types import ASGIApp, Receive, Scope, Send  # type: ignore
-except ImportError:
-    raise DidNotEnable("Starlette is not installed")
-
 
 _DEFAULT_TRANSACTION_NAME = "generic FastAPI request"
 
@@ -34,27 +28,7 @@ class FastApiIntegration(StarletteIntegration):
     @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
+        patch_get_request_handler()
 
 
 def _set_transaction_name_and_source(event, transaction_style, request):
@@ -82,42 +56,55 @@ def _set_transaction_name_and_source(event, transaction_style, request):
     event["transaction_info"] = {"source": SOURCE_FOR_STYLE[transaction_style]}
 
 
-class SentryFastApiMiddleware:
-    def __init__(self, app, dispatch=None):
-        # type: (ASGIApp, Any) -> None
-        self.app = app
+def patch_get_request_handler():
+    # type: () -> None
+    old_get_request_handler = fastapi.routing.get_request_handler
+
+    def _sentry_get_request_handler(*args, **kwargs):
+        # type: (*Any, **Any) -> Any
+        old_app = old_get_request_handler(*args, **kwargs)
+
+        async def _sentry_app(*args, **kwargs):
+            # type: (*Any, **Any) -> Any
+            hub = Hub.current
+            integration = hub.get_integration(FastApiIntegration)
+            if integration is None:
+                return await old_app(*args, **kwargs)
+
+            with hub.configure_scope() as sentry_scope:
+                request = args[0]
+                extractor = StarletteRequestExtractor(request)
+                info = await extractor.extract_request_info()
 
-    async def __call__(self, scope, receive, send):
-        # type: (Scope, Receive, Send) -> Any
-        if scope["type"] != "http":
-            await self.app(scope, receive, send)
-            return
+                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]
 
-        hub = Hub.current
-        integration = hub.get_integration(FastApiIntegration)
-        if integration is None:
-            await self.app(scope, receive, send)
-            return
+                        # 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
 
-        with hub.configure_scope() as sentry_scope:
-            request = Request(scope, receive=receive, send=send)
+                        _set_transaction_name_and_source(
+                            event, integration.transaction_style, req
+                        )
 
-            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]
+                        return event
 
-                    _set_transaction_name_and_source(
-                        event, integration.transaction_style, req
-                    )
+                    return event_processor
 
-                    return event
+                sentry_scope._name = FastApiIntegration.identifier
+                sentry_scope.add_event_processor(
+                    _make_request_event_processor(request, integration)
+                )
 
-                return event_processor
+            return await old_app(*args, **kwargs)
 
-            sentry_scope._name = FastApiIntegration.identifier
-            sentry_scope.add_event_processor(
-                _make_request_event_processor(request, integration)
-            )
+        return _sentry_app
 
-            await self.app(scope, receive, send)
+    fastapi.routing.get_request_handler = _sentry_get_request_handler
diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index e2c5366ae2..254ae5b387 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -1,5 +1,8 @@
 from __future__ import absolute_import
 
+import asyncio
+import functools
+
 from sentry_sdk._compat import iteritems
 from sentry_sdk._types import MYPY
 from sentry_sdk.hub import Hub, _should_send_default_pii
@@ -23,10 +26,13 @@
     from sentry_sdk._types import Event
 
 try:
+    import starlette  # type: ignore
     from starlette.applications import Starlette  # type: ignore
     from starlette.datastructures import UploadFile  # type: ignore
     from starlette.middleware import Middleware  # type: ignore
-    from starlette.middleware.authentication import AuthenticationMiddleware  # type: ignore
+    from starlette.middleware.authentication import (  # type: ignore
+        AuthenticationMiddleware,
+    )
     from starlette.requests import Request  # type: ignore
     from starlette.routing import Match  # type: ignore
     from starlette.types import ASGIApp, Receive, Scope, Send  # type: ignore
@@ -71,6 +77,7 @@ def setup_once():
         # type: () -> None
         patch_middlewares()
         patch_asgi_app()
+        patch_request_response()
 
 
 def _enable_span_for_middleware(middleware_class):
@@ -133,15 +140,32 @@ def _sentry_middleware_init(self, *args, **kwargs):
         old_middleware_init(self, *args, **kwargs)
 
         # Patch existing exception handlers
-        for key in self._exception_handlers.keys():
-            old_handler = self._exception_handlers.get(key)
+        old_handlers = self._exception_handlers.copy()
+
+        async def _sentry_patched_exception_handler(self, *args, **kwargs):
+            # type: (Any, Any, Any) -> None
+            exp = args[0]
 
-            def _sentry_patched_exception_handler(self, *args, **kwargs):
-                # type: (Any, Any, Any) -> None
-                exp = args[0]
+            is_http_server_error = hasattr(exp, "staus_code") and exp.status_code >= 500
+            if is_http_server_error:
                 _capture_exception(exp, handled=True)
+
+            # Find a matching handler
+            old_handler = None
+            for cls in type(exp).__mro__:
+                if cls in old_handlers:
+                    old_handler = old_handlers[cls]
+                    break
+
+            if old_handler is None:
+                return
+
+            if _is_async_callable(old_handler):
+                return await old_handler(self, *args, **kwargs)
+            else:
                 return old_handler(self, *args, **kwargs)
 
+        for key in self._exception_handlers.keys():
             self._exception_handlers[key] = _sentry_patched_exception_handler
 
     middleware_class.__init__ = _sentry_middleware_init
@@ -225,32 +249,22 @@ def patch_middlewares():
     """
     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)
+    not_yet_patched = "_sentry_middleware_init" not in str(old_middleware_init)
 
-        if cls == ExceptionMiddleware:
-            patch_exception_middleware(cls)
+    if not_yet_patched:
 
-    Middleware.__init__ = _sentry_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)
 
-    old_build_middleware_stack = Starlette.build_middleware_stack
+            if cls == AuthenticationMiddleware:
+                patch_authentication_middleware(cls)
 
-    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
+            if cls == ExceptionMiddleware:
+                patch_exception_middleware(cls)
 
-    Starlette.build_middleware_stack = _sentry_build_middleware_stack
+        Middleware.__init__ = _sentry_middleware_init
 
 
 def patch_asgi_app():
@@ -275,6 +289,119 @@ async def _sentry_patched_asgi_app(self, scope, receive, send):
     Starlette.__call__ = _sentry_patched_asgi_app
 
 
+# This was vendored in from Starlette to support Starlette 0.19.1 because
+# this function was only introduced in 0.20.x
+def _is_async_callable(obj):
+    # type: (Any) -> bool
+    while isinstance(obj, functools.partial):
+        obj = obj.func
+
+    return asyncio.iscoroutinefunction(obj) or (
+        callable(obj) and asyncio.iscoroutinefunction(obj.__call__)
+    )
+
+
+def patch_request_response():
+    # type: () -> None
+    old_request_response = starlette.routing.request_response
+
+    def _sentry_request_response(func):
+        # type: (Callable[[Any], Any]) -> ASGIApp
+        old_func = func
+
+        is_coroutine = _is_async_callable(old_func)
+        if is_coroutine:
+
+            async def _sentry_async_func(*args, **kwargs):
+                # type: (*Any, **Any) -> Any
+                hub = Hub.current
+                integration = hub.get_integration(StarletteIntegration)
+                if integration is None:
+                    return await old_func(*args, **kwargs)
+
+                with hub.configure_scope() as sentry_scope:
+                    request = args[0]
+                    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)
+                )
+
+                return await old_func(*args, **kwargs)
+
+            func = _sentry_async_func
+        else:
+
+            def _sentry_sync_func(*args, **kwargs):
+                # type: (*Any, **Any) -> Any
+                hub = Hub.current
+                integration = hub.get_integration(StarletteIntegration)
+                if integration is None:
+                    return old_func(*args, **kwargs)
+
+                with hub.configure_scope() as sentry_scope:
+                    request = args[0]
+                    extractor = StarletteRequestExtractor(request)
+                    cookies = extractor.extract_cookies_from_request()
+
+                    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 cookies:
+                                request_info["cookies"] = cookies
+
+                            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)
+                )
+
+                return old_func(*args, **kwargs)
+
+            func = _sentry_sync_func
+
+        return old_request_response(func)
+
+    starlette.routing.request_response = _sentry_request_response
+
+
 class StarletteRequestExtractor:
     """
     Extracts useful information from the Starlette request
@@ -287,6 +414,18 @@ def __init__(self, request):
         # type: (StarletteRequestExtractor, Request) -> None
         self.request = request
 
+    def extract_cookies_from_request(self):
+        # type: (StarletteRequestExtractor) -> Optional[Dict[str, Any]]
+        client = Hub.current.client
+        if client is None:
+            return None
+
+        cookies = None  # type: Optional[Dict[str, Any]]
+        if _should_send_default_pii():
+            cookies = self.cookies()
+
+        return cookies
+
     async def extract_request_info(self):
         # type: (StarletteRequestExtractor) -> Optional[Dict[str, Any]]
         client = Hub.current.client
@@ -415,56 +554,3 @@ def _set_transaction_name_and_source(event, transaction_style, request):
 
     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:
-            await self.app(scope, receive, send)
-            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)

From 08b1fffec62af1bf09aa626a40766c9b356efcb2 Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Fri, 5 Aug 2022 12:51:05 +0000
Subject: [PATCH 066/209] release: 1.9.1

---
 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 6ff922b23b..342705561e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## 1.9.1
+
+### Various fixes & improvements
+
+- Fix FastAPI issues (#1532) ( #1514) (#1532) by @antonpirker
+- Add deprecation warning for 3.4, 3.5 (#1541) by @sl0thentr0py
+- Fast tests (#1504) by @antonpirker
+- Replace Travis CI badge with GitHub Actions badge (#1538) by @153957
+- chore(deps): update urllib3 minimum version with environment markers (#1312) by @miketheman
+- Update Flask and Quart integrations (#1520) by @pgjones
+- chore: Remove ancient examples from tracing prototype (#1528) by @sl0thentr0py
+- fix(django): Send correct "url" transaction source if Django resolver fails to resolve (#1525) by @sl0thentr0py
+
 ## 1.9.0
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 4856f57486..7d26e39617 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.9.0"
+release = "1.9.1"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index df42f150fe..42c8a555f5 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -103,7 +103,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.9.0"
+VERSION = "1.9.1"
 SDK_INFO = {
     "name": "sentry.python",
     "version": VERSION,
diff --git a/setup.py b/setup.py
index 22bbdd177d..3dcb9eb658 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.9.0",
+    version="1.9.1",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From cbe4c91f763dcaa7cb7e7838393a3a9197afb54a Mon Sep 17 00:00:00 2001
From: Vladan Paunovic 
Date: Fri, 5 Aug 2022 20:39:13 +0200
Subject: [PATCH 067/209] chore: remove quotes (#1545)

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 3dcb9eb658..8e370c68f2 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ def get_file_text(file_name):
     install_requires=[
         'urllib3>=1.25.7; python_version<="3.4"',
         'urllib3>=1.26.9; python_version>="3.5"',
-        'urllib3>=1.26.11"; python_version >="3.6"',
+        'urllib3>=1.26.11; python_version >="3.6"',
         "certifi",
     ],
     extras_require={

From f15fb96eec86340d26d9899515791f12614cabb4 Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Fri, 5 Aug 2022 18:40:11 +0000
Subject: [PATCH 068/209] release: 1.9.2

---
 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 342705561e..42255efc96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.9.2
+
+### Various fixes & improvements
+
+- chore: remove quotes (#1545) by @vladanpaunovic
+
 ## 1.9.1
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 7d26e39617..5dfd8e4831 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.9.1"
+release = "1.9.2"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 42c8a555f5..a991db7d14 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -103,7 +103,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.9.1"
+VERSION = "1.9.2"
 SDK_INFO = {
     "name": "sentry.python",
     "version": VERSION,
diff --git a/setup.py b/setup.py
index 8e370c68f2..127ef8aafb 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.9.1",
+    version="1.9.2",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From 89c800b43af2fc6c5c3027547f8b0782eec7283d Mon Sep 17 00:00:00 2001
From: Neel Shah 
Date: Mon, 8 Aug 2022 14:23:42 +0200
Subject: [PATCH 069/209] Wrap StarletteRequestExtractor in
 capture_internal_exceptions (#1551)

Fixes https://github.com/getsentry/sentry-python/issues/1550
---
 sentry_sdk/integrations/starlette.py | 40 +++++++++++++++++-----------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index 254ae5b387..18cc4d5121 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -16,6 +16,7 @@
 from sentry_sdk.utils import (
     TRANSACTION_SOURCE_ROUTE,
     AnnotatedValue,
+    capture_internal_exceptions,
     event_from_exception,
     transaction_from_function,
 )
@@ -437,28 +438,35 @@ async def extract_request_info(self):
         content_length = await self.content_length()
         request_info = {}  # type: Dict[str, Any]
 
-        if _should_send_default_pii():
-            request_info["cookies"] = self.cookies()
+        with capture_internal_exceptions():
+            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():
+            if not request_body_within_bounds(client, content_length):
                 data = AnnotatedValue(
                     "",
-                    {"rem": [["!raw", "x", 0, content_length]], "len": content_length},
+                    {
+                        "rem": [["!config", "x", 0, content_length]],
+                        "len": content_length,
+                    },
                 )
             else:
-                data = None
+                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
+            if data is not None:
+                request_info["data"] = data
 
         return request_info
 

From 9fdb437e29a6dd37ce40dc3db91b9973c551ba6d Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Mon, 8 Aug 2022 13:51:06 +0000
Subject: [PATCH 070/209] release: 1.9.3

---
 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 42255efc96..eadfdcebe4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.9.3
+
+### Various fixes & improvements
+
+- Wrap StarletteRequestExtractor in capture_internal_exceptions (#1551) by @sl0thentr0py
+
 ## 1.9.2
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 5dfd8e4831..701fb38b74 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.9.2"
+release = "1.9.3"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index a991db7d14..cc8cb28958 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -103,7 +103,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.9.2"
+VERSION = "1.9.3"
 SDK_INFO = {
     "name": "sentry.python",
     "version": VERSION,
diff --git a/setup.py b/setup.py
index 127ef8aafb..5ed5560b9b 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.9.2",
+    version="1.9.3",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From 96ea71f369f6e94241dc14647c21f1243e52cb6c Mon Sep 17 00:00:00 2001
From: Daniel Szoke 
Date: Mon, 8 Aug 2022 12:47:53 -0700
Subject: [PATCH 071/209] Handle no release when uploading profiles (#1548)

* Handle no release when uploading profiles

* Using get method instead of try block
---
 sentry_sdk/client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 449cf5624e..54e4e0031b 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -403,7 +403,7 @@ def capture_event(
             if is_transaction:
                 if "profile" in event_opt:
                     event_opt["profile"]["transaction_id"] = event_opt["event_id"]
-                    event_opt["profile"]["version_name"] = event_opt["release"]
+                    event_opt["profile"]["version_name"] = event_opt.get("release", "")
                     envelope.add_profile(event_opt.pop("profile"))
                 envelope.add_transaction(event_opt)
             else:

From 7a7f6d90b8e9b62dc85c8f84203427e90de5b45c Mon Sep 17 00:00:00 2001
From: Joris Bayer 
Date: Thu, 11 Aug 2022 13:32:34 +0200
Subject: [PATCH 072/209] feat(redis): Add instrumentation for redis pipeline
 (#1543)

Add automatic instrumentation of redis pipelining for both redis and rediscluster.
https://redis.io/docs/manual/pipelining/
Note: This does not add instrumentation for StrictRedisCluster.
---
 sentry_sdk/integrations/redis.py              | 84 ++++++++++++++++---
 tests/integrations/redis/test_redis.py        | 39 ++++++++-
 .../rediscluster/test_rediscluster.py         | 44 +++++++++-
 3 files changed, 154 insertions(+), 13 deletions(-)

diff --git a/sentry_sdk/integrations/redis.py b/sentry_sdk/integrations/redis.py
index df7cbae7bb..a4434a3f01 100644
--- a/sentry_sdk/integrations/redis.py
+++ b/sentry_sdk/integrations/redis.py
@@ -7,13 +7,64 @@
 from sentry_sdk._types import MYPY
 
 if MYPY:
-    from typing import Any
+    from typing import Any, Sequence
 
 _SINGLE_KEY_COMMANDS = frozenset(
     ["decr", "decrby", "get", "incr", "incrby", "pttl", "set", "setex", "setnx", "ttl"]
 )
 _MULTI_KEY_COMMANDS = frozenset(["del", "touch", "unlink"])
 
+#: Trim argument lists to this many values
+_MAX_NUM_ARGS = 10
+
+
+def patch_redis_pipeline(pipeline_cls, is_cluster, get_command_args_fn):
+    # type: (Any, bool, Any) -> None
+    old_execute = pipeline_cls.execute
+
+    def sentry_patched_execute(self, *args, **kwargs):
+        # type: (Any, *Any, **Any) -> Any
+        hub = Hub.current
+
+        if hub.get_integration(RedisIntegration) is None:
+            return old_execute(self, *args, **kwargs)
+
+        with hub.start_span(op="redis", description="redis.pipeline.execute") as span:
+            with capture_internal_exceptions():
+                span.set_tag("redis.is_cluster", is_cluster)
+                transaction = self.transaction if not is_cluster else False
+                span.set_tag("redis.transaction", transaction)
+
+                commands = []
+                for i, arg in enumerate(self.command_stack):
+                    if i > _MAX_NUM_ARGS:
+                        break
+                    command_args = []
+                    for j, command_arg in enumerate(get_command_args_fn(arg)):
+                        if j > 0:
+                            command_arg = repr(command_arg)
+                        command_args.append(command_arg)
+                    commands.append(" ".join(command_args))
+
+                span.set_data(
+                    "redis.commands",
+                    {"count": len(self.command_stack), "first_ten": commands},
+                )
+
+            return old_execute(self, *args, **kwargs)
+
+    pipeline_cls.execute = sentry_patched_execute
+
+
+def _get_redis_command_args(command):
+    # type: (Any) -> Sequence[Any]
+    return command[0]
+
+
+def _parse_rediscluster_command(command):
+    # type: (Any) -> Sequence[Any]
+    return command.args
+
 
 def _patch_rediscluster():
     # type: () -> None
@@ -22,7 +73,7 @@ def _patch_rediscluster():
     except ImportError:
         return
 
-    patch_redis_client(rediscluster.RedisCluster)
+    patch_redis_client(rediscluster.RedisCluster, is_cluster=True)
 
     # up to v1.3.6, __version__ attribute is a tuple
     # from v2.0.0, __version__ is a string and VERSION a tuple
@@ -31,7 +82,12 @@ def _patch_rediscluster():
     # StrictRedisCluster was introduced in v0.2.0 and removed in v2.0.0
     # https://github.com/Grokzen/redis-py-cluster/blob/master/docs/release-notes.rst
     if (0, 2, 0) < version < (2, 0, 0):
-        patch_redis_client(rediscluster.StrictRedisCluster)
+        pipeline_cls = rediscluster.StrictClusterPipeline
+        patch_redis_client(rediscluster.StrictRedisCluster, is_cluster=True)
+    else:
+        pipeline_cls = rediscluster.ClusterPipeline
+
+    patch_redis_pipeline(pipeline_cls, True, _parse_rediscluster_command)
 
 
 class RedisIntegration(Integration):
@@ -45,16 +101,23 @@ def setup_once():
         except ImportError:
             raise DidNotEnable("Redis client not installed")
 
-        patch_redis_client(redis.StrictRedis)
+        patch_redis_client(redis.StrictRedis, is_cluster=False)
+        patch_redis_pipeline(redis.client.Pipeline, False, _get_redis_command_args)
+        try:
+            strict_pipeline = redis.client.StrictPipeline  # type: ignore
+        except AttributeError:
+            pass
+        else:
+            patch_redis_pipeline(strict_pipeline, False, _get_redis_command_args)
 
         try:
             import rb.clients  # type: ignore
         except ImportError:
             pass
         else:
-            patch_redis_client(rb.clients.FanoutClient)
-            patch_redis_client(rb.clients.MappingClient)
-            patch_redis_client(rb.clients.RoutingClient)
+            patch_redis_client(rb.clients.FanoutClient, is_cluster=False)
+            patch_redis_client(rb.clients.MappingClient, is_cluster=False)
+            patch_redis_client(rb.clients.RoutingClient, is_cluster=False)
 
         try:
             _patch_rediscluster()
@@ -62,8 +125,8 @@ def setup_once():
             logger.exception("Error occurred while patching `rediscluster` library")
 
 
-def patch_redis_client(cls):
-    # type: (Any) -> None
+def patch_redis_client(cls, is_cluster):
+    # type: (Any, bool) -> None
     """
     This function can be used to instrument custom redis client classes or
     subclasses.
@@ -83,7 +146,7 @@ def sentry_patched_execute_command(self, name, *args, **kwargs):
         with capture_internal_exceptions():
             description_parts = [name]
             for i, arg in enumerate(args):
-                if i > 10:
+                if i > _MAX_NUM_ARGS:
                     break
 
                 description_parts.append(repr(arg))
@@ -91,6 +154,7 @@ def sentry_patched_execute_command(self, name, *args, **kwargs):
             description = " ".join(description_parts)
 
         with hub.start_span(op="redis", description=description) as span:
+            span.set_tag("redis.is_cluster", is_cluster)
             if name:
                 span.set_tag("redis.command", name)
 
diff --git a/tests/integrations/redis/test_redis.py b/tests/integrations/redis/test_redis.py
index 3708995068..4b3f2a7bb0 100644
--- a/tests/integrations/redis/test_redis.py
+++ b/tests/integrations/redis/test_redis.py
@@ -1,7 +1,8 @@
-from sentry_sdk import capture_message
+from sentry_sdk import capture_message, start_transaction
 from sentry_sdk.integrations.redis import RedisIntegration
 
 from fakeredis import FakeStrictRedis
+import pytest
 
 
 def test_basic(sentry_init, capture_events):
@@ -19,7 +20,41 @@ def test_basic(sentry_init, capture_events):
     assert crumb == {
         "category": "redis",
         "message": "GET 'foobar'",
-        "data": {"redis.key": "foobar", "redis.command": "GET"},
+        "data": {
+            "redis.key": "foobar",
+            "redis.command": "GET",
+            "redis.is_cluster": False,
+        },
         "timestamp": crumb["timestamp"],
         "type": "redis",
     }
+
+
+@pytest.mark.parametrize("is_transaction", [False, True])
+def test_redis_pipeline(sentry_init, capture_events, is_transaction):
+    sentry_init(integrations=[RedisIntegration()], traces_sample_rate=1.0)
+    events = capture_events()
+
+    connection = FakeStrictRedis()
+    with start_transaction():
+
+        pipeline = connection.pipeline(transaction=is_transaction)
+        pipeline.get("foo")
+        pipeline.set("bar", 1)
+        pipeline.set("baz", 2)
+        pipeline.execute()
+
+    (event,) = events
+    (span,) = event["spans"]
+    assert span["op"] == "redis"
+    assert span["description"] == "redis.pipeline.execute"
+    assert span["data"] == {
+        "redis.commands": {
+            "count": 3,
+            "first_ten": ["GET 'foo'", "SET 'bar' 1", "SET 'baz' 2"],
+        }
+    }
+    assert span["tags"] == {
+        "redis.transaction": is_transaction,
+        "redis.is_cluster": False,
+    }
diff --git a/tests/integrations/rediscluster/test_rediscluster.py b/tests/integrations/rediscluster/test_rediscluster.py
index 425ff13b2f..7442490b2e 100644
--- a/tests/integrations/rediscluster/test_rediscluster.py
+++ b/tests/integrations/rediscluster/test_rediscluster.py
@@ -1,5 +1,6 @@
 import pytest
 from sentry_sdk import capture_message
+from sentry_sdk.api import start_transaction
 from sentry_sdk.integrations.redis import RedisIntegration
 
 import rediscluster
@@ -12,6 +13,15 @@
 
 @pytest.fixture(scope="module", autouse=True)
 def monkeypatch_rediscluster_classes():
+
+    try:
+        pipeline_cls = rediscluster.ClusterPipeline
+    except AttributeError:
+        pipeline_cls = rediscluster.StrictClusterPipeline
+    rediscluster.RedisCluster.pipeline = lambda *_, **__: pipeline_cls(
+        connection_pool=True
+    )
+    pipeline_cls.execute = lambda *_, **__: None
     for cls in rediscluster_classes:
         cls.execute_command = lambda *_, **__: None
 
@@ -31,7 +41,39 @@ def test_rediscluster_basic(rediscluster_cls, sentry_init, capture_events):
     assert crumb == {
         "category": "redis",
         "message": "GET 'foobar'",
-        "data": {"redis.key": "foobar", "redis.command": "GET"},
+        "data": {
+            "redis.key": "foobar",
+            "redis.command": "GET",
+            "redis.is_cluster": True,
+        },
         "timestamp": crumb["timestamp"],
         "type": "redis",
     }
+
+
+def test_rediscluster_pipeline(sentry_init, capture_events):
+    sentry_init(integrations=[RedisIntegration()], traces_sample_rate=1.0)
+    events = capture_events()
+
+    rc = rediscluster.RedisCluster(connection_pool=True)
+    with start_transaction():
+        pipeline = rc.pipeline()
+        pipeline.get("foo")
+        pipeline.set("bar", 1)
+        pipeline.set("baz", 2)
+        pipeline.execute()
+
+    (event,) = events
+    (span,) = event["spans"]
+    assert span["op"] == "redis"
+    assert span["description"] == "redis.pipeline.execute"
+    assert span["data"] == {
+        "redis.commands": {
+            "count": 3,
+            "first_ten": ["GET 'foo'", "SET 'bar' 1", "SET 'baz' 2"],
+        }
+    }
+    assert span["tags"] == {
+        "redis.transaction": False,  # For Cluster, this is always False
+        "redis.is_cluster": True,
+    }

From cf9c2d8e0f6254d2fa60cb13e2b22f4702a47d67 Mon Sep 17 00:00:00 2001
From: Neel Shah 
Date: Thu, 11 Aug 2022 13:58:10 +0200
Subject: [PATCH 073/209] Remove TRANSACTION_SOURCE_UNKNOWN and default to
 CUSTOM (#1558)

Fixes #1557
see https://github.com/getsentry/develop/pull/667

`unknown` is only supposed to be inferred by relay as a default and not
set by any SDKs.
Additionally, fix some of the other cases where start_transaction was
begin called without a source in integrations.
---
 sentry_sdk/integrations/aiohttp.py         |  3 ++-
 sentry_sdk/integrations/rq.py              |  3 ++-
 sentry_sdk/integrations/starlette.py       |  3 +--
 sentry_sdk/integrations/tornado.py         |  7 ++++++-
 sentry_sdk/integrations/wsgi.py            |  7 +++++--
 sentry_sdk/tracing.py                      |  3 +--
 sentry_sdk/utils.py                        | 10 ----------
 tests/integrations/celery/test_celery.py   |  2 +-
 tests/integrations/tornado/test_tornado.py |  2 +-
 tests/tracing/test_integration_tests.py    |  3 +++
 10 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py
index 9f4a823b98..f07790173d 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 SOURCE_FOR_STYLE, Transaction
+from sentry_sdk.tracing import SOURCE_FOR_STYLE, Transaction, TRANSACTION_SOURCE_ROUTE
 from sentry_sdk.utils import (
     capture_internal_exceptions,
     event_from_exception,
@@ -103,6 +103,7 @@ async def sentry_app_handle(self, request, *args, **kwargs):
                     # If this transaction name makes it to the UI, AIOHTTP's
                     # URL resolver did not find a route or died trying.
                     name="generic AIOHTTP request",
+                    source=TRANSACTION_SOURCE_ROUTE,
                 )
                 with hub.start_transaction(
                     transaction, custom_sampling_context={"aiohttp_request": request}
diff --git a/sentry_sdk/integrations/rq.py b/sentry_sdk/integrations/rq.py
index f4c77d7df2..095ab357a7 100644
--- a/sentry_sdk/integrations/rq.py
+++ b/sentry_sdk/integrations/rq.py
@@ -5,7 +5,7 @@
 from sentry_sdk.hub import Hub
 from sentry_sdk.integrations import DidNotEnable, Integration
 from sentry_sdk.integrations.logging import ignore_logger
-from sentry_sdk.tracing import Transaction
+from sentry_sdk.tracing import Transaction, TRANSACTION_SOURCE_TASK
 from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
 
 try:
@@ -63,6 +63,7 @@ def sentry_patched_perform_job(self, job, *args, **kwargs):
                     job.meta.get("_sentry_trace_headers") or {},
                     op="rq.task",
                     name="unknown RQ task",
+                    source=TRANSACTION_SOURCE_TASK,
                 )
 
                 with capture_internal_exceptions():
diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index 18cc4d5121..a58c9e9bd6 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -12,9 +12,8 @@
     request_body_within_bounds,
 )
 from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
-from sentry_sdk.tracing import SOURCE_FOR_STYLE
+from sentry_sdk.tracing import SOURCE_FOR_STYLE, TRANSACTION_SOURCE_ROUTE
 from sentry_sdk.utils import (
-    TRANSACTION_SOURCE_ROUTE,
     AnnotatedValue,
     capture_internal_exceptions,
     event_from_exception,
diff --git a/sentry_sdk/integrations/tornado.py b/sentry_sdk/integrations/tornado.py
index af048fb5e0..b4a639b136 100644
--- a/sentry_sdk/integrations/tornado.py
+++ b/sentry_sdk/integrations/tornado.py
@@ -3,7 +3,11 @@
 from inspect import iscoroutinefunction
 
 from sentry_sdk.hub import Hub, _should_send_default_pii
-from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT, Transaction
+from sentry_sdk.tracing import (
+    TRANSACTION_SOURCE_COMPONENT,
+    TRANSACTION_SOURCE_ROUTE,
+    Transaction,
+)
 from sentry_sdk.utils import (
     HAS_REAL_CONTEXTVARS,
     CONTEXTVARS_ERROR_MESSAGE,
@@ -116,6 +120,7 @@ def _handle_request_impl(self):
             # sentry_urldispatcher_resolve is responsible for
             # setting a transaction name later.
             name="generic Tornado request",
+            source=TRANSACTION_SOURCE_ROUTE,
         )
 
         with hub.start_transaction(
diff --git a/sentry_sdk/integrations/wsgi.py b/sentry_sdk/integrations/wsgi.py
index 32bba51cd2..214aea41b9 100644
--- a/sentry_sdk/integrations/wsgi.py
+++ b/sentry_sdk/integrations/wsgi.py
@@ -8,7 +8,7 @@
     event_from_exception,
 )
 from sentry_sdk._compat import PY2, reraise, iteritems
-from sentry_sdk.tracing import Transaction
+from sentry_sdk.tracing import Transaction, TRANSACTION_SOURCE_ROUTE
 from sentry_sdk.sessions import auto_session_tracking
 from sentry_sdk.integrations._wsgi_common import _filter_headers
 from sentry_sdk.profiler import profiling
@@ -123,7 +123,10 @@ def __call__(self, environ, start_response):
                             )
 
                     transaction = Transaction.continue_from_environ(
-                        environ, op="http.server", name="generic WSGI request"
+                        environ,
+                        op="http.server",
+                        name="generic WSGI request",
+                        source=TRANSACTION_SOURCE_ROUTE,
                     )
 
                     with hub.start_transaction(
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index fa95b6ec6f..e291d2f03e 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -34,7 +34,6 @@
 TRANSACTION_SOURCE_VIEW = "view"
 TRANSACTION_SOURCE_COMPONENT = "component"
 TRANSACTION_SOURCE_TASK = "task"
-TRANSACTION_SOURCE_UNKNOWN = "unknown"
 
 SOURCE_FOR_STYLE = {
     "endpoint": TRANSACTION_SOURCE_COMPONENT,
@@ -547,7 +546,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
+        source=TRANSACTION_SOURCE_CUSTOM,  # type: str
         **kwargs  # type: Any
     ):
         # type: (...) -> None
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 6307e6b6f9..ccac6e37e3 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -42,16 +42,6 @@
 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/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py
index f72b896f53..2c52031701 100644
--- a/tests/integrations/celery/test_celery.py
+++ b/tests/integrations/celery/test_celery.py
@@ -159,7 +159,7 @@ def dummy_task(x, y):
     assert execution_event["transaction_info"] == {"source": "task"}
 
     assert submission_event["transaction"] == "submission"
-    assert submission_event["transaction_info"] == {"source": "unknown"}
+    assert submission_event["transaction_info"] == {"source": "custom"}
 
     assert execution_event["type"] == submission_event["type"] == "transaction"
     assert execution_event["contexts"]["trace"]["trace_id"] == transaction.trace_id
diff --git a/tests/integrations/tornado/test_tornado.py b/tests/integrations/tornado/test_tornado.py
index f59781dc21..c0dac2d93f 100644
--- a/tests/integrations/tornado/test_tornado.py
+++ b/tests/integrations/tornado/test_tornado.py
@@ -131,7 +131,7 @@ 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"
+        "source": "custom"
     }  # because this is just the start_transaction() above.
 
     if server_error is not None:
diff --git a/tests/tracing/test_integration_tests.py b/tests/tracing/test_integration_tests.py
index 80a8ba7a0c..fbaf07d509 100644
--- a/tests/tracing/test_integration_tests.py
+++ b/tests/tracing/test_integration_tests.py
@@ -32,6 +32,9 @@ def test_basic(sentry_init, capture_events, sample_rate):
         assert len(events) == 1
         event = events[0]
 
+        assert event["transaction"] == "hi"
+        assert event["transaction_info"]["source"] == "custom"
+
         span1, span2 = event["spans"]
         parent_span = event
         assert span1["tags"]["status"] == "internal_error"

From 4e3b6d5857010453a9ed2e80fd502f4a8eacbf3c Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Thu, 11 Aug 2022 13:00:01 +0000
Subject: [PATCH 074/209] release: 1.9.4

---
 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 eadfdcebe4..a1636936b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.9.4
+
+### Various fixes & improvements
+
+- Remove TRANSACTION_SOURCE_UNKNOWN and default to CUSTOM (#1558) by @sl0thentr0py
+- feat(redis): Add instrumentation for redis pipeline (#1543) by @jjbayer
+- Handle no release when uploading profiles (#1548) by @szokeasaurusrex
+
 ## 1.9.3
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 701fb38b74..fe4acf2201 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.9.3"
+release = "1.9.4"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index cc8cb28958..b71e91f401 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -103,7 +103,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.9.3"
+VERSION = "1.9.4"
 SDK_INFO = {
     "name": "sentry.python",
     "version": VERSION,
diff --git a/setup.py b/setup.py
index 5ed5560b9b..8115855a37 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.9.3",
+    version="1.9.4",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From 8588dbeb023a124c6f8c35b66391a7d8caa8bf35 Mon Sep 17 00:00:00 2001
From: Neel Shah 
Date: Fri, 12 Aug 2022 14:42:59 +0200
Subject: [PATCH 075/209] Fix side effects for parallel tests (#1554)

* Fix parallel tests in older sanic versions 0.8 and 18
* Fix rediscluster test side-effect by resetting integrations
---
 sentry_sdk/integrations/redis.py                 |  1 -
 tests/conftest.py                                | 12 ++++++++++++
 .../rediscluster/test_rediscluster.py            |  4 ++--
 tests/integrations/sanic/test_sanic.py           | 16 +++++++++++++++-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/sentry_sdk/integrations/redis.py b/sentry_sdk/integrations/redis.py
index a4434a3f01..fc4e9cc7c2 100644
--- a/sentry_sdk/integrations/redis.py
+++ b/sentry_sdk/integrations/redis.py
@@ -131,7 +131,6 @@ def patch_redis_client(cls, is_cluster):
     This function can be used to instrument custom redis client classes or
     subclasses.
     """
-
     old_execute_command = cls.execute_command
 
     def sentry_patched_execute_command(self, name, *args, **kwargs):
diff --git a/tests/conftest.py b/tests/conftest.py
index 61f25d98ee..7479a3e213 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -19,6 +19,7 @@
 from sentry_sdk.transport import Transport
 from sentry_sdk.envelope import Envelope
 from sentry_sdk.utils import capture_internal_exceptions
+from sentry_sdk.integrations import _installed_integrations  # noqa: F401
 
 from tests import _warning_recorder, _warning_recorder_mgr
 
@@ -165,6 +166,17 @@ def inner(event):
     return inner
 
 
+@pytest.fixture
+def reset_integrations():
+    """
+    Use with caution, sometimes we really need to start
+    with a clean slate to ensure monkeypatching works well,
+    but this also means some other stuff will be monkeypatched twice.
+    """
+    global _installed_integrations
+    _installed_integrations.clear()
+
+
 @pytest.fixture
 def sentry_init(monkeypatch_test_transport, request):
     def inner(*a, **kw):
diff --git a/tests/integrations/rediscluster/test_rediscluster.py b/tests/integrations/rediscluster/test_rediscluster.py
index 7442490b2e..9be21a2953 100644
--- a/tests/integrations/rediscluster/test_rediscluster.py
+++ b/tests/integrations/rediscluster/test_rediscluster.py
@@ -11,8 +11,8 @@
     rediscluster_classes.append(rediscluster.StrictRedisCluster)
 
 
-@pytest.fixture(scope="module", autouse=True)
-def monkeypatch_rediscluster_classes():
+@pytest.fixture(autouse=True)
+def monkeypatch_rediscluster_classes(reset_integrations):
 
     try:
         pipeline_cls = rediscluster.ClusterPipeline
diff --git a/tests/integrations/sanic/test_sanic.py b/tests/integrations/sanic/test_sanic.py
index f8fdd696bc..808c6f14c3 100644
--- a/tests/integrations/sanic/test_sanic.py
+++ b/tests/integrations/sanic/test_sanic.py
@@ -1,5 +1,5 @@
+import os
 import sys
-
 import random
 import asyncio
 from unittest.mock import Mock
@@ -18,6 +18,20 @@
 
 @pytest.fixture
 def app():
+    if SANIC_VERSION < (19,):
+        """
+        Older Sanic versions 0.8 and 18 bind to the same fixed port which
+        creates problems when we run tests concurrently.
+        """
+        old_test_client = Sanic.test_client.__get__
+
+        def new_test_client(self):
+            client = old_test_client(self, Sanic)
+            client.port += os.getpid() % 100
+            return client
+
+        Sanic.test_client = property(new_test_client)
+
     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

From 94f7502fc150495a1d4e2136a15e4e062ac26c9d Mon Sep 17 00:00:00 2001
From: Oleksandr 
Date: Tue, 16 Aug 2022 12:00:30 +0200
Subject: [PATCH 076/209] fix(redis): import redis pipeline using full path
 (#1565)

* fix(redis): import rediscluster pipeline using full path
* Capture rediscluster breakage in tox matrix

Co-authored-by: Neel Shah 
---
 sentry_sdk/integrations/redis.py                     | 4 ++--
 tests/integrations/rediscluster/test_rediscluster.py | 2 +-
 tox.ini                                              | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sentry_sdk/integrations/redis.py b/sentry_sdk/integrations/redis.py
index fc4e9cc7c2..c27eefa3f6 100644
--- a/sentry_sdk/integrations/redis.py
+++ b/sentry_sdk/integrations/redis.py
@@ -82,10 +82,10 @@ def _patch_rediscluster():
     # StrictRedisCluster was introduced in v0.2.0 and removed in v2.0.0
     # https://github.com/Grokzen/redis-py-cluster/blob/master/docs/release-notes.rst
     if (0, 2, 0) < version < (2, 0, 0):
-        pipeline_cls = rediscluster.StrictClusterPipeline
+        pipeline_cls = rediscluster.pipeline.StrictClusterPipeline
         patch_redis_client(rediscluster.StrictRedisCluster, is_cluster=True)
     else:
-        pipeline_cls = rediscluster.ClusterPipeline
+        pipeline_cls = rediscluster.pipeline.ClusterPipeline
 
     patch_redis_pipeline(pipeline_cls, True, _parse_rediscluster_command)
 
diff --git a/tests/integrations/rediscluster/test_rediscluster.py b/tests/integrations/rediscluster/test_rediscluster.py
index 9be21a2953..62923cffae 100644
--- a/tests/integrations/rediscluster/test_rediscluster.py
+++ b/tests/integrations/rediscluster/test_rediscluster.py
@@ -15,7 +15,7 @@
 def monkeypatch_rediscluster_classes(reset_integrations):
 
     try:
-        pipeline_cls = rediscluster.ClusterPipeline
+        pipeline_cls = rediscluster.pipeline.ClusterPipeline
     except AttributeError:
         pipeline_cls = rediscluster.StrictClusterPipeline
     rediscluster.RedisCluster.pipeline = lambda *_, **__: pipeline_cls(
diff --git a/tox.ini b/tox.ini
index 3eec4a7a11..cf7c1a4cfe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -77,7 +77,7 @@ envlist =
     {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}
+    {py2.7,py3.7,py3.8,py3.9}-rediscluster-{1,2.1.0,2}
 
     {py2.7,py3.7,py3.8,py3.9,py3.10}-sqlalchemy-{1.2,1.3}
 
@@ -227,7 +227,8 @@ deps =
     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
+    rediscluster-2.1.0: redis-py-cluster>=2.0.0,<2.1.1
+    rediscluster-2: redis-py-cluster>=2.1.1,<3.0.0
 
     sqlalchemy-1.2: sqlalchemy>=1.2,<1.3
     sqlalchemy-1.3: sqlalchemy>=1.3,<1.4

From 0ea6e2260076083d676196e568a90b1f775b151e Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Tue, 16 Aug 2022 10:37:59 +0000
Subject: [PATCH 077/209] release: 1.9.5

---
 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 a1636936b5..c5d86acf2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.9.5
+
+### Various fixes & improvements
+
+- fix(redis): import redis pipeline using full path (#1565) by @olksdr
+- Fix side effects for parallel tests (#1554) by @sl0thentr0py
+
 ## 1.9.4
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index fe4acf2201..eb7c7372dd 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.9.4"
+release = "1.9.5"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index b71e91f401..d76bfa45a3 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -103,7 +103,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.9.4"
+VERSION = "1.9.5"
 SDK_INFO = {
     "name": "sentry.python",
     "version": VERSION,
diff --git a/setup.py b/setup.py
index 8115855a37..db281c8c07 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.9.4",
+    version="1.9.5",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From b3bd629bc6163d371a45f64fcab37851746efdb7 Mon Sep 17 00:00:00 2001
From: Neel Shah 
Date: Tue, 16 Aug 2022 13:46:57 +0200
Subject: [PATCH 078/209] Fix typo in starlette attribute check (#1566)

---
 sentry_sdk/integrations/starlette.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index a58c9e9bd6..f4af729c3f 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -146,7 +146,9 @@ async def _sentry_patched_exception_handler(self, *args, **kwargs):
             # type: (Any, Any, Any) -> None
             exp = args[0]
 
-            is_http_server_error = hasattr(exp, "staus_code") and exp.status_code >= 500
+            is_http_server_error = (
+                hasattr(exp, "status_code") and exp.status_code >= 500
+            )
             if is_http_server_error:
                 _capture_exception(exp, handled=True)
 

From fa4f5b03c2d686e1dfb40543d0d099e5391850a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isra=C3=ABl=20Hall=C3=A9?= 
Date: Fri, 19 Aug 2022 15:38:17 -0400
Subject: [PATCH 079/209] Add more version constraints (#1574)

For some reason, poetry will run the solver at least twice if python version are above 3.6, each with a different constraint for urllib3. This add a significant slowdown on our end in some project.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index db281c8c07..c51f7fa021 100644
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ def get_file_text(file_name):
     license="BSD",
     install_requires=[
         'urllib3>=1.25.7; python_version<="3.4"',
-        'urllib3>=1.26.9; python_version>="3.5"',
+        'urllib3>=1.26.9; python_version=="3.5"',
         'urllib3>=1.26.11; python_version >="3.6"',
         "certifi",
     ],

From 1f9f9998f000fc88872a6bea3b1b277c513b5346 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Wed, 31 Aug 2022 14:58:29 +0200
Subject: [PATCH 080/209] Auto-enable Starlette and FastAPI (#1533)

* Auto enable Starlette/FastAPI
* Raise error when SentryASGIMIddleware is used manually in combination with Starlette/FastAPI. If you use Starlette/FastAPI you do not need to use SentryASGIMIddleware anymore, the SDK is setting up everything automatically.
* Fixed Starlette/FastAPI tests.
* Deactivated ASGI middleware tests, because they need to be rewritten without Starlette.
---
 sentry_sdk/integrations/__init__.py           |   2 +
 sentry_sdk/integrations/asgi.py               |  12 +-
 tests/integrations/asgi/__init__.py           |   3 -
 tests/integrations/asgi/test_asgi.py          | 430 +-----------------
 tests/integrations/fastapi/test_fastapi.py    |  35 +-
 .../integrations/starlette/test_starlette.py  |  34 +-
 tests/test_basics.py                          |   4 +-
 tox.ini                                       |   3 -
 8 files changed, 46 insertions(+), 477 deletions(-)

diff --git a/sentry_sdk/integrations/__init__.py b/sentry_sdk/integrations/__init__.py
index 68445d3416..8d32741542 100644
--- a/sentry_sdk/integrations/__init__.py
+++ b/sentry_sdk/integrations/__init__.py
@@ -54,6 +54,8 @@ def iter_default_integrations(with_auto_enabling_integrations):
 _AUTO_ENABLING_INTEGRATIONS = (
     "sentry_sdk.integrations.django.DjangoIntegration",
     "sentry_sdk.integrations.flask.FlaskIntegration",
+    "sentry_sdk.integrations.starlette.StarletteIntegration",
+    "sentry_sdk.integrations.fastapi.FastApiIntegration",
     "sentry_sdk.integrations.bottle.BottleIntegration",
     "sentry_sdk.integrations.falcon.FalconIntegration",
     "sentry_sdk.integrations.sanic.SanicIntegration",
diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py
index 125aad5b61..3a2e97404e 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.integrations.modules import _get_installed_modules
 from sentry_sdk.sessions import auto_session_tracking
 from sentry_sdk.tracing import (
     SOURCE_FOR_STYLE,
@@ -91,7 +92,6 @@ def __init__(
 
         :param unsafe_context_data: Disable errors when a proper contextvars installation could not be found. We do not recommend changing this from the default.
         """
-
         if not unsafe_context_data and not HAS_REAL_CONTEXTVARS:
             # We better have contextvars or we're going to leak state between
             # requests.
@@ -108,6 +108,16 @@ def __init__(
         self.mechanism_type = mechanism_type
         self.app = app
 
+        asgi_middleware_while_using_starlette_or_fastapi = (
+            "starlette" in _get_installed_modules() and self.mechanism_type == "asgi"
+        )
+        if asgi_middleware_while_using_starlette_or_fastapi:
+            raise RuntimeError(
+                "The Sentry Python SDK can now automatically support ASGI frameworks like Starlette and FastAPI. "
+                "Please remove 'SentryAsgiMiddleware' from your project. "
+                "See https://docs.sentry.io/platforms/python/guides/asgi/ for more information."
+            )
+
         if _looks_like_asgi3(app):
             self.__call__ = self._run_asgi3  # type: Callable[..., Any]
         else:
diff --git a/tests/integrations/asgi/__init__.py b/tests/integrations/asgi/__init__.py
index c89ddf99a8..e69de29bb2 100644
--- a/tests/integrations/asgi/__init__.py
+++ b/tests/integrations/asgi/__init__.py
@@ -1,3 +0,0 @@
-import pytest
-
-pytest.importorskip("starlette")
diff --git a/tests/integrations/asgi/test_asgi.py b/tests/integrations/asgi/test_asgi.py
index a5687f86ad..81dfeef29a 100644
--- a/tests/integrations/asgi/test_asgi.py
+++ b/tests/integrations/asgi/test_asgi.py
@@ -1,427 +1,7 @@
-from collections import Counter
-import sys
+#
+# TODO: Implement tests similar to test_wsgi using async-asgi-testclient
+#
 
-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
-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():
-    app = Starlette()
-
-    @app.route("/sync-message")
-    def hi(request):
-        capture_message("hi", level="error")
-        return PlainTextResponse("ok")
-
-    @app.route("/async-message")
-    async def hi2(request):
-        capture_message("hi", level="error")
-        return PlainTextResponse("ok")
-
-    app.add_middleware(SentryAsgiMiddleware)
-
-    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)
-    events = capture_events()
-
-    client = TestClient(app)
-    response = client.get("/sync-message?foo=bar", headers={"Foo": "ä"})
-
-    assert response.status_code == 200
-
-    (event,) = events
-    assert event["transaction"] == "tests.integrations.asgi.test_asgi.app..hi"
-    assert event["request"]["env"] == {"REMOTE_ADDR": "testclient"}
-    assert set(event["request"]["headers"]) == {
-        "accept",
-        "accept-encoding",
-        "connection",
-        "host",
-        "user-agent",
-        "foo",
-    }
-    assert event["request"]["query_string"] == "foo=bar"
-    assert event["request"]["url"].endswith("/sync-message")
-    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
-
-
-def test_async_request_data(sentry_init, app, capture_events):
-    sentry_init(send_default_pii=True)
-    events = capture_events()
-
-    client = TestClient(app)
-    response = client.get("/async-message?foo=bar")
-
-    assert response.status_code == 200
-
-    (event,) = events
-    assert event["transaction"] == "tests.integrations.asgi.test_asgi.app..hi2"
-    assert event["request"]["env"] == {"REMOTE_ADDR": "testclient"}
-    assert set(event["request"]["headers"]) == {
-        "accept",
-        "accept-encoding",
-        "connection",
-        "host",
-        "user-agent",
-    }
-    assert event["request"]["query_string"] == "foo=bar"
-    assert event["request"]["url"].endswith("/async-message")
-    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
-
-
-def test_errors(sentry_init, app, capture_events):
-    sentry_init(send_default_pii=True)
-    events = capture_events()
-
-    @app.route("/error")
-    def myerror(request):
-        raise ValueError("oh no")
-
-    client = TestClient(app, raise_server_exceptions=False)
-    response = client.get("/error")
-
-    assert response.status_code == 500
-
-    (event,) = events
-    assert (
-        event["transaction"]
-        == "tests.integrations.asgi.test_asgi.test_errors..myerror"
-    )
-    (exception,) = event["exception"]["values"]
-
-    assert exception["type"] == "ValueError"
-    assert exception["value"] == "oh no"
-    assert any(
-        frame["filename"].endswith("tests/integrations/asgi/test_asgi.py")
-        for frame in exception["stacktrace"]["frames"]
-    )
-
-
-def test_websocket(sentry_init, capture_events, request):
-    sentry_init(debug=True, send_default_pii=True)
-
-    # Bind client to main thread because context propagation for the websocket
-    # client does not work.
-    Hub.main.bind_client(Hub.current.client)
-    request.addfinalizer(lambda: Hub.main.bind_client(None))
-
-    events = capture_events()
-
-    from starlette.testclient import TestClient
-
-    def message():
-        capture_message("hi")
-        raise ValueError("oh no")
-
-    async def app(scope, receive, send):
-        assert scope["type"] == "websocket"
-        websocket = WebSocket(scope, receive=receive, send=send)
-        await websocket.accept()
-        await websocket.send_text(message())
-        await websocket.close()
-
-    app = SentryAsgiMiddleware(app)
-
-    client = TestClient(app)
-    with client.websocket_connect("/") as websocket:
-        with pytest.raises(ValueError):
-            websocket.receive_text()
-
-    msg_event, error_event = events
-
-    assert msg_event["message"] == "hi"
-
-    (exc,) = error_event["exception"]["values"]
-    assert exc["type"] == "ValueError"
-    assert exc["value"] == "oh no"
-
-    assert (
-        msg_event["request"]
-        == error_event["request"]
-        == {
-            "env": {"REMOTE_ADDR": "testclient"},
-            "headers": {
-                "accept": "*/*",
-                "accept-encoding": "gzip, deflate",
-                "connection": "upgrade",
-                "host": "testserver",
-                "sec-websocket-key": "testserver==",
-                "sec-websocket-version": "13",
-                "user-agent": "testclient",
-            },
-            "method": None,
-            "query_string": None,
-            "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"
-
-
-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"
-    )
-
-
-@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.
-            "route",
-        ),
-        (
-            "/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.
-            "route",
-        ),
-        (
-            "/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.
-            "route",
-        ),
-    ],
-)
-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
-):
-    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"}
-                )
-            }
-        )
-    )
-
-
-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("/sync-message", 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(
-        "/sync-message", 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("/sync-message", 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"}
-
-
-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
+def test_noop():
+    pass
diff --git a/tests/integrations/fastapi/test_fastapi.py b/tests/integrations/fastapi/test_fastapi.py
index 86f7db8cad..5f76ae4d90 100644
--- a/tests/integrations/fastapi/test_fastapi.py
+++ b/tests/integrations/fastapi/test_fastapi.py
@@ -117,26 +117,17 @@ def test_transaction_style(
     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(),
-        ],
+def test_legacy_setup(sentry_init):
+    # Check for error message if the user
+    # updates and the integrations are auto enabled
+    # and the SentryAsgiMiddleware is still there
+    sentry_init()
+
+    with pytest.raises(RuntimeError) as exc:
+        app = fastapi_app_factory()
+        app = SentryAsgiMiddleware(app)
+
+    assert (
+        "The Sentry Python SDK can now automatically support ASGI frameworks like Starlette and FastAPI."
+        in str(exc)
     )
-    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/test_starlette.py b/tests/integrations/starlette/test_starlette.py
index 16c1dfb67b..636bbe1078 100644
--- a/tests/integrations/starlette/test_starlette.py
+++ b/tests/integrations/starlette/test_starlette.py
@@ -543,25 +543,17 @@ def test_middleware_spans(sentry_init, capture_events):
             idx += 1
 
 
-def test_legacy_setup(
-    sentry_init,
-    capture_events,
-):
-    # Check that behaviour does not change
-    # if the user just adds the new Integration
-    # and forgets to remove SentryAsgiMiddleware
-    sentry_init(
-        integrations=[
-            StarletteIntegration(),
-        ],
+def test_legacy_setup(sentry_init):
+    # Check for error message if the user
+    # updates and the integration is auto enabled
+    # and the SentryAsgiMiddleware is still there
+    sentry_init()
+
+    with pytest.raises(RuntimeError) as exc:
+        app = starlette_app_factory()
+        app = SentryAsgiMiddleware(app)
+
+    assert (
+        "The Sentry Python SDK can now automatically support ASGI frameworks like Starlette and FastAPI."
+        in str(exc)
     )
-    app = starlette_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/test_basics.py b/tests/test_basics.py
index e9ae6465c9..1e2feaff14 100644
--- a/tests/test_basics.py
+++ b/tests/test_basics.py
@@ -50,7 +50,7 @@ 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
+    REDIS = 12  # noqa: N806
 
     sentry_init(auto_enabling_integrations=True, debug=True)
 
@@ -65,7 +65,7 @@ def test_auto_enabling_integrations_catches_import_error(sentry_init, caplog):
                 "Did not import default integration {}:".format(import_string)
             )
             for record in caplog.records
-        )
+        ), "Problem with checking auto enabling {}".format(import_string)
 
 
 def test_event_id(sentry_init, capture_events):
diff --git a/tox.ini b/tox.ini
index cf7c1a4cfe..3d11ad0c0d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -131,9 +131,6 @@ deps =
     quart: quart-auth
     quart: pytest-asyncio
 
-    asgi: requests
-    asgi: starlette
-
     starlette: pytest-asyncio
     starlette: python-multipart
     starlette: requests

From 60ef59425a4c6b14a213a0fe0e108eb87ae06239 Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Wed, 31 Aug 2022 13:52:10 +0000
Subject: [PATCH 081/209] release: 1.9.6

---
 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 c5d86acf2d..04426d2a56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.9.6
+
+### Various fixes & improvements
+
+- Auto-enable Starlette and FastAPI (#1533) by @antonpirker
+- Add more version constraints (#1574) by @isra17
+- Fix typo in starlette attribute check (#1566) by @sl0thentr0py
+
 ## 1.9.5
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index eb7c7372dd..4bf71eee97 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.9.5"
+release = "1.9.6"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index d76bfa45a3..c44cce2e96 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -103,7 +103,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.9.5"
+VERSION = "1.9.6"
 SDK_INFO = {
     "name": "sentry.python",
     "version": VERSION,
diff --git a/setup.py b/setup.py
index c51f7fa021..2c4dfdca07 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.9.5",
+    version="1.9.6",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From d0b70dfc74760ee1e17fa39a60e5ae39a265972a Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 1 Sep 2022 17:50:40 +0200
Subject: [PATCH 082/209] Let SentryAsgiMiddleware work with Starlette and
 FastAPI integrations (#1594)

People where complaining (rightly so) that just raising an error when SentryAsgiMiddleware and Starlette/Fastapi is used is not a nice thing to do.

So we tried again to make this work together. To not break our users code.
The plan was to make SentryASGIMiddleware no-op when there is already one there. Turns out this works already on Starlette but on FastAPI it broke. (This was because of how FastAPI deals with middlewares)

We debugged the whole thing and it turns out that we where patching our own SentryAsgiMiddleware (like the FastAPI internal ones) to create spans when they are executed. This and the fact that we use __slots__ extensively made the integration break.

We found out, that if we are not patching our own middleware this fixes the problem when initializing the middleware twice (once by our users and once by our auto-enabled FastAPI integration).

Fixes #1592
---
 sentry_sdk/integrations/asgi.py               | 15 ++++++-----
 sentry_sdk/integrations/starlette.py          |  4 +++
 tests/integrations/fastapi/test_fastapi.py    | 26 +++++++++++--------
 .../integrations/starlette/test_starlette.py  | 26 +++++++++++--------
 4 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py
index 3a2e97404e..67e6eac230 100644
--- a/sentry_sdk/integrations/asgi.py
+++ b/sentry_sdk/integrations/asgi.py
@@ -1,7 +1,7 @@
 """
 An ASGI middleware.
 
-Based on Tom Christie's `sentry-asgi `_.
+Based on Tom Christie's `sentry-asgi `.
 """
 
 import asyncio
@@ -23,6 +23,7 @@
     event_from_exception,
     HAS_REAL_CONTEXTVARS,
     CONTEXTVARS_ERROR_MESSAGE,
+    logger,
     transaction_from_function,
 )
 from sentry_sdk.tracing import Transaction
@@ -104,20 +105,21 @@ def __init__(
                 "Invalid value for transaction_style: %s (must be in %s)"
                 % (transaction_style, TRANSACTION_STYLE_VALUES)
             )
-        self.transaction_style = transaction_style
-        self.mechanism_type = mechanism_type
-        self.app = app
 
         asgi_middleware_while_using_starlette_or_fastapi = (
-            "starlette" in _get_installed_modules() and self.mechanism_type == "asgi"
+            "starlette" in _get_installed_modules() and mechanism_type == "asgi"
         )
         if asgi_middleware_while_using_starlette_or_fastapi:
-            raise RuntimeError(
+            logger.warning(
                 "The Sentry Python SDK can now automatically support ASGI frameworks like Starlette and FastAPI. "
                 "Please remove 'SentryAsgiMiddleware' from your project. "
                 "See https://docs.sentry.io/platforms/python/guides/asgi/ for more information."
             )
 
+        self.transaction_style = transaction_style
+        self.mechanism_type = mechanism_type
+        self.app = app
+
         if _looks_like_asgi3(app):
             self.__call__ = self._run_asgi3  # type: Callable[..., Any]
         else:
@@ -138,7 +140,6 @@ async def _run_asgi3(self, scope, receive, send):
     async def _run_app(self, scope, callback):
         # type: (Any, Any) -> Any
         is_recursive_asgi_middleware = _asgi_middleware_applied.get(False)
-
         if is_recursive_asgi_middleware:
             try:
                 return await callback()
diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index f4af729c3f..0342a64344 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -257,6 +257,9 @@ def patch_middlewares():
 
         def _sentry_middleware_init(self, cls, **options):
             # type: (Any, Any, Any) -> None
+            if cls == SentryAsgiMiddleware:
+                return old_middleware_init(self, cls, **options)
+
             span_enabled_cls = _enable_span_for_middleware(cls)
             old_middleware_init(self, span_enabled_cls, **options)
 
@@ -285,6 +288,7 @@ async def _sentry_patched_asgi_app(self, scope, receive, send):
             lambda *a, **kw: old_app(self, *a, **kw),
             mechanism_type=StarletteIntegration.identifier,
         )
+
         middleware.__call__ = middleware._run_asgi3
         return await middleware(scope, receive, send)
 
diff --git a/tests/integrations/fastapi/test_fastapi.py b/tests/integrations/fastapi/test_fastapi.py
index 5f76ae4d90..bc61cfc263 100644
--- a/tests/integrations/fastapi/test_fastapi.py
+++ b/tests/integrations/fastapi/test_fastapi.py
@@ -117,17 +117,21 @@ def test_transaction_style(
     assert "transaction" not in event
 
 
-def test_legacy_setup(sentry_init):
-    # Check for error message if the user
-    # updates and the integrations are auto enabled
-    # and the SentryAsgiMiddleware is still there
+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()
+    app = fastapi_app_factory()
+    asgi_app = SentryAsgiMiddleware(app)
 
-    with pytest.raises(RuntimeError) as exc:
-        app = fastapi_app_factory()
-        app = SentryAsgiMiddleware(app)
+    events = capture_events()
 
-    assert (
-        "The Sentry Python SDK can now automatically support ASGI frameworks like Starlette and FastAPI."
-        in str(exc)
-    )
+    client = TestClient(asgi_app)
+    client.get("/message/123456")
+
+    (event,) = events
+    assert event["transaction"] == "/message/{message_id}"
diff --git a/tests/integrations/starlette/test_starlette.py b/tests/integrations/starlette/test_starlette.py
index 636bbe1078..7db29eacd8 100644
--- a/tests/integrations/starlette/test_starlette.py
+++ b/tests/integrations/starlette/test_starlette.py
@@ -543,17 +543,21 @@ def test_middleware_spans(sentry_init, capture_events):
             idx += 1
 
 
-def test_legacy_setup(sentry_init):
-    # Check for error message if the user
-    # updates and the integration is auto enabled
-    # and the SentryAsgiMiddleware is still there
+def test_legacy_setup(
+    sentry_init,
+    capture_events,
+):
+    # Check that behaviour does not change
+    # if the user just adds the new Integration
+    # and forgets to remove SentryAsgiMiddleware
     sentry_init()
+    app = starlette_app_factory()
+    asgi_app = SentryAsgiMiddleware(app)
 
-    with pytest.raises(RuntimeError) as exc:
-        app = starlette_app_factory()
-        app = SentryAsgiMiddleware(app)
+    events = capture_events()
 
-    assert (
-        "The Sentry Python SDK can now automatically support ASGI frameworks like Starlette and FastAPI."
-        in str(exc)
-    )
+    client = TestClient(asgi_app)
+    client.get("/message/123456")
+
+    (event,) = events
+    assert event["transaction"] == "/message/{message_id}"

From 0100ab83b63601d5f8e67c76dfb46ec527795045 Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Thu, 1 Sep 2022 15:54:31 +0000
Subject: [PATCH 083/209] release: 1.9.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 04426d2a56..ac486f1c7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.9.7
+
+### Various fixes & improvements
+
+- Let SentryAsgiMiddleware work with Starlette and FastAPI integrations (#1594) by @antonpirker
+
 ## 1.9.6
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 4bf71eee97..ae67facfee 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.9.6"
+release = "1.9.7"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index c44cce2e96..c9146871f5 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -103,7 +103,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.9.6"
+VERSION = "1.9.7"
 SDK_INFO = {
     "name": "sentry.python",
     "version": VERSION,
diff --git a/setup.py b/setup.py
index 2c4dfdca07..f47955964d 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.9.6",
+    version="1.9.7",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From aba1db6ad1892529d64b6a59dba8eb74914a23d8 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 1 Sep 2022 18:00:25 +0200
Subject: [PATCH 084/209] Updated changelog

---
 CHANGELOG.md | 87 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac486f1c7c..75b51391cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,15 @@
 
 - Let SentryAsgiMiddleware work with Starlette and FastAPI integrations (#1594) by @antonpirker
 
+**Note:** The last version 1.9.6 introduced a breaking change where projects that used Starlette or FastAPI
+and had manually setup `SentryAsgiMiddleware` could not start. This versions fixes this behaviour.
+With this version if you have a manual `SentryAsgiMiddleware` setup and are using Starlette or FastAPI
+everything just works out of the box.
+
+Sorry for any inconveniences the last version might have brought to you.
+
+We can do better and in the future we will do our best to not break your code again.
+
 ## 1.9.6
 
 ### Various fixes & improvements
@@ -66,44 +75,44 @@
 ### Various fixes & improvements
 
 - feat(starlette): add Starlette integration (#1441) by @sl0thentr0py
-    
-    **Important:** Remove manual usage of `SentryAsgiMiddleware`! This is now done by the Starlette integration.
-    
-    Usage:
-    
-    ```python
-    from starlette.applications import Starlette
-    
-    from sentry_sdk.integrations.starlette import StarletteIntegration
-    
-    sentry_sdk.init(
-        dsn="...", 
-        integrations=[StarletteIntegration()],
-    )
-    
-    app = Starlette(debug=True, routes=[...])
-    ```
+  **Important:** Remove manual usage of `SentryAsgiMiddleware`! This is now done by the Starlette integration.
+  Usage:
+
+  ```python
+  from starlette.applications import Starlette
+
+  from sentry_sdk.integrations.starlette import StarletteIntegration
+
+  sentry_sdk.init(
+      dsn="...",
+      integrations=[StarletteIntegration()],
+  )
+
+  app = Starlette(debug=True, routes=[...])
+  ```
+
 - feat(fastapi): add FastAPI integration (#829) by @antonpirker
-    
-    **Important:** Remove manual usage of `SentryAsgiMiddleware`! This is now done by the FastAPI integration.
-    
-    Usage:
-    
-    ```python
-    from fastapi import FastAPI
-    
-    from sentry_sdk.integrations.starlette import StarletteIntegration
-    from sentry_sdk.integrations.fastapi import FastApiIntegration
-
-    sentry_sdk.init(
-        dsn="...", 
-        integrations=[StarletteIntegration(), FastApiIntegration()],
-    )
-    
-    app = FastAPI()
-    ```
-    
-    Yes, you have to add both, the `StarletteIntegration` **AND** the `FastApiIntegration`!
+
+  **Important:** Remove manual usage of `SentryAsgiMiddleware`! This is now done by the FastAPI integration.
+
+  Usage:
+
+  ```python
+  from fastapi import FastAPI
+
+  from sentry_sdk.integrations.starlette import StarletteIntegration
+  from sentry_sdk.integrations.fastapi import FastApiIntegration
+
+  sentry_sdk.init(
+      dsn="...",
+      integrations=[StarletteIntegration(), FastApiIntegration()],
+  )
+
+  app = FastAPI()
+  ```
+
+  Yes, you have to add both, the `StarletteIntegration` **AND** the `FastApiIntegration`!
+
 - fix: avoid sending empty Baggage header (#1507) by @intgr
 - fix: properly freeze Baggage object (#1508) by @intgr
 - docs: fix simple typo, collecter -> collector (#1505) by @timgates42
@@ -128,7 +137,7 @@
 - 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.  
+  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.
 
@@ -138,7 +147,7 @@
 
 - Fix Deployment (#1474) by @antonpirker
 - Serverless V2 (#1450) by @antonpirker
-- Use logging levelno instead of levelname.  Levelnames can be overridden (#1449) by @rrauenza
+- Use logging levelno instead of levelname. Levelnames can be overridden (#1449) by @rrauenza
 
 ## 1.5.12
 

From f932402f3db76740552817500b4a743690d9ffe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=89VEIL?=
 
Date: Mon, 5 Sep 2022 13:17:03 +0200
Subject: [PATCH 085/209] doc(readme): add links to Starlette and FastAPI
 (#1598)

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 131ae57b25..597ed852bb 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,8 @@ raise ValueError()  # Will also create an event in Sentry.
 - [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/)
+- [Starlette](https://docs.sentry.io/platforms/python/guides/starlette/)
+- [FastAPI](https://docs.sentry.io/platforms/python/guides/fastapi/)
 - [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/)

From 6db44a95825245b1f7c9baa54957d044f7be18eb Mon Sep 17 00:00:00 2001
From: Neel Shah 
Date: Mon, 5 Sep 2022 13:48:13 +0200
Subject: [PATCH 086/209] Baggage creation for head of trace (#1589)

---
 sentry_sdk/hub.py                             | 13 +++
 sentry_sdk/tracing.py                         | 37 +++++++--
 sentry_sdk/tracing_utils.py                   | 51 +++++++++++-
 .../sqlalchemy/test_sqlalchemy.py             |  8 --
 tests/integrations/stdlib/test_httplib.py     | 49 ++++++++++-
 tests/tracing/test_integration_tests.py       | 81 +++++++++++++++++++
 6 files changed, 220 insertions(+), 19 deletions(-)

diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
index 3fd084ba27..33870e2df0 100644
--- a/sentry_sdk/hub.py
+++ b/sentry_sdk/hub.py
@@ -717,6 +717,19 @@ def iter_trace_propagation_headers(self, span=None):
         for header in span.iter_headers():
             yield header
 
+    def trace_propagation_meta(self, span=None):
+        # type: (Optional[Span]) -> str
+        """
+        Return meta tags which should be injected into the HTML template
+        to allow propagation of trace data.
+        """
+        meta = ""
+
+        for name, content in self.iter_trace_propagation_headers(span):
+            meta += '' % (name, content)
+
+        return meta
+
 
 GLOBAL_HUB = Hub()
 _local.set(GLOBAL_HUB)
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index e291d2f03e..78084d27f3 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -35,6 +35,11 @@
 TRANSACTION_SOURCE_COMPONENT = "component"
 TRANSACTION_SOURCE_TASK = "task"
 
+# These are typically high cardinality and the server hates them
+LOW_QUALITY_TRANSACTION_SOURCES = [
+    TRANSACTION_SOURCE_URL,
+]
+
 SOURCE_FOR_STYLE = {
     "endpoint": TRANSACTION_SOURCE_COMPONENT,
     "function_name": TRANSACTION_SOURCE_COMPONENT,
@@ -281,6 +286,10 @@ def continue_from_headers(
 
         if sentrytrace_kwargs is not None:
             kwargs.update(sentrytrace_kwargs)
+
+            # If there's an incoming sentry-trace but no incoming baggage header,
+            # for instance in traces coming from older SDKs,
+            # baggage will be empty and immutable and won't be populated as head SDK.
             baggage.freeze()
 
         kwargs.update(extract_tracestate_data(headers.get("tracestate")))
@@ -309,8 +318,8 @@ def iter_headers(self):
         if tracestate:
             yield "tracestate", tracestate
 
-        if self.containing_transaction and self.containing_transaction._baggage:
-            baggage = self.containing_transaction._baggage.serialize()
+        if self.containing_transaction:
+            baggage = self.containing_transaction.get_baggage().serialize()
             if baggage:
                 yield "baggage", baggage
 
@@ -513,11 +522,10 @@ 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:
+        if self.containing_transaction:
             rv[
                 "dynamic_sampling_context"
-            ] = self.containing_transaction._baggage.dynamic_sampling_context()
+            ] = self.containing_transaction.get_baggage().dynamic_sampling_context()
 
         return rv
 
@@ -527,6 +535,8 @@ class Transaction(Span):
         "name",
         "source",
         "parent_sampled",
+        # used to create baggage value for head SDKs in dynamic sampling
+        "sample_rate",
         # 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
@@ -562,6 +572,7 @@ def __init__(
         Span.__init__(self, **kwargs)
         self.name = name
         self.source = source
+        self.sample_rate = None  # type: Optional[float]
         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
@@ -570,7 +581,7 @@ def __init__(
         self._third_party_tracestate = third_party_tracestate
         self._measurements = {}  # type: Dict[str, Any]
         self._profile = None  # type: Optional[Sampler]
-        self._baggage = baggage
+        self._baggage = baggage  # type: Optional[Baggage]
 
     def __repr__(self):
         # type: () -> str
@@ -708,6 +719,17 @@ def to_json(self):
 
         return rv
 
+    def get_baggage(self):
+        # type: () -> Baggage
+        """
+        The first time a new baggage with sentry items is made,
+        it will be frozen.
+        """
+        if not self._baggage or self._baggage.mutable:
+            self._baggage = Baggage.populate_from_transaction(self)
+
+        return self._baggage
+
     def _set_initial_sampling_decision(self, sampling_context):
         # type: (SamplingContext) -> None
         """
@@ -745,6 +767,7 @@ def _set_initial_sampling_decision(self, sampling_context):
         # 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:
+            self.sample_rate = float(self.sampled)
             return
 
         # we would have bailed already if neither `traces_sampler` nor
@@ -773,6 +796,8 @@ def _set_initial_sampling_decision(self, sampling_context):
             self.sampled = False
             return
 
+        self.sample_rate = float(sample_rate)
+
         # 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:
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
index 0b4e33c6ec..899e1749ff 100644
--- a/sentry_sdk/tracing_utils.py
+++ b/sentry_sdk/tracing_utils.py
@@ -470,6 +470,54 @@ def from_incoming_header(cls, header):
 
         return Baggage(sentry_items, third_party_items, mutable)
 
+    @classmethod
+    def populate_from_transaction(cls, transaction):
+        # type: (Transaction) -> Baggage
+        """
+        Populate fresh baggage entry with sentry_items and make it immutable
+        if this is the head SDK which originates traces.
+        """
+        hub = transaction.hub or sentry_sdk.Hub.current
+        client = hub.client
+        sentry_items = {}  # type: Dict[str, str]
+
+        if not client:
+            return Baggage(sentry_items)
+
+        options = client.options or {}
+        user = (hub.scope and hub.scope._user) or {}
+
+        sentry_items["trace_id"] = transaction.trace_id
+
+        if options.get("environment"):
+            sentry_items["environment"] = options["environment"]
+
+        if options.get("release"):
+            sentry_items["release"] = options["release"]
+
+        if options.get("dsn"):
+            sentry_items["public_key"] = Dsn(options["dsn"]).public_key
+
+        if (
+            transaction.name
+            and transaction.source not in LOW_QUALITY_TRANSACTION_SOURCES
+        ):
+            sentry_items["transaction"] = transaction.name
+
+        if user.get("segment"):
+            sentry_items["user_segment"] = user["segment"]
+
+        if transaction.sample_rate is not None:
+            sentry_items["sample_rate"] = str(transaction.sample_rate)
+
+        # there's an existing baggage but it was mutable,
+        # which is why we are creating this new baggage.
+        # However, if by chance the user put some sentry items in there, give them precedence.
+        if transaction._baggage and transaction._baggage.sentry_items:
+            sentry_items.update(transaction._baggage.sentry_items)
+
+        return Baggage(sentry_items, mutable=False)
+
     def freeze(self):
         # type: () -> None
         self.mutable = False
@@ -500,6 +548,7 @@ def serialize(self, include_third_party=False):
 
 
 # Circular imports
+from sentry_sdk.tracing import LOW_QUALITY_TRANSACTION_SOURCES
 
 if MYPY:
-    from sentry_sdk.tracing import Span
+    from sentry_sdk.tracing import Span, Transaction
diff --git a/tests/integrations/sqlalchemy/test_sqlalchemy.py b/tests/integrations/sqlalchemy/test_sqlalchemy.py
index 421a72ebae..d9fa10095c 100644
--- a/tests/integrations/sqlalchemy/test_sqlalchemy.py
+++ b/tests/integrations/sqlalchemy/test_sqlalchemy.py
@@ -191,14 +191,6 @@ def processor(event, hint):
     # Some spans are discarded.
     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,
-    # the number here should never change across test runs.
-    #
-    # Which exact span descriptions are truncated depends on the span durations
-    # of each SQL query and is non-deterministic.
-    assert len(event["_meta"]["spans"]) == 537
-
     for i, span in enumerate(event["spans"]):
         description = span["description"]
 
diff --git a/tests/integrations/stdlib/test_httplib.py b/tests/integrations/stdlib/test_httplib.py
index e59b245863..839dc011ab 100644
--- a/tests/integrations/stdlib/test_httplib.py
+++ b/tests/integrations/stdlib/test_httplib.py
@@ -1,6 +1,6 @@
 import platform
 import sys
-
+import random
 import pytest
 
 try:
@@ -122,9 +122,7 @@ def test_httplib_misuse(sentry_init, capture_events, request):
     }
 
 
-def test_outgoing_trace_headers(
-    sentry_init, monkeypatch, StringContaining  # noqa: N803
-):
+def test_outgoing_trace_headers(sentry_init, monkeypatch):
     # 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.
@@ -176,3 +174,46 @@ def test_outgoing_trace_headers(
         assert sorted(request_headers["baggage"].split(",")) == sorted(
             expected_outgoing_baggage_items
         )
+
+
+def test_outgoing_trace_headers_head_sdk(sentry_init, monkeypatch):
+    # 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)
+
+    # make sure transaction is always sampled
+    monkeypatch.setattr(random, "random", lambda: 0.1)
+
+    sentry_init(traces_sample_rate=0.5, release="foo")
+    transaction = Transaction.continue_from_headers({})
+
+    with start_transaction(transaction=transaction, name="Head SDK tx") as transaction:
+        HTTPSConnection("www.squirrelchasers.com").request("GET", "/top-chasers")
+
+        (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
+
+        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=%s" % transaction.trace_id,
+            "sentry-sample_rate=0.5",
+            "sentry-release=foo",
+            "sentry-environment=production",
+        ]
+
+        assert sorted(request_headers["baggage"].split(",")) == sorted(
+            expected_outgoing_baggage_items
+        )
diff --git a/tests/tracing/test_integration_tests.py b/tests/tracing/test_integration_tests.py
index fbaf07d509..f42df1091b 100644
--- a/tests/tracing/test_integration_tests.py
+++ b/tests/tracing/test_integration_tests.py
@@ -1,7 +1,9 @@
 # coding: utf-8
 import weakref
 import gc
+import re
 import pytest
+import random
 
 from sentry_sdk import (
     capture_message,
@@ -142,6 +144,61 @@ def test_continue_from_headers(sentry_init, capture_envelopes, sampled, sample_r
     assert message_payload["message"] == "hello"
 
 
+@pytest.mark.parametrize("sample_rate", [0.5, 1.0])
+def test_dynamic_sampling_head_sdk_creates_dsc(
+    sentry_init, capture_envelopes, sample_rate, monkeypatch
+):
+    sentry_init(traces_sample_rate=sample_rate, release="foo")
+    envelopes = capture_envelopes()
+
+    # make sure transaction is sampled for both cases
+    monkeypatch.setattr(random, "random", lambda: 0.1)
+
+    transaction = Transaction.continue_from_headers({}, name="Head SDK tx")
+
+    # will create empty mutable baggage
+    baggage = transaction._baggage
+    assert baggage
+    assert baggage.mutable
+    assert baggage.sentry_items == {}
+    assert baggage.third_party_items == ""
+
+    with start_transaction(transaction):
+        with start_span(op="foo", description="foodesc"):
+            pass
+
+    # finish will create a new baggage entry
+    baggage = transaction._baggage
+    trace_id = transaction.trace_id
+
+    assert baggage
+    assert not baggage.mutable
+    assert baggage.third_party_items == ""
+    assert baggage.sentry_items == {
+        "environment": "production",
+        "release": "foo",
+        "sample_rate": str(sample_rate),
+        "transaction": "Head SDK tx",
+        "trace_id": trace_id,
+    }
+
+    expected_baggage = (
+        "sentry-environment=production,sentry-release=foo,sentry-sample_rate=%s,sentry-transaction=Head%%20SDK%%20tx,sentry-trace_id=%s"
+        % (sample_rate, trace_id)
+    )
+    assert sorted(baggage.serialize().split(",")) == sorted(expected_baggage.split(","))
+
+    (envelope,) = envelopes
+    assert envelope.headers["trace"] == baggage.dynamic_sampling_context()
+    assert envelope.headers["trace"] == {
+        "environment": "production",
+        "release": "foo",
+        "sample_rate": str(sample_rate),
+        "transaction": "Head SDK tx",
+        "trace_id": trace_id,
+    }
+
+
 @pytest.mark.parametrize(
     "args,expected_refcount",
     [({"traces_sample_rate": 1.0}, 100), ({"traces_sample_rate": 0.0}, 0)],
@@ -201,3 +258,27 @@ def capture_event(self, event):
             pass
 
     assert len(events) == 1
+
+
+def test_trace_propagation_meta_head_sdk(sentry_init):
+    sentry_init(traces_sample_rate=1.0, release="foo")
+
+    transaction = Transaction.continue_from_headers({}, name="Head SDK tx")
+    meta = None
+    span = None
+
+    with start_transaction(transaction):
+        with start_span(op="foo", description="foodesc") as current_span:
+            span = current_span
+            meta = Hub.current.trace_propagation_meta()
+
+    ind = meta.find(">") + 1
+    sentry_trace, baggage = meta[:ind], meta[ind:]
+
+    assert 'meta name="sentry-trace"' in sentry_trace
+    sentry_trace_content = re.findall('content="([^"]*)"', sentry_trace)[0]
+    assert sentry_trace_content == span.to_traceparent()
+
+    assert 'meta name="baggage"' in baggage
+    baggage_content = re.findall('content="([^"]*)"', baggage)[0]
+    assert baggage_content == transaction.get_baggage().serialize()

From 59dea5254506770b3d53fd4e8496516704489611 Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Mon, 5 Sep 2022 11:58:43 +0000
Subject: [PATCH 087/209] release: 1.9.8

---
 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 75b51391cc..417cabdcb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.9.8
+
+### Various fixes & improvements
+
+- Baggage creation for head of trace (#1589) by @sl0thentr0py
+- doc(readme): add links to Starlette and FastAPI (#1598) by @thomasleveil
+
 ## 1.9.7
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index ae67facfee..f7a5fc8a73 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.9.7"
+release = "1.9.8"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index c9146871f5..aad6a532f1 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -103,7 +103,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.9.7"
+VERSION = "1.9.8"
 SDK_INFO = {
     "name": "sentry.python",
     "version": VERSION,
diff --git a/setup.py b/setup.py
index f47955964d..1d597119eb 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.9.7",
+    version="1.9.8",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From 253cf9457a11a3a8e33ecf2360a9b2e42e606803 Mon Sep 17 00:00:00 2001
From: Neel Shah 
Date: Mon, 5 Sep 2022 14:01:53 +0200
Subject: [PATCH 088/209] Fix changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 417cabdcb2..5967d4af2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
 ### Various fixes & improvements
 
 - Baggage creation for head of trace (#1589) by @sl0thentr0py
-- doc(readme): add links to Starlette and FastAPI (#1598) by @thomasleveil
+  - The SDK now also generates new baggage entries for dynamic sampling when it is the first (head) SDK in the pipeline.
 
 ## 1.9.7
 

From 0e6aa6d83b3cebdaec98c98d2e873cba41d9893a Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Mon, 12 Sep 2022 14:37:58 -0400
Subject: [PATCH 089/209] feat(profiling): Support for multithreaded profiles
 (#1570)

A signal handler can only be installed on the main thread, this was the reason
why we could not use signals to profile multithreaded programs. This change
installs the signal handler during sdk initialization which should happen on the
main thread. The timers are still started on the individual threads to allow for
profiles being recorded from different threads.
---
 sentry_sdk/_types.py                 |   1 +
 sentry_sdk/client.py                 |   1 +
 sentry_sdk/envelope.py               |   2 +
 sentry_sdk/integrations/profiling.py |  14 +
 sentry_sdk/integrations/wsgi.py      |   4 +-
 sentry_sdk/profiler.py               | 399 ++++++++++++++++++---------
 sentry_sdk/tracing.py                |  29 +-
 tests/integrations/wsgi/test_wsgi.py |  14 +-
 8 files changed, 302 insertions(+), 162 deletions(-)
 create mode 100644 sentry_sdk/integrations/profiling.py

diff --git a/sentry_sdk/_types.py b/sentry_sdk/_types.py
index 59970ad60a..3c985f21e9 100644
--- a/sentry_sdk/_types.py
+++ b/sentry_sdk/_types.py
@@ -45,6 +45,7 @@
         "attachment",
         "session",
         "internal",
+        "profile",
     ]
     SessionStatus = Literal["ok", "exited", "crashed", "abnormal"]
     EndpointType = Literal["store", "envelope"]
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 54e4e0031b..20c4f08f5e 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -403,6 +403,7 @@ def capture_event(
             if is_transaction:
                 if "profile" in event_opt:
                     event_opt["profile"]["transaction_id"] = event_opt["event_id"]
+                    event_opt["profile"]["environment"] = event_opt.get("environment")
                     event_opt["profile"]["version_name"] = event_opt.get("release", "")
                     envelope.add_profile(event_opt.pop("profile"))
                 envelope.add_transaction(event_opt)
diff --git a/sentry_sdk/envelope.py b/sentry_sdk/envelope.py
index f8d895d0bf..24eb87b91f 100644
--- a/sentry_sdk/envelope.py
+++ b/sentry_sdk/envelope.py
@@ -252,6 +252,8 @@ def data_category(self):
             return "error"
         elif ty == "client_report":
             return "internal"
+        elif ty == "profile":
+            return "profile"
         else:
             return "default"
 
diff --git a/sentry_sdk/integrations/profiling.py b/sentry_sdk/integrations/profiling.py
new file mode 100644
index 0000000000..e31a1822af
--- /dev/null
+++ b/sentry_sdk/integrations/profiling.py
@@ -0,0 +1,14 @@
+from sentry_sdk.integrations import DidNotEnable, Integration
+from sentry_sdk.profiler import _setup_profiler
+
+
+class ProfilingIntegration(Integration):
+    identifier = "profiling"
+
+    @staticmethod
+    def setup_once():
+        # type: () -> None
+        try:
+            _setup_profiler()
+        except ValueError:
+            raise DidNotEnable("Profiling can only be enabled from the main thread.")
diff --git a/sentry_sdk/integrations/wsgi.py b/sentry_sdk/integrations/wsgi.py
index 214aea41b9..31ffe224ba 100644
--- a/sentry_sdk/integrations/wsgi.py
+++ b/sentry_sdk/integrations/wsgi.py
@@ -11,7 +11,7 @@
 from sentry_sdk.tracing import Transaction, TRANSACTION_SOURCE_ROUTE
 from sentry_sdk.sessions import auto_session_tracking
 from sentry_sdk.integrations._wsgi_common import _filter_headers
-from sentry_sdk.profiler import profiling
+from sentry_sdk.profiler import start_profiling
 
 from sentry_sdk._types import MYPY
 
@@ -131,7 +131,7 @@ def __call__(self, environ, start_response):
 
                     with hub.start_transaction(
                         transaction, custom_sampling_context={"wsgi_environ": environ}
-                    ), profiling(transaction, hub):
+                    ), start_profiling(transaction, hub):
                         try:
                             rv = self.app(
                                 environ,
diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index f499a5eac2..1116d59017 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -13,33 +13,37 @@
 """
 
 import atexit
+import platform
 import signal
+import threading
 import time
+import sys
+import uuid
+
+from collections import deque
 from contextlib import contextmanager
 
 import sentry_sdk
 from sentry_sdk._compat import PY2
-from sentry_sdk.utils import logger
-
-if PY2:
-    import thread  # noqa
-else:
-    import threading
 
 from sentry_sdk._types import MYPY
 
 if MYPY:
-    import typing
+    from typing import Any
+    from typing import Deque
+    from typing import Dict
     from typing import Generator
+    from typing import List
     from typing import Optional
+    from typing import Sequence
+    from typing import Tuple
     import sentry_sdk.tracing
 
+    Frame = Any
+    FrameData = Tuple[str, str, int]
 
-if PY2:
 
-    def thread_id():
-        # type: () -> int
-        return thread.get_ident()
+if PY2:
 
     def nanosecond_time():
         # type: () -> int
@@ -47,166 +51,295 @@ def nanosecond_time():
 
 else:
 
-    def thread_id():
-        # type: () -> int
-        return threading.get_ident()
-
     def nanosecond_time():
         # type: () -> int
+
+        # In python3.7+, there is a time.perf_counter_ns()
+        # that we may want to switch to for more precision
         return int(time.perf_counter() * 1e9)
 
 
-class FrameData:
-    def __init__(self, frame):
-        # type: (typing.Any) -> None
-        self.function_name = frame.f_code.co_name
-        self.module = frame.f_globals["__name__"]
+_sample_buffer = None  # type: Optional[_SampleBuffer]
+_scheduler = None  # type: Optional[_Scheduler]
 
-        # Depending on Python version, frame.f_code.co_filename either stores just the file name or the entire absolute path.
-        self.file_name = frame.f_code.co_filename
-        self.line_number = frame.f_code.co_firstlineno
 
-    @property
-    def _attribute_tuple(self):
-        # type: () -> typing.Tuple[str, str, str, int]
-        """Returns a tuple of the attributes used in comparison"""
-        return (self.function_name, self.module, self.file_name, self.line_number)
+def _setup_profiler(buffer_secs=60, frequency=101):
+    # type: (int, int) -> None
 
-    def __eq__(self, other):
-        # type: (typing.Any) -> bool
-        if isinstance(other, FrameData):
-            return self._attribute_tuple == other._attribute_tuple
-        return False
+    """
+    This method sets up the application so that it can be profiled.
+    It MUST be called from the main thread. This is a limitation of
+    python's signal library where it only allows the main thread to
+    set a signal handler.
 
-    def __hash__(self):
-        # type: () -> int
-        return hash(self._attribute_tuple)
+    `buffer_secs` determines the max time a sample will be buffered for
+    `frequency` determines the number of samples to take per second (Hz)
+    """
+
+    global _sample_buffer
+    global _scheduler
+
+    assert _sample_buffer is None and _scheduler is None
+
+    # To buffer samples for `buffer_secs` at `frequency` Hz, we need
+    # a capcity of `buffer_secs * frequency`.
+    _sample_buffer = _SampleBuffer(capacity=buffer_secs * frequency)
+
+    _scheduler = _Scheduler(frequency=frequency)
 
+    # This setups a process wide signal handler that will be called
+    # at an interval to record samples.
+    signal.signal(signal.SIGPROF, _sample_stack)
+    atexit.register(_teardown_profiler)
 
-class StackSample:
-    def __init__(self, top_frame, profiler_start_time, frame_indices):
-        # type: (typing.Any, int, typing.Dict[FrameData, int]) -> None
-        self.sample_time = nanosecond_time() - profiler_start_time
-        self.stack = []  # type: typing.List[int]
-        self._add_all_frames(top_frame, frame_indices)
 
-    def _add_all_frames(self, top_frame, frame_indices):
-        # type: (typing.Any, typing.Dict[FrameData, int]) -> None
-        frame = top_frame
-        while frame is not None:
-            frame_data = FrameData(frame)
-            if frame_data not in frame_indices:
-                frame_indices[frame_data] = len(frame_indices)
-            self.stack.append(frame_indices[frame_data])
-            frame = frame.f_back
-        self.stack = list(reversed(self.stack))
+def _teardown_profiler():
+    # type: () -> None
 
+    global _sample_buffer
+    global _scheduler
 
-class Sampler(object):
+    assert _sample_buffer is not None and _scheduler is not None
+
+    _sample_buffer = None
+    _scheduler = None
+
+    # setting the timer with 0 will stop will clear the timer
+    signal.setitimer(signal.ITIMER_PROF, 0)
+
+    # put back the default signal handler
+    signal.signal(signal.SIGPROF, signal.SIG_DFL)
+
+
+def _sample_stack(_signal_num, _frame):
+    # type: (int, Frame) -> None
     """
-    A simple stack sampler for low-overhead CPU profiling: samples the call
-    stack every `interval` seconds and keeps track of counts by frame. Because
-    this uses signals, it only works on the main thread.
+    Take a sample of the stack on all the threads in the process.
+    This handler is called to handle the signal at a set interval.
+
+    See https://www.gnu.org/software/libc/manual/html_node/Alarm-Signals.html
+
+    This is not based on wall time, and you may see some variances
+    in the frequency at which this handler is called.
+
+    Notably, it looks like only threads started using the threading
+    module counts towards the time elapsed. It is unclear why that
+    is the case right now. However, we are able to get samples from
+    threading._DummyThread if this handler is called as a result of
+    another thread (e.g. the main thread).
     """
 
-    def __init__(self, transaction, interval=0.01):
-        # type: (sentry_sdk.tracing.Transaction, float) -> None
-        self.interval = interval
-        self.stack_samples = []  # type: typing.List[StackSample]
-        self._frame_indices = dict()  # type: typing.Dict[FrameData, int]
-        self._transaction = transaction
-        self.duration = 0  # This value will only be correct after the profiler has been started and stopped
-        transaction._profile = self
+    assert _sample_buffer is not None
+    _sample_buffer.write(
+        (
+            nanosecond_time(),
+            [
+                (tid, _extract_stack(frame))
+                for tid, frame in sys._current_frames().items()
+            ],
+        )
+    )
 
-    def __enter__(self):
-        # type: () -> None
-        self.start()
 
-    def __exit__(self, *_):
-        # type: (*typing.List[typing.Any]) -> None
-        self.stop()
+# We want to impose a stack depth limit so that samples aren't too large.
+MAX_STACK_DEPTH = 128
 
-    def start(self):
-        # type: () -> None
-        self._start_time = nanosecond_time()
-        self.stack_samples = []
-        self._frame_indices = dict()
-        try:
-            signal.signal(signal.SIGVTALRM, self._sample)
-        except ValueError:
-            logger.error(
-                "Profiler failed to run because it was started from a non-main thread"
-            )
-            return
 
-        signal.setitimer(signal.ITIMER_VIRTUAL, self.interval)
-        atexit.register(self.stop)
+def _extract_stack(frame):
+    # type: (Frame) -> Sequence[FrameData]
+    """
+    Extracts the stack starting the specified frame. The extracted stack
+    assumes the specified frame is the top of the stack, and works back
+    to the bottom of the stack.
+
+    In the event that the stack is more than `MAX_STACK_DEPTH` frames deep,
+    only the first `MAX_STACK_DEPTH` frames will be returned.
+    """
 
-    def _sample(self, _, frame):
-        # type: (typing.Any, typing.Any) -> None
-        self.stack_samples.append(
-            StackSample(frame, self._start_time, self._frame_indices)
+    stack = deque(maxlen=MAX_STACK_DEPTH)  # type: Deque[FrameData]
+
+    while frame is not None:
+        stack.append(
+            (
+                # co_name only contains the frame name.
+                # If the frame was a class method,
+                # the class name will NOT be included.
+                frame.f_code.co_name,
+                frame.f_code.co_filename,
+                frame.f_code.co_firstlineno,
+            )
         )
-        signal.setitimer(signal.ITIMER_VIRTUAL, self.interval)
+        frame = frame.f_back
+
+    return stack
+
+
+class Profile(object):
+    def __init__(self, transaction, hub=None):
+        # type: (sentry_sdk.tracing.Transaction, Optional[sentry_sdk.Hub]) -> None
+        self.transaction = transaction
+        self.hub = hub
+        self._start_ns = None  # type: Optional[int]
+        self._stop_ns = None  # type: Optional[int]
+
+    def __enter__(self):
+        # type: () -> None
+        assert _scheduler is not None
+        self._start_ns = nanosecond_time()
+        _scheduler.start_profiling()
+
+    def __exit__(self, ty, value, tb):
+        # type: (Optional[Any], Optional[Any], Optional[Any]) -> None
+        assert _scheduler is not None
+        _scheduler.stop_profiling()
+        self._stop_ns = nanosecond_time()
+
+        # Now that we've collected all the data, attach it to the
+        # transaction so that it can be sent in the same envelope
+        self.transaction._profile = self.to_json()
 
     def to_json(self):
-        # type: () -> typing.Any
+        # type: () -> Dict[str, Any]
+        assert _sample_buffer is not None
+        assert self._start_ns is not None
+        assert self._stop_ns is not None
+
+        return {
+            "device_os_name": platform.system(),
+            "device_os_version": platform.release(),
+            "duration_ns": str(self._stop_ns - self._start_ns),
+            "environment": None,  # Gets added in client.py
+            "platform": "python",
+            "platform_version": platform.python_version(),
+            "profile_id": uuid.uuid4().hex,
+            "profile": _sample_buffer.slice_profile(self._start_ns, self._stop_ns),
+            "trace_id": self.transaction.trace_id,
+            "transaction_id": None,  # Gets added in client.py
+            "transaction_name": self.transaction.name,
+            "version_code": "",  # TODO: Determine appropriate value. Currently set to empty string so profile will not get rejected.
+            "version_name": None,  # Gets added in client.py
+        }
+
+
+class _SampleBuffer(object):
+    """
+    A simple implementation of a ring buffer to buffer the samples taken.
+
+    At some point, the ring buffer will start overwriting old samples.
+    This is a trade off we've chosen to ensure the memory usage does not
+    grow indefinitely. But by having a sufficiently large buffer, this is
+    largely not a problem.
+    """
+
+    def __init__(self, capacity):
+        # type: (int) -> None
+
+        self.buffer = [None] * capacity
+        self.capacity = capacity
+        self.idx = 0
+
+    def write(self, sample):
+        # type: (Any) -> None
         """
-        Exports this object to a JSON format compatible with Sentry's profiling visualizer.
-        Returns dictionary which can be serialized to JSON.
+        Writing to the buffer is not thread safe. There is the possibility
+        that parallel writes will overwrite one another.
+
+        This should only be a problem if the signal handler itself is
+        interrupted by the next signal.
+        (i.e. SIGPROF is sent again before the handler finishes).
+
+        For this reason, and to keep it performant, we've chosen not to add
+        any synchronization mechanisms here like locks.
         """
-        return {
-            "samples": [
-                {
-                    "frames": sample.stack,
-                    "relative_timestamp_ns": sample.sample_time,
-                    "thread_id": thread_id(),
-                }
-                for sample in self.stack_samples
-            ],
-            "frames": [
-                {
-                    "name": frame.function_name,
-                    "file": frame.file_name,
-                    "line": frame.line_number,
+        idx = self.idx
+        self.buffer[idx] = sample
+        self.idx = (idx + 1) % self.capacity
+
+    def slice_profile(self, start_ns, stop_ns):
+        # type: (int, int) -> Dict[str, List[Any]]
+        samples = []  # type: List[Any]
+        frames = dict()  # type: Dict[FrameData, int]
+        frames_list = list()  # type: List[Any]
+
+        # TODO: This is doing an naive iteration over the
+        # buffer and extracting the appropriate samples.
+        #
+        # Is it safe to assume that the samples are always in
+        # chronological order and binary search the buffer?
+        for raw_sample in self.buffer:
+            if raw_sample is None:
+                continue
+
+            ts = raw_sample[0]
+            if start_ns > ts or ts > stop_ns:
+                continue
+
+            for tid, stack in raw_sample[1]:
+                sample = {
+                    "frames": [],
+                    "relative_timestamp_ns": ts - start_ns,
+                    "thread_id": tid,
                 }
-                for frame in self.frame_list()
-            ],
-        }
 
-    def frame_list(self):
-        # type: () -> typing.List[FrameData]
-        # Build frame array from the frame indices
-        frames = [None] * len(self._frame_indices)  # type: typing.List[typing.Any]
-        for frame, index in self._frame_indices.items():
-            frames[index] = frame
-        return frames
+                for frame in stack:
+                    if frame not in frames:
+                        frames[frame] = len(frames)
+                        frames_list.append(
+                            {
+                                "name": frame[0],
+                                "file": frame[1],
+                                "line": frame[2],
+                            }
+                        )
+                    sample["frames"].append(frames[frame])
+
+                samples.append(sample)
+
+        return {"frames": frames_list, "samples": samples}
 
-    def stop(self):
-        # type: () -> None
-        self.duration = nanosecond_time() - self._start_time
-        signal.setitimer(signal.ITIMER_VIRTUAL, 0)
 
-    @property
-    def transaction_name(self):
-        # type: () -> str
-        return self._transaction.name
+class _Scheduler(object):
+    def __init__(self, frequency):
+        # type: (int) -> None
+        self._lock = threading.Lock()
+        self._count = 0
+        self._interval = 1.0 / frequency
 
+    def start_profiling(self):
+        # type: () -> bool
+        with self._lock:
+            # we only need to start the timer if we're starting the first profile
+            should_start_timer = self._count == 0
+            self._count += 1
 
-def has_profiling_enabled(hub=None):
-    # type: (Optional[sentry_sdk.Hub]) -> bool
-    if hub is None:
-        hub = sentry_sdk.Hub.current
+        if should_start_timer:
+            signal.setitimer(signal.ITIMER_PROF, self._interval, self._interval)
+        return should_start_timer
 
-    options = hub.client and hub.client.options
-    return bool(options and options["_experiments"].get("enable_profiling"))
+    def stop_profiling(self):
+        # type: () -> bool
+        with self._lock:
+            # we only need to stop the timer if we're stoping the last profile
+            should_stop_timer = self._count == 1
+            self._count -= 1
+
+        if should_stop_timer:
+            signal.setitimer(signal.ITIMER_PROF, 0)
+        return should_stop_timer
+
+
+def _has_profiling_enabled():
+    # type: () -> bool
+    return _sample_buffer is not None and _scheduler is not None
 
 
 @contextmanager
-def profiling(transaction, hub=None):
+def start_profiling(transaction, hub=None):
     # type: (sentry_sdk.tracing.Transaction, Optional[sentry_sdk.Hub]) -> Generator[None, None, None]
-    if has_profiling_enabled(hub):
-        with Sampler(transaction):
+
+    # if profiling was not enabled, this should be a noop
+    if _has_profiling_enabled():
+        with Profile(transaction, hub=hub):
             yield
     else:
         yield
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 78084d27f3..c6328664bf 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -1,13 +1,11 @@
 import uuid
 import random
 import time
-import platform
 
 from datetime import datetime, timedelta
 
 import sentry_sdk
 
-from sentry_sdk.profiler import has_profiling_enabled
 from sentry_sdk.utils import logger
 from sentry_sdk._types import MYPY
 
@@ -21,7 +19,6 @@
     from typing import List
     from typing import Tuple
     from typing import Iterator
-    from sentry_sdk.profiler import Sampler
 
     from sentry_sdk._types import SamplingContext, MeasurementUnit
 
@@ -580,8 +577,8 @@ def __init__(
         self._sentry_tracestate = sentry_tracestate
         self._third_party_tracestate = third_party_tracestate
         self._measurements = {}  # type: Dict[str, Any]
-        self._profile = None  # type: Optional[Sampler]
-        self._baggage = baggage  # type: Optional[Baggage]
+        self._profile = None  # type: Optional[Dict[str, Any]]
+        self._baggage = baggage
 
     def __repr__(self):
         # type: () -> str
@@ -673,26 +670,8 @@ def finish(self, hub=None):
             "spans": finished_spans,
         }
 
-        if (
-            has_profiling_enabled(hub)
-            and hub.client is not None
-            and self._profile is not None
-        ):
-            event["profile"] = {
-                "device_os_name": platform.system(),
-                "device_os_version": platform.release(),
-                "duration_ns": self._profile.duration,
-                "environment": hub.client.options["environment"],
-                "platform": "python",
-                "platform_version": platform.python_version(),
-                "profile_id": uuid.uuid4().hex,
-                "profile": self._profile.to_json(),
-                "trace_id": self.trace_id,
-                "transaction_id": None,  # Gets added in client.py
-                "transaction_name": self.name,
-                "version_code": "",  # TODO: Determine appropriate value. Currently set to empty string so profile will not get rejected.
-                "version_name": None,  # Gets added in client.py
-            }
+        if hub.client is not None and self._profile is not None:
+            event["profile"] = self._profile
 
         if has_custom_measurements_enabled():
             event["measurements"] = self._measurements
diff --git a/tests/integrations/wsgi/test_wsgi.py b/tests/integrations/wsgi/test_wsgi.py
index a45b6fa154..0fe129972b 100644
--- a/tests/integrations/wsgi/test_wsgi.py
+++ b/tests/integrations/wsgi/test_wsgi.py
@@ -2,7 +2,9 @@
 import pytest
 
 import sentry_sdk
+from sentry_sdk.integrations.profiling import ProfilingIntegration
 from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
+from sentry_sdk.profiler import _teardown_profiler
 from collections import Counter
 
 try:
@@ -19,6 +21,12 @@ def app(environ, start_response):
     return app
 
 
+@pytest.fixture
+def profiling_integration():
+    yield ProfilingIntegration()
+    _teardown_profiler()
+
+
 class IterableApp(object):
     def __init__(self, iterable):
         self.iterable = iterable
@@ -281,12 +289,14 @@ def sample_app(environ, start_response):
     assert len(session_aggregates) == 1
 
 
-def test_profile_sent_when_profiling_enabled(capture_envelopes, sentry_init):
+def test_profile_sent_when_profiling_enabled(
+    capture_envelopes, sentry_init, profiling_integration
+):
     def test_app(environ, start_response):
         start_response("200 OK", [])
         return ["Go get the ball! Good dog!"]
 
-    sentry_init(traces_sample_rate=1.0, _experiments={"enable_profiling": True})
+    sentry_init(traces_sample_rate=1.0, integrations=[profiling_integration])
     app = SentryWsgiMiddleware(test_app)
     envelopes = capture_envelopes()
 

From b36d84a76bd6f8344c9b0a9694591939296e9c06 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Wed, 14 Sep 2022 11:27:14 -0400
Subject: [PATCH 090/209] feat(profiling): Add support for profiles_sample_rate
 (#1613)

This changes the way profiling is enabled in the python sdk by allowing the end
user to specify a `profiles_sample_rate` which is used to control the sampling
of profiles. This sample rate is relative to the `traces_sample_rate` meaning
the true sample rate of profiles is approximately equal to
`traces_sample_rate * profiles_sample_rate`.
---
 sentry_sdk/client.py                 |  8 +++++
 sentry_sdk/consts.py                 |  2 +-
 sentry_sdk/integrations/profiling.py | 14 --------
 sentry_sdk/profiler.py               | 37 +++++++++++++++------
 tests/integrations/wsgi/test_wsgi.py | 48 +++++++++++-----------------
 5 files changed, 55 insertions(+), 54 deletions(-)
 delete mode 100644 sentry_sdk/integrations/profiling.py

diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 20c4f08f5e..dec9018154 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.profiler import setup_profiler
 from sentry_sdk.tracing_utils import has_tracestate_enabled, reinflate_tracestate
 
 from sentry_sdk._types import MYPY
@@ -130,6 +131,13 @@ def _capture_envelope(envelope):
         finally:
             _client_init_debug.set(old_debug)
 
+        profiles_sample_rate = self.options["_experiments"].get("profiles_sample_rate")
+        if profiles_sample_rate is not None and profiles_sample_rate > 0:
+            try:
+                setup_profiler()
+            except ValueError:
+                logger.debug("Profiling can only be enabled from the main thread.")
+
     @property
     def dsn(self):
         # type: () -> Optional[str]
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index aad6a532f1..f335c3bc18 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -34,7 +34,7 @@
             "smart_transaction_trimming": Optional[bool],
             "propagate_tracestate": Optional[bool],
             "custom_measurements": Optional[bool],
-            "enable_profiling": Optional[bool],
+            "profiles_sample_rate": Optional[float],
         },
         total=False,
     )
diff --git a/sentry_sdk/integrations/profiling.py b/sentry_sdk/integrations/profiling.py
deleted file mode 100644
index e31a1822af..0000000000
--- a/sentry_sdk/integrations/profiling.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from sentry_sdk.integrations import DidNotEnable, Integration
-from sentry_sdk.profiler import _setup_profiler
-
-
-class ProfilingIntegration(Integration):
-    identifier = "profiling"
-
-    @staticmethod
-    def setup_once():
-        # type: () -> None
-        try:
-            _setup_profiler()
-        except ValueError:
-            raise DidNotEnable("Profiling can only be enabled from the main thread.")
diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 1116d59017..fcfde6ef0d 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -14,6 +14,7 @@
 
 import atexit
 import platform
+import random
 import signal
 import threading
 import time
@@ -63,7 +64,7 @@ def nanosecond_time():
 _scheduler = None  # type: Optional[_Scheduler]
 
 
-def _setup_profiler(buffer_secs=60, frequency=101):
+def setup_profiler(buffer_secs=60, frequency=101):
     # type: (int, int) -> None
 
     """
@@ -90,17 +91,15 @@ def _setup_profiler(buffer_secs=60, frequency=101):
     # This setups a process wide signal handler that will be called
     # at an interval to record samples.
     signal.signal(signal.SIGPROF, _sample_stack)
-    atexit.register(_teardown_profiler)
+    atexit.register(teardown_profiler)
 
 
-def _teardown_profiler():
+def teardown_profiler():
     # type: () -> None
 
     global _sample_buffer
     global _scheduler
 
-    assert _sample_buffer is not None and _scheduler is not None
-
     _sample_buffer = None
     _scheduler = None
 
@@ -328,9 +327,29 @@ def stop_profiling(self):
         return should_stop_timer
 
 
-def _has_profiling_enabled():
-    # type: () -> bool
-    return _sample_buffer is not None and _scheduler is not None
+def _should_profile(hub):
+    # type: (Optional[sentry_sdk.Hub]) -> bool
+
+    # The profiler hasn't been properly initialized.
+    if _sample_buffer is None or _scheduler is None:
+        return False
+
+    hub = hub or sentry_sdk.Hub.current
+    client = hub.client
+
+    # The client is None, so we can't get the sample rate.
+    if client is None:
+        return False
+
+    options = client.options
+    profiles_sample_rate = options["_experiments"].get("profiles_sample_rate")
+
+    # The profiles_sample_rate option was not set, so profiling
+    # was never enabled.
+    if profiles_sample_rate is None:
+        return False
+
+    return random.random() < float(profiles_sample_rate)
 
 
 @contextmanager
@@ -338,7 +357,7 @@ def start_profiling(transaction, hub=None):
     # type: (sentry_sdk.tracing.Transaction, Optional[sentry_sdk.Hub]) -> Generator[None, None, None]
 
     # if profiling was not enabled, this should be a noop
-    if _has_profiling_enabled():
+    if _should_profile(hub):
         with Profile(transaction, hub=hub):
             yield
     else:
diff --git a/tests/integrations/wsgi/test_wsgi.py b/tests/integrations/wsgi/test_wsgi.py
index 0fe129972b..a89000f570 100644
--- a/tests/integrations/wsgi/test_wsgi.py
+++ b/tests/integrations/wsgi/test_wsgi.py
@@ -1,10 +1,10 @@
 from werkzeug.test import Client
+
 import pytest
 
 import sentry_sdk
-from sentry_sdk.integrations.profiling import ProfilingIntegration
 from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
-from sentry_sdk.profiler import _teardown_profiler
+from sentry_sdk.profiler import teardown_profiler
 from collections import Counter
 
 try:
@@ -22,9 +22,9 @@ def app(environ, start_response):
 
 
 @pytest.fixture
-def profiling_integration():
-    yield ProfilingIntegration()
-    _teardown_profiler()
+def profiling():
+    yield
+    teardown_profiler()
 
 
 class IterableApp(object):
@@ -289,43 +289,31 @@ def sample_app(environ, start_response):
     assert len(session_aggregates) == 1
 
 
+@pytest.mark.parametrize(
+    "profiles_sample_rate,should_send",
+    [(1.0, True), (0.75, True), (0.25, False), (None, False)],
+)
 def test_profile_sent_when_profiling_enabled(
-    capture_envelopes, sentry_init, profiling_integration
+    capture_envelopes, sentry_init, profiling, profiles_sample_rate, should_send
 ):
     def test_app(environ, start_response):
         start_response("200 OK", [])
         return ["Go get the ball! Good dog!"]
 
-    sentry_init(traces_sample_rate=1.0, integrations=[profiling_integration])
-    app = SentryWsgiMiddleware(test_app)
-    envelopes = capture_envelopes()
-
-    client = Client(app)
-    client.get("/")
-
-    profile_sent = False
-    for item in envelopes[0].items:
-        if item.headers["type"] == "profile":
-            profile_sent = True
-            break
-    assert profile_sent
-
-
-def test_profile_not_sent_when_profiling_disabled(capture_envelopes, sentry_init):
-    def test_app(environ, start_response):
-        start_response("200 OK", [])
-        return ["Go get the ball! Good dog!"]
-
-    sentry_init(traces_sample_rate=1.0)
+    sentry_init(
+        traces_sample_rate=1.0,
+        _experiments={"profiles_sample_rate": profiles_sample_rate},
+    )
     app = SentryWsgiMiddleware(test_app)
     envelopes = capture_envelopes()
 
-    client = Client(app)
-    client.get("/")
+    with mock.patch("sentry_sdk.profiler.random.random", return_value=0.5):
+        client = Client(app)
+        client.get("/")
 
     profile_sent = False
     for item in envelopes[0].items:
         if item.headers["type"] == "profile":
             profile_sent = True
             break
-    assert not profile_sent
+    assert profile_sent == should_send

From f5ee56b4cc4c0b7f57f32cae05029a894de0782c Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 19 Sep 2022 16:40:20 +0200
Subject: [PATCH 091/209] Faster Tests (DjangoCon) (#1602)

* Running tests the sentry-ruby way (splitting up into multiple yaml files. Created a script to split tox.ini into multiple yaml files automatically)
* Cleaning up the yaml file in general.
* Removed PyPy from the test suite because it was never run. We have to reevaluate support for PyPy.

This fixes #1499
---
 .github/workflows/ci.yml                      |  76 +--------
 .github/workflows/test-common.yml             |  72 ++++++++
 .../workflows/test-integration-aiohttp.yml    |  56 +++++++
 .github/workflows/test-integration-asgi.yml   |  56 +++++++
 .../workflows/test-integration-aws_lambda.yml |  56 +++++++
 .github/workflows/test-integration-beam.yml   |  56 +++++++
 .github/workflows/test-integration-boto3.yml  |  56 +++++++
 .github/workflows/test-integration-bottle.yml |  56 +++++++
 .github/workflows/test-integration-celery.yml |  56 +++++++
 .../workflows/test-integration-chalice.yml    |  56 +++++++
 .github/workflows/test-integration-django.yml |  73 +++++++++
 .github/workflows/test-integration-falcon.yml |  56 +++++++
 .../workflows/test-integration-fastapi.yml    |  56 +++++++
 .github/workflows/test-integration-flask.yml  |  56 +++++++
 .github/workflows/test-integration-gcp.yml    |  56 +++++++
 .github/workflows/test-integration-httpx.yml  |  56 +++++++
 .../workflows/test-integration-pure_eval.yml  |  56 +++++++
 .../workflows/test-integration-pyramid.yml    |  56 +++++++
 .github/workflows/test-integration-quart.yml  |  56 +++++++
 .github/workflows/test-integration-redis.yml  |  56 +++++++
 .../test-integration-rediscluster.yml         |  56 +++++++
 .../workflows/test-integration-requests.yml   |  56 +++++++
 .github/workflows/test-integration-rq.yml     |  56 +++++++
 .github/workflows/test-integration-sanic.yml  |  56 +++++++
 .../workflows/test-integration-sqlalchemy.yml |  56 +++++++
 .../workflows/test-integration-starlette.yml  |  56 +++++++
 .../workflows/test-integration-tornado.yml    |  56 +++++++
 .../workflows/test-integration-trytond.yml    |  56 +++++++
 .../split-tox-gh-actions/ci-yaml-services.txt |  18 ++
 scripts/split-tox-gh-actions/ci-yaml.txt      |  53 ++++++
 .../split-tox-gh-actions.py                   | 154 ++++++++++++++++++
 test-requirements.txt                         |  12 +-
 tox.ini                                       |  44 ++---
 33 files changed, 1806 insertions(+), 96 deletions(-)
 create mode 100644 .github/workflows/test-common.yml
 create mode 100644 .github/workflows/test-integration-aiohttp.yml
 create mode 100644 .github/workflows/test-integration-asgi.yml
 create mode 100644 .github/workflows/test-integration-aws_lambda.yml
 create mode 100644 .github/workflows/test-integration-beam.yml
 create mode 100644 .github/workflows/test-integration-boto3.yml
 create mode 100644 .github/workflows/test-integration-bottle.yml
 create mode 100644 .github/workflows/test-integration-celery.yml
 create mode 100644 .github/workflows/test-integration-chalice.yml
 create mode 100644 .github/workflows/test-integration-django.yml
 create mode 100644 .github/workflows/test-integration-falcon.yml
 create mode 100644 .github/workflows/test-integration-fastapi.yml
 create mode 100644 .github/workflows/test-integration-flask.yml
 create mode 100644 .github/workflows/test-integration-gcp.yml
 create mode 100644 .github/workflows/test-integration-httpx.yml
 create mode 100644 .github/workflows/test-integration-pure_eval.yml
 create mode 100644 .github/workflows/test-integration-pyramid.yml
 create mode 100644 .github/workflows/test-integration-quart.yml
 create mode 100644 .github/workflows/test-integration-redis.yml
 create mode 100644 .github/workflows/test-integration-rediscluster.yml
 create mode 100644 .github/workflows/test-integration-requests.yml
 create mode 100644 .github/workflows/test-integration-rq.yml
 create mode 100644 .github/workflows/test-integration-sanic.yml
 create mode 100644 .github/workflows/test-integration-sqlalchemy.yml
 create mode 100644 .github/workflows/test-integration-starlette.yml
 create mode 100644 .github/workflows/test-integration-tornado.yml
 create mode 100644 .github/workflows/test-integration-trytond.yml
 create mode 100644 scripts/split-tox-gh-actions/ci-yaml-services.txt
 create mode 100644 scripts/split-tox-gh-actions/ci-yaml.txt
 create mode 100755 scripts/split-tox-gh-actions/split-tox-gh-actions.py

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 772caeb12f..ff9ca8c643 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,81 +32,19 @@ jobs:
           pip install tox
           tox -e linters
 
-  test:
-    name: Run Tests
-    runs-on: ${{ matrix.linux-version }}
-    timeout-minutes: 45
-    continue-on-error: true
-    strategy:
-      matrix:
-        linux-version: [ubuntu-latest]
-        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
-          # 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
-      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
+  check-ci-config:
+    name: Check CI config
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
-        run: |
-          pip install codecov tox
+          python-version: 3.9
 
-      - 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
-          coverage combine .coverage*
-          coverage xml -i
-          codecov --file coverage.xml
+      - run: |
+          python scripts/split-tox-gh-actions/split-tox-gh-actions.py --fail-on-changes
 
   build_lambda_layer:
     name: Build Package
diff --git a/.github/workflows/test-common.yml b/.github/workflows/test-common.yml
new file mode 100644
index 0000000000..2c8964d4ae
--- /dev/null
+++ b/.github/workflows/test-common.yml
@@ -0,0 +1,72 @@
+name: Test Common
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: Test Python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
+    services:
+      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@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Run Tests
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "py${{ matrix.python-version }}$" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch --ignore=tests/integrations
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-aiohttp.yml b/.github/workflows/test-integration-aiohttp.yml
new file mode 100644
index 0000000000..1bd1e69cb2
--- /dev/null
+++ b/.github/workflows/test-integration-aiohttp.yml
@@ -0,0 +1,56 @@
+name: Test aiohttp
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: aiohttp, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test aiohttp
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-aiohttp" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-asgi.yml b/.github/workflows/test-integration-asgi.yml
new file mode 100644
index 0000000000..49edcf0984
--- /dev/null
+++ b/.github/workflows/test-integration-asgi.yml
@@ -0,0 +1,56 @@
+name: Test asgi
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: asgi, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test asgi
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-asgi" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-aws_lambda.yml b/.github/workflows/test-integration-aws_lambda.yml
new file mode 100644
index 0000000000..551e50df35
--- /dev/null
+++ b/.github/workflows/test-integration-aws_lambda.yml
@@ -0,0 +1,56 @@
+name: Test aws_lambda
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: aws_lambda, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.7"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test aws_lambda
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-aws_lambda" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-beam.yml b/.github/workflows/test-integration-beam.yml
new file mode 100644
index 0000000000..4f5d2c721b
--- /dev/null
+++ b/.github/workflows/test-integration-beam.yml
@@ -0,0 +1,56 @@
+name: Test beam
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: beam, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.7"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test beam
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-beam" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-boto3.yml b/.github/workflows/test-integration-boto3.yml
new file mode 100644
index 0000000000..f82a0fdf2c
--- /dev/null
+++ b/.github/workflows/test-integration-boto3.yml
@@ -0,0 +1,56 @@
+name: Test boto3
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: boto3, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["2.7","3.6","3.7","3.8"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test boto3
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-boto3" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-bottle.yml b/.github/workflows/test-integration-bottle.yml
new file mode 100644
index 0000000000..bf0f4e0a15
--- /dev/null
+++ b/.github/workflows/test-integration-bottle.yml
@@ -0,0 +1,56 @@
+name: Test bottle
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: bottle, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test bottle
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-bottle" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-celery.yml b/.github/workflows/test-integration-celery.yml
new file mode 100644
index 0000000000..7eee993eb4
--- /dev/null
+++ b/.github/workflows/test-integration-celery.yml
@@ -0,0 +1,56 @@
+name: Test celery
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: celery, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test celery
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-celery" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-chalice.yml b/.github/workflows/test-integration-chalice.yml
new file mode 100644
index 0000000000..74a6a7f7f8
--- /dev/null
+++ b/.github/workflows/test-integration-chalice.yml
@@ -0,0 +1,56 @@
+name: Test chalice
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: chalice, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.6","3.7","3.8"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test chalice
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-chalice" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-django.yml b/.github/workflows/test-integration-django.yml
new file mode 100644
index 0000000000..2f8a4c6a0d
--- /dev/null
+++ b/.github/workflows/test-integration-django.yml
@@ -0,0 +1,73 @@
+name: Test django
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: django, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+    services:
+      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@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test django
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-django" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-falcon.yml b/.github/workflows/test-integration-falcon.yml
new file mode 100644
index 0000000000..398067c962
--- /dev/null
+++ b/.github/workflows/test-integration-falcon.yml
@@ -0,0 +1,56 @@
+name: Test falcon
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: falcon, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test falcon
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-falcon" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-fastapi.yml b/.github/workflows/test-integration-fastapi.yml
new file mode 100644
index 0000000000..5337c53cd4
--- /dev/null
+++ b/.github/workflows/test-integration-fastapi.yml
@@ -0,0 +1,56 @@
+name: Test fastapi
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: fastapi, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test fastapi
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-fastapi" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-flask.yml b/.github/workflows/test-integration-flask.yml
new file mode 100644
index 0000000000..ed0066bc88
--- /dev/null
+++ b/.github/workflows/test-integration-flask.yml
@@ -0,0 +1,56 @@
+name: Test flask
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: flask, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test flask
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-flask" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-gcp.yml b/.github/workflows/test-integration-gcp.yml
new file mode 100644
index 0000000000..e7aa1bd3ea
--- /dev/null
+++ b/.github/workflows/test-integration-gcp.yml
@@ -0,0 +1,56 @@
+name: Test gcp
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: gcp, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.7"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test gcp
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-gcp" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-httpx.yml b/.github/workflows/test-integration-httpx.yml
new file mode 100644
index 0000000000..f43fce229a
--- /dev/null
+++ b/.github/workflows/test-integration-httpx.yml
@@ -0,0 +1,56 @@
+name: Test httpx
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: httpx, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.6","3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test httpx
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-httpx" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-pure_eval.yml b/.github/workflows/test-integration-pure_eval.yml
new file mode 100644
index 0000000000..f3d407062f
--- /dev/null
+++ b/.github/workflows/test-integration-pure_eval.yml
@@ -0,0 +1,56 @@
+name: Test pure_eval
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: pure_eval, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.5","3.6","3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test pure_eval
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-pure_eval" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-pyramid.yml b/.github/workflows/test-integration-pyramid.yml
new file mode 100644
index 0000000000..990d5acdbd
--- /dev/null
+++ b/.github/workflows/test-integration-pyramid.yml
@@ -0,0 +1,56 @@
+name: Test pyramid
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: pyramid, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test pyramid
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-pyramid" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-quart.yml b/.github/workflows/test-integration-quart.yml
new file mode 100644
index 0000000000..fbea7be0d9
--- /dev/null
+++ b/.github/workflows/test-integration-quart.yml
@@ -0,0 +1,56 @@
+name: Test quart
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: quart, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test quart
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-quart" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-redis.yml b/.github/workflows/test-integration-redis.yml
new file mode 100644
index 0000000000..78159108c3
--- /dev/null
+++ b/.github/workflows/test-integration-redis.yml
@@ -0,0 +1,56 @@
+name: Test redis
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: redis, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["2.7","3.7","3.8","3.9"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test redis
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-redis" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-rediscluster.yml b/.github/workflows/test-integration-rediscluster.yml
new file mode 100644
index 0000000000..b1c2824ba2
--- /dev/null
+++ b/.github/workflows/test-integration-rediscluster.yml
@@ -0,0 +1,56 @@
+name: Test rediscluster
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: rediscluster, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["2.7","3.7","3.8","3.9"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test rediscluster
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-rediscluster" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-requests.yml b/.github/workflows/test-integration-requests.yml
new file mode 100644
index 0000000000..146d43f3c1
--- /dev/null
+++ b/.github/workflows/test-integration-requests.yml
@@ -0,0 +1,56 @@
+name: Test requests
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: requests, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["2.7","3.8","3.9"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test requests
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-requests" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-rq.yml b/.github/workflows/test-integration-rq.yml
new file mode 100644
index 0000000000..a8b209061f
--- /dev/null
+++ b/.github/workflows/test-integration-rq.yml
@@ -0,0 +1,56 @@
+name: Test rq
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: rq, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test rq
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-rq" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-sanic.yml b/.github/workflows/test-integration-sanic.yml
new file mode 100644
index 0000000000..1263982408
--- /dev/null
+++ b/.github/workflows/test-integration-sanic.yml
@@ -0,0 +1,56 @@
+name: Test sanic
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: sanic, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.5","3.6","3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test sanic
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-sanic" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-sqlalchemy.yml b/.github/workflows/test-integration-sqlalchemy.yml
new file mode 100644
index 0000000000..c916bafaa5
--- /dev/null
+++ b/.github/workflows/test-integration-sqlalchemy.yml
@@ -0,0 +1,56 @@
+name: Test sqlalchemy
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: sqlalchemy, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["2.7","3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test sqlalchemy
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-sqlalchemy" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-starlette.yml b/.github/workflows/test-integration-starlette.yml
new file mode 100644
index 0000000000..8494181ee8
--- /dev/null
+++ b/.github/workflows/test-integration-starlette.yml
@@ -0,0 +1,56 @@
+name: Test starlette
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: starlette, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test starlette
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-starlette" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-tornado.yml b/.github/workflows/test-integration-tornado.yml
new file mode 100644
index 0000000000..c81236a94d
--- /dev/null
+++ b/.github/workflows/test-integration-tornado.yml
@@ -0,0 +1,56 @@
+name: Test tornado
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: tornado, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test tornado
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-tornado" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/test-integration-trytond.yml b/.github/workflows/test-integration-trytond.yml
new file mode 100644
index 0000000000..2673df4379
--- /dev/null
+++ b/.github/workflows/test-integration-trytond.yml
@@ -0,0 +1,56 @@
+name: Test trytond
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: trytond, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["3.5","3.6","3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test trytond
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-trytond" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/scripts/split-tox-gh-actions/ci-yaml-services.txt b/scripts/split-tox-gh-actions/ci-yaml-services.txt
new file mode 100644
index 0000000000..f6a658eee8
--- /dev/null
+++ b/scripts/split-tox-gh-actions/ci-yaml-services.txt
@@ -0,0 +1,18 @@
+    services:
+      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
\ No newline at end of file
diff --git a/scripts/split-tox-gh-actions/ci-yaml.txt b/scripts/split-tox-gh-actions/ci-yaml.txt
new file mode 100644
index 0000000000..bce51da521
--- /dev/null
+++ b/scripts/split-tox-gh-actions/ci-yaml.txt
@@ -0,0 +1,53 @@
+name: Test {{ framework }}
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: {{ framework }}, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+{{ strategy_matrix }}
+{{ services }}
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test {{ framework }}
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-{{ framework }}" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
\ No newline at end of file
diff --git a/scripts/split-tox-gh-actions/split-tox-gh-actions.py b/scripts/split-tox-gh-actions/split-tox-gh-actions.py
new file mode 100755
index 0000000000..6e0018d0ff
--- /dev/null
+++ b/scripts/split-tox-gh-actions/split-tox-gh-actions.py
@@ -0,0 +1,154 @@
+"""Split Tox to GitHub Actions
+
+This is a small script to split a tox.ini config file into multiple GitHub actions configuration files.
+This way each framework defined in tox.ini will get its own GitHub actions configuration file
+which allows them to be run in parallel in GitHub actions.
+
+This will generate/update several configuration files, that need to be commited to Git afterwards.
+Whenever tox.ini is changed, this script needs to be run.
+
+Usage:
+    python split-tox-gh-actions.py [--fail-on-changes]
+
+If the parameter `--fail-on-changes` is set, the script will raise a RuntimeError in case the yaml
+files have been changed by the scripts execution. This is used in CI to check if the yaml files
+represent the current tox.ini file. (And if not the CI run fails.)
+"""
+
+import configparser
+import hashlib
+import sys
+from collections import defaultdict
+from glob import glob
+from pathlib import Path
+
+OUT_DIR = Path(__file__).resolve().parent.parent.parent / ".github" / "workflows"
+TOX_FILE = Path(__file__).resolve().parent.parent.parent / "tox.ini"
+TEMPLATE_DIR = Path(__file__).resolve().parent
+TEMPLATE_FILE = TEMPLATE_DIR / "ci-yaml.txt"
+TEMPLATE_FILE_SERVICES = TEMPLATE_DIR / "ci-yaml-services.txt"
+
+FRAMEWORKS_NEEDING_POSTGRES = ["django"]
+
+MATRIX_DEFINITION = """
+    strategy:
+      matrix:
+        python-version: [{{ python-version }}]
+        os: [ubuntu-latest]
+"""
+
+
+def write_yaml_file(
+    template,
+    current_framework,
+    python_versions,
+):
+    """Write the YAML configuration file for one framework to disk."""
+    # render template for print
+    out = ""
+    for template_line in template:
+        if template_line == "{{ strategy_matrix }}\n":
+            py_versions = [f'"{py.replace("py", "")}"' for py in python_versions]
+
+            m = MATRIX_DEFINITION
+            m = m.replace("{{ framework }}", current_framework).replace(
+                "{{ python-version }}", ",".join(py_versions)
+            )
+            out += m
+
+        elif template_line == "{{ services }}\n":
+            if current_framework in FRAMEWORKS_NEEDING_POSTGRES:
+                f = open(TEMPLATE_FILE_SERVICES, "r")
+                out += "".join(f.readlines())
+                f.close()
+
+        else:
+            out += template_line.replace("{{ framework }}", current_framework)
+
+    # write rendered template
+    outfile_name = OUT_DIR / f"test-integration-{current_framework}.yml"
+    print(f"Writing {outfile_name}")
+    f = open(outfile_name, "w")
+    f.writelines(out)
+    f.close()
+
+
+def get_yaml_files_hash():
+    """Calculate a hash of all the yaml configuration files"""
+
+    hasher = hashlib.md5()
+    path_pattern = (OUT_DIR / f"test-integration-*.yml").as_posix()
+    for file in glob(path_pattern):
+        with open(file, "rb") as f:
+            buf = f.read()
+            hasher.update(buf)
+
+    return hasher.hexdigest()
+
+
+def main(fail_on_changes):
+    """Create one CI workflow for each framework defined in tox.ini"""
+    if fail_on_changes:
+        old_hash = get_yaml_files_hash()
+
+    print("Read GitHub actions config file template")
+    f = open(TEMPLATE_FILE, "r")
+    template = f.readlines()
+    f.close()
+
+    print("Read tox.ini")
+    config = configparser.ConfigParser()
+    config.read(TOX_FILE)
+    lines = [x for x in config["tox"]["envlist"].split("\n") if len(x) > 0]
+
+    python_versions = defaultdict(list)
+
+    print("Parse tox.ini nevlist")
+
+    for line in lines:
+        # normalize lines
+        line = line.strip().lower()
+
+        # ignore comments
+        if line.startswith("#"):
+            continue
+
+        try:
+            # parse tox environment definition
+            try:
+                (raw_python_versions, framework, _) = line.split("-")
+            except ValueError:
+                (raw_python_versions, framework) = line.split("-")
+
+            # collect python versions to test the framework in
+            for python_version in (
+                raw_python_versions.replace("{", "").replace("}", "").split(",")
+            ):
+                if python_version not in python_versions[framework]:
+                    python_versions[framework].append(python_version)
+
+        except ValueError as err:
+            print(f"ERROR reading line {line}")
+
+    for framework in python_versions:
+        write_yaml_file(template, framework, python_versions[framework])
+
+    if fail_on_changes:
+        new_hash = get_yaml_files_hash()
+
+        if old_hash != new_hash:
+            raise RuntimeError(
+                "The yaml configuration files have changed. This means that tox.ini has changed "
+                "but the changes have not been propagated to the GitHub actions config files. "
+                "Please run `python scripts/split-tox-gh-actions/split-tox-gh-actions.py` "
+                "locally and commit the changes of the yaml configuration files to continue. "
+            )
+
+    print("All done. Have a nice day!")
+
+
+if __name__ == "__main__":
+    fail_on_changes = (
+        True if len(sys.argv) == 2 and sys.argv[1] == "--fail-on-changes" else False
+    )
+    main(fail_on_changes)
diff --git a/test-requirements.txt b/test-requirements.txt
index 746b10b9b4..74332d9629 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,15 +1,13 @@
+pip  # always use newest pip
+mock # for testing under python < 3.3
 pytest<7
+pytest-cov==2.8.1
 pytest-forked<=1.4.0
+pytest-localserver==0.5.0
 pytest-watch==4.2.0
 tox==3.7.0
 Werkzeug<2.1.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
-
 executing
-asttokens
+asttokens
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 3d11ad0c0d..179b3c6b46 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,8 +7,6 @@
 envlist =
     # === Core ===
     py{2.7,3.4,3.5,3.6,3.7,3.8,3.9,3.10}
-    pypy
-
 
     # === Integrations ===
     # General format is {pythonversion}-{integrationname}-{frameworkversion}
@@ -20,13 +18,20 @@ envlist =
     #   {py3.7}-django-{3.2}
     #   {py3.7,py3.10}-django-{3.2,4.0}
 
-    {pypy,py2.7,py3.5}-django-{1.8,1.9,1.10}
-    {pypy,py2.7}-django-{1.8,1.9,1.10,1.11}
+    # Django 1.x
+    {py2.7,py3.5}-django-{1.8,1.9,1.10}
+    {py2.7,py3.5,py3.6,py3.7}-django-{1.11}
+    # Django 2.x
     {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.11,0.12,1.0}
-    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-flask-1.1
+    {py3.5,py3.6,py3.7,py3.8,py3.9}-django-{2.2}
+    # Django 3.x
+    {py3.6,py3.7,py3.8,py3.9}-django-{3.0,3.1}
+    {py3.6,py3.7,py3.8,py3.9,py3.10}-django-{3.2}
+    # Django 4.x (comming soon)
+    #{py3.8,py3.9,py3.10}-django-{4.0,4.1}
+
+    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.11,0.12,1.0}
+    {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,py3.10}-asgi
@@ -37,19 +42,19 @@ envlist =
 
     {py3.7,py3.8,py3.9,py3.10}-quart
 
-    {pypy,py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-bottle-0.12
+    {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,py3.10}-falcon-2.0
+    {py2.7,py3.5,py3.6,py3.7}-falcon-1.4
+    {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,py3.10}-sanic-21
 
-    {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}
+    {py2.7}-celery-3
+    {py2.7,py3.5,py3.6}-celery-{4.1,4.2}
+    {py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.3,4.4}
     {py3.6,py3.7,py3.8,py3.9,py3.10}-celery-5.0
 
     py3.7-beam-{2.12,2.13,2.32,2.33}
@@ -59,10 +64,10 @@ envlist =
 
     py3.7-gcp
 
-    {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}
+    {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}
+    {py2.7,py3.5,py3.6}-rq-{0.6,0.7,0.8,0.9,0.10,0.11}
+    {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,py3.10}-rq-{1.4,1.5}
 
     py3.7-aiohttp-3.5
@@ -175,7 +180,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,py3.10}-celery: newrelic
+    {py2.7,py3.6,py3.7,py3.8,py3.9,py3.10}-celery: newrelic
 
     requests: requests>=2.0
 
@@ -315,7 +320,6 @@ basepython =
     # CI. Other tools such as mypy and black have options that pin the Python
     # version.
     linters: python3.9
-    pypy: pypy
 
 commands =
     ; https://github.com/pytest-dev/pytest/issues/5532
@@ -331,7 +335,7 @@ commands =
     ; 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}
+    py.test --durations=5 {env:TESTPATH} {posargs}
 
 [testenv:linters]
 commands =

From 412f824b8b53c444671c81ec8e119eba66308064 Mon Sep 17 00:00:00 2001
From: Jens L 
Date: Mon, 19 Sep 2022 17:12:07 +0200
Subject: [PATCH 092/209] feat(django): add instrumentation for django signals
 (#1526)

* feat(django): add instrumentation for django signals

Co-authored-by: Anton Pirker 
Co-authored-by: Neel Shah 
---
 sentry_sdk/integrations/django/__init__.py    |  2 +
 .../integrations/django/signals_handlers.py   | 52 +++++++++++++++++++
 tests/integrations/django/asgi/test_asgi.py   |  7 ++-
 tests/integrations/django/test_basic.py       | 12 ++++-
 4 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 sentry_sdk/integrations/django/signals_handlers.py

diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index 8403ad36e0..23b446f2d7 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -43,6 +43,7 @@
     patch_templates,
 )
 from sentry_sdk.integrations.django.middleware import patch_django_middlewares
+from sentry_sdk.integrations.django.signals_handlers import patch_signals
 from sentry_sdk.integrations.django.views import patch_views
 
 
@@ -212,6 +213,7 @@ def _django_queryset_repr(value, hint):
         patch_django_middlewares()
         patch_views()
         patch_templates()
+        patch_signals()
 
 
 _DRF_PATCHED = False
diff --git a/sentry_sdk/integrations/django/signals_handlers.py b/sentry_sdk/integrations/django/signals_handlers.py
new file mode 100644
index 0000000000..71bc07f854
--- /dev/null
+++ b/sentry_sdk/integrations/django/signals_handlers.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import
+
+from django.dispatch import Signal
+
+from sentry_sdk import Hub
+from sentry_sdk._types import MYPY
+
+
+if MYPY:
+    from typing import Any
+    from typing import Callable
+    from typing import List
+
+
+def patch_signals():
+    # type: () -> None
+    """Patch django signal receivers to create a span"""
+
+    old_live_receivers = Signal._live_receivers
+
+    def _get_receiver_name(receiver):
+        # type: (Callable[..., Any]) -> str
+        name = receiver.__module__ + "."
+        if hasattr(receiver, "__name__"):
+            return name + receiver.__name__
+        return name + str(receiver)
+
+    def _sentry_live_receivers(self, sender):
+        # type: (Signal, Any) -> List[Callable[..., Any]]
+        hub = Hub.current
+        receivers = old_live_receivers(self, sender)
+
+        def sentry_receiver_wrapper(receiver):
+            # type: (Callable[..., Any]) -> Callable[..., Any]
+            def wrapper(*args, **kwargs):
+                # type: (Any, Any) -> Any
+                with hub.start_span(
+                    op="django.signals",
+                    description=_get_receiver_name(receiver),
+                ) as span:
+                    span.set_data("signal", _get_receiver_name(receiver))
+                    return receiver(*args, **kwargs)
+
+            return wrapper
+
+        for idx, receiver in enumerate(receivers):
+            receivers[idx] = sentry_receiver_wrapper(receiver)
+
+        return receivers
+
+    Signal._live_receivers = _sentry_live_receivers
diff --git a/tests/integrations/django/asgi/test_asgi.py b/tests/integrations/django/asgi/test_asgi.py
index 0e6dd4f9ff..2b3382b9b4 100644
--- a/tests/integrations/django/asgi/test_asgi.py
+++ b/tests/integrations/django/asgi/test_asgi.py
@@ -175,10 +175,15 @@ async def test_async_middleware_spans(
         render_span_tree(transaction)
         == """\
 - op="http.server": description=null
+  - op="django.signals": description="django.db.reset_queries"
+  - op="django.signals": description="django.db.close_old_connections"
   - 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\""""
+          - op="django.view": description="async_message"
+  - op="django.signals": description="django.db.close_old_connections"
+  - op="django.signals": description="django.core.cache.close_caches"
+  - op="django.signals": description="django.core.handlers.base.reset_urlconf\""""
     )
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index 329fc04f9c..683a42472f 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -703,6 +703,8 @@ def test_middleware_spans(sentry_init, client, capture_events, render_span_tree)
             render_span_tree(transaction)
             == """\
 - op="http.server": description=null
+  - op="django.signals": description="django.db.reset_queries"
+  - op="django.signals": description="django.db.close_old_connections"
   - op="django.middleware": description="django.contrib.sessions.middleware.SessionMiddleware.__call__"
     - op="django.middleware": description="django.contrib.auth.middleware.AuthenticationMiddleware.__call__"
       - op="django.middleware": description="django.middleware.csrf.CsrfViewMiddleware.__call__"
@@ -718,6 +720,8 @@ def test_middleware_spans(sentry_init, client, capture_events, render_span_tree)
             render_span_tree(transaction)
             == """\
 - op="http.server": description=null
+  - op="django.signals": description="django.db.reset_queries"
+  - op="django.signals": description="django.db.close_old_connections"
   - op="django.middleware": description="django.contrib.sessions.middleware.SessionMiddleware.process_request"
   - op="django.middleware": description="django.contrib.auth.middleware.AuthenticationMiddleware.process_request"
   - op="django.middleware": description="tests.integrations.django.myapp.settings.TestMiddleware.process_request"
@@ -742,7 +746,13 @@ def test_middleware_spans_disabled(sentry_init, client, capture_events):
 
     assert message["message"] == "hi"
 
-    assert not transaction["spans"]
+    assert len(transaction["spans"]) == 2
+
+    assert transaction["spans"][0]["op"] == "django.signals"
+    assert transaction["spans"][0]["description"] == "django.db.reset_queries"
+
+    assert transaction["spans"][1]["op"] == "django.signals"
+    assert transaction["spans"][1]["description"] == "django.db.close_old_connections"
 
 
 def test_csrf(sentry_init, client):

From 7dc58d2d724c6d681751dab4574326454e37c1b4 Mon Sep 17 00:00:00 2001
From: Neel Shah 
Date: Mon, 19 Sep 2022 17:39:50 +0200
Subject: [PATCH 093/209] Wrap Baggage ser/deser in capture_internal_exceptions
 (#1630)

Also add a str while serializing the val just to be safe
---
 sentry_sdk/tracing_utils.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
index 899e1749ff..80bbcc2d50 100644
--- a/sentry_sdk/tracing_utils.py
+++ b/sentry_sdk/tracing_utils.py
@@ -459,14 +459,16 @@ def from_incoming_header(cls, 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):
-                    baggage_key = unquote(key.split("-")[1])
-                    sentry_items[baggage_key] = unquote(val)
-                    mutable = False
-                else:
-                    third_party_items += ("," if third_party_items else "") + item
+
+                with capture_internal_exceptions():
+                    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)
 
@@ -538,8 +540,9 @@ def serialize(self, include_third_party=False):
         items = []
 
         for key, val in iteritems(self.sentry_items):
-            item = Baggage.SENTRY_PREFIX + quote(key) + "=" + quote(val)
-            items.append(item)
+            with capture_internal_exceptions():
+                item = Baggage.SENTRY_PREFIX + quote(key) + "=" + quote(str(val))
+                items.append(item)
 
         if include_third_party:
             items.append(self.third_party_items)

From e32f2247390b5978583abb2ce74296e518a21e2a Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Mon, 19 Sep 2022 13:32:35 -0400
Subject: [PATCH 094/209] fix(profiling): Check transaction sampled status
 before profiling (#1624)

Should always check if the transaction is sampled before deciding to profile to
avoid profiling when it's not necessary.
---
 sentry_sdk/profiler.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index fcfde6ef0d..b3ee3ef04f 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -327,8 +327,13 @@ def stop_profiling(self):
         return should_stop_timer
 
 
-def _should_profile(hub):
-    # type: (Optional[sentry_sdk.Hub]) -> bool
+def _should_profile(transaction, hub):
+    # type: (sentry_sdk.tracing.Transaction, Optional[sentry_sdk.Hub]) -> bool
+
+    # The corresponding transaction was not sampled,
+    # so don't generate a profile for it.
+    if not transaction.sampled:
+        return False
 
     # The profiler hasn't been properly initialized.
     if _sample_buffer is None or _scheduler is None:
@@ -357,7 +362,7 @@ def start_profiling(transaction, hub=None):
     # type: (sentry_sdk.tracing.Transaction, Optional[sentry_sdk.Hub]) -> Generator[None, None, None]
 
     # if profiling was not enabled, this should be a noop
-    if _should_profile(hub):
+    if _should_profile(transaction, hub):
         with Profile(transaction, hub=hub):
             yield
     else:

From 19720e638d4e9487bd2bd97f89268eb412a3cd51 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Mon, 19 Sep 2022 16:48:11 -0400
Subject: [PATCH 095/209] feat(profiling): Introduce different profiler
 schedulers (#1616)

Previously, the only scheduling mechanism was via `signals.SIGPROF`. This was
limited to UNIX platforms and was not always consistent. This PR introduces more
ways to schedule the sampling. They are the following:

- `_SigprofScheduler` uses `signals.SIGPROF` to schedule
- `_SigalrmScheduler` uses `signals.SIGALRM` to schedule
- `_SleepScheduler` uses threads and `time.sleep` to schedule
- `_EventScheduler` uses threads and `threading.Event().wait` to schedule
---
 sentry_sdk/client.py   |   6 +-
 sentry_sdk/profiler.py | 282 +++++++++++++++++++++++++++++++++++------
 2 files changed, 243 insertions(+), 45 deletions(-)

diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index dec9018154..a0b0bc233f 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -134,9 +134,9 @@ def _capture_envelope(envelope):
         profiles_sample_rate = self.options["_experiments"].get("profiles_sample_rate")
         if profiles_sample_rate is not None and profiles_sample_rate > 0:
             try:
-                setup_profiler()
-            except ValueError:
-                logger.debug("Profiling can only be enabled from the main thread.")
+                setup_profiler(self.options)
+            except ValueError as e:
+                logger.debug(str(e))
 
     @property
     def dsn(self):
diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index b3ee3ef04f..5eaf3f9fd6 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -64,18 +64,15 @@ def nanosecond_time():
 _scheduler = None  # type: Optional[_Scheduler]
 
 
-def setup_profiler(buffer_secs=60, frequency=101):
-    # type: (int, int) -> None
+def setup_profiler(options):
+    # type: (Dict[str, Any]) -> None
 
     """
-    This method sets up the application so that it can be profiled.
-    It MUST be called from the main thread. This is a limitation of
-    python's signal library where it only allows the main thread to
-    set a signal handler.
-
     `buffer_secs` determines the max time a sample will be buffered for
     `frequency` determines the number of samples to take per second (Hz)
     """
+    buffer_secs = 60
+    frequency = 101
 
     global _sample_buffer
     global _scheduler
@@ -86,11 +83,19 @@ def setup_profiler(buffer_secs=60, frequency=101):
     # a capcity of `buffer_secs * frequency`.
     _sample_buffer = _SampleBuffer(capacity=buffer_secs * frequency)
 
-    _scheduler = _Scheduler(frequency=frequency)
+    profiler_mode = options["_experiments"].get("profiler_mode", _SigprofScheduler.mode)
+    if profiler_mode == _SigprofScheduler.mode:
+        _scheduler = _SigprofScheduler(frequency=frequency)
+    elif profiler_mode == _SigalrmScheduler.mode:
+        _scheduler = _SigalrmScheduler(frequency=frequency)
+    elif profiler_mode == _SleepScheduler.mode:
+        _scheduler = _SleepScheduler(frequency=frequency)
+    elif profiler_mode == _EventScheduler.mode:
+        _scheduler = _EventScheduler(frequency=frequency)
+    else:
+        raise ValueError("Unknown profiler mode: {}".format(profiler_mode))
+    _scheduler.setup()
 
-    # This setups a process wide signal handler that will be called
-    # at an interval to record samples.
-    signal.signal(signal.SIGPROF, _sample_stack)
     atexit.register(teardown_profiler)
 
 
@@ -100,32 +105,18 @@ def teardown_profiler():
     global _sample_buffer
     global _scheduler
 
+    if _scheduler is not None:
+        _scheduler.teardown()
+
     _sample_buffer = None
     _scheduler = None
 
-    # setting the timer with 0 will stop will clear the timer
-    signal.setitimer(signal.ITIMER_PROF, 0)
-
-    # put back the default signal handler
-    signal.signal(signal.SIGPROF, signal.SIG_DFL)
 
-
-def _sample_stack(_signal_num, _frame):
-    # type: (int, Frame) -> None
+def _sample_stack(*args, **kwargs):
+    # type: (*Any, **Any) -> None
     """
     Take a sample of the stack on all the threads in the process.
-    This handler is called to handle the signal at a set interval.
-
-    See https://www.gnu.org/software/libc/manual/html_node/Alarm-Signals.html
-
-    This is not based on wall time, and you may see some variances
-    in the frequency at which this handler is called.
-
-    Notably, it looks like only threads started using the threading
-    module counts towards the time elapsed. It is unclear why that
-    is the case right now. However, we are able to get samples from
-    threading._DummyThread if this handler is called as a result of
-    another thread (e.g. the main thread).
+    This should be called at a regular interval to collect samples.
     """
 
     assert _sample_buffer is not None
@@ -298,33 +289,240 @@ def slice_profile(self, start_ns, stop_ns):
 
 
 class _Scheduler(object):
+    mode = "unknown"
+
     def __init__(self, frequency):
         # type: (int) -> None
         self._lock = threading.Lock()
         self._count = 0
         self._interval = 1.0 / frequency
 
+    def setup(self):
+        # type: () -> None
+        raise NotImplementedError
+
+    def teardown(self):
+        # type: () -> None
+        raise NotImplementedError
+
     def start_profiling(self):
         # type: () -> bool
         with self._lock:
-            # we only need to start the timer if we're starting the first profile
-            should_start_timer = self._count == 0
             self._count += 1
-
-        if should_start_timer:
-            signal.setitimer(signal.ITIMER_PROF, self._interval, self._interval)
-        return should_start_timer
+            return self._count == 1
 
     def stop_profiling(self):
         # type: () -> bool
         with self._lock:
-            # we only need to stop the timer if we're stoping the last profile
-            should_stop_timer = self._count == 1
             self._count -= 1
+            return self._count == 0
+
+
+class _ThreadScheduler(_Scheduler):
+    """
+    This abstract scheduler is based on running a daemon thread that will call
+    the sampler at a regular interval.
+    """
+
+    mode = "thread"
+
+    def __init__(self, frequency):
+        # type: (int) -> None
+        super(_ThreadScheduler, self).__init__(frequency)
+        self.event = threading.Event()
+
+    def setup(self):
+        # type: () -> None
+        pass
+
+    def teardown(self):
+        # type: () -> None
+        pass
+
+    def start_profiling(self):
+        # type: () -> bool
+        if super(_ThreadScheduler, self).start_profiling():
+            # make sure to clear the event as we reuse the same event
+            # over the lifetime of the scheduler
+            self.event.clear()
+
+            # make sure the thread is a daemon here otherwise this
+            # can keep the application running after other threads
+            # have exited
+            thread = threading.Thread(target=self.run, daemon=True)
+            thread.start()
+            return True
+        return False
+
+    def stop_profiling(self):
+        # type: () -> bool
+        if super(_ThreadScheduler, self).stop_profiling():
+            # make sure the set the event here so that the thread
+            # can check to see if it should keep running
+            self.event.set()
+            return True
+        return False
+
+    def run(self):
+        # type: () -> None
+        raise NotImplementedError
+
+
+class _SleepScheduler(_ThreadScheduler):
+    """
+    This scheduler uses time.sleep to wait the required interval before calling
+    the sampling function.
+    """
+
+    mode = "sleep"
+
+    def run(self):
+        # type: () -> None
+        while True:
+            if self.event.is_set():
+                break
+            time.sleep(self._interval)
+            _sample_stack()
+
+
+class _EventScheduler(_ThreadScheduler):
+    """
+    This scheduler uses threading.Event to wait the required interval before
+    calling the sampling function.
+    """
+
+    mode = "event"
 
-        if should_stop_timer:
-            signal.setitimer(signal.ITIMER_PROF, 0)
-        return should_stop_timer
+    def run(self):
+        # type: () -> None
+        while True:
+            if self.event.is_set():
+                break
+            self.event.wait(timeout=self._interval)
+            _sample_stack()
+
+
+class _SignalScheduler(_Scheduler):
+    """
+    This abstract scheduler is based on UNIX signals. It sets up a
+    signal handler for the specified signal, and the matching itimer in order
+    for the signal handler to fire at a regular interval.
+
+    See https://www.gnu.org/software/libc/manual/html_node/Alarm-Signals.html
+    """
+
+    mode = "signal"
+
+    @property
+    def signal_num(self):
+        # type: () -> signal.Signals
+        raise NotImplementedError
+
+    @property
+    def signal_timer(self):
+        # type: () -> int
+        raise NotImplementedError
+
+    def setup(self):
+        # type: () -> None
+        """
+        This method sets up the application so that it can be profiled.
+        It MUST be called from the main thread. This is a limitation of
+        python's signal library where it only allows the main thread to
+        set a signal handler.
+        """
+
+        # This setups a process wide signal handler that will be called
+        # at an interval to record samples.
+        try:
+            signal.signal(self.signal_num, _sample_stack)
+        except ValueError:
+            raise ValueError(
+                "Signal based profiling can only be enabled from the main thread."
+            )
+
+        # Ensures that system calls interrupted by signals are restarted
+        # automatically. Otherwise, we may see some strage behaviours
+        # such as IOErrors caused by the system call being interrupted.
+        signal.siginterrupt(self.signal_num, False)
+
+    def teardown(self):
+        # type: () -> None
+
+        # setting the timer with 0 will stop will clear the timer
+        signal.setitimer(self.signal_timer, 0)
+
+        # put back the default signal handler
+        signal.signal(self.signal_num, signal.SIG_DFL)
+
+    def start_profiling(self):
+        # type: () -> bool
+        if super(_SignalScheduler, self).start_profiling():
+            signal.setitimer(self.signal_timer, self._interval, self._interval)
+            return True
+        return False
+
+    def stop_profiling(self):
+        # type: () -> bool
+        if super(_SignalScheduler, self).stop_profiling():
+            signal.setitimer(self.signal_timer, 0)
+            return True
+        return False
+
+
+class _SigprofScheduler(_SignalScheduler):
+    """
+    This scheduler uses SIGPROF to regularly call a signal handler where the
+    samples will be taken.
+
+    This is not based on wall time, and you may see some variances
+    in the frequency at which this handler is called.
+
+    This has some limitations:
+    - Only the main thread counts towards the time elapsed. This means that if
+      the main thread is blocking on a sleep() or select() system call, then
+      this clock will not count down. Some examples of this in practice are
+        - When using uwsgi with multiple threads in a worker, the non main
+          threads will only be profiled if the main thread is actively running
+          at the same time.
+        - When using gunicorn with threads, the main thread does not handle the
+          requests directly, so the clock counts down slower than expected since
+          its mostly idling while waiting for requests.
+    """
+
+    mode = "sigprof"
+
+    @property
+    def signal_num(self):
+        # type: () -> signal.Signals
+        return signal.SIGPROF
+
+    @property
+    def signal_timer(self):
+        # type: () -> int
+        return signal.ITIMER_PROF
+
+
+class _SigalrmScheduler(_SignalScheduler):
+    """
+    This scheduler uses SIGALRM to regularly call a signal handler where the
+    samples will be taken.
+
+    This is based on real time, so it *should* be called close to the expected
+    frequency.
+    """
+
+    mode = "sigalrm"
+
+    @property
+    def signal_num(self):
+        # type: () -> signal.Signals
+        return signal.SIGALRM
+
+    @property
+    def signal_timer(self):
+        # type: () -> int
+        return signal.ITIMER_REAL
 
 
 def _should_profile(transaction, hub):

From 3096b4000fd4e07e2084190491db88f82ae0bafe Mon Sep 17 00:00:00 2001
From: anthony sottile <103459774+asottile-sentry@users.noreply.github.com>
Date: Tue, 20 Sep 2022 04:08:29 -0400
Subject: [PATCH 096/209] ref: upgrade linters to flake8 5.x (#1610)

---
 .flake8                                    | 31 +++++++++++-----------
 .pre-commit-config.yaml                    |  4 +--
 linter-requirements.txt                    |  7 +++--
 sentry_sdk/_compat.py                      |  4 +--
 sentry_sdk/api.py                          | 14 +++++-----
 sentry_sdk/hub.py                          |  6 ++---
 sentry_sdk/integrations/serverless.py      |  2 +-
 sentry_sdk/integrations/starlette.py       |  2 +-
 sentry_sdk/profiler.py                     |  1 -
 sentry_sdk/utils.py                        |  2 +-
 tests/conftest.py                          |  2 +-
 tests/integrations/aiohttp/test_aiohttp.py |  2 +-
 tests/integrations/aws_lambda/test_aws.py  |  4 +--
 tests/integrations/django/test_basic.py    |  2 +-
 tests/test_envelope.py                     | 24 ++++++++---------
 15 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/.flake8 b/.flake8
index 0bb586b18e..37f5883f00 100644
--- a/.flake8
+++ b/.flake8
@@ -1,16 +1,17 @@
 [flake8]
-ignore = 
-  E203,  // Handled by black (Whitespace before ':' -- handled by black)
-  E266,  // Handled by black (Too many leading '#' for block comment)
-  E501,  // Handled by black (Line too long)
-  W503,  // Handled by black (Line break occured before a binary operator)
-  E402,  // Sometimes not possible due to execution order (Module level import is not at top of file)
-  E731,  // I don't care (Do not assign a lambda expression, use a def)
-  B950,  // Handled by black (Line too long by flake8-bugbear)
-  B011,  // I don't care (Do not call assert False)
-  B014,  // does not apply to Python 2 (redundant exception types by flake8-bugbear)
-  N812,  // I don't care (Lowercase imported as non-lowercase by pep8-naming)
-  N804   // is a worse version of and conflicts with B902 (first argument of a classmethod should be named cls)
-max-line-length = 80
-select = N,B,C,E,F,W,T4,B9
-exclude=checkouts,lol*,.tox
+extend-ignore =
+  # Handled by black (Whitespace before ':' -- handled by black)
+  E203,
+  # Handled by black (Line too long)
+  E501,
+  # Sometimes not possible due to execution order (Module level import is not at top of file)
+  E402,
+  # I don't care (Do not assign a lambda expression, use a def)
+  E731,
+  # does not apply to Python 2 (redundant exception types by flake8-bugbear)
+  B014,
+  # I don't care (Lowercase imported as non-lowercase by pep8-naming)
+  N812,
+  # is a worse version of and conflicts with B902 (first argument of a classmethod should be named cls)
+  N804,
+extend-exclude=checkouts,lol*
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3f7e548518..cb7882d38f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,8 +12,8 @@ repos:
     hooks:
     -   id: black
 
--   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+-   repo: https://github.com/pycqa/flake8
+    rev: 5.0.4
     hooks:
     -   id: flake8
 
diff --git a/linter-requirements.txt b/linter-requirements.txt
index 53edc6477f..f29b068609 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -1,10 +1,9 @@
 black==22.3.0
-flake8==3.9.2
-flake8-import-order==0.18.1
+flake8==5.0.4
 mypy==0.961
 types-certifi
 types-redis
 types-setuptools
-flake8-bugbear==21.4.3
-pep8-naming==0.13.0
+flake8-bugbear==22.9.11
+pep8-naming==0.13.2
 pre-commit # local linting
diff --git a/sentry_sdk/_compat.py b/sentry_sdk/_compat.py
index 49a55392a7..40ae40126b 100644
--- a/sentry_sdk/_compat.py
+++ b/sentry_sdk/_compat.py
@@ -15,7 +15,7 @@
 PY2 = sys.version_info[0] == 2
 
 if PY2:
-    import urlparse  # noqa
+    import urlparse
 
     text_type = unicode  # noqa
 
@@ -39,7 +39,7 @@ def implements_str(cls):
     text_type = str
     string_types = (text_type,)  # type: Tuple[type]
     number_types = (int, float)  # type: Tuple[type, type]
-    int_types = (int,)  # noqa
+    int_types = (int,)
     iteritems = lambda x: x.items()
 
     def implements_str(x):
diff --git a/sentry_sdk/api.py b/sentry_sdk/api.py
index f4a44e4500..cec914aca1 100644
--- a/sentry_sdk/api.py
+++ b/sentry_sdk/api.py
@@ -108,7 +108,7 @@ def add_breadcrumb(
 
 
 @overload
-def configure_scope():  # noqa: F811
+def configure_scope():
     # type: () -> ContextManager[Scope]
     pass
 
@@ -130,7 +130,7 @@ def configure_scope(  # noqa: F811
 
 
 @overload
-def push_scope():  # noqa: F811
+def push_scope():
     # type: () -> ContextManager[Scope]
     pass
 
@@ -151,31 +151,31 @@ def push_scope(  # noqa: F811
     return Hub.current.push_scope(callback)
 
 
-@scopemethod  # noqa
+@scopemethod
 def set_tag(key, value):
     # type: (str, Any) -> None
     return Hub.current.scope.set_tag(key, value)
 
 
-@scopemethod  # noqa
+@scopemethod
 def set_context(key, value):
     # type: (str, Dict[str, Any]) -> None
     return Hub.current.scope.set_context(key, value)
 
 
-@scopemethod  # noqa
+@scopemethod
 def set_extra(key, value):
     # type: (str, Any) -> None
     return Hub.current.scope.set_extra(key, value)
 
 
-@scopemethod  # noqa
+@scopemethod
 def set_user(value):
     # type: (Optional[Dict[str, Any]]) -> None
     return Hub.current.scope.set_user(value)
 
 
-@scopemethod  # noqa
+@scopemethod
 def set_level(value):
     # type: (str) -> None
     return Hub.current.scope.set_level(value)
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
index 33870e2df0..3d4a28d526 100644
--- a/sentry_sdk/hub.py
+++ b/sentry_sdk/hub.py
@@ -546,7 +546,7 @@ def start_transaction(
         return transaction
 
     @overload
-    def push_scope(  # noqa: F811
+    def push_scope(
         self, callback=None  # type: Optional[None]
     ):
         # type: (...) -> ContextManager[Scope]
@@ -595,7 +595,7 @@ def pop_scope_unsafe(self):
         return rv
 
     @overload
-    def configure_scope(  # noqa: F811
+    def configure_scope(
         self, callback=None  # type: Optional[None]
     ):
         # type: (...) -> ContextManager[Scope]
@@ -610,7 +610,7 @@ def configure_scope(  # noqa: F811
 
     def configure_scope(  # noqa
         self, callback=None  # type: Optional[Callable[[Scope], None]]
-    ):  # noqa
+    ):
         # type: (...) -> Optional[ContextManager[Scope]]
 
         """
diff --git a/sentry_sdk/integrations/serverless.py b/sentry_sdk/integrations/serverless.py
index c46f8cee31..c22fbfd37f 100644
--- a/sentry_sdk/integrations/serverless.py
+++ b/sentry_sdk/integrations/serverless.py
@@ -27,7 +27,7 @@ def overload(x):
 
 
 @overload
-def serverless_function(f, flush=True):  # noqa: F811
+def serverless_function(f, flush=True):
     # type: (F, bool) -> F
     pass
 
diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index 0342a64344..2d23250fa0 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -48,7 +48,7 @@
 
 try:
     # Optional dependency of Starlette to parse form data.
-    import multipart  # type: ignore # noqa: F401
+    import multipart  # type: ignore
 except ImportError:
     multipart = None
 
diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 5eaf3f9fd6..89820436e3 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -26,7 +26,6 @@
 
 import sentry_sdk
 from sentry_sdk._compat import PY2
-
 from sentry_sdk._types import MYPY
 
 if MYPY:
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index ccac6e37e3..3279b3f2bd 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -861,7 +861,7 @@ def _get_contextvars():
             # `aiocontextvars` is absolutely required for functional
             # contextvars on Python 3.6.
             try:
-                from aiocontextvars import ContextVar  # noqa
+                from aiocontextvars import ContextVar
 
                 return True, ContextVar
             except ImportError:
diff --git a/tests/conftest.py b/tests/conftest.py
index 7479a3e213..a239ccc1fe 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -400,7 +400,7 @@ def __init__(self, substring):
             try:
                 # 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
+                self.valid_types = (str, unicode)
             except NameError:
                 self.valid_types = (str, bytes)
 
diff --git a/tests/integrations/aiohttp/test_aiohttp.py b/tests/integrations/aiohttp/test_aiohttp.py
index 3375ee76ad..7e49a285c3 100644
--- a/tests/integrations/aiohttp/test_aiohttp.py
+++ b/tests/integrations/aiohttp/test_aiohttp.py
@@ -249,7 +249,7 @@ async def test_traces_sampler_gets_request_object_in_sampling_context(
     sentry_init,
     aiohttp_client,
     DictionaryContaining,  # noqa:N803
-    ObjectDescribedBy,  # noqa:N803
+    ObjectDescribedBy,
 ):
     traces_sampler = mock.Mock()
     sentry_init(
diff --git a/tests/integrations/aws_lambda/test_aws.py b/tests/integrations/aws_lambda/test_aws.py
index c6fb54b94f..458f55bf1a 100644
--- a/tests/integrations/aws_lambda/test_aws.py
+++ b/tests/integrations/aws_lambda/test_aws.py
@@ -523,8 +523,8 @@ def test_handler(event, context):
 def test_traces_sampler_gets_correct_values_in_sampling_context(
     run_lambda_function,
     DictionaryContaining,  # noqa:N803
-    ObjectDescribedBy,  # noqa:N803
-    StringContaining,  # noqa:N803
+    ObjectDescribedBy,
+    StringContaining,
 ):
     # 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
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index 683a42472f..b1fee30e2c 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -630,7 +630,7 @@ def test_rest_framework_basic(
     elif ct == "application/x-www-form-urlencoded":
         client.post(reverse(route), data=body)
     else:
-        assert False
+        raise AssertionError("unreachable")
 
     (error,) = exceptions
     assert isinstance(error, ZeroDivisionError)
diff --git a/tests/test_envelope.py b/tests/test_envelope.py
index 582fe6236f..b6a3ddf8be 100644
--- a/tests/test_envelope.py
+++ b/tests/test_envelope.py
@@ -141,15 +141,15 @@ def test_envelope_with_sized_items():
     """
     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'
+        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)
+    for envelope in (envelope_raw, envelope_raw_eof_terminated):
+        actual = Envelope.deserialize(envelope)
 
         items = [item for item in actual]
 
@@ -177,15 +177,15 @@ def test_envelope_with_implicitly_sized_items():
     """
     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'
+        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)
+    for envelope in (envelope_raw, envelope_raw_eof_terminated):
+        actual = Envelope.deserialize(envelope)
         assert actual.headers["event_id"] == "9ec79c33ec9942ab8353589fcb2e04dc"
 
         items = [item for item in actual]

From 4587e989678269601dfc23e413b44ee99c533f66 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Sep 2022 08:20:55 +0000
Subject: [PATCH 097/209] build(deps): bump sphinx from 5.0.2 to 5.1.1 (#1524)

Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 5.0.2 to 5.1.1.

Signed-off-by: dependabot[bot] 
Co-authored-by: Anton Pirker 
---
 docs-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-requirements.txt b/docs-requirements.txt
index fdb9fe783f..9b3fbfc0c1 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx==5.0.2
+sphinx==5.1.1
 sphinx-rtd-theme
 sphinx-autodoc-typehints[type_comments]>=1.8.0
 typing-extensions

From d59211486cdedfaad06331e5f68b58acd3e8784f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Sep 2022 08:28:35 +0000
Subject: [PATCH 098/209] build(deps): bump black from 22.3.0 to 22.8.0 (#1596)

Bumps [black](https://github.com/psf/black) from 22.3.0 to 22.8.0.

Signed-off-by: dependabot[bot] 
Co-authored-by: Anton Pirker 
---
 linter-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linter-requirements.txt b/linter-requirements.txt
index f29b068609..a8d3eeedd3 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -1,4 +1,4 @@
-black==22.3.0
+black==22.8.0
 flake8==5.0.4
 mypy==0.961
 types-certifi

From 17e2db3e0eac3e4f0b175449b2d7877fb126aec8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Sep 2022 08:53:09 +0000
Subject: [PATCH 099/209] build(deps): bump mypy from 0.961 to 0.971 (#1517)

Bumps [mypy](https://github.com/python/mypy) from 0.961 to 0.971.

Signed-off-by: dependabot[bot] 
Co-authored-by: Anton Pirker 
---
 linter-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linter-requirements.txt b/linter-requirements.txt
index a8d3eeedd3..e497c212e2 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -1,6 +1,6 @@
+mypy==0.971
 black==22.8.0
 flake8==5.0.4
-mypy==0.961
 types-certifi
 types-redis
 types-setuptools

From 01e37e50820a9250ac8289600790a4983886f3a4 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Tue, 20 Sep 2022 15:25:29 +0200
Subject: [PATCH 100/209] New ASGIMiddleware tests (#1600)

Rewrote tests to not use Starlette (or any other framework) for testing the SentryAsgiMiddleware.
---
 tests/integrations/asgi/__init__.py           |   4 +
 tests/integrations/asgi/test_asgi.py          | 445 +++++++++++++++++-
 .../integrations/starlette/test_starlette.py  |  29 +-
 tox.ini                                       |   3 +
 4 files changed, 475 insertions(+), 6 deletions(-)

diff --git a/tests/integrations/asgi/__init__.py b/tests/integrations/asgi/__init__.py
index e69de29bb2..1fb057c1fc 100644
--- a/tests/integrations/asgi/__init__.py
+++ b/tests/integrations/asgi/__init__.py
@@ -0,0 +1,4 @@
+import pytest
+
+asyncio = pytest.importorskip("asyncio")
+pytest_asyncio = pytest.importorskip("pytest_asyncio")
diff --git a/tests/integrations/asgi/test_asgi.py b/tests/integrations/asgi/test_asgi.py
index 81dfeef29a..ce28b1e8b9 100644
--- a/tests/integrations/asgi/test_asgi.py
+++ b/tests/integrations/asgi/test_asgi.py
@@ -1,7 +1,444 @@
-#
-# TODO: Implement tests similar to test_wsgi using async-asgi-testclient
-#
+import sys
 
+from collections import Counter
 
-def test_noop():
+import pytest
+import sentry_sdk
+from sentry_sdk import capture_message
+from sentry_sdk.integrations.asgi import SentryAsgiMiddleware, _looks_like_asgi3
+
+async_asgi_testclient = pytest.importorskip("async_asgi_testclient")
+from async_asgi_testclient import TestClient
+
+
+minimum_python_36 = pytest.mark.skipif(
+    sys.version_info < (3, 6), reason="ASGI is only supported in Python >= 3.6"
+)
+
+
+@pytest.fixture
+def asgi3_app():
+    async def app(scope, receive, send):
+        if (
+            scope["type"] == "http"
+            and "route" in scope
+            and scope["route"] == "/trigger/error"
+        ):
+            division_by_zero = 1 / 0  # noqa
+
+        await send(
+            {
+                "type": "http.response.start",
+                "status": 200,
+                "headers": [
+                    [b"content-type", b"text/plain"],
+                ],
+            }
+        )
+
+        await send(
+            {
+                "type": "http.response.body",
+                "body": b"Hello, world!",
+            }
+        )
+
+    return app
+
+
+@pytest.fixture
+def asgi3_app_with_error():
+    async def app(scope, receive, send):
+        await send(
+            {
+                "type": "http.response.start",
+                "status": 200,
+                "headers": [
+                    [b"content-type", b"text/plain"],
+                ],
+            }
+        )
+
+        division_by_zero = 1 / 0  # noqa
+
+        await send(
+            {
+                "type": "http.response.body",
+                "body": b"Hello, world!",
+            }
+        )
+
+    return app
+
+
+@pytest.fixture
+def asgi3_ws_app():
+    def message():
+        capture_message("Some message to the world!")
+        raise ValueError("Oh no")
+
+    async def app(scope, receive, send):
+        await send(
+            {
+                "type": "websocket.send",
+                "text": message(),
+            }
+        )
+
+    return app
+
+
+@minimum_python_36
+def test_invalid_transaction_style(asgi3_app):
+    with pytest.raises(ValueError) as exp:
+        SentryAsgiMiddleware(asgi3_app, transaction_style="URL")
+
+    assert (
+        str(exp.value)
+        == "Invalid value for transaction_style: URL (must be in ('endpoint', 'url'))"
+    )
+
+
+@minimum_python_36
+@pytest.mark.asyncio
+async def test_capture_transaction(
+    sentry_init,
+    asgi3_app,
+    capture_events,
+):
+    sentry_init(send_default_pii=True, traces_sample_rate=1.0)
+    app = SentryAsgiMiddleware(asgi3_app)
+
+    async with TestClient(app) as client:
+        events = capture_events()
+        await client.get("/?somevalue=123")
+
+    (transaction_event,) = events
+
+    assert transaction_event["type"] == "transaction"
+    assert transaction_event["transaction"] == "generic ASGI request"
+    assert transaction_event["contexts"]["trace"]["op"] == "http.server"
+    assert transaction_event["request"] == {
+        "headers": {
+            "host": "localhost",
+            "remote-addr": "127.0.0.1",
+            "user-agent": "ASGI-Test-Client",
+        },
+        "method": "GET",
+        "query_string": "somevalue=123",
+        "url": "http://localhost/",
+    }
+
+
+@minimum_python_36
+@pytest.mark.asyncio
+async def test_capture_transaction_with_error(
+    sentry_init,
+    asgi3_app_with_error,
+    capture_events,
+    DictionaryContaining,  # noqa: N803
+):
+    sentry_init(send_default_pii=True, traces_sample_rate=1.0)
+    app = SentryAsgiMiddleware(asgi3_app_with_error)
+
+    with pytest.raises(ZeroDivisionError):
+        async with TestClient(app) as client:
+            events = capture_events()
+            await client.get("/")
+
+    (error_event, transaction_event) = events
+
+    assert error_event["transaction"] == "generic ASGI request"
+    assert error_event["contexts"]["trace"]["op"] == "http.server"
+    assert error_event["exception"]["values"][0]["type"] == "ZeroDivisionError"
+    assert error_event["exception"]["values"][0]["value"] == "division by zero"
+    assert error_event["exception"]["values"][0]["mechanism"]["handled"] is False
+    assert error_event["exception"]["values"][0]["mechanism"]["type"] == "asgi"
+
+    assert transaction_event["type"] == "transaction"
+    assert transaction_event["contexts"]["trace"] == DictionaryContaining(
+        error_event["contexts"]["trace"]
+    )
+    assert transaction_event["contexts"]["trace"]["status"] == "internal_error"
+    assert transaction_event["transaction"] == error_event["transaction"]
+    assert transaction_event["request"] == error_event["request"]
+
+
+@minimum_python_36
+@pytest.mark.asyncio
+async def test_websocket(sentry_init, asgi3_ws_app, capture_events, request):
+    sentry_init(debug=True, send_default_pii=True)
+
+    events = capture_events()
+
+    asgi3_ws_app = SentryAsgiMiddleware(asgi3_ws_app)
+
+    scope = {
+        "type": "websocket",
+        "endpoint": asgi3_app,
+        "client": ("127.0.0.1", 60457),
+        "route": "some_url",
+        "headers": [
+            ("accept", "*/*"),
+        ],
+    }
+
+    with pytest.raises(ValueError):
+        async with TestClient(asgi3_ws_app, scope=scope) as client:
+            async with client.websocket_connect("/ws") as ws:
+                await ws.receive_text()
+
+    msg_event, error_event = events
+
+    assert msg_event["message"] == "Some message to the world!"
+
+    (exc,) = error_event["exception"]["values"]
+    assert exc["type"] == "ValueError"
+    assert exc["value"] == "Oh no"
+
+
+@minimum_python_36
+@pytest.mark.asyncio
+async def test_auto_session_tracking_with_aggregates(
+    sentry_init, asgi3_app, capture_envelopes
+):
+    sentry_init(send_default_pii=True, traces_sample_rate=1.0)
+    app = SentryAsgiMiddleware(asgi3_app)
+
+    scope = {
+        "endpoint": asgi3_app,
+        "client": ("127.0.0.1", 60457),
+    }
+    with pytest.raises(ZeroDivisionError):
+        envelopes = capture_envelopes()
+        async with TestClient(app, scope=scope) as client:
+            scope["route"] = "/some/fine/url"
+            await client.get("/some/fine/url")
+            scope["route"] = "/some/fine/url"
+            await client.get("/some/fine/url")
+            scope["route"] = "/trigger/error"
+            await client.get("/trigger/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"] == 4
+    assert count_item_types["event"] == 1
+    assert count_item_types["sessions"] == 1
+    assert len(envelopes) == 6
+
+    session_aggregates = envelopes[-1].items[0].payload.json["aggregates"]
+    assert session_aggregates[0]["exited"] == 3
+    assert session_aggregates[0]["crashed"] == 1
+    assert len(session_aggregates) == 1
+
+
+@minimum_python_36
+@pytest.mark.parametrize(
+    "url,transaction_style,expected_transaction,expected_source",
+    [
+        (
+            "/message",
+            "url",
+            "generic ASGI request",
+            "route",
+        ),
+        (
+            "/message",
+            "endpoint",
+            "tests.integrations.asgi.test_asgi.asgi3_app_with_error..app",
+            "component",
+        ),
+    ],
+)
+@pytest.mark.asyncio
+async def test_transaction_style(
+    sentry_init,
+    asgi3_app_with_error,
+    capture_events,
+    url,
+    transaction_style,
+    expected_transaction,
+    expected_source,
+):
+    sentry_init(send_default_pii=True, traces_sample_rate=1.0)
+    app = SentryAsgiMiddleware(
+        asgi3_app_with_error, transaction_style=transaction_style
+    )
+
+    scope = {
+        "endpoint": asgi3_app_with_error,
+        "route": url,
+        "client": ("127.0.0.1", 60457),
+    }
+
+    with pytest.raises(ZeroDivisionError):
+        async with TestClient(app, scope=scope) as client:
+            events = capture_events()
+            await client.get(url)
+
+    (_, transaction_event) = events
+
+    assert transaction_event["transaction"] == expected_transaction
+    assert transaction_event["transaction_info"] == {"source": expected_source}
+
+
+def mock_asgi2_app():
     pass
+
+
+class MockAsgi2App:
+    def __call__():
+        pass
+
+
+class MockAsgi3App(MockAsgi2App):
+    def __await__():
+        pass
+
+    async def __call__():
+        pass
+
+
+@minimum_python_36
+def test_looks_like_asgi3(asgi3_app):
+    # branch: inspect.isclass(app)
+    assert _looks_like_asgi3(MockAsgi3App)
+    assert not _looks_like_asgi3(MockAsgi2App)
+
+    # branch: inspect.isfunction(app)
+    assert _looks_like_asgi3(asgi3_app)
+    assert not _looks_like_asgi3(mock_asgi2_app)
+
+    # breanch: else
+    asgi3 = MockAsgi3App()
+    assert _looks_like_asgi3(asgi3)
+    asgi2 = MockAsgi2App()
+    assert not _looks_like_asgi3(asgi2)
+
+
+@minimum_python_36
+def test_get_ip_x_forwarded_for():
+    headers = [
+        (b"x-forwarded-for", b"8.8.8.8"),
+    ]
+    scope = {
+        "client": ("127.0.0.1", 60457),
+        "headers": headers,
+    }
+    middleware = SentryAsgiMiddleware({})
+    ip = middleware._get_ip(scope)
+    assert ip == "8.8.8.8"
+
+    # x-forwarded-for overrides x-real-ip
+    headers = [
+        (b"x-forwarded-for", b"8.8.8.8"),
+        (b"x-real-ip", b"10.10.10.10"),
+    ]
+    scope = {
+        "client": ("127.0.0.1", 60457),
+        "headers": headers,
+    }
+    middleware = SentryAsgiMiddleware({})
+    ip = middleware._get_ip(scope)
+    assert ip == "8.8.8.8"
+
+    # when multiple x-forwarded-for headers are, the first is taken
+    headers = [
+        (b"x-forwarded-for", b"5.5.5.5"),
+        (b"x-forwarded-for", b"6.6.6.6"),
+        (b"x-forwarded-for", b"7.7.7.7"),
+    ]
+    scope = {
+        "client": ("127.0.0.1", 60457),
+        "headers": headers,
+    }
+    middleware = SentryAsgiMiddleware({})
+    ip = middleware._get_ip(scope)
+    assert ip == "5.5.5.5"
+
+
+@minimum_python_36
+def test_get_ip_x_real_ip():
+    headers = [
+        (b"x-real-ip", b"10.10.10.10"),
+    ]
+    scope = {
+        "client": ("127.0.0.1", 60457),
+        "headers": headers,
+    }
+    middleware = SentryAsgiMiddleware({})
+    ip = middleware._get_ip(scope)
+    assert ip == "10.10.10.10"
+
+    # x-forwarded-for overrides x-real-ip
+    headers = [
+        (b"x-forwarded-for", b"8.8.8.8"),
+        (b"x-real-ip", b"10.10.10.10"),
+    ]
+    scope = {
+        "client": ("127.0.0.1", 60457),
+        "headers": headers,
+    }
+    middleware = SentryAsgiMiddleware({})
+    ip = middleware._get_ip(scope)
+    assert ip == "8.8.8.8"
+
+
+@minimum_python_36
+def test_get_ip():
+    # if now headers are provided the ip is taken from the client.
+    headers = []
+    scope = {
+        "client": ("127.0.0.1", 60457),
+        "headers": headers,
+    }
+    middleware = SentryAsgiMiddleware({})
+    ip = middleware._get_ip(scope)
+    assert ip == "127.0.0.1"
+
+    # x-forwarded-for header overides the ip from client
+    headers = [
+        (b"x-forwarded-for", b"8.8.8.8"),
+    ]
+    scope = {
+        "client": ("127.0.0.1", 60457),
+        "headers": headers,
+    }
+    middleware = SentryAsgiMiddleware({})
+    ip = middleware._get_ip(scope)
+    assert ip == "8.8.8.8"
+
+    # x-real-for header overides the ip from client
+    headers = [
+        (b"x-real-ip", b"10.10.10.10"),
+    ]
+    scope = {
+        "client": ("127.0.0.1", 60457),
+        "headers": headers,
+    }
+    middleware = SentryAsgiMiddleware({})
+    ip = middleware._get_ip(scope)
+    assert ip == "10.10.10.10"
+
+
+@minimum_python_36
+def test_get_headers():
+    headers = [
+        (b"x-real-ip", b"10.10.10.10"),
+        (b"some_header", b"123"),
+        (b"some_header", b"abc"),
+    ]
+    scope = {
+        "client": ("127.0.0.1", 60457),
+        "headers": headers,
+    }
+    middleware = SentryAsgiMiddleware({})
+    headers = middleware._get_headers(scope)
+    assert headers == {
+        "x-real-ip": "10.10.10.10",
+        "some_header": "123, abc",
+    }
diff --git a/tests/integrations/starlette/test_starlette.py b/tests/integrations/starlette/test_starlette.py
index 7db29eacd8..52d9ad4fe8 100644
--- a/tests/integrations/starlette/test_starlette.py
+++ b/tests/integrations/starlette/test_starlette.py
@@ -5,6 +5,7 @@
 
 import pytest
 
+from sentry_sdk import last_event_id, capture_exception
 from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
 
 try:
@@ -82,7 +83,7 @@
 }
 
 
-def starlette_app_factory(middleware=None):
+def starlette_app_factory(middleware=None, debug=True):
     async def _homepage(request):
         1 / 0
         return starlette.responses.JSONResponse({"status": "ok"})
@@ -99,7 +100,7 @@ async def _message_with_id(request):
         return starlette.responses.JSONResponse({"status": "ok"})
 
     app = starlette.applications.Starlette(
-        debug=True,
+        debug=debug,
         routes=[
             starlette.routing.Route("/some_url", _homepage),
             starlette.routing.Route("/custom_error", _custom_error),
@@ -543,6 +544,30 @@ def test_middleware_spans(sentry_init, capture_events):
             idx += 1
 
 
+def test_last_event_id(sentry_init, capture_events):
+    sentry_init(
+        integrations=[StarletteIntegration()],
+    )
+    events = capture_events()
+
+    def handler(request, exc):
+        capture_exception(exc)
+        return starlette.responses.PlainTextResponse(last_event_id(), status_code=500)
+
+    app = starlette_app_factory(debug=False)
+    app.add_exception_handler(500, handler)
+
+    client = TestClient(SentryAsgiMiddleware(app), raise_server_exceptions=False)
+    response = client.get("/custom_error")
+    assert response.status_code == 500
+
+    event = events[0]
+    assert response.content.strip().decode("ascii") == event["event_id"]
+    (exception,) = event["exception"]["values"]
+    assert exception["type"] == "Exception"
+    assert exception["value"] == "Too Hot"
+
+
 def test_legacy_setup(
     sentry_init,
     capture_events,
diff --git a/tox.ini b/tox.ini
index 179b3c6b46..92ef7207d2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -132,6 +132,9 @@ deps =
     flask-1.1: Flask>=1.1,<1.2
     flask-2.0: Flask>=2.0,<2.1
 
+    asgi: pytest-asyncio
+    asgi: async-asgi-testclient
+
     quart: quart>=0.16.1
     quart: quart-auth
     quart: pytest-asyncio

From 9fd938ed8762c06a8a1d355beb79f57c199ca92c Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Tue, 20 Sep 2022 14:43:52 -0400
Subject: [PATCH 101/209] fix(profiling): Profiler mode type hints (#1633)

This was missed in #1616.
---
 sentry_sdk/consts.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index f335c3bc18..d7a8b9e6f7 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -35,6 +35,7 @@
             "propagate_tracestate": Optional[bool],
             "custom_measurements": Optional[bool],
             "profiles_sample_rate": Optional[float],
+            "profiler_mode": Optional[str],
         },
         total=False,
     )

From 380f5145ff2d80f4273a27e47e4c583a11f90f47 Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Mon, 26 Sep 2022 12:46:45 +0000
Subject: [PATCH 102/209] release: 1.9.9

---
 CHANGELOG.md         | 24 ++++++++++++++++++++++++
 docs/conf.py         |  2 +-
 sentry_sdk/consts.py |  2 +-
 setup.py             |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5967d4af2b..f744798997 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog
 
+## 1.9.9
+
+### Django update (ongoing)
+
+* Support Django 4.0
+* include other Django enhancements brought up by the community
+
+By: @BeryJu (#1526)
+
+### Various fixes & improvements
+
+- fix(profiling): Profiler mode type hints (#1633) by @Zylphrex
+- New ASGIMiddleware tests (#1600) by @antonpirker
+- build(deps): bump mypy from 0.961 to 0.971 (#1517) by @dependabot
+- build(deps): bump black from 22.3.0 to 22.8.0 (#1596) by @dependabot
+- build(deps): bump sphinx from 5.0.2 to 5.1.1 (#1524) by @dependabot
+- ref: upgrade linters to flake8 5.x (#1610) by @asottile-sentry
+- feat(profiling): Introduce different profiler schedulers (#1616) by @Zylphrex
+- fix(profiling): Check transaction sampled status before profiling (#1624) by @Zylphrex
+- Wrap Baggage ser/deser in capture_internal_exceptions (#1630) by @sl0thentr0py
+- Faster Tests (DjangoCon) (#1602) by @antonpirker
+- feat(profiling): Add support for profiles_sample_rate (#1613) by @Zylphrex
+- feat(profiling): Support for multithreaded profiles (#1570) by @Zylphrex
+
 ## 1.9.8
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index f7a5fc8a73..6bac38f9b0 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.9.8"
+release = "1.9.9"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index d7a8b9e6f7..c90bbea337 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -104,7 +104,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.9.8"
+VERSION = "1.9.9"
 SDK_INFO = {
     "name": "sentry.python",
     "version": VERSION,
diff --git a/setup.py b/setup.py
index 1d597119eb..da836fe8c4 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.9.8",
+    version="1.9.9",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From a05c818c658febdba07197ccd8299e66b89b39b7 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 26 Sep 2022 14:51:47 +0200
Subject: [PATCH 103/209] Changed changelog

---
 CHANGELOG.md                       | 6 ++----
 sentry_sdk/client.py               | 3 +++
 sentry_sdk/integrations/logging.py | 3 +++
 sentry_sdk/utils.py                | 4 ++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f744798997..08b1ad34c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,8 @@
 
 ### Django update (ongoing)
 
-* Support Django 4.0
-* include other Django enhancements brought up by the community
-
-By: @BeryJu (#1526)
+- Instrument Django Signals so they show up in "Performance" view (#1526) by @BeryJu
+- include other Django enhancements brought up by the community
 
 ### Various fixes & improvements
 
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index a0b0bc233f..1b0b2f356d 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -177,6 +177,9 @@ def _prepare_event(
             and "threads" not in event
         ):
             with capture_internal_exceptions():
+                import ipdb
+
+                ipdb.set_trace()
                 event["threads"] = {
                     "values": [
                         {
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
index 86cea09bd8..16a0af0e24 100644
--- a/sentry_sdk/integrations/logging.py
+++ b/sentry_sdk/integrations/logging.py
@@ -215,6 +215,9 @@ def _emit(self, record):
             event = {}
             hint = {}
             with capture_internal_exceptions():
+                import ipdb
+
+                ipdb.set_trace()
                 event["threads"] = {
                     "values": [
                         {
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 3279b3f2bd..564471f740 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -514,6 +514,10 @@ def current_stacktrace(with_locals=True):
     __tracebackhide__ = True
     frames = []
 
+    import ipdb
+
+    ipdb.set_trace()
+
     f = sys._getframe()  # type: Optional[FrameType]
     while f is not None:
         if not should_hide_frame(f):

From 52455f149e3585e4b37d39eaa92c66ba470fa286 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 26 Sep 2022 15:00:30 +0200
Subject: [PATCH 104/209] Removed debug commands

---
 sentry_sdk/client.py               | 3 ---
 sentry_sdk/integrations/logging.py | 3 ---
 sentry_sdk/utils.py                | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 1b0b2f356d..a0b0bc233f 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -177,9 +177,6 @@ def _prepare_event(
             and "threads" not in event
         ):
             with capture_internal_exceptions():
-                import ipdb
-
-                ipdb.set_trace()
                 event["threads"] = {
                     "values": [
                         {
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
index 16a0af0e24..86cea09bd8 100644
--- a/sentry_sdk/integrations/logging.py
+++ b/sentry_sdk/integrations/logging.py
@@ -215,9 +215,6 @@ def _emit(self, record):
             event = {}
             hint = {}
             with capture_internal_exceptions():
-                import ipdb
-
-                ipdb.set_trace()
                 event["threads"] = {
                     "values": [
                         {
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 564471f740..3279b3f2bd 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -514,10 +514,6 @@ def current_stacktrace(with_locals=True):
     __tracebackhide__ = True
     frames = []
 
-    import ipdb
-
-    ipdb.set_trace()
-
     f = sys._getframe()  # type: Optional[FrameType]
     while f is not None:
         if not should_hide_frame(f):

From f71a8f45e780525e52fa5868f45bb876dcf0994b Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Mon, 26 Sep 2022 10:33:15 -0400
Subject: [PATCH 105/209] fix(profiling): Dynamically adjust profiler sleep
 time (#1634)

Because more time may have elapsed between 2 samples due to us calling the
sampling function and other threads executing, we need to account for it in the
sleep or the time between samples will often be greater than the expected
interval. This change ensures we account for this time elapsed and dynamically
adjust the amount of time we sleep for between samples.
---
 sentry_sdk/profiler.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 89820436e3..f3cb52a47b 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -377,10 +377,23 @@ class _SleepScheduler(_ThreadScheduler):
 
     def run(self):
         # type: () -> None
+        last = time.perf_counter()
+
         while True:
+            # some time may have elapsed since the last time
+            # we sampled, so we need to account for that and
+            # not sleep for too long
+            now = time.perf_counter()
+            elapsed = max(now - last, 0)
+
+            if elapsed < self._interval:
+                time.sleep(self._interval - elapsed)
+
+            last = time.perf_counter()
+
             if self.event.is_set():
                 break
-            time.sleep(self._interval)
+
             _sample_stack()
 
 
@@ -395,9 +408,11 @@ class _EventScheduler(_ThreadScheduler):
     def run(self):
         # type: () -> None
         while True:
+            self.event.wait(timeout=self._interval)
+
             if self.event.is_set():
                 break
-            self.event.wait(timeout=self._interval)
+
             _sample_stack()
 
 

From 5348834cd6f6b2f877e10febd6ab963166519e04 Mon Sep 17 00:00:00 2001
From: Pierre Massat 
Date: Tue, 27 Sep 2022 15:21:52 -0400
Subject: [PATCH 106/209] feat(profiling): Convert profile output to the sample
 format (#1611)

---
 sentry_sdk/_compat.py                |  2 +
 sentry_sdk/client.py                 |  7 ++-
 sentry_sdk/profiler.py               | 86 +++++++++++++++++-----------
 sentry_sdk/tracing.py                |  7 +++
 sentry_sdk/utils.py                  | 24 +++++++-
 tests/integrations/wsgi/test_wsgi.py | 66 ++++++++++-----------
 6 files changed, 124 insertions(+), 68 deletions(-)

diff --git a/sentry_sdk/_compat.py b/sentry_sdk/_compat.py
index 40ae40126b..2061774464 100644
--- a/sentry_sdk/_compat.py
+++ b/sentry_sdk/_compat.py
@@ -13,6 +13,8 @@
 
 
 PY2 = sys.version_info[0] == 2
+PY33 = sys.version_info[0] == 3 and sys.version_info[1] >= 3
+PY37 = sys.version_info[0] == 3 and sys.version_info[1] >= 7
 
 if PY2:
     import urlparse
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index a0b0bc233f..06923c501b 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -410,9 +410,12 @@ def capture_event(
 
             if is_transaction:
                 if "profile" in event_opt:
-                    event_opt["profile"]["transaction_id"] = event_opt["event_id"]
                     event_opt["profile"]["environment"] = event_opt.get("environment")
-                    event_opt["profile"]["version_name"] = event_opt.get("release", "")
+                    event_opt["profile"]["release"] = event_opt.get("release", "")
+                    event_opt["profile"]["timestamp"] = event_opt.get("timestamp", "")
+                    event_opt["profile"]["transactions"][0]["id"] = event_opt[
+                        "event_id"
+                    ]
                     envelope.add_profile(event_opt.pop("profile"))
                 envelope.add_transaction(event_opt)
             else:
diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index f3cb52a47b..45ef706815 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -25,8 +25,10 @@
 from contextlib import contextmanager
 
 import sentry_sdk
-from sentry_sdk._compat import PY2
+from sentry_sdk._compat import PY33
+
 from sentry_sdk._types import MYPY
+from sentry_sdk.utils import nanosecond_time
 
 if MYPY:
     from typing import Any
@@ -43,22 +45,6 @@
     FrameData = Tuple[str, str, int]
 
 
-if PY2:
-
-    def nanosecond_time():
-        # type: () -> int
-        return int(time.clock() * 1e9)
-
-else:
-
-    def nanosecond_time():
-        # type: () -> int
-
-        # In python3.7+, there is a time.perf_counter_ns()
-        # that we may want to switch to for more precision
-        return int(time.perf_counter() * 1e9)
-
-
 _sample_buffer = None  # type: Optional[_SampleBuffer]
 _scheduler = None  # type: Optional[_Scheduler]
 
@@ -73,6 +59,12 @@ def setup_profiler(options):
     buffer_secs = 60
     frequency = 101
 
+    if not PY33:
+        from sentry_sdk.utils import logger
+
+        logger.warn("profiling is only supported on Python >= 3.3")
+        return
+
     global _sample_buffer
     global _scheduler
 
@@ -194,19 +186,39 @@ def to_json(self):
         assert self._stop_ns is not None
 
         return {
-            "device_os_name": platform.system(),
-            "device_os_version": platform.release(),
-            "duration_ns": str(self._stop_ns - self._start_ns),
             "environment": None,  # Gets added in client.py
+            "event_id": uuid.uuid4().hex,
             "platform": "python",
-            "platform_version": platform.python_version(),
-            "profile_id": uuid.uuid4().hex,
             "profile": _sample_buffer.slice_profile(self._start_ns, self._stop_ns),
-            "trace_id": self.transaction.trace_id,
-            "transaction_id": None,  # Gets added in client.py
-            "transaction_name": self.transaction.name,
-            "version_code": "",  # TODO: Determine appropriate value. Currently set to empty string so profile will not get rejected.
-            "version_name": None,  # Gets added in client.py
+            "release": None,  # Gets added in client.py
+            "timestamp": None,  # Gets added in client.py
+            "version": "1",
+            "device": {
+                "architecture": platform.machine(),
+            },
+            "os": {
+                "name": platform.system(),
+                "version": platform.release(),
+            },
+            "runtime": {
+                "name": platform.python_implementation(),
+                "version": platform.python_version(),
+            },
+            "transactions": [
+                {
+                    "id": None,  # Gets added in client.py
+                    "name": self.transaction.name,
+                    # we start the transaction before the profile and this is
+                    # the transaction start time relative to the profile, so we
+                    # hardcode it to 0 until we can start the profile before
+                    "relative_start_ns": "0",
+                    # use the duration of the profile instead of the transaction
+                    # because we end the transaction after the profile
+                    "relative_end_ns": str(self._stop_ns - self._start_ns),
+                    "trace_id": self.transaction.trace_id,
+                    "active_thread_id": str(self.transaction._active_thread_id),
+                }
+            ],
         }
 
 
@@ -245,8 +257,10 @@ def write(self, sample):
         self.idx = (idx + 1) % self.capacity
 
     def slice_profile(self, start_ns, stop_ns):
-        # type: (int, int) -> Dict[str, List[Any]]
+        # type: (int, int) -> Dict[str, Any]
         samples = []  # type: List[Any]
+        stacks = dict()  # type: Dict[Any, int]
+        stacks_list = list()  # type: List[Any]
         frames = dict()  # type: Dict[FrameData, int]
         frames_list = list()  # type: List[Any]
 
@@ -265,10 +279,10 @@ def slice_profile(self, start_ns, stop_ns):
 
             for tid, stack in raw_sample[1]:
                 sample = {
-                    "frames": [],
-                    "relative_timestamp_ns": ts - start_ns,
-                    "thread_id": tid,
+                    "elapsed_since_start_ns": str(ts - start_ns),
+                    "thread_id": str(tid),
                 }
+                current_stack = []
 
                 for frame in stack:
                     if frame not in frames:
@@ -280,11 +294,17 @@ def slice_profile(self, start_ns, stop_ns):
                                 "line": frame[2],
                             }
                         )
-                    sample["frames"].append(frames[frame])
+                    current_stack.append(frames[frame])
+
+                current_stack = tuple(current_stack)
+                if current_stack not in stacks:
+                    stacks[current_stack] = len(stacks)
+                    stacks_list.append(current_stack)
 
+                sample["stack_id"] = stacks[current_stack]
                 samples.append(sample)
 
-        return {"frames": frames_list, "samples": samples}
+        return {"stacks": stacks_list, "frames": frames_list, "samples": samples}
 
 
 class _Scheduler(object):
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index c6328664bf..3bef18bc35 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -1,5 +1,6 @@
 import uuid
 import random
+import threading
 import time
 
 from datetime import datetime, timedelta
@@ -544,6 +545,7 @@ class Transaction(Span):
         "_measurements",
         "_profile",
         "_baggage",
+        "_active_thread_id",
     )
 
     def __init__(
@@ -579,6 +581,11 @@ def __init__(
         self._measurements = {}  # type: Dict[str, Any]
         self._profile = None  # type: Optional[Dict[str, Any]]
         self._baggage = baggage
+        # for profiling, we want to know on which thread a transaction is started
+        # to accurately show the active thread in the UI
+        self._active_thread_id = (
+            threading.current_thread().ident
+        )  # used by profiling.py
 
     def __repr__(self):
         # type: () -> str
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 3279b3f2bd..69afe91e80 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -7,11 +7,12 @@
 import threading
 import subprocess
 import re
+import time
 
 from datetime import datetime
 
 import sentry_sdk
-from sentry_sdk._compat import urlparse, text_type, implements_str, PY2
+from sentry_sdk._compat import urlparse, text_type, implements_str, PY2, PY33, PY37
 
 from sentry_sdk._types import MYPY
 
@@ -1010,3 +1011,24 @@ def from_base64(base64_string):
         )
 
     return utf8_string
+
+
+if PY37:
+
+    def nanosecond_time():
+        # type: () -> int
+        return time.perf_counter_ns()
+
+elif PY33:
+
+    def nanosecond_time():
+        # type: () -> int
+
+        return int(time.perf_counter() * 1e9)
+
+else:
+
+    def nanosecond_time():
+        # type: () -> int
+
+        raise AttributeError
diff --git a/tests/integrations/wsgi/test_wsgi.py b/tests/integrations/wsgi/test_wsgi.py
index a89000f570..4bf4e66067 100644
--- a/tests/integrations/wsgi/test_wsgi.py
+++ b/tests/integrations/wsgi/test_wsgi.py
@@ -6,6 +6,7 @@
 from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
 from sentry_sdk.profiler import teardown_profiler
 from collections import Counter
+from sentry_sdk.utils import PY33
 
 try:
     from unittest import mock  # python 3.3 and above
@@ -21,12 +22,6 @@ def app(environ, start_response):
     return app
 
 
-@pytest.fixture
-def profiling():
-    yield
-    teardown_profiler()
-
-
 class IterableApp(object):
     def __init__(self, iterable):
         self.iterable = iterable
@@ -289,31 +284,38 @@ def sample_app(environ, start_response):
     assert len(session_aggregates) == 1
 
 
-@pytest.mark.parametrize(
-    "profiles_sample_rate,should_send",
-    [(1.0, True), (0.75, True), (0.25, False), (None, False)],
-)
-def test_profile_sent_when_profiling_enabled(
-    capture_envelopes, sentry_init, profiling, profiles_sample_rate, should_send
-):
-    def test_app(environ, start_response):
-        start_response("200 OK", [])
-        return ["Go get the ball! Good dog!"]
-
-    sentry_init(
-        traces_sample_rate=1.0,
-        _experiments={"profiles_sample_rate": profiles_sample_rate},
-    )
-    app = SentryWsgiMiddleware(test_app)
-    envelopes = capture_envelopes()
+if PY33:
 
-    with mock.patch("sentry_sdk.profiler.random.random", return_value=0.5):
-        client = Client(app)
-        client.get("/")
+    @pytest.fixture
+    def profiling():
+        yield
+        teardown_profiler()
 
-    profile_sent = False
-    for item in envelopes[0].items:
-        if item.headers["type"] == "profile":
-            profile_sent = True
-            break
-    assert profile_sent == should_send
+    @pytest.mark.parametrize(
+        "profiles_sample_rate,should_send",
+        [(1.0, True), (0.75, True), (0.25, False), (None, False)],
+    )
+    def test_profile_sent_when_profiling_enabled(
+        capture_envelopes, sentry_init, profiling, profiles_sample_rate, should_send
+    ):
+        def test_app(environ, start_response):
+            start_response("200 OK", [])
+            return ["Go get the ball! Good dog!"]
+
+        sentry_init(
+            traces_sample_rate=1.0,
+            _experiments={"profiles_sample_rate": profiles_sample_rate},
+        )
+        app = SentryWsgiMiddleware(test_app)
+        envelopes = capture_envelopes()
+
+        with mock.patch("sentry_sdk.profiler.random.random", return_value=0.5):
+            client = Client(app)
+            client.get("/")
+
+        profile_sent = False
+        for item in envelopes[0].items:
+            if item.headers["type"] == "profile":
+                profile_sent = True
+                break
+        assert profile_sent == should_send

From 77b583ab50ed6eae8b44b46d91532357dba21608 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Wed, 28 Sep 2022 14:27:25 +0200
Subject: [PATCH 107/209] Fix for partial signals in old Django and old Python
 versions. (#1641)

* Making sure signal names can be retrieved from partials and normal functions in all Python and Django versions.
* Added test to safeguard the change.
---
 .../integrations/django/signals_handlers.py   | 32 +++++++++++++------
 tests/integrations/django/test_basic.py       | 28 +++++++++++++---
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/sentry_sdk/integrations/django/signals_handlers.py b/sentry_sdk/integrations/django/signals_handlers.py
index 71bc07f854..4d81772452 100644
--- a/sentry_sdk/integrations/django/signals_handlers.py
+++ b/sentry_sdk/integrations/django/signals_handlers.py
@@ -13,19 +13,32 @@
     from typing import List
 
 
+def _get_receiver_name(receiver):
+    # type: (Callable[..., Any]) -> str
+    name = ""
+
+    if hasattr(receiver, "__qualname__"):
+        name += receiver.__qualname__
+    elif hasattr(receiver, "__name__"):  # Python 2.7 has no __qualname__
+        name += receiver.__name__
+
+    if (
+        name == ""
+    ):  # certain functions (like partials) dont have a name so return the string representation
+        return str(receiver)
+
+    if hasattr(receiver, "__module__"):  # prepend with module, if there is one
+        name = receiver.__module__ + "." + name
+
+    return name
+
+
 def patch_signals():
     # type: () -> None
     """Patch django signal receivers to create a span"""
 
     old_live_receivers = Signal._live_receivers
 
-    def _get_receiver_name(receiver):
-        # type: (Callable[..., Any]) -> str
-        name = receiver.__module__ + "."
-        if hasattr(receiver, "__name__"):
-            return name + receiver.__name__
-        return name + str(receiver)
-
     def _sentry_live_receivers(self, sender):
         # type: (Signal, Any) -> List[Callable[..., Any]]
         hub = Hub.current
@@ -35,11 +48,12 @@ def sentry_receiver_wrapper(receiver):
             # type: (Callable[..., Any]) -> Callable[..., Any]
             def wrapper(*args, **kwargs):
                 # type: (Any, Any) -> Any
+                signal_name = _get_receiver_name(receiver)
                 with hub.start_span(
                     op="django.signals",
-                    description=_get_receiver_name(receiver),
+                    description=signal_name,
                 ) as span:
-                    span.set_data("signal", _get_receiver_name(receiver))
+                    span.set_data("signal", signal_name)
                     return receiver(*args, **kwargs)
 
             return wrapper
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index b1fee30e2c..7809239c30 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -1,8 +1,9 @@
 from __future__ import absolute_import
 
+import json
 import pytest
 import pytest_django
-import json
+from functools import partial
 
 from werkzeug.test import Client
 from django import VERSION as DJANGO_VERSION
@@ -10,16 +11,16 @@
 from django.core.management import execute_from_command_line
 from django.db.utils import OperationalError, ProgrammingError, DataError
 
-from sentry_sdk.integrations.executing import ExecutingIntegration
-
 try:
     from django.urls import reverse
 except ImportError:
     from django.core.urlresolvers import reverse
 
+from sentry_sdk._compat import PY2
 from sentry_sdk import capture_message, capture_exception, configure_scope
 from sentry_sdk.integrations.django import DjangoIntegration
-from functools import partial
+from sentry_sdk.integrations.django.signals_handlers import _get_receiver_name
+from sentry_sdk.integrations.executing import ExecutingIntegration
 
 from tests.integrations.django.myapp.wsgi import application
 
@@ -816,3 +817,22 @@ def test_custom_urlconf_middleware(
     assert "custom_urlconf_middleware" in render_span_tree(transaction_event)
 
     settings.MIDDLEWARE.pop(0)
+
+
+def test_get_receiver_name():
+    def dummy(a, b):
+        return a + b
+
+    name = _get_receiver_name(dummy)
+
+    if PY2:
+        assert name == "tests.integrations.django.test_basic.dummy"
+    else:
+        assert (
+            name
+            == "tests.integrations.django.test_basic.test_get_receiver_name..dummy"
+        )
+
+    a_partial = partial(dummy)
+    name = _get_receiver_name(a_partial)
+    assert name == str(a_partial)

From 09298711c330dea5f2e0c85bf6b7e91a899d843a Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 29 Sep 2022 15:24:16 +0200
Subject: [PATCH 108/209] Pin Sanic version for CI (#1650)

* Make it work on macos
* Exclude new version of Sanic from tests because it has breaking changes.
---
 scripts/runtox.sh                      | 2 +-
 tests/integrations/sanic/test_sanic.py | 5 ++---
 tox.ini                                | 8 ++++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/runtox.sh b/scripts/runtox.sh
index cb6292bf8a..a658da4132 100755
--- a/scripts/runtox.sh
+++ b/scripts/runtox.sh
@@ -27,4 +27,4 @@ elif [ -n "$AZURE_PYTHON_VERSION" ]; then
 fi
 
 export TOX_PARALLEL_NO_SPINNER=1
-exec $TOXPATH --parallel auto -e $($TOXPATH -l | grep "$searchstring" | tr $'\n' ',') -- "${@:2}"
+exec $TOXPATH -p auto -e $($TOXPATH -l | grep "$searchstring" | tr $'\n' ',') -- "${@:2}"
diff --git a/tests/integrations/sanic/test_sanic.py b/tests/integrations/sanic/test_sanic.py
index 808c6f14c3..de84845cf4 100644
--- a/tests/integrations/sanic/test_sanic.py
+++ b/tests/integrations/sanic/test_sanic.py
@@ -32,8 +32,8 @@ def new_test_client(self):
 
         Sanic.test_client = property(new_test_client)
 
-    if SANIC_VERSION >= (20, 12):
-        # Build (20.12.0) adds a feature where the instance is stored in an internal class
+    if SANIC_VERSION >= (20, 12) and SANIC_VERSION < (22, 6):
+        # Some builds (20.12.0 intruduced and 22.6.0 removed again) have 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("Test", register=False)
     else:
@@ -229,7 +229,6 @@ def __init__(self, request_body):
                 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):
diff --git a/tox.ini b/tox.ini
index 92ef7207d2..0b884bfa50 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,6 +51,7 @@ envlist =
     {py3.6,py3.7}-sanic-19
     {py3.6,py3.7,py3.8}-sanic-20
     {py3.7,py3.8,py3.9,py3.10}-sanic-21
+    {py3.7,py3.8,py3.9,py3.10}-sanic-22
 
     {py2.7}-celery-3
     {py2.7,py3.5,py3.6}-celery-{4.1,4.2}
@@ -160,9 +161,12 @@ 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,py3.10}-sanic-21: sanic_testing
-    {py3.5,py3.6}-sanic: aiocontextvars==0.2.1
+    sanic-22: sanic>=22.0,<22.9.0
+
     sanic: aiohttp
+    sanic-21: sanic_testing<22
+    sanic-22: sanic_testing<22.9.0
+    {py3.5,py3.6}-sanic: aiocontextvars==0.2.1
     py3.5-sanic: ujson<4
 
     beam-2.12: apache-beam>=2.12.0, <2.13.0

From dd294be47d660472e66c3f706c400b1c498818fd Mon Sep 17 00:00:00 2001
From: Kev <6111995+k-fish@users.noreply.github.com>
Date: Thu, 29 Sep 2022 09:32:14 -0400
Subject: [PATCH 109/209] ref(perf-issues): Increase max string size for desc
 (#1647)

Our python sdk is the only sdk which sends truncated desc from the sdk side. This effects our ability to cleanly detect perf issues, but in general we should probably aim for more consistency. This bumps the max limit by a moderate amount (again, other sdk's are already sending unbounded data).
---
 sentry_sdk/utils.py                              |  2 +-
 tests/integrations/bottle/test_bottle.py         | 12 ++++++------
 tests/integrations/falcon/test_falcon.py         |  4 ++--
 tests/integrations/flask/test_flask.py           | 12 ++++++------
 tests/integrations/pyramid/test_pyramid.py       |  8 ++++----
 tests/integrations/sqlalchemy/test_sqlalchemy.py |  2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 69afe91e80..05e620a0ca 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -40,7 +40,7 @@
 # The logger is created here but initialized in the debug support module
 logger = logging.getLogger("sentry_sdk.errors")
 
-MAX_STRING_LENGTH = 512
+MAX_STRING_LENGTH = 1024
 BASE64_ALPHABET = re.compile(r"^[a-zA-Z0-9/+=]*$")
 
 
diff --git a/tests/integrations/bottle/test_bottle.py b/tests/integrations/bottle/test_bottle.py
index 0ef4339874..9a209fd896 100644
--- a/tests/integrations/bottle/test_bottle.py
+++ b/tests/integrations/bottle/test_bottle.py
@@ -150,9 +150,9 @@ def index():
 
     (event,) = events
     assert event["_meta"]["request"]["data"]["foo"]["bar"] == {
-        "": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
+        "": {"len": 2000, "rem": [["!limit", "x", 1021, 1024]]}
     }
-    assert len(event["request"]["data"]["foo"]["bar"]) == 512
+    assert len(event["request"]["data"]["foo"]["bar"]) == 1024
 
 
 @pytest.mark.parametrize("data", [{}, []], ids=["empty-dict", "empty-list"])
@@ -200,9 +200,9 @@ def index():
 
     (event,) = events
     assert event["_meta"]["request"]["data"]["foo"] == {
-        "": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
+        "": {"len": 2000, "rem": [["!limit", "x", 1021, 1024]]}
     }
-    assert len(event["request"]["data"]["foo"]) == 512
+    assert len(event["request"]["data"]["foo"]) == 1024
 
 
 @pytest.mark.parametrize("input_char", ["a", b"a"])
@@ -265,9 +265,9 @@ def index():
 
     (event,) = events
     assert event["_meta"]["request"]["data"]["foo"] == {
-        "": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
+        "": {"len": 2000, "rem": [["!limit", "x", 1021, 1024]]}
     }
-    assert len(event["request"]["data"]["foo"]) == 512
+    assert len(event["request"]["data"]["foo"]) == 1024
 
     assert event["_meta"]["request"]["data"]["file"] == {
         "": {
diff --git a/tests/integrations/falcon/test_falcon.py b/tests/integrations/falcon/test_falcon.py
index 96aa0ee036..dd7aa80dfe 100644
--- a/tests/integrations/falcon/test_falcon.py
+++ b/tests/integrations/falcon/test_falcon.py
@@ -207,9 +207,9 @@ def on_post(self, req, resp):
 
     (event,) = events
     assert event["_meta"]["request"]["data"]["foo"]["bar"] == {
-        "": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
+        "": {"len": 2000, "rem": [["!limit", "x", 1021, 1024]]}
     }
-    assert len(event["request"]["data"]["foo"]["bar"]) == 512
+    assert len(event["request"]["data"]["foo"]["bar"]) == 1024
 
 
 @pytest.mark.parametrize("data", [{}, []], ids=["empty-dict", "empty-list"])
diff --git a/tests/integrations/flask/test_flask.py b/tests/integrations/flask/test_flask.py
index d64e616b37..be3e57c407 100644
--- a/tests/integrations/flask/test_flask.py
+++ b/tests/integrations/flask/test_flask.py
@@ -263,9 +263,9 @@ def index():
 
     (event,) = events
     assert event["_meta"]["request"]["data"]["foo"]["bar"] == {
-        "": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
+        "": {"len": 2000, "rem": [["!limit", "x", 1021, 1024]]}
     }
-    assert len(event["request"]["data"]["foo"]["bar"]) == 512
+    assert len(event["request"]["data"]["foo"]["bar"]) == 1024
 
 
 def test_flask_session_tracking(sentry_init, capture_envelopes, app):
@@ -352,9 +352,9 @@ def index():
 
     (event,) = events
     assert event["_meta"]["request"]["data"]["foo"] == {
-        "": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
+        "": {"len": 2000, "rem": [["!limit", "x", 1021, 1024]]}
     }
-    assert len(event["request"]["data"]["foo"]) == 512
+    assert len(event["request"]["data"]["foo"]) == 1024
 
 
 def test_flask_formdata_request_appear_transaction_body(
@@ -441,9 +441,9 @@ def index():
 
     (event,) = events
     assert event["_meta"]["request"]["data"]["foo"] == {
-        "": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
+        "": {"len": 2000, "rem": [["!limit", "x", 1021, 1024]]}
     }
-    assert len(event["request"]["data"]["foo"]) == 512
+    assert len(event["request"]["data"]["foo"]) == 1024
 
     assert event["_meta"]["request"]["data"]["file"] == {
         "": {"len": 0, "rem": [["!raw", "x", 0, 0]]}
diff --git a/tests/integrations/pyramid/test_pyramid.py b/tests/integrations/pyramid/test_pyramid.py
index c49f8b4475..495f19b16f 100644
--- a/tests/integrations/pyramid/test_pyramid.py
+++ b/tests/integrations/pyramid/test_pyramid.py
@@ -165,9 +165,9 @@ def index(request):
 
     (event,) = events
     assert event["_meta"]["request"]["data"]["foo"]["bar"] == {
-        "": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
+        "": {"len": 2000, "rem": [["!limit", "x", 1021, 1024]]}
     }
-    assert len(event["request"]["data"]["foo"]["bar"]) == 512
+    assert len(event["request"]["data"]["foo"]["bar"]) == 1024
 
 
 @pytest.mark.parametrize("data", [{}, []], ids=["empty-dict", "empty-list"])
@@ -209,9 +209,9 @@ def index(request):
 
     (event,) = events
     assert event["_meta"]["request"]["data"]["foo"] == {
-        "": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
+        "": {"len": 2000, "rem": [["!limit", "x", 1021, 1024]]}
     }
-    assert len(event["request"]["data"]["foo"]) == 512
+    assert len(event["request"]["data"]["foo"]) == 1024
 
     assert event["_meta"]["request"]["data"]["file"] == {
         "": {"len": 0, "rem": [["!raw", "x", 0, 0]]}
diff --git a/tests/integrations/sqlalchemy/test_sqlalchemy.py b/tests/integrations/sqlalchemy/test_sqlalchemy.py
index d9fa10095c..e9d8c4e849 100644
--- a/tests/integrations/sqlalchemy/test_sqlalchemy.py
+++ b/tests/integrations/sqlalchemy/test_sqlalchemy.py
@@ -214,5 +214,5 @@ def processor(event, hint):
 
     # The _meta for other truncated fields should be there as well.
     assert event["_meta"]["message"] == {
-        "": {"len": 522, "rem": [["!limit", "x", 509, 512]]}
+        "": {"len": 1034, "rem": [["!limit", "x", 1021, 1024]]}
     }

From 37e165edd633bfde5927150633193bc1bf41eab1 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 29 Sep 2022 17:22:12 +0200
Subject: [PATCH 110/209] Cancel old CI runs when new one is started. (#1651)

* Cancel old CI runs when new one is started. This should save some CI minutes (and concurrency)
---
 .github/workflows/test-integration-aiohttp.yml      | 8 +++++++-
 .github/workflows/test-integration-asgi.yml         | 8 +++++++-
 .github/workflows/test-integration-aws_lambda.yml   | 8 +++++++-
 .github/workflows/test-integration-beam.yml         | 8 +++++++-
 .github/workflows/test-integration-boto3.yml        | 8 +++++++-
 .github/workflows/test-integration-bottle.yml       | 8 +++++++-
 .github/workflows/test-integration-celery.yml       | 8 +++++++-
 .github/workflows/test-integration-chalice.yml      | 8 +++++++-
 .github/workflows/test-integration-django.yml       | 8 +++++++-
 .github/workflows/test-integration-falcon.yml       | 8 +++++++-
 .github/workflows/test-integration-fastapi.yml      | 8 +++++++-
 .github/workflows/test-integration-flask.yml        | 8 +++++++-
 .github/workflows/test-integration-gcp.yml          | 8 +++++++-
 .github/workflows/test-integration-httpx.yml        | 8 +++++++-
 .github/workflows/test-integration-pure_eval.yml    | 8 +++++++-
 .github/workflows/test-integration-pyramid.yml      | 8 +++++++-
 .github/workflows/test-integration-quart.yml        | 8 +++++++-
 .github/workflows/test-integration-redis.yml        | 8 +++++++-
 .github/workflows/test-integration-rediscluster.yml | 8 +++++++-
 .github/workflows/test-integration-requests.yml     | 8 +++++++-
 .github/workflows/test-integration-rq.yml           | 8 +++++++-
 .github/workflows/test-integration-sanic.yml        | 8 +++++++-
 .github/workflows/test-integration-sqlalchemy.yml   | 8 +++++++-
 .github/workflows/test-integration-starlette.yml    | 8 +++++++-
 .github/workflows/test-integration-tornado.yml      | 8 +++++++-
 .github/workflows/test-integration-trytond.yml      | 8 +++++++-
 scripts/split-tox-gh-actions/ci-yaml.txt            | 8 +++++++-
 27 files changed, 189 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/test-integration-aiohttp.yml b/.github/workflows/test-integration-aiohttp.yml
index 1bd1e69cb2..62f0a48ebf 100644
--- a/.github/workflows/test-integration-aiohttp.yml
+++ b/.github/workflows/test-integration-aiohttp.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-aiohttp" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-asgi.yml b/.github/workflows/test-integration-asgi.yml
index 49edcf0984..069ebbf3aa 100644
--- a/.github/workflows/test-integration-asgi.yml
+++ b/.github/workflows/test-integration-asgi.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-asgi" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-aws_lambda.yml b/.github/workflows/test-integration-aws_lambda.yml
index 551e50df35..5e40fed7e6 100644
--- a/.github/workflows/test-integration-aws_lambda.yml
+++ b/.github/workflows/test-integration-aws_lambda.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-aws_lambda" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-beam.yml b/.github/workflows/test-integration-beam.yml
index 4f5d2c721b..55f8e015be 100644
--- a/.github/workflows/test-integration-beam.yml
+++ b/.github/workflows/test-integration-beam.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-beam" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-boto3.yml b/.github/workflows/test-integration-boto3.yml
index f82a0fdf2c..9b8747c5f8 100644
--- a/.github/workflows/test-integration-boto3.yml
+++ b/.github/workflows/test-integration-boto3.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-boto3" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-bottle.yml b/.github/workflows/test-integration-bottle.yml
index bf0f4e0a15..834638213b 100644
--- a/.github/workflows/test-integration-bottle.yml
+++ b/.github/workflows/test-integration-bottle.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-bottle" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-celery.yml b/.github/workflows/test-integration-celery.yml
index 7eee993eb4..17feb5a4ba 100644
--- a/.github/workflows/test-integration-celery.yml
+++ b/.github/workflows/test-integration-celery.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-celery" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-chalice.yml b/.github/workflows/test-integration-chalice.yml
index 74a6a7f7f8..36067fc7ca 100644
--- a/.github/workflows/test-integration-chalice.yml
+++ b/.github/workflows/test-integration-chalice.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-chalice" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-django.yml b/.github/workflows/test-integration-django.yml
index 2f8a4c6a0d..db659728a8 100644
--- a/.github/workflows/test-integration-django.yml
+++ b/.github/workflows/test-integration-django.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -70,4 +76,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-django" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-falcon.yml b/.github/workflows/test-integration-falcon.yml
index 398067c962..af4c701e1a 100644
--- a/.github/workflows/test-integration-falcon.yml
+++ b/.github/workflows/test-integration-falcon.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-falcon" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-fastapi.yml b/.github/workflows/test-integration-fastapi.yml
index 5337c53cd4..6352d134e4 100644
--- a/.github/workflows/test-integration-fastapi.yml
+++ b/.github/workflows/test-integration-fastapi.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-fastapi" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-flask.yml b/.github/workflows/test-integration-flask.yml
index ed0066bc88..8e353814ff 100644
--- a/.github/workflows/test-integration-flask.yml
+++ b/.github/workflows/test-integration-flask.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-flask" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-gcp.yml b/.github/workflows/test-integration-gcp.yml
index e7aa1bd3ea..8aa4e12b7a 100644
--- a/.github/workflows/test-integration-gcp.yml
+++ b/.github/workflows/test-integration-gcp.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-gcp" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-httpx.yml b/.github/workflows/test-integration-httpx.yml
index f43fce229a..f9e1b4ec31 100644
--- a/.github/workflows/test-integration-httpx.yml
+++ b/.github/workflows/test-integration-httpx.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-httpx" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-pure_eval.yml b/.github/workflows/test-integration-pure_eval.yml
index f3d407062f..ef39704c43 100644
--- a/.github/workflows/test-integration-pure_eval.yml
+++ b/.github/workflows/test-integration-pure_eval.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-pure_eval" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-pyramid.yml b/.github/workflows/test-integration-pyramid.yml
index 990d5acdbd..bbd017b66f 100644
--- a/.github/workflows/test-integration-pyramid.yml
+++ b/.github/workflows/test-integration-pyramid.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-pyramid" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-quart.yml b/.github/workflows/test-integration-quart.yml
index fbea7be0d9..de7671dbda 100644
--- a/.github/workflows/test-integration-quart.yml
+++ b/.github/workflows/test-integration-quart.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-quart" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-redis.yml b/.github/workflows/test-integration-redis.yml
index 78159108c3..60352088cd 100644
--- a/.github/workflows/test-integration-redis.yml
+++ b/.github/workflows/test-integration-redis.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-redis" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-rediscluster.yml b/.github/workflows/test-integration-rediscluster.yml
index b1c2824ba2..5866637176 100644
--- a/.github/workflows/test-integration-rediscluster.yml
+++ b/.github/workflows/test-integration-rediscluster.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-rediscluster" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-requests.yml b/.github/workflows/test-integration-requests.yml
index 146d43f3c1..7e33b446db 100644
--- a/.github/workflows/test-integration-requests.yml
+++ b/.github/workflows/test-integration-requests.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-requests" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-rq.yml b/.github/workflows/test-integration-rq.yml
index a8b209061f..e2a0ebaff8 100644
--- a/.github/workflows/test-integration-rq.yml
+++ b/.github/workflows/test-integration-rq.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-rq" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-sanic.yml b/.github/workflows/test-integration-sanic.yml
index 1263982408..aa99f54a90 100644
--- a/.github/workflows/test-integration-sanic.yml
+++ b/.github/workflows/test-integration-sanic.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-sanic" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-sqlalchemy.yml b/.github/workflows/test-integration-sqlalchemy.yml
index c916bafaa5..ea36e0f562 100644
--- a/.github/workflows/test-integration-sqlalchemy.yml
+++ b/.github/workflows/test-integration-sqlalchemy.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-sqlalchemy" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-starlette.yml b/.github/workflows/test-integration-starlette.yml
index 8494181ee8..a35544e9e9 100644
--- a/.github/workflows/test-integration-starlette.yml
+++ b/.github/workflows/test-integration-starlette.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-starlette" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-tornado.yml b/.github/workflows/test-integration-tornado.yml
index c81236a94d..17c1f18a8e 100644
--- a/.github/workflows/test-integration-tornado.yml
+++ b/.github/workflows/test-integration-tornado.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-tornado" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-trytond.yml b/.github/workflows/test-integration-trytond.yml
index 2673df4379..12771ffd21 100644
--- a/.github/workflows/test-integration-trytond.yml
+++ b/.github/workflows/test-integration-trytond.yml
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -53,4 +59,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-trytond" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/scripts/split-tox-gh-actions/ci-yaml.txt b/scripts/split-tox-gh-actions/ci-yaml.txt
index bce51da521..2e14cb5062 100644
--- a/scripts/split-tox-gh-actions/ci-yaml.txt
+++ b/scripts/split-tox-gh-actions/ci-yaml.txt
@@ -8,6 +8,12 @@ on:
 
   pull_request:
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 
@@ -50,4 +56,4 @@ jobs:
           ./scripts/runtox.sh "${{ matrix.python-version }}-{{ framework }}" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml

From 932350e47babfd6613864b362eb5f9c029a9f1d0 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Fri, 30 Sep 2022 16:14:27 +0200
Subject: [PATCH 111/209] feat(django): Django4 support (#1632)

* Add Django 4 to test suite
* Manual test for async ORM queries and async class based views to show up in "Performance"
---
 tox.ini | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 0b884bfa50..834bd4381f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,8 +27,8 @@ envlist =
     # Django 3.x
     {py3.6,py3.7,py3.8,py3.9}-django-{3.0,3.1}
     {py3.6,py3.7,py3.8,py3.9,py3.10}-django-{3.2}
-    # Django 4.x (comming soon)
-    #{py3.8,py3.9,py3.10}-django-{4.0,4.1}
+    # Django 4.x
+    {py3.8,py3.9,py3.10}-django-{4.0,4.1}
 
     {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.11,0.12,1.0}
     {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-flask-1.1
@@ -115,6 +115,12 @@ deps =
     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-{4.0,4.1}: djangorestframework
+    django-{4.0,4.1}: pytest-asyncio
+    django-{4.0,4.1}: psycopg2-binary
+    django-{4.0,4.1}: pytest-django
+    django-{4.0,4.1}: Werkzeug
+
     django-1.8: Django>=1.8,<1.9
     django-1.9: Django>=1.9,<1.10
     django-1.10: Django>=1.10,<1.11
@@ -125,6 +131,8 @@ deps =
     django-3.0: Django>=3.0,<3.1
     django-3.1: Django>=3.1,<3.2
     django-3.2: Django>=3.2,<3.3
+    django-4.0: Django>=4.0,<4.1
+    django-4.1: Django>=4.1,<4.2
 
     flask: flask-login
     flask-0.11: Flask>=0.11,<0.12

From 067d80cbdfdf862da409b6dbba9a8aeec6856d64 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 3 Oct 2022 14:22:14 +0200
Subject: [PATCH 112/209] Added newer Celery versions to test suite (#1655)

---
 tox.ini | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 834bd4381f..2b26d2f45a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -56,7 +56,8 @@ envlist =
     {py2.7}-celery-3
     {py2.7,py3.5,py3.6}-celery-{4.1,4.2}
     {py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.3,4.4}
-    {py3.6,py3.7,py3.8,py3.9,py3.10}-celery-5.0
+    {py3.6,py3.7,py3.8}-celery-{5.0}
+    {py3.7,py3.8,py3.9,py3.10}-celery-{5.1,5.2}
 
     py3.7-beam-{2.12,2.13,2.32,2.33}
 
@@ -193,8 +194,11 @@ deps =
     # 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
+    celery-5.1: Celery>=5.1,<5.2
+    celery-5.2: Celery>=5.2,<5.3
 
     py3.5-celery: newrelic<6.0.0
+    {py3.7}-celery: importlib-metadata<5.0
     {py2.7,py3.6,py3.7,py3.8,py3.9,py3.10}-celery: newrelic
 
     requests: requests>=2.0

From e5b80d6a96c625ffcdf3768f4ba415d836457d8d Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 3 Oct 2022 16:50:46 +0200
Subject: [PATCH 113/209] Use content-length header in ASGI instead of reading
 request body (#1646, #1631, #1595, #1573)

* Do not read request body to determine content length.
* Made AnnotatedValue understandable
---
 sentry_sdk/integrations/_wsgi_common.py       | 19 ++----
 sentry_sdk/integrations/aiohttp.py            |  5 +-
 sentry_sdk/integrations/aws_lambda.py         |  2 +-
 sentry_sdk/integrations/gcp.py                |  2 +-
 sentry_sdk/integrations/starlette.py          | 58 ++++++++-----------
 sentry_sdk/utils.py                           | 39 +++++++++++++
 tests/integrations/bottle/test_bottle.py      |  9 +--
 tests/integrations/django/test_basic.py       |  3 +-
 tests/integrations/flask/test_flask.py        |  8 +--
 tests/integrations/pyramid/test_pyramid.py    |  4 +-
 .../integrations/starlette/test_starlette.py  | 18 +++---
 11 files changed, 87 insertions(+), 80 deletions(-)

diff --git a/sentry_sdk/integrations/_wsgi_common.py b/sentry_sdk/integrations/_wsgi_common.py
index 4f253acc35..1b7b222f18 100644
--- a/sentry_sdk/integrations/_wsgi_common.py
+++ b/sentry_sdk/integrations/_wsgi_common.py
@@ -64,19 +64,13 @@ def extract_into_event(self, event):
             request_info["cookies"] = dict(self.cookies())
 
         if not request_body_within_bounds(client, content_length):
-            data = AnnotatedValue(
-                "",
-                {"rem": [["!config", "x", 0, content_length]], "len": content_length},
-            )
+            data = AnnotatedValue.removed_because_over_size_limit()
         else:
             parsed_body = self.parsed_body()
             if parsed_body is not None:
                 data = parsed_body
             elif self.raw_data():
-                data = AnnotatedValue(
-                    "",
-                    {"rem": [["!raw", "x", 0, content_length]], "len": content_length},
-                )
+                data = AnnotatedValue.removed_because_raw_data()
             else:
                 data = None
 
@@ -110,11 +104,8 @@ def parsed_body(self):
         files = self.files()
         if form or files:
             data = dict(iteritems(form))
-            for k, v in iteritems(files):
-                size = self.size_of_file(v)
-                data[k] = AnnotatedValue(
-                    "", {"len": size, "rem": [["!raw", "x", 0, size]]}
-                )
+            for key, _ in iteritems(files):
+                data[key] = AnnotatedValue.removed_because_raw_data()
 
             return data
 
@@ -175,7 +166,7 @@ def _filter_headers(headers):
         k: (
             v
             if k.upper().replace("-", "_") not in SENSITIVE_HEADERS
-            else AnnotatedValue("", {"rem": [["!config", "x", 0, len(v)]]})
+            else AnnotatedValue.removed_because_over_size_limit()
         )
         for k, v in iteritems(headers)
     }
diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py
index f07790173d..c9a637eeb4 100644
--- a/sentry_sdk/integrations/aiohttp.py
+++ b/sentry_sdk/integrations/aiohttp.py
@@ -218,11 +218,8 @@ def get_aiohttp_request_data(hub, request):
     if bytes_body is not None:
         # we have body to show
         if not request_body_within_bounds(hub.client, len(bytes_body)):
+            return AnnotatedValue.removed_because_over_size_limit()
 
-            return AnnotatedValue(
-                "",
-                {"rem": [["!config", "x", 0, len(bytes_body)]], "len": len(bytes_body)},
-            )
         encoding = request.charset or "utf-8"
         return bytes_body.decode(encoding, "replace")
 
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
index 8f41ce52cb..365247781c 100644
--- a/sentry_sdk/integrations/aws_lambda.py
+++ b/sentry_sdk/integrations/aws_lambda.py
@@ -377,7 +377,7 @@ def event_processor(sentry_event, hint, start_time=start_time):
             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]]})
+                request["data"] = AnnotatedValue.removed_because_raw_data()
 
         sentry_event["request"] = request
 
diff --git a/sentry_sdk/integrations/gcp.py b/sentry_sdk/integrations/gcp.py
index e401daa9ca..6025d38c45 100644
--- a/sentry_sdk/integrations/gcp.py
+++ b/sentry_sdk/integrations/gcp.py
@@ -190,7 +190,7 @@ def event_processor(event, hint):
             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]]})
+                request["data"] = AnnotatedValue.removed_because_raw_data()
 
         event["request"] = request
 
diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index 2d23250fa0..28993611e6 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -438,49 +438,40 @@ async def extract_request_info(self):
         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]
 
         with capture_internal_exceptions():
             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,
-                        },
-                    )
+            content_length = await self.content_length()
+
+            if content_length:
+                data = None  # type: Union[Dict[str, Any], AnnotatedValue, None]
+
+                if not request_body_within_bounds(client, content_length):
+                    data = AnnotatedValue.removed_because_over_size_limit()
+
                 else:
-                    data = None
+                    parsed_body = await self.parsed_body()
+                    if parsed_body is not None:
+                        data = parsed_body
+                    elif await self.raw_data():
+                        data = AnnotatedValue.removed_because_raw_data()
+                    else:
+                        data = None
 
-            if data is not None:
-                request_info["data"] = data
+                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)
+        # type: (StarletteRequestExtractor) -> Optional[int]
+        if "content-length" in self.request.headers:
+            return int(self.request.headers["content-length"])
+
+        return None
 
     def cookies(self):
         # type: (StarletteRequestExtractor) -> Dict[str, Any]
@@ -525,10 +516,7 @@ async def parsed_body(self):
             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]]}
-                    )
+                    data[key] = AnnotatedValue.removed_because_raw_data()
                 else:
                     data[key] = val
 
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 05e620a0ca..5e74885b32 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -283,6 +283,13 @@ def to_header(self):
 
 
 class AnnotatedValue(object):
+    """
+    Meta information for a data field in the event payload.
+    This is to tell Relay that we have tampered with the fields value.
+    See:
+    https://github.com/getsentry/relay/blob/be12cd49a0f06ea932ed9b9f93a655de5d6ad6d1/relay-general/src/types/meta.rs#L407-L423
+    """
+
     __slots__ = ("value", "metadata")
 
     def __init__(self, value, metadata):
@@ -290,6 +297,38 @@ def __init__(self, value, metadata):
         self.value = value
         self.metadata = metadata
 
+    @classmethod
+    def removed_because_raw_data(cls):
+        # type: () -> AnnotatedValue
+        """The value was removed because it could not be parsed. This is done for request body values that are not json nor a form."""
+        return AnnotatedValue(
+            value="",
+            metadata={
+                "rem": [  # Remark
+                    [
+                        "!raw",  # Unparsable raw data
+                        "x",  # The fields original value was removed
+                    ]
+                ]
+            },
+        )
+
+    @classmethod
+    def removed_because_over_size_limit(cls):
+        # type: () -> AnnotatedValue
+        """The actual value was removed because the size of the field exceeded the configured maximum size (specified with the request_bodies sdk option)"""
+        return AnnotatedValue(
+            value="",
+            metadata={
+                "rem": [  # Remark
+                    [
+                        "!config",  # Because of configured maximum size
+                        "x",  # The fields original value was removed
+                    ]
+                ]
+            },
+        )
+
 
 if MYPY:
     from typing import TypeVar
diff --git a/tests/integrations/bottle/test_bottle.py b/tests/integrations/bottle/test_bottle.py
index 9a209fd896..dfd6e52f80 100644
--- a/tests/integrations/bottle/test_bottle.py
+++ b/tests/integrations/bottle/test_bottle.py
@@ -234,9 +234,7 @@ def index():
     assert response[1] == "200 OK"
 
     (event,) = events
-    assert event["_meta"]["request"]["data"] == {
-        "": {"len": 2000, "rem": [["!config", "x", 0, 2000]]}
-    }
+    assert event["_meta"]["request"]["data"] == {"": {"rem": [["!config", "x"]]}}
     assert not event["request"]["data"]
 
 
@@ -271,9 +269,8 @@ def index():
 
     assert event["_meta"]["request"]["data"]["file"] == {
         "": {
-            "len": -1,
-            "rem": [["!raw", "x", 0, -1]],
-        }  # bottle default content-length is -1
+            "rem": [["!raw", "x"]],
+        }
     }
     assert not event["request"]["data"]["file"]
 
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index 7809239c30..a62f1bb073 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -520,8 +520,7 @@ def test_request_body(sentry_init, client, capture_events):
     assert event["message"] == "hi"
     assert event["request"]["data"] == ""
     assert event["_meta"]["request"]["data"][""] == {
-        "len": 6,
-        "rem": [["!raw", "x", 0, 6]],
+        "rem": [["!raw", "x"]],
     }
 
     del events[:]
diff --git a/tests/integrations/flask/test_flask.py b/tests/integrations/flask/test_flask.py
index be3e57c407..8983c4e5ff 100644
--- a/tests/integrations/flask/test_flask.py
+++ b/tests/integrations/flask/test_flask.py
@@ -414,9 +414,7 @@ def index():
     assert response.status_code == 200
 
     (event,) = events
-    assert event["_meta"]["request"]["data"] == {
-        "": {"len": 2000, "rem": [["!config", "x", 0, 2000]]}
-    }
+    assert event["_meta"]["request"]["data"] == {"": {"rem": [["!config", "x"]]}}
     assert not event["request"]["data"]
 
 
@@ -445,9 +443,7 @@ def index():
     }
     assert len(event["request"]["data"]["foo"]) == 1024
 
-    assert event["_meta"]["request"]["data"]["file"] == {
-        "": {"len": 0, "rem": [["!raw", "x", 0, 0]]}
-    }
+    assert event["_meta"]["request"]["data"]["file"] == {"": {"rem": [["!raw", "x"]]}}
     assert not event["request"]["data"]["file"]
 
 
diff --git a/tests/integrations/pyramid/test_pyramid.py b/tests/integrations/pyramid/test_pyramid.py
index 495f19b16f..0f8755ac6b 100644
--- a/tests/integrations/pyramid/test_pyramid.py
+++ b/tests/integrations/pyramid/test_pyramid.py
@@ -213,9 +213,7 @@ def index(request):
     }
     assert len(event["request"]["data"]["foo"]) == 1024
 
-    assert event["_meta"]["request"]["data"]["file"] == {
-        "": {"len": 0, "rem": [["!raw", "x", 0, 0]]}
-    }
+    assert event["_meta"]["request"]["data"]["file"] == {"": {"rem": [["!raw", "x"]]}}
     assert not event["request"]["data"]["file"]
 
 
diff --git a/tests/integrations/starlette/test_starlette.py b/tests/integrations/starlette/test_starlette.py
index 52d9ad4fe8..5908ebae52 100644
--- a/tests/integrations/starlette/test_starlette.py
+++ b/tests/integrations/starlette/test_starlette.py
@@ -56,9 +56,7 @@
 PARSED_BODY = {
     "username": "Jane",
     "password": "hello123",
-    "photo": AnnotatedValue(
-        "", {"len": 28023, "rem": [["!raw", "x", 0, 28023]]}
-    ),  # size of photo.jpg read above
+    "photo": AnnotatedValue("", {"rem": [["!raw", "x"]]}),
 }
 
 # Dummy ASGI scope for creating mock Starlette requests
@@ -160,7 +158,11 @@ async def test_starlettrequestextractor_content_length(sentry_init):
         "starlette.requests.Request.stream",
         return_value=AsyncIterator(json.dumps(BODY_JSON)),
     ):
-        starlette_request = starlette.requests.Request(SCOPE)
+        scope = SCOPE.copy()
+        scope["headers"] = [
+            [b"content-length", str(len(json.dumps(BODY_JSON))).encode()],
+        ]
+        starlette_request = starlette.requests.Request(scope)
         extractor = StarletteRequestExtractor(starlette_request)
 
         assert await extractor.content_length() == len(json.dumps(BODY_JSON))
@@ -266,6 +268,7 @@ async def test_starlettrequestextractor_extract_request_info_too_big(sentry_init
     scope = SCOPE.copy()
     scope["headers"] = [
         [b"content-type", b"multipart/form-data; boundary=fd721ef49ea403a6"],
+        [b"content-length", str(len(BODY_FORM)).encode()],
         [b"cookie", b"yummy_cookie=choco; tasty_cookie=strawberry"],
     ]
     with mock.patch(
@@ -283,10 +286,7 @@ async def test_starlettrequestextractor_extract_request_info_too_big(sentry_init
             "yummy_cookie": "choco",
         }
         # Because request is too big only the AnnotatedValue is extracted.
-        assert request_info["data"].metadata == {
-            "rem": [["!config", "x", 0, 28355]],
-            "len": 28355,
-        }
+        assert request_info["data"].metadata == {"rem": [["!config", "x"]]}
 
 
 @pytest.mark.asyncio
@@ -298,6 +298,7 @@ async def test_starlettrequestextractor_extract_request_info(sentry_init):
     scope = SCOPE.copy()
     scope["headers"] = [
         [b"content-type", b"application/json"],
+        [b"content-length", str(len(json.dumps(BODY_JSON))).encode()],
         [b"cookie", b"yummy_cookie=choco; tasty_cookie=strawberry"],
     ]
 
@@ -327,6 +328,7 @@ async def test_starlettrequestextractor_extract_request_info_no_pii(sentry_init)
     scope = SCOPE.copy()
     scope["headers"] = [
         [b"content-type", b"application/json"],
+        [b"content-length", str(len(json.dumps(BODY_JSON))).encode()],
         [b"cookie", b"yummy_cookie=choco; tasty_cookie=strawberry"],
     ]
 

From 64adaf82d1f15fa5b0cbc63dcfa330713f2c2081 Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Mon, 3 Oct 2022 14:52:39 +0000
Subject: [PATCH 114/209] release: 1.9.10

---
 CHANGELOG.md         | 14 ++++++++++++++
 docs/conf.py         |  2 +-
 sentry_sdk/consts.py |  2 +-
 setup.py             |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08b1ad34c1..c0615c3808 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## 1.9.10
+
+### Various fixes & improvements
+
+- Use content-length header in ASGI instead of reading request body (#1646, #1631, #1595, #1573) (#1649) by @antonpirker
+- Added newer Celery versions to test suite (#1655) by @antonpirker
+- feat(django): Django4 support (#1632) by @antonpirker
+- Cancel old CI runs when new one is started. (#1651) by @antonpirker
+- ref(perf-issues): Increase max string size for desc (#1647) by @k-fish
+- Pin Sanic version for CI (#1650) by @antonpirker
+- Fix for partial signals in old Django and old Python versions. (#1641) by @antonpirker
+- feat(profiling): Convert profile output to the sample format (#1611) by @phacops
+- fix(profiling): Dynamically adjust profiler sleep time (#1634) by @Zylphrex
+
 ## 1.9.9
 
 ### Django update (ongoing)
diff --git a/docs/conf.py b/docs/conf.py
index 6bac38f9b0..5107e0f061 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.9.9"
+release = "1.9.10"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index c90bbea337..ceba6b512e 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -104,7 +104,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.9.9"
+VERSION = "1.9.10"
 SDK_INFO = {
     "name": "sentry.python",
     "version": VERSION,
diff --git a/setup.py b/setup.py
index da836fe8c4..f87a9f2104 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.9.9",
+    version="1.9.10",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From 84319ecfe92954dc9869e38862191f358159c24f Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 3 Oct 2022 16:54:30 +0200
Subject: [PATCH 115/209] Updated changelog

---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0615c3808..1f661d0b2a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,13 +6,13 @@
 
 - Use content-length header in ASGI instead of reading request body (#1646, #1631, #1595, #1573) (#1649) by @antonpirker
 - Added newer Celery versions to test suite (#1655) by @antonpirker
-- feat(django): Django4 support (#1632) by @antonpirker
+- Django 4.x support (#1632) by @antonpirker
 - Cancel old CI runs when new one is started. (#1651) by @antonpirker
-- ref(perf-issues): Increase max string size for desc (#1647) by @k-fish
+- Increase max string size for desc (#1647) by @k-fish
 - Pin Sanic version for CI (#1650) by @antonpirker
 - Fix for partial signals in old Django and old Python versions. (#1641) by @antonpirker
-- feat(profiling): Convert profile output to the sample format (#1611) by @phacops
-- fix(profiling): Dynamically adjust profiler sleep time (#1634) by @Zylphrex
+- Convert profile output to the sample format (#1611) by @phacops
+- Dynamically adjust profiler sleep time (#1634) by @Zylphrex
 
 ## 1.9.9
 

From c05bcf598c5455a6f35eabd18c840c4544c9392c Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Fri, 7 Oct 2022 12:03:19 -0400
Subject: [PATCH 116/209] feat(profiling): Attach thread metadata to profiles
 (#1660)

Attaching thread metadata to the profiles will allow the UI to render a thread
name in the thread selector.
---
 sentry_sdk/client.py   | 12 ++++--------
 sentry_sdk/profiler.py | 42 +++++++++++++++++++++++++++++-------------
 sentry_sdk/tracing.py  |  7 ++++---
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 06923c501b..32581a60db 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -357,6 +357,8 @@ def capture_event(
         if not self._should_capture(event, hint, scope):
             return None
 
+        profile = event.pop("profile", None)
+
         event_opt = self._prepare_event(event, hint, scope)
         if event_opt is None:
             return None
@@ -409,14 +411,8 @@ def capture_event(
             envelope = Envelope(headers=headers)
 
             if is_transaction:
-                if "profile" in event_opt:
-                    event_opt["profile"]["environment"] = event_opt.get("environment")
-                    event_opt["profile"]["release"] = event_opt.get("release", "")
-                    event_opt["profile"]["timestamp"] = event_opt.get("timestamp", "")
-                    event_opt["profile"]["transactions"][0]["id"] = event_opt[
-                        "event_id"
-                    ]
-                    envelope.add_profile(event_opt.pop("profile"))
+                if profile is not None:
+                    envelope.add_profile(profile.to_json(event_opt))
                 envelope.add_transaction(event_opt)
             else:
                 envelope.add_event(event_opt)
diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 45ef706815..86cf1bf91d 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -56,7 +56,7 @@ def setup_profiler(options):
     `buffer_secs` determines the max time a sample will be buffered for
     `frequency` determines the number of samples to take per second (Hz)
     """
-    buffer_secs = 60
+    buffer_secs = 30
     frequency = 101
 
     if not PY33:
@@ -163,6 +163,8 @@ def __init__(self, transaction, hub=None):
         self._start_ns = None  # type: Optional[int]
         self._stop_ns = None  # type: Optional[int]
 
+        transaction._profile = self
+
     def __enter__(self):
         # type: () -> None
         assert _scheduler is not None
@@ -175,23 +177,19 @@ def __exit__(self, ty, value, tb):
         _scheduler.stop_profiling()
         self._stop_ns = nanosecond_time()
 
-        # Now that we've collected all the data, attach it to the
-        # transaction so that it can be sent in the same envelope
-        self.transaction._profile = self.to_json()
-
-    def to_json(self):
-        # type: () -> Dict[str, Any]
+    def to_json(self, event_opt):
+        # type: (Any) -> Dict[str, Any]
         assert _sample_buffer is not None
         assert self._start_ns is not None
         assert self._stop_ns is not None
 
         return {
-            "environment": None,  # Gets added in client.py
+            "environment": event_opt.get("environment"),
             "event_id": uuid.uuid4().hex,
             "platform": "python",
             "profile": _sample_buffer.slice_profile(self._start_ns, self._stop_ns),
-            "release": None,  # Gets added in client.py
-            "timestamp": None,  # Gets added in client.py
+            "release": event_opt.get("release", ""),
+            "timestamp": event_opt["timestamp"],
             "version": "1",
             "device": {
                 "architecture": platform.machine(),
@@ -206,7 +204,7 @@ def to_json(self):
             },
             "transactions": [
                 {
-                    "id": None,  # Gets added in client.py
+                    "id": event_opt["event_id"],
                     "name": self.transaction.name,
                     # we start the transaction before the profile and this is
                     # the transaction start time relative to the profile, so we
@@ -304,7 +302,22 @@ def slice_profile(self, start_ns, stop_ns):
                 sample["stack_id"] = stacks[current_stack]
                 samples.append(sample)
 
-        return {"stacks": stacks_list, "frames": frames_list, "samples": samples}
+        # This collects the thread metadata at the end of a profile. Doing it
+        # this way means that any threads that terminate before the profile ends
+        # will not have any metadata associated with it.
+        thread_metadata = {
+            str(thread.ident): {
+                "name": thread.name,
+            }
+            for thread in threading.enumerate()
+        }
+
+        return {
+            "stacks": stacks_list,
+            "frames": frames_list,
+            "samples": samples,
+            "thread_metadata": thread_metadata,
+        }
 
 
 class _Scheduler(object):
@@ -344,6 +357,7 @@ class _ThreadScheduler(_Scheduler):
     """
 
     mode = "thread"
+    name = None  # type: Optional[str]
 
     def __init__(self, frequency):
         # type: (int) -> None
@@ -368,7 +382,7 @@ def start_profiling(self):
             # make sure the thread is a daemon here otherwise this
             # can keep the application running after other threads
             # have exited
-            thread = threading.Thread(target=self.run, daemon=True)
+            thread = threading.Thread(name=self.name, target=self.run, daemon=True)
             thread.start()
             return True
         return False
@@ -394,6 +408,7 @@ class _SleepScheduler(_ThreadScheduler):
     """
 
     mode = "sleep"
+    name = "sentry.profiler.SleepScheduler"
 
     def run(self):
         # type: () -> None
@@ -424,6 +439,7 @@ class _EventScheduler(_ThreadScheduler):
     """
 
     mode = "event"
+    name = "sentry.profiler.EventScheduler"
 
     def run(self):
         # type: () -> None
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 3bef18bc35..aacb3a5bb3 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -21,7 +21,8 @@
     from typing import Tuple
     from typing import Iterator
 
-    from sentry_sdk._types import SamplingContext, MeasurementUnit
+    import sentry_sdk.profiler
+    from sentry_sdk._types import Event, SamplingContext, MeasurementUnit
 
 
 # Transaction source
@@ -579,7 +580,7 @@ def __init__(
         self._sentry_tracestate = sentry_tracestate
         self._third_party_tracestate = third_party_tracestate
         self._measurements = {}  # type: Dict[str, Any]
-        self._profile = None  # type: Optional[Dict[str, Any]]
+        self._profile = None  # type: Optional[sentry_sdk.profiler.Profile]
         self._baggage = baggage
         # for profiling, we want to know on which thread a transaction is started
         # to accurately show the active thread in the UI
@@ -675,7 +676,7 @@ def finish(self, hub=None):
             "timestamp": self.timestamp,
             "start_timestamp": self.start_timestamp,
             "spans": finished_spans,
-        }
+        }  # type: Event
 
         if hub.client is not None and self._profile is not None:
             event["profile"] = self._profile

From ec98b3e139ad05be7aa7a23fe34ffa845c105982 Mon Sep 17 00:00:00 2001
From: Denys Pidlisnyi <93984934+denys-pidlisnyi@users.noreply.github.com>
Date: Mon, 10 Oct 2022 14:48:10 +0300
Subject: [PATCH 117/209] Add session for aiohttp integration (#1605)

---
 sentry_sdk/integrations/aiohttp.py | 67 ++++++++++++++++--------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py
index c9a637eeb4..8db3f11afa 100644
--- a/sentry_sdk/integrations/aiohttp.py
+++ b/sentry_sdk/integrations/aiohttp.py
@@ -5,6 +5,7 @@
 from sentry_sdk.hub import Hub
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.integrations.logging import ignore_logger
+from sentry_sdk.sessions import auto_session_tracking
 from sentry_sdk.integrations._wsgi_common import (
     _filter_headers,
     request_body_within_bounds,
@@ -91,38 +92,40 @@ async def sentry_app_handle(self, request, *args, **kwargs):
             weak_request = weakref.ref(request)
 
             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:
-                    scope.clear_breadcrumbs()
-                    scope.add_event_processor(_make_request_processor(weak_request))
-
-                transaction = Transaction.continue_from_headers(
-                    request.headers,
-                    op="http.server",
-                    # If this transaction name makes it to the UI, AIOHTTP's
-                    # URL resolver did not find a route or died trying.
-                    name="generic AIOHTTP request",
-                    source=TRANSACTION_SOURCE_ROUTE,
-                )
-                with hub.start_transaction(
-                    transaction, custom_sampling_context={"aiohttp_request": request}
-                ):
-                    try:
-                        response = await old_handle(self, request)
-                    except HTTPException as e:
-                        transaction.set_http_status(e.status_code)
-                        raise
-                    except (asyncio.CancelledError, ConnectionResetError):
-                        transaction.set_status("cancelled")
-                        raise
-                    except Exception:
-                        # This will probably map to a 500 but seems like we
-                        # have no way to tell. Do not set span status.
-                        reraise(*_capture_exception(hub))
-
-                    transaction.set_http_status(response.status)
-                    return response
+                with auto_session_tracking(hub, session_mode="request"):
+                    # Scope data will not leak between requests because aiohttp
+                    # create a task to wrap each request.
+                    with hub.configure_scope() as scope:
+                        scope.clear_breadcrumbs()
+                        scope.add_event_processor(_make_request_processor(weak_request))
+
+                    transaction = Transaction.continue_from_headers(
+                        request.headers,
+                        op="http.server",
+                        # If this transaction name makes it to the UI, AIOHTTP's
+                        # URL resolver did not find a route or died trying.
+                        name="generic AIOHTTP request",
+                        source=TRANSACTION_SOURCE_ROUTE,
+                    )
+                    with hub.start_transaction(
+                        transaction,
+                        custom_sampling_context={"aiohttp_request": request},
+                    ):
+                        try:
+                            response = await old_handle(self, request)
+                        except HTTPException as e:
+                            transaction.set_http_status(e.status_code)
+                            raise
+                        except (asyncio.CancelledError, ConnectionResetError):
+                            transaction.set_status("cancelled")
+                            raise
+                        except Exception:
+                            # This will probably map to a 500 but seems like we
+                            # have no way to tell. Do not set span status.
+                            reraise(*_capture_exception(hub))
+
+                        transaction.set_http_status(response.status)
+                        return response
 
         Application._handle = sentry_app_handle
 

From c0ef3d0bbb5b3ed6094010570730679bf9e06fd9 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 10 Oct 2022 14:45:05 +0200
Subject: [PATCH 118/209] Unified naming for span ops (#1661)

* Unified naming for span ops.
---
 CHANGELOG.md                                  | 32 ++++++++++++-
 sentry_sdk/consts.py                          | 22 +++++++++
 sentry_sdk/integrations/aiohttp.py            |  3 +-
 sentry_sdk/integrations/asgi.py               |  3 +-
 sentry_sdk/integrations/aws_lambda.py         |  3 +-
 sentry_sdk/integrations/boto3.py              |  5 +-
 sentry_sdk/integrations/celery.py             |  7 ++-
 sentry_sdk/integrations/django/__init__.py    |  3 +-
 sentry_sdk/integrations/django/asgi.py        |  3 +-
 sentry_sdk/integrations/django/middleware.py  |  3 +-
 .../integrations/django/signals_handlers.py   |  3 +-
 sentry_sdk/integrations/django/templates.py   |  5 +-
 sentry_sdk/integrations/django/views.py       |  3 +-
 sentry_sdk/integrations/gcp.py                |  3 +-
 sentry_sdk/integrations/httpx.py              |  5 +-
 sentry_sdk/integrations/redis.py              |  7 ++-
 sentry_sdk/integrations/rq.py                 |  3 +-
 sentry_sdk/integrations/starlette.py          |  3 +-
 sentry_sdk/integrations/stdlib.py             | 11 +++--
 sentry_sdk/integrations/tornado.py            |  3 +-
 sentry_sdk/integrations/wsgi.py               |  3 +-
 sentry_sdk/tracing_utils.py                   |  7 +--
 tests/integrations/aws_lambda/test_aws.py     |  6 +--
 tests/integrations/boto3/test_s3.py           | 10 ++--
 tests/integrations/celery/test_celery.py      |  4 +-
 tests/integrations/django/asgi/test_asgi.py   | 22 ++++-----
 tests/integrations/django/test_basic.py       | 46 +++++++++----------
 tests/integrations/gcp/test_gcp.py            |  4 +-
 tests/integrations/redis/test_redis.py        |  2 +-
 .../rediscluster/test_rediscluster.py         |  2 +-
 tests/integrations/rq/test_rq.py              |  4 +-
 .../integrations/starlette/test_starlette.py  |  2 +-
 32 files changed, 160 insertions(+), 82 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f661d0b2a..47c02117ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Changelog
 
+## 1.9.11
+
+### Various fixes & improvements
+
+- Unified naming of span "op"s (#1643) by @antonpirker
+
+  We have unified the strings of our span operations. See https://develop.sentry.dev/sdk/performance/span-operations/
+
+  **WARNING:** If you have dashboards defined that use `transaction.op` in their fields, conditions, aggregates or columns please check them before updating to this version of the SDK.
+
+  Here a list of all the changes:
+
+  | Old operation (`op`)     | New Operation (`op`)   |
+  | ------------------------ | ---------------------- |
+  | `asgi.server`            | `http.server`          |
+  | `aws.request`            | `http.client`          |
+  | `aws.request.stream`     | `http.client.stream`   |
+  | `celery.submit`          | `queue.submit.celery`  |
+  | `celery.task`            | `queue.task.celery`    |
+  | `django.middleware`      | `middleware.django`    |
+  | `django.signals`         | `event.django`         |
+  | `django.template.render` | `template.render`      |
+  | `django.view`            | `view.render`          |
+  | `http`                   | `http.client`          |
+  | `redis`                  | `db.redis`             |
+  | `rq.task`                | `queue.task.rq`        |
+  | `serverless.function`    | `function.aws`         |
+  | `serverless.function`    | `function.gcp`         |
+  | `starlette.middleware`   | `middleware.starlette` |
+
 ## 1.9.10
 
 ### Various fixes & improvements
@@ -158,7 +188,7 @@ We can do better and in the future we will do our best to not break your code ag
 
 - fix: avoid sending empty Baggage header (#1507) by @intgr
 - fix: properly freeze Baggage object (#1508) by @intgr
-- docs: fix simple typo, collecter -> collector (#1505) by @timgates42
+- docs: fix simple typo, collecter | collector (#1505) by @timgates42
 
 ## 1.7.2
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index ceba6b512e..f2d5649c5e 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -110,3 +110,25 @@ def _get_default_options():
     "version": VERSION,
     "packages": [{"name": "pypi:sentry-sdk", "version": VERSION}],
 }
+
+
+class OP:
+    DB = "db"
+    DB_REDIS = "db.redis"
+    EVENT_DJANGO = "event.django"
+    FUNCTION_AWS = "function.aws"
+    FUNCTION_GCP = "function.gcp"
+    HTTP_CLIENT = "http.client"
+    HTTP_CLIENT_STREAM = "http.client.stream"
+    HTTP_SERVER = "http.server"
+    MIDDLEWARE_DJANGO = "middleware.django"
+    MIDDLEWARE_STARLETTE = "middleware.starlette"
+    QUEUE_SUBMIT_CELERY = "queue.submit.celery"
+    QUEUE_TASK_CELERY = "queue.task.celery"
+    QUEUE_TASK_RQ = "queue.task.rq"
+    SUBPROCESS = "subprocess"
+    SUBPROCESS_WAIT = "subprocess.wait"
+    SUBPROCESS_COMMUNICATE = "subprocess.communicate"
+    TEMPLATE_RENDER = "template.render"
+    VIEW_RENDER = "view.render"
+    WEBSOCKET_SERVER = "websocket.server"
diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py
index 8db3f11afa..d1728f6edb 100644
--- a/sentry_sdk/integrations/aiohttp.py
+++ b/sentry_sdk/integrations/aiohttp.py
@@ -2,6 +2,7 @@
 import weakref
 
 from sentry_sdk._compat import reraise
+from sentry_sdk.consts import OP
 from sentry_sdk.hub import Hub
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.integrations.logging import ignore_logger
@@ -101,7 +102,7 @@ async def sentry_app_handle(self, request, *args, **kwargs):
 
                     transaction = Transaction.continue_from_headers(
                         request.headers,
-                        op="http.server",
+                        op=OP.HTTP_SERVER,
                         # If this transaction name makes it to the UI, AIOHTTP's
                         # URL resolver did not find a route or died trying.
                         name="generic AIOHTTP request",
diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py
index 67e6eac230..cfeaf4d298 100644
--- a/sentry_sdk/integrations/asgi.py
+++ b/sentry_sdk/integrations/asgi.py
@@ -10,6 +10,7 @@
 
 from sentry_sdk._functools import partial
 from sentry_sdk._types import MYPY
+from sentry_sdk.consts import OP
 from sentry_sdk.hub import Hub, _should_send_default_pii
 from sentry_sdk.integrations._wsgi_common import _filter_headers
 from sentry_sdk.integrations.modules import _get_installed_modules
@@ -166,7 +167,7 @@ async def _run_app(self, scope, callback):
                             op="{}.server".format(ty),
                         )
                     else:
-                        transaction = Transaction(op="asgi.server")
+                        transaction = Transaction(op=OP.HTTP_SERVER)
 
                     transaction.name = _DEFAULT_TRANSACTION_NAME
                     transaction.source = TRANSACTION_SOURCE_ROUTE
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
index 365247781c..6017adfa7b 100644
--- a/sentry_sdk/integrations/aws_lambda.py
+++ b/sentry_sdk/integrations/aws_lambda.py
@@ -1,6 +1,7 @@
 from datetime import datetime, timedelta
 from os import environ
 import sys
+from sentry_sdk.consts import OP
 
 from sentry_sdk.hub import Hub, _should_send_default_pii
 from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT, Transaction
@@ -140,7 +141,7 @@ def sentry_handler(aws_event, aws_context, *args, **kwargs):
                 headers = {}
             transaction = Transaction.continue_from_headers(
                 headers,
-                op="serverless.function",
+                op=OP.FUNCTION_AWS,
                 name=aws_context.function_name,
                 source=TRANSACTION_SOURCE_COMPONENT,
             )
diff --git a/sentry_sdk/integrations/boto3.py b/sentry_sdk/integrations/boto3.py
index e65f5a754b..2f2f6bbea9 100644
--- a/sentry_sdk/integrations/boto3.py
+++ b/sentry_sdk/integrations/boto3.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 from sentry_sdk import Hub
+from sentry_sdk.consts import OP
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.tracing import Span
 
@@ -62,7 +63,7 @@ def _sentry_request_created(service_id, request, operation_name, **kwargs):
     description = "aws.%s.%s" % (service_id, operation_name)
     span = hub.start_span(
         hub=hub,
-        op="aws.request",
+        op=OP.HTTP_CLIENT,
         description=description,
     )
     span.set_tag("aws.service_id", service_id)
@@ -92,7 +93,7 @@ def _sentry_after_call(context, parsed, **kwargs):
         return
 
     streaming_span = span.start_child(
-        op="aws.request.stream",
+        op=OP.HTTP_CLIENT_STREAM,
         description=span.description,
     )
 
diff --git a/sentry_sdk/integrations/celery.py b/sentry_sdk/integrations/celery.py
index 2a095ec8c6..ea865b35a4 100644
--- a/sentry_sdk/integrations/celery.py
+++ b/sentry_sdk/integrations/celery.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 import sys
+from sentry_sdk.consts import OP
 
 from sentry_sdk.hub import Hub
 from sentry_sdk.tracing import TRANSACTION_SOURCE_TASK
@@ -103,7 +104,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) as span:
+            with hub.start_span(
+                op=OP.QUEUE_SUBMIT_CELERY, description=args[0].name
+            ) as span:
                 with capture_internal_exceptions():
                     headers = dict(hub.iter_trace_propagation_headers(span))
 
@@ -156,7 +159,7 @@ def _inner(*args, **kwargs):
             with capture_internal_exceptions():
                 transaction = Transaction.continue_from_headers(
                     args[3].get("headers") or {},
-                    op="celery.task",
+                    op=OP.QUEUE_TASK_CELERY,
                     name="unknown celery task",
                     source=TRANSACTION_SOURCE_TASK,
                 )
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index 23b446f2d7..67a0bf3844 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -6,6 +6,7 @@
 import weakref
 
 from sentry_sdk._types import MYPY
+from sentry_sdk.consts import OP
 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
@@ -581,7 +582,7 @@ def connect(self):
         with capture_internal_exceptions():
             hub.add_breadcrumb(message="connect", category="query")
 
-        with hub.start_span(op="db", description="connect"):
+        with hub.start_span(op=OP.DB, description="connect"):
             return real_connect(self)
 
     CursorWrapper.execute = execute
diff --git a/sentry_sdk/integrations/django/asgi.py b/sentry_sdk/integrations/django/asgi.py
index 79916e94fb..5803a7e29b 100644
--- a/sentry_sdk/integrations/django/asgi.py
+++ b/sentry_sdk/integrations/django/asgi.py
@@ -10,6 +10,7 @@
 
 from sentry_sdk import Hub, _functools
 from sentry_sdk._types import MYPY
+from sentry_sdk.consts import OP
 
 from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
 
@@ -89,7 +90,7 @@ 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
+            op=OP.VIEW_RENDER, description=request.resolver_match.view_name
         ):
             return await callback(request, *args, **kwargs)
 
diff --git a/sentry_sdk/integrations/django/middleware.py b/sentry_sdk/integrations/django/middleware.py
index c9001cdbf4..35680e10b1 100644
--- a/sentry_sdk/integrations/django/middleware.py
+++ b/sentry_sdk/integrations/django/middleware.py
@@ -7,6 +7,7 @@
 from sentry_sdk import Hub
 from sentry_sdk._functools import wraps
 from sentry_sdk._types import MYPY
+from sentry_sdk.consts import OP
 from sentry_sdk.utils import (
     ContextVar,
     transaction_from_function,
@@ -88,7 +89,7 @@ def _check_middleware_span(old_method):
             description = "{}.{}".format(description, function_basename)
 
         middleware_span = hub.start_span(
-            op="django.middleware", description=description
+            op=OP.MIDDLEWARE_DJANGO, description=description
         )
         middleware_span.set_tag("django.function_name", function_name)
         middleware_span.set_tag("django.middleware_name", middleware_name)
diff --git a/sentry_sdk/integrations/django/signals_handlers.py b/sentry_sdk/integrations/django/signals_handlers.py
index 4d81772452..e207a4b711 100644
--- a/sentry_sdk/integrations/django/signals_handlers.py
+++ b/sentry_sdk/integrations/django/signals_handlers.py
@@ -5,6 +5,7 @@
 
 from sentry_sdk import Hub
 from sentry_sdk._types import MYPY
+from sentry_sdk.consts import OP
 
 
 if MYPY:
@@ -50,7 +51,7 @@ def wrapper(*args, **kwargs):
                 # type: (Any, Any) -> Any
                 signal_name = _get_receiver_name(receiver)
                 with hub.start_span(
-                    op="django.signals",
+                    op=OP.EVENT_DJANGO,
                     description=signal_name,
                 ) as span:
                     span.set_data("signal", signal_name)
diff --git a/sentry_sdk/integrations/django/templates.py b/sentry_sdk/integrations/django/templates.py
index 2ff9d1b184..39279be4ce 100644
--- a/sentry_sdk/integrations/django/templates.py
+++ b/sentry_sdk/integrations/django/templates.py
@@ -3,6 +3,7 @@
 
 from sentry_sdk import _functools, Hub
 from sentry_sdk._types import MYPY
+from sentry_sdk.consts import OP
 
 if MYPY:
     from typing import Any
@@ -66,7 +67,7 @@ def rendered_content(self):
             return real_rendered_content.fget(self)
 
         with hub.start_span(
-            op="django.template.render",
+            op=OP.TEMPLATE_RENDER,
             description=_get_template_name_description(self.template_name),
         ) as span:
             span.set_data("context", self.context_data)
@@ -88,7 +89,7 @@ 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",
+            op=OP.TEMPLATE_RENDER,
             description=_get_template_name_description(template_name),
         ) as span:
             span.set_data("context", context)
diff --git a/sentry_sdk/integrations/django/views.py b/sentry_sdk/integrations/django/views.py
index 51f1abc8fb..fdec84b086 100644
--- a/sentry_sdk/integrations/django/views.py
+++ b/sentry_sdk/integrations/django/views.py
@@ -1,3 +1,4 @@
+from sentry_sdk.consts import OP
 from sentry_sdk.hub import Hub
 from sentry_sdk._types import MYPY
 from sentry_sdk import _functools
@@ -62,7 +63,7 @@ def _wrap_sync_view(hub, 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
+            op=OP.VIEW_RENDER, description=request.resolver_match.view_name
         ):
             return callback(request, *args, **kwargs)
 
diff --git a/sentry_sdk/integrations/gcp.py b/sentry_sdk/integrations/gcp.py
index 6025d38c45..a69637a409 100644
--- a/sentry_sdk/integrations/gcp.py
+++ b/sentry_sdk/integrations/gcp.py
@@ -1,6 +1,7 @@
 from datetime import datetime, timedelta
 from os import environ
 import sys
+from sentry_sdk.consts import OP
 
 from sentry_sdk.hub import Hub, _should_send_default_pii
 from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT, Transaction
@@ -82,7 +83,7 @@ def sentry_func(functionhandler, gcp_event, *args, **kwargs):
                 headers = gcp_event.headers
             transaction = Transaction.continue_from_headers(
                 headers,
-                op="serverless.function",
+                op=OP.FUNCTION_GCP,
                 name=environ.get("FUNCTION_NAME", ""),
                 source=TRANSACTION_SOURCE_COMPONENT,
             )
diff --git a/sentry_sdk/integrations/httpx.py b/sentry_sdk/integrations/httpx.py
index 3d4bbf8300..2e9142d2b8 100644
--- a/sentry_sdk/integrations/httpx.py
+++ b/sentry_sdk/integrations/httpx.py
@@ -1,4 +1,5 @@
 from sentry_sdk import Hub
+from sentry_sdk.consts import OP
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk.utils import logger
 
@@ -41,7 +42,7 @@ def send(self, request, **kwargs):
             return real_send(self, request, **kwargs)
 
         with hub.start_span(
-            op="http", description="%s %s" % (request.method, request.url)
+            op=OP.HTTP_CLIENT, description="%s %s" % (request.method, request.url)
         ) as span:
             span.set_data("method", request.method)
             span.set_data("url", str(request.url))
@@ -73,7 +74,7 @@ async def send(self, request, **kwargs):
             return await real_send(self, request, **kwargs)
 
         with hub.start_span(
-            op="http", description="%s %s" % (request.method, request.url)
+            op=OP.HTTP_CLIENT, description="%s %s" % (request.method, request.url)
         ) as span:
             span.set_data("method", request.method)
             span.set_data("url", str(request.url))
diff --git a/sentry_sdk/integrations/redis.py b/sentry_sdk/integrations/redis.py
index c27eefa3f6..aae5647f3d 100644
--- a/sentry_sdk/integrations/redis.py
+++ b/sentry_sdk/integrations/redis.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 from sentry_sdk import Hub
+from sentry_sdk.consts import OP
 from sentry_sdk.utils import capture_internal_exceptions, logger
 from sentry_sdk.integrations import Integration, DidNotEnable
 
@@ -29,7 +30,9 @@ def sentry_patched_execute(self, *args, **kwargs):
         if hub.get_integration(RedisIntegration) is None:
             return old_execute(self, *args, **kwargs)
 
-        with hub.start_span(op="redis", description="redis.pipeline.execute") as span:
+        with hub.start_span(
+            op=OP.DB_REDIS, description="redis.pipeline.execute"
+        ) as span:
             with capture_internal_exceptions():
                 span.set_tag("redis.is_cluster", is_cluster)
                 transaction = self.transaction if not is_cluster else False
@@ -152,7 +155,7 @@ def sentry_patched_execute_command(self, name, *args, **kwargs):
 
             description = " ".join(description_parts)
 
-        with hub.start_span(op="redis", description=description) as span:
+        with hub.start_span(op=OP.DB_REDIS, description=description) as span:
             span.set_tag("redis.is_cluster", is_cluster)
             if name:
                 span.set_tag("redis.command", name)
diff --git a/sentry_sdk/integrations/rq.py b/sentry_sdk/integrations/rq.py
index 095ab357a7..8b174c46ef 100644
--- a/sentry_sdk/integrations/rq.py
+++ b/sentry_sdk/integrations/rq.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 import weakref
+from sentry_sdk.consts import OP
 
 from sentry_sdk.hub import Hub
 from sentry_sdk.integrations import DidNotEnable, Integration
@@ -61,7 +62,7 @@ def sentry_patched_perform_job(self, job, *args, **kwargs):
 
                 transaction = Transaction.continue_from_headers(
                     job.meta.get("_sentry_trace_headers") or {},
-                    op="rq.task",
+                    op=OP.QUEUE_TASK_RQ,
                     name="unknown RQ task",
                     source=TRANSACTION_SOURCE_TASK,
                 )
diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index 28993611e6..dffba5afd5 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -5,6 +5,7 @@
 
 from sentry_sdk._compat import iteritems
 from sentry_sdk._types import MYPY
+from sentry_sdk.consts import OP
 from sentry_sdk.hub import Hub, _should_send_default_pii
 from sentry_sdk.integrations import DidNotEnable, Integration
 from sentry_sdk.integrations._wsgi_common import (
@@ -91,7 +92,7 @@ async def _create_span_call(*args, **kwargs):
         if integration is not None:
             middleware_name = args[0].__class__.__name__
             with hub.start_span(
-                op="starlette.middleware", description=middleware_name
+                op=OP.MIDDLEWARE_STARLETTE, description=middleware_name
             ) as middleware_span:
                 middleware_span.set_tag("starlette.middleware_name", middleware_name)
 
diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py
index 9495d406dc..8790713a8e 100644
--- a/sentry_sdk/integrations/stdlib.py
+++ b/sentry_sdk/integrations/stdlib.py
@@ -2,6 +2,7 @@
 import subprocess
 import sys
 import platform
+from sentry_sdk.consts import OP
 
 from sentry_sdk.hub import Hub
 from sentry_sdk.integrations import Integration
@@ -78,7 +79,9 @@ def putrequest(self, method, url, *args, **kwargs):
                 url,
             )
 
-        span = hub.start_span(op="http", description="%s %s" % (method, real_url))
+        span = hub.start_span(
+            op=OP.HTTP_CLIENT, description="%s %s" % (method, real_url)
+        )
 
         span.set_data("method", method)
         span.set_data("url", real_url)
@@ -183,7 +186,7 @@ def sentry_patched_popen_init(self, *a, **kw):
 
         env = None
 
-        with hub.start_span(op="subprocess", description=description) as span:
+        with hub.start_span(op=OP.SUBPROCESS, description=description) as span:
 
             for k, v in hub.iter_trace_propagation_headers(span):
                 if env is None:
@@ -211,7 +214,7 @@ def sentry_patched_popen_wait(self, *a, **kw):
         if hub.get_integration(StdlibIntegration) is None:
             return old_popen_wait(self, *a, **kw)
 
-        with hub.start_span(op="subprocess.wait") as span:
+        with hub.start_span(op=OP.SUBPROCESS_WAIT) as span:
             span.set_tag("subprocess.pid", self.pid)
             return old_popen_wait(self, *a, **kw)
 
@@ -226,7 +229,7 @@ def sentry_patched_popen_communicate(self, *a, **kw):
         if hub.get_integration(StdlibIntegration) is None:
             return old_popen_communicate(self, *a, **kw)
 
-        with hub.start_span(op="subprocess.communicate") as span:
+        with hub.start_span(op=OP.SUBPROCESS_COMMUNICATE) as span:
             span.set_tag("subprocess.pid", self.pid)
             return old_popen_communicate(self, *a, **kw)
 
diff --git a/sentry_sdk/integrations/tornado.py b/sentry_sdk/integrations/tornado.py
index b4a639b136..a64f4f5b11 100644
--- a/sentry_sdk/integrations/tornado.py
+++ b/sentry_sdk/integrations/tornado.py
@@ -1,6 +1,7 @@
 import weakref
 import contextlib
 from inspect import iscoroutinefunction
+from sentry_sdk.consts import OP
 
 from sentry_sdk.hub import Hub, _should_send_default_pii
 from sentry_sdk.tracing import (
@@ -114,7 +115,7 @@ def _handle_request_impl(self):
 
         transaction = Transaction.continue_from_headers(
             self.request.headers,
-            op="http.server",
+            op=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
diff --git a/sentry_sdk/integrations/wsgi.py b/sentry_sdk/integrations/wsgi.py
index 31ffe224ba..03ce665489 100644
--- a/sentry_sdk/integrations/wsgi.py
+++ b/sentry_sdk/integrations/wsgi.py
@@ -1,6 +1,7 @@
 import sys
 
 from sentry_sdk._functools import partial
+from sentry_sdk.consts import OP
 from sentry_sdk.hub import Hub, _should_send_default_pii
 from sentry_sdk.utils import (
     ContextVar,
@@ -124,7 +125,7 @@ def __call__(self, environ, start_response):
 
                     transaction = Transaction.continue_from_environ(
                         environ,
-                        op="http.server",
+                        op=OP.HTTP_SERVER,
                         name="generic WSGI request",
                         source=TRANSACTION_SOURCE_ROUTE,
                     )
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
index 80bbcc2d50..61d630321a 100644
--- a/sentry_sdk/tracing_utils.py
+++ b/sentry_sdk/tracing_utils.py
@@ -6,6 +6,7 @@
 from numbers import Real
 
 import sentry_sdk
+from sentry_sdk.consts import OP
 
 from sentry_sdk.utils import (
     capture_internal_exceptions,
@@ -189,7 +190,7 @@ def record_sql_queries(
     with capture_internal_exceptions():
         hub.add_breadcrumb(message=query, category="query", data=data)
 
-    with hub.start_span(op="db", description=query) as span:
+    with hub.start_span(op=OP.DB, description=query) as span:
         for k, v in data.items():
             span.set_data(k, v)
         yield span
@@ -197,11 +198,11 @@ def record_sql_queries(
 
 def maybe_create_breadcrumbs_from_span(hub, span):
     # type: (sentry_sdk.Hub, Span) -> None
-    if span.op == "redis":
+    if span.op == OP.DB_REDIS:
         hub.add_breadcrumb(
             message=span.description, type="redis", category="redis", data=span._tags
         )
-    elif span.op == "http":
+    elif span.op == OP.HTTP_CLIENT:
         hub.add_breadcrumb(type="http", category="httplib", data=span._data)
     elif span.op == "subprocess":
         hub.add_breadcrumb(
diff --git a/tests/integrations/aws_lambda/test_aws.py b/tests/integrations/aws_lambda/test_aws.py
index 458f55bf1a..78c9770317 100644
--- a/tests/integrations/aws_lambda/test_aws.py
+++ b/tests/integrations/aws_lambda/test_aws.py
@@ -360,7 +360,7 @@ def test_handler(event, context):
 
     (envelope,) = envelopes
     assert envelope["type"] == "transaction"
-    assert envelope["contexts"]["trace"]["op"] == "serverless.function"
+    assert envelope["contexts"]["trace"]["op"] == "function.aws.lambda"
     assert envelope["transaction"].startswith("test_function_")
     assert envelope["transaction_info"] == {"source": "component"}
     assert envelope["transaction"] in envelope["request"]["url"]
@@ -389,7 +389,7 @@ def test_handler(event, context):
     (envelope,) = envelopes
 
     assert envelope["type"] == "transaction"
-    assert envelope["contexts"]["trace"]["op"] == "serverless.function"
+    assert envelope["contexts"]["trace"]["op"] == "function.aws.lambda"
     assert envelope["transaction"].startswith("test_function_")
     assert envelope["transaction_info"] == {"source": "component"}
     assert envelope["transaction"] in envelope["request"]["url"]
@@ -476,7 +476,7 @@ def test_handler(event, context):
 
     error_event = events[0]
     assert error_event["level"] == "error"
-    assert error_event["contexts"]["trace"]["op"] == "serverless.function"
+    assert error_event["contexts"]["trace"]["op"] == "function.aws.lambda"
 
     function_name = error_event["extra"]["lambda"]["function_name"]
     assert function_name.startswith("test_function_")
diff --git a/tests/integrations/boto3/test_s3.py b/tests/integrations/boto3/test_s3.py
index 67376b55d4..7f02d422a0 100644
--- a/tests/integrations/boto3/test_s3.py
+++ b/tests/integrations/boto3/test_s3.py
@@ -30,7 +30,7 @@ def test_basic(sentry_init, capture_events):
     assert event["type"] == "transaction"
     assert len(event["spans"]) == 1
     (span,) = event["spans"]
-    assert span["op"] == "aws.request"
+    assert span["op"] == "http.client"
     assert span["description"] == "aws.s3.ListObjects"
 
 
@@ -54,10 +54,10 @@ def test_streaming(sentry_init, capture_events):
     assert event["type"] == "transaction"
     assert len(event["spans"]) == 2
     span1 = event["spans"][0]
-    assert span1["op"] == "aws.request"
+    assert span1["op"] == "http.client"
     assert span1["description"] == "aws.s3.GetObject"
     span2 = event["spans"][1]
-    assert span2["op"] == "aws.request.stream"
+    assert span2["op"] == "http.client.stream"
     assert span2["description"] == "aws.s3.GetObject"
     assert span2["parent_span_id"] == span1["span_id"]
 
@@ -80,6 +80,6 @@ def test_streaming_close(sentry_init, capture_events):
     assert event["type"] == "transaction"
     assert len(event["spans"]) == 2
     span1 = event["spans"][0]
-    assert span1["op"] == "aws.request"
+    assert span1["op"] == "http.client"
     span2 = event["spans"][1]
-    assert span2["op"] == "aws.request.stream"
+    assert span2["op"] == "http.client.stream"
diff --git a/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py
index 2c52031701..a2c8fa1594 100644
--- a/tests/integrations/celery/test_celery.py
+++ b/tests/integrations/celery/test_celery.py
@@ -174,7 +174,7 @@ def dummy_task(x, y):
     assert submission_event["spans"] == [
         {
             "description": "dummy_task",
-            "op": "celery.submit",
+            "op": "queue.submit.celery",
             "parent_span_id": submission_event["contexts"]["trace"]["span_id"],
             "same_process_as_parent": True,
             "span_id": submission_event["spans"][0]["span_id"],
@@ -347,7 +347,7 @@ def dummy_task(self):
         submit_transaction["spans"]
     ), 4  # Because redis integration was auto enabled
     span = submit_transaction["spans"][0]
-    assert span["op"] == "celery.submit"
+    assert span["op"] == "queue.submit.celery"
     assert span["description"] == "dummy_task"
 
     event = events.read_event()
diff --git a/tests/integrations/django/asgi/test_asgi.py b/tests/integrations/django/asgi/test_asgi.py
index 2b3382b9b4..70fd416188 100644
--- a/tests/integrations/django/asgi/test_asgi.py
+++ b/tests/integrations/django/asgi/test_asgi.py
@@ -175,15 +175,15 @@ async def test_async_middleware_spans(
         render_span_tree(transaction)
         == """\
 - op="http.server": description=null
-  - op="django.signals": description="django.db.reset_queries"
-  - op="django.signals": description="django.db.close_old_connections"
-  - 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"
-  - op="django.signals": description="django.db.close_old_connections"
-  - op="django.signals": description="django.core.cache.close_caches"
-  - op="django.signals": description="django.core.handlers.base.reset_urlconf\""""
+  - op="event.django": description="django.db.reset_queries"
+  - op="event.django": description="django.db.close_old_connections"
+  - op="middleware.django": description="django.contrib.sessions.middleware.SessionMiddleware.__acall__"
+    - op="middleware.django": description="django.contrib.auth.middleware.AuthenticationMiddleware.__acall__"
+      - op="middleware.django": description="django.middleware.csrf.CsrfViewMiddleware.__acall__"
+        - op="middleware.django": description="tests.integrations.django.myapp.settings.TestMiddleware.__acall__"
+          - op="middleware.django": description="django.middleware.csrf.CsrfViewMiddleware.process_view"
+          - op="view.render": description="async_message"
+  - op="event.django": description="django.db.close_old_connections"
+  - op="event.django": description="django.core.cache.close_caches"
+  - op="event.django": description="django.core.handlers.base.reset_urlconf\""""
     )
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index a62f1bb073..bb99b92f94 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -666,14 +666,14 @@ def test_render_spans(sentry_init, client, capture_events, render_span_tree):
     views_tests = [
         (
             reverse("template_test2"),
-            '- op="django.template.render": description="[user_name.html, ...]"',
+            '- op="template.render": description="[user_name.html, ...]"',
         ),
     ]
     if DJANGO_VERSION >= (1, 7):
         views_tests.append(
             (
                 reverse("template_test"),
-                '- op="django.template.render": description="user_name.html"',
+                '- op="template.render": description="user_name.html"',
             ),
         )
 
@@ -703,15 +703,15 @@ def test_middleware_spans(sentry_init, client, capture_events, render_span_tree)
             render_span_tree(transaction)
             == """\
 - op="http.server": description=null
-  - op="django.signals": description="django.db.reset_queries"
-  - op="django.signals": description="django.db.close_old_connections"
-  - op="django.middleware": description="django.contrib.sessions.middleware.SessionMiddleware.__call__"
-    - op="django.middleware": description="django.contrib.auth.middleware.AuthenticationMiddleware.__call__"
-      - op="django.middleware": description="django.middleware.csrf.CsrfViewMiddleware.__call__"
-        - op="django.middleware": description="tests.integrations.django.myapp.settings.TestMiddleware.__call__"
-          - op="django.middleware": description="tests.integrations.django.myapp.settings.TestFunctionMiddleware.__call__"
-            - op="django.middleware": description="django.middleware.csrf.CsrfViewMiddleware.process_view"
-            - op="django.view": description="message"\
+  - op="event.django": description="django.db.reset_queries"
+  - op="event.django": description="django.db.close_old_connections"
+  - op="middleware.django": description="django.contrib.sessions.middleware.SessionMiddleware.__call__"
+    - op="middleware.django": description="django.contrib.auth.middleware.AuthenticationMiddleware.__call__"
+      - op="middleware.django": description="django.middleware.csrf.CsrfViewMiddleware.__call__"
+        - op="middleware.django": description="tests.integrations.django.myapp.settings.TestMiddleware.__call__"
+          - op="middleware.django": description="tests.integrations.django.myapp.settings.TestFunctionMiddleware.__call__"
+            - op="middleware.django": description="django.middleware.csrf.CsrfViewMiddleware.process_view"
+            - op="view.render": description="message"\
 """
         )
 
@@ -720,16 +720,16 @@ def test_middleware_spans(sentry_init, client, capture_events, render_span_tree)
             render_span_tree(transaction)
             == """\
 - op="http.server": description=null
-  - op="django.signals": description="django.db.reset_queries"
-  - op="django.signals": description="django.db.close_old_connections"
-  - op="django.middleware": description="django.contrib.sessions.middleware.SessionMiddleware.process_request"
-  - op="django.middleware": description="django.contrib.auth.middleware.AuthenticationMiddleware.process_request"
-  - op="django.middleware": description="tests.integrations.django.myapp.settings.TestMiddleware.process_request"
-  - op="django.middleware": description="django.middleware.csrf.CsrfViewMiddleware.process_view"
-  - op="django.view": description="message"
-  - op="django.middleware": description="tests.integrations.django.myapp.settings.TestMiddleware.process_response"
-  - op="django.middleware": description="django.middleware.csrf.CsrfViewMiddleware.process_response"
-  - op="django.middleware": description="django.contrib.sessions.middleware.SessionMiddleware.process_response"\
+  - op="event.django": description="django.db.reset_queries"
+  - op="event.django": description="django.db.close_old_connections"
+  - op="middleware.django": description="django.contrib.sessions.middleware.SessionMiddleware.process_request"
+  - op="middleware.django": description="django.contrib.auth.middleware.AuthenticationMiddleware.process_request"
+  - op="middleware.django": description="tests.integrations.django.myapp.settings.TestMiddleware.process_request"
+  - op="middleware.django": description="django.middleware.csrf.CsrfViewMiddleware.process_view"
+  - op="view.render": description="message"
+  - op="middleware.django": description="tests.integrations.django.myapp.settings.TestMiddleware.process_response"
+  - op="middleware.django": description="django.middleware.csrf.CsrfViewMiddleware.process_response"
+  - op="middleware.django": description="django.contrib.sessions.middleware.SessionMiddleware.process_response"\
 """
         )
 
@@ -748,10 +748,10 @@ def test_middleware_spans_disabled(sentry_init, client, capture_events):
 
     assert len(transaction["spans"]) == 2
 
-    assert transaction["spans"][0]["op"] == "django.signals"
+    assert transaction["spans"][0]["op"] == "event.django"
     assert transaction["spans"][0]["description"] == "django.db.reset_queries"
 
-    assert transaction["spans"][1]["op"] == "django.signals"
+    assert transaction["spans"][1]["op"] == "event.django"
     assert transaction["spans"][1]["description"] == "django.db.close_old_connections"
 
 
diff --git a/tests/integrations/gcp/test_gcp.py b/tests/integrations/gcp/test_gcp.py
index 5f41300bcb..3ccdbd752a 100644
--- a/tests/integrations/gcp/test_gcp.py
+++ b/tests/integrations/gcp/test_gcp.py
@@ -253,7 +253,7 @@ def cloud_function(functionhandler, event):
     )
 
     assert envelope["type"] == "transaction"
-    assert envelope["contexts"]["trace"]["op"] == "serverless.function"
+    assert envelope["contexts"]["trace"]["op"] == "function.gcp"
     assert envelope["transaction"].startswith("Google Cloud function")
     assert envelope["transaction_info"] == {"source": "component"}
     assert envelope["transaction"] in envelope["request"]["url"]
@@ -279,7 +279,7 @@ def cloud_function(functionhandler, event):
     )
 
     assert envelope["type"] == "transaction"
-    assert envelope["contexts"]["trace"]["op"] == "serverless.function"
+    assert envelope["contexts"]["trace"]["op"] == "function.gcp"
     assert envelope["transaction"].startswith("Google Cloud function")
     assert envelope["transaction"] in envelope["request"]["url"]
     assert event["level"] == "error"
diff --git a/tests/integrations/redis/test_redis.py b/tests/integrations/redis/test_redis.py
index 4b3f2a7bb0..9a6d066e03 100644
--- a/tests/integrations/redis/test_redis.py
+++ b/tests/integrations/redis/test_redis.py
@@ -46,7 +46,7 @@ def test_redis_pipeline(sentry_init, capture_events, is_transaction):
 
     (event,) = events
     (span,) = event["spans"]
-    assert span["op"] == "redis"
+    assert span["op"] == "db.redis"
     assert span["description"] == "redis.pipeline.execute"
     assert span["data"] == {
         "redis.commands": {
diff --git a/tests/integrations/rediscluster/test_rediscluster.py b/tests/integrations/rediscluster/test_rediscluster.py
index 62923cffae..6c7e5f90a4 100644
--- a/tests/integrations/rediscluster/test_rediscluster.py
+++ b/tests/integrations/rediscluster/test_rediscluster.py
@@ -65,7 +65,7 @@ def test_rediscluster_pipeline(sentry_init, capture_events):
 
     (event,) = events
     (span,) = event["spans"]
-    assert span["op"] == "redis"
+    assert span["op"] == "db.redis"
     assert span["description"] == "redis.pipeline.execute"
     assert span["data"] == {
         "redis.commands": {
diff --git a/tests/integrations/rq/test_rq.py b/tests/integrations/rq/test_rq.py
index 651bf22248..b6aec29daa 100644
--- a/tests/integrations/rq/test_rq.py
+++ b/tests/integrations/rq/test_rq.py
@@ -101,7 +101,7 @@ def test_transaction_with_error(
     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["contexts"]["trace"]["op"] == "queue.task.rq"
     assert error_event["exception"]["values"][0]["type"] == "Exception"
     assert (
         error_event["exception"]["values"][0]["value"]
@@ -136,7 +136,7 @@ def test_transaction_no_error(
     envelope = events[0]
 
     assert envelope["type"] == "transaction"
-    assert envelope["contexts"]["trace"]["op"] == "rq.task"
+    assert envelope["contexts"]["trace"]["op"] == "queue.task.rq"
     assert envelope["transaction"] == "tests.integrations.rq.test_rq.do_trick"
     assert envelope["extra"]["rq-job"] == DictionaryContaining(
         {
diff --git a/tests/integrations/starlette/test_starlette.py b/tests/integrations/starlette/test_starlette.py
index 5908ebae52..24254b69ef 100644
--- a/tests/integrations/starlette/test_starlette.py
+++ b/tests/integrations/starlette/test_starlette.py
@@ -540,7 +540,7 @@ def test_middleware_spans(sentry_init, capture_events):
 
     idx = 0
     for span in transaction_event["spans"]:
-        if span["op"] == "starlette.middleware":
+        if span["op"] == "middleware.starlette":
             assert span["description"] == expected[idx]
             assert span["tags"]["starlette.middleware_name"] == expected[idx]
             idx += 1

From a48fafd8b5fb52e0b695e5e7564f4a2bed80048b Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 10 Oct 2022 15:50:09 +0200
Subject: [PATCH 119/209] Include framework in SDK name (#1662)

* Made SDK name dynamic depending on modules loaded
---
 sentry_sdk/client.py | 19 ++++++++++++-
 sentry_sdk/consts.py |  5 ----
 sentry_sdk/utils.py  | 34 ++++++++++++++++++++++
 tests/test_basics.py | 67 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 119 insertions(+), 6 deletions(-)

diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 32581a60db..02741a2f10 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -10,6 +10,7 @@
     current_stacktrace,
     disable_capture_event,
     format_timestamp,
+    get_sdk_name,
     get_type_name,
     get_default_release,
     handle_in_app,
@@ -17,7 +18,11 @@
 )
 from sentry_sdk.serializer import serialize
 from sentry_sdk.transport import make_transport
-from sentry_sdk.consts import DEFAULT_OPTIONS, SDK_INFO, ClientConstructor
+from sentry_sdk.consts import (
+    DEFAULT_OPTIONS,
+    VERSION,
+    ClientConstructor,
+)
 from sentry_sdk.integrations import setup_integrations
 from sentry_sdk.utils import ContextVar
 from sentry_sdk.sessions import SessionFlusher
@@ -41,6 +46,13 @@
 _client_init_debug = ContextVar("client_init_debug")
 
 
+SDK_INFO = {
+    "name": "sentry.python",  # SDK name will be overridden after integrations have been loaded with sentry_sdk.integrations.setup_integrations()
+    "version": VERSION,
+    "packages": [{"name": "pypi:sentry-sdk", "version": VERSION}],
+}
+
+
 def _get_options(*args, **kwargs):
     # type: (*Optional[str], **Any) -> Dict[str, Any]
     if args and (isinstance(args[0], (text_type, bytes, str)) or args[0] is None):
@@ -128,6 +140,11 @@ def _capture_envelope(envelope):
                     "auto_enabling_integrations"
                 ],
             )
+
+            sdk_name = get_sdk_name(list(self.integrations.keys()))
+            SDK_INFO["name"] = sdk_name
+            logger.debug("Setting SDK name to '%s'", sdk_name)
+
         finally:
             _client_init_debug.set(old_debug)
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index f2d5649c5e..b6e546e336 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -105,11 +105,6 @@ def _get_default_options():
 
 
 VERSION = "1.9.10"
-SDK_INFO = {
-    "name": "sentry.python",
-    "version": VERSION,
-    "packages": [{"name": "pypi:sentry-sdk", "version": VERSION}],
-}
 
 
 class OP:
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 5e74885b32..9b970a307d 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -95,6 +95,40 @@ def get_default_release():
     return None
 
 
+def get_sdk_name(installed_integrations):
+    # type: (List[str]) -> str
+    """Return the SDK name including the name of the used web framework."""
+
+    # Note: I can not use for example sentry_sdk.integrations.django.DjangoIntegration.identifier
+    # here because if django is not installed the integration is not accessible.
+    framework_integrations = [
+        "django",
+        "flask",
+        "fastapi",
+        "bottle",
+        "falcon",
+        "quart",
+        "sanic",
+        "starlette",
+        "chalice",
+        "serverless",
+        "pyramid",
+        "tornado",
+        "aiohttp",
+        "aws_lambda",
+        "gcp",
+        "beam",
+        "asgi",
+        "wsgi",
+    ]
+
+    for integration in framework_integrations:
+        if integration in installed_integrations:
+            return "sentry.python.{}".format(integration)
+
+    return "sentry.python"
+
+
 class CaptureInternalException(object):
     __slots__ = ()
 
diff --git a/tests/test_basics.py b/tests/test_basics.py
index 1e2feaff14..8657231fc9 100644
--- a/tests/test_basics.py
+++ b/tests/test_basics.py
@@ -24,6 +24,7 @@
     add_global_event_processor,
     global_event_processors,
 )
+from sentry_sdk.utils import get_sdk_name
 
 
 def test_processors(sentry_init, capture_events):
@@ -437,3 +438,69 @@ def foo(event, hint):
     assert reports == [("event_processor", "error"), ("event_processor", "transaction")]
 
     global_event_processors.pop()
+
+
+@pytest.mark.parametrize(
+    "installed_integrations, expected_name",
+    [
+        # integrations with own name
+        (["django"], "sentry.python.django"),
+        (["flask"], "sentry.python.flask"),
+        (["fastapi"], "sentry.python.fastapi"),
+        (["bottle"], "sentry.python.bottle"),
+        (["falcon"], "sentry.python.falcon"),
+        (["quart"], "sentry.python.quart"),
+        (["sanic"], "sentry.python.sanic"),
+        (["starlette"], "sentry.python.starlette"),
+        (["chalice"], "sentry.python.chalice"),
+        (["serverless"], "sentry.python.serverless"),
+        (["pyramid"], "sentry.python.pyramid"),
+        (["tornado"], "sentry.python.tornado"),
+        (["aiohttp"], "sentry.python.aiohttp"),
+        (["aws_lambda"], "sentry.python.aws_lambda"),
+        (["gcp"], "sentry.python.gcp"),
+        (["beam"], "sentry.python.beam"),
+        (["asgi"], "sentry.python.asgi"),
+        (["wsgi"], "sentry.python.wsgi"),
+        # integrations without name
+        (["argv"], "sentry.python"),
+        (["atexit"], "sentry.python"),
+        (["boto3"], "sentry.python"),
+        (["celery"], "sentry.python"),
+        (["dedupe"], "sentry.python"),
+        (["excepthook"], "sentry.python"),
+        (["executing"], "sentry.python"),
+        (["modules"], "sentry.python"),
+        (["pure_eval"], "sentry.python"),
+        (["redis"], "sentry.python"),
+        (["rq"], "sentry.python"),
+        (["sqlalchemy"], "sentry.python"),
+        (["stdlib"], "sentry.python"),
+        (["threading"], "sentry.python"),
+        (["trytond"], "sentry.python"),
+        (["logging"], "sentry.python"),
+        (["gnu_backtrace"], "sentry.python"),
+        (["httpx"], "sentry.python"),
+        # precedence of frameworks
+        (["flask", "django", "celery"], "sentry.python.django"),
+        (["fastapi", "flask", "redis"], "sentry.python.flask"),
+        (["bottle", "fastapi", "httpx"], "sentry.python.fastapi"),
+        (["falcon", "bottle", "logging"], "sentry.python.bottle"),
+        (["quart", "falcon", "gnu_backtrace"], "sentry.python.falcon"),
+        (["sanic", "quart", "sqlalchemy"], "sentry.python.quart"),
+        (["starlette", "sanic", "rq"], "sentry.python.sanic"),
+        (["chalice", "starlette", "modules"], "sentry.python.starlette"),
+        (["serverless", "chalice", "pure_eval"], "sentry.python.chalice"),
+        (["pyramid", "serverless", "modules"], "sentry.python.serverless"),
+        (["tornado", "pyramid", "executing"], "sentry.python.pyramid"),
+        (["aiohttp", "tornado", "dedupe"], "sentry.python.tornado"),
+        (["aws_lambda", "aiohttp", "boto3"], "sentry.python.aiohttp"),
+        (["gcp", "aws_lambda", "atexit"], "sentry.python.aws_lambda"),
+        (["beam", "gcp", "argv"], "sentry.python.gcp"),
+        (["asgi", "beam", "stdtlib"], "sentry.python.beam"),
+        (["wsgi", "asgi", "boto3"], "sentry.python.asgi"),
+        (["wsgi", "celery", "redis"], "sentry.python.wsgi"),
+    ],
+)
+def test_get_sdk_name(installed_integrations, expected_name):
+    assert get_sdk_name(installed_integrations) == expected_name

From 6e0b02b16dd31df27b535364dc2dbdf8f2ed6262 Mon Sep 17 00:00:00 2001
From: Arvind Mishra 
Date: Tue, 11 Oct 2022 15:07:16 +0530
Subject: [PATCH 120/209] Check for Decimal is in_valid_sample_rate (#1672)

---
 sentry_sdk/tracing_utils.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
index 61d630321a..cc1851ff46 100644
--- a/sentry_sdk/tracing_utils.py
+++ b/sentry_sdk/tracing_utils.py
@@ -4,6 +4,7 @@
 import math
 
 from numbers import Real
+from decimal import Decimal
 
 import sentry_sdk
 from sentry_sdk.consts import OP
@@ -131,8 +132,8 @@ def is_valid_sample_rate(rate):
 
     # 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):
+    # separately for NaN and Decimal does not derive from Real so need to check that too
+    if not isinstance(rate, (Real, Decimal)) 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)

From 3bc8bb85cd07906dd34ff03bc21486f0b1f4416e Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Thu, 13 Oct 2022 10:38:20 -0400
Subject: [PATCH 121/209] test(profiling): Add basic profiling tests (#1677)

This introduces some basic tests to the setup of the profiler.
---
 tests/conftest.py                    | 13 +++--
 tests/integrations/wsgi/test_wsgi.py | 74 +++++++++++++++-------------
 tests/test_profiler.py               | 61 +++++++++++++++++++++++
 3 files changed, 110 insertions(+), 38 deletions(-)
 create mode 100644 tests/test_profiler.py

diff --git a/tests/conftest.py b/tests/conftest.py
index a239ccc1fe..cb1fedb4c6 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -15,11 +15,12 @@
     eventlet = None
 
 import sentry_sdk
-from sentry_sdk._compat import reraise, string_types, iteritems
-from sentry_sdk.transport import Transport
+from sentry_sdk._compat import iteritems, reraise, string_types
 from sentry_sdk.envelope import Envelope
-from sentry_sdk.utils import capture_internal_exceptions
 from sentry_sdk.integrations import _installed_integrations  # noqa: F401
+from sentry_sdk.profiler import teardown_profiler
+from sentry_sdk.transport import Transport
+from sentry_sdk.utils import capture_internal_exceptions
 
 from tests import _warning_recorder, _warning_recorder_mgr
 
@@ -554,3 +555,9 @@ def __ne__(self, test_obj):
             return not self.__eq__(test_obj)
 
     return ObjectDescribedBy
+
+
+@pytest.fixture
+def teardown_profiling():
+    yield
+    teardown_profiler()
diff --git a/tests/integrations/wsgi/test_wsgi.py b/tests/integrations/wsgi/test_wsgi.py
index 4bf4e66067..9eba712616 100644
--- a/tests/integrations/wsgi/test_wsgi.py
+++ b/tests/integrations/wsgi/test_wsgi.py
@@ -1,12 +1,12 @@
+import sys
+
 from werkzeug.test import Client
 
 import pytest
 
 import sentry_sdk
 from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
-from sentry_sdk.profiler import teardown_profiler
 from collections import Counter
-from sentry_sdk.utils import PY33
 
 try:
     from unittest import mock  # python 3.3 and above
@@ -284,38 +284,42 @@ def sample_app(environ, start_response):
     assert len(session_aggregates) == 1
 
 
-if PY33:
-
-    @pytest.fixture
-    def profiling():
-        yield
-        teardown_profiler()
+@pytest.mark.skipif(
+    sys.version_info < (3, 3), reason="Profiling is only supported in Python >= 3.3"
+)
+@pytest.mark.parametrize(
+    "profiles_sample_rate,profile_count",
+    [
+        pytest.param(1.0, 1, id="profiler sampled at 1.0"),
+        pytest.param(0.75, 1, id="profiler sampled at 0.75"),
+        pytest.param(0.25, 0, id="profiler not sampled at 0.25"),
+        pytest.param(None, 0, id="profiler not enabled"),
+    ],
+)
+def test_profile_sent(
+    capture_envelopes,
+    sentry_init,
+    teardown_profiling,
+    profiles_sample_rate,
+    profile_count,
+):
+    def test_app(environ, start_response):
+        start_response("200 OK", [])
+        return ["Go get the ball! Good dog!"]
 
-    @pytest.mark.parametrize(
-        "profiles_sample_rate,should_send",
-        [(1.0, True), (0.75, True), (0.25, False), (None, False)],
+    sentry_init(
+        traces_sample_rate=1.0,
+        _experiments={"profiles_sample_rate": profiles_sample_rate},
     )
-    def test_profile_sent_when_profiling_enabled(
-        capture_envelopes, sentry_init, profiling, profiles_sample_rate, should_send
-    ):
-        def test_app(environ, start_response):
-            start_response("200 OK", [])
-            return ["Go get the ball! Good dog!"]
-
-        sentry_init(
-            traces_sample_rate=1.0,
-            _experiments={"profiles_sample_rate": profiles_sample_rate},
-        )
-        app = SentryWsgiMiddleware(test_app)
-        envelopes = capture_envelopes()
-
-        with mock.patch("sentry_sdk.profiler.random.random", return_value=0.5):
-            client = Client(app)
-            client.get("/")
-
-        profile_sent = False
-        for item in envelopes[0].items:
-            if item.headers["type"] == "profile":
-                profile_sent = True
-                break
-        assert profile_sent == should_send
+    app = SentryWsgiMiddleware(test_app)
+    envelopes = capture_envelopes()
+
+    with mock.patch("sentry_sdk.profiler.random.random", return_value=0.5):
+        client = Client(app)
+        client.get("/")
+
+    count_item_types = Counter()
+    for envelope in envelopes:
+        for item in envelope.items:
+            count_item_types[item.type] += 1
+    assert count_item_types["profile"] == profile_count
diff --git a/tests/test_profiler.py b/tests/test_profiler.py
new file mode 100644
index 0000000000..68d2604169
--- /dev/null
+++ b/tests/test_profiler.py
@@ -0,0 +1,61 @@
+import platform
+import sys
+import threading
+
+import pytest
+
+from sentry_sdk.profiler import setup_profiler
+
+
+minimum_python_33 = pytest.mark.skipif(
+    sys.version_info < (3, 3), reason="Profiling is only supported in Python >= 3.3"
+)
+
+unix_only = pytest.mark.skipif(
+    platform.system().lower() not in {"linux", "darwin"}, reason="UNIX only"
+)
+
+
+@minimum_python_33
+def test_profiler_invalid_mode(teardown_profiling):
+    with pytest.raises(ValueError):
+        setup_profiler({"_experiments": {"profiler_mode": "magic"}})
+    # make sure to clean up at the end of the test
+
+
+@unix_only
+@minimum_python_33
+@pytest.mark.parametrize("mode", ["sigprof", "sigalrm"])
+def test_profiler_signal_mode_none_main_thread(mode, teardown_profiling):
+    """
+    signal based profiling must be initialized from the main thread because
+    of how the signal library in python works
+    """
+
+    class ProfilerThread(threading.Thread):
+        def run(self):
+            self.exc = None
+            try:
+                setup_profiler({"_experiments": {"profiler_mode": mode}})
+            except Exception as e:
+                # store the exception so it can be raised in the caller
+                self.exc = e
+
+        def join(self, timeout=None):
+            ret = super(ProfilerThread, self).join(timeout=timeout)
+            if self.exc:
+                raise self.exc
+            return ret
+
+    with pytest.raises(ValueError):
+        thread = ProfilerThread()
+        thread.start()
+        thread.join()
+
+    # make sure to clean up at the end of the test
+
+
+@pytest.mark.parametrize("mode", ["sleep", "event", "sigprof", "sigalrm"])
+def test_profiler_valid_mode(mode, teardown_profiling):
+    # should not raise any exceptions
+    setup_profiler({"_experiments": {"profiler_mode": mode}})

From ed0d4dbe67056d0a6498bfcf9d2b88b93f1c61ff Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Thu, 13 Oct 2022 11:00:38 -0400
Subject: [PATCH 122/209] feat(profiling): Extract qualified name for each
 frame (#1669)

Currently, we use `code.co_name` for the frame name. This does not include the
name of the class if it was a method. This tries to extract the qualified name
for each frame where possible.

- methods: *typically* have `self` as a positional argument and we can inspect
           it to extract the class name
- class methods: *typically* have `cls` as a positional argument and we can
                 inspect it to extract the class name
- static methods: no obvious way of extract the class name
---
 sentry_sdk/profiler.py | 78 ++++++++++++++++++++++-----------
 tests/test_profiler.py | 97 ++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 146 insertions(+), 29 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 86cf1bf91d..fc409abfe7 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -16,21 +16,20 @@
 import platform
 import random
 import signal
+import sys
 import threading
 import time
-import sys
 import uuid
-
-from collections import deque
+from collections import deque, namedtuple
 from contextlib import contextmanager
 
 import sentry_sdk
 from sentry_sdk._compat import PY33
-
 from sentry_sdk._types import MYPY
 from sentry_sdk.utils import nanosecond_time
 
 if MYPY:
+    from types import FrameType
     from typing import Any
     from typing import Deque
     from typing import Dict
@@ -38,11 +37,10 @@
     from typing import List
     from typing import Optional
     from typing import Sequence
-    from typing import Tuple
     import sentry_sdk.tracing
 
-    Frame = Any
-    FrameData = Tuple[str, str, int]
+
+FrameData = namedtuple("FrameData", ["name", "file", "line"])
 
 
 _sample_buffer = None  # type: Optional[_SampleBuffer]
@@ -115,7 +113,7 @@ def _sample_stack(*args, **kwargs):
         (
             nanosecond_time(),
             [
-                (tid, _extract_stack(frame))
+                (tid, extract_stack(frame))
                 for tid, frame in sys._current_frames().items()
             ],
         )
@@ -126,8 +124,8 @@ def _sample_stack(*args, **kwargs):
 MAX_STACK_DEPTH = 128
 
 
-def _extract_stack(frame):
-    # type: (Frame) -> Sequence[FrameData]
+def extract_stack(frame, max_stack_depth=MAX_STACK_DEPTH):
+    # type: (Optional[FrameType], int) -> Sequence[FrameData]
     """
     Extracts the stack starting the specified frame. The extracted stack
     assumes the specified frame is the top of the stack, and works back
@@ -137,22 +135,52 @@ def _extract_stack(frame):
     only the first `MAX_STACK_DEPTH` frames will be returned.
     """
 
-    stack = deque(maxlen=MAX_STACK_DEPTH)  # type: Deque[FrameData]
+    stack = deque(maxlen=max_stack_depth)  # type: Deque[FrameType]
 
     while frame is not None:
-        stack.append(
-            (
-                # co_name only contains the frame name.
-                # If the frame was a class method,
-                # the class name will NOT be included.
-                frame.f_code.co_name,
-                frame.f_code.co_filename,
-                frame.f_code.co_firstlineno,
-            )
-        )
+        stack.append(frame)
         frame = frame.f_back
 
-    return stack
+    return [
+        FrameData(
+            name=get_frame_name(frame),
+            file=frame.f_code.co_filename,
+            line=frame.f_lineno,
+        )
+        for frame in stack
+    ]
+
+
+def get_frame_name(frame):
+    # type: (FrameType) -> str
+
+    # in 3.11+, there is a frame.f_code.co_qualname that
+    # we should consider using instead where possible
+
+    # co_name only contains the frame name.  If the frame was a method,
+    # the class name will NOT be included.
+    name = frame.f_code.co_name
+
+    # if it was a method, we can get the class name by inspecting
+    # the f_locals for the `self` argument
+    try:
+        if "self" in frame.f_locals:
+            return "{}.{}".format(frame.f_locals["self"].__class__.__name__, name)
+    except AttributeError:
+        pass
+
+    # if it was a class method, (decorated with `@classmethod`)
+    # we can get the class name by inspecting the f_locals for the `cls` argument
+    try:
+        if "cls" in frame.f_locals:
+            return "{}.{}".format(frame.f_locals["cls"].__name__, name)
+    except AttributeError:
+        pass
+
+    # nothing we can do if it is a staticmethod (decorated with @staticmethod)
+
+    # we've done all we can, time to give up and return what we have
+    return name
 
 
 class Profile(object):
@@ -287,9 +315,9 @@ def slice_profile(self, start_ns, stop_ns):
                         frames[frame] = len(frames)
                         frames_list.append(
                             {
-                                "name": frame[0],
-                                "file": frame[1],
-                                "line": frame[2],
+                                "name": frame.name,
+                                "file": frame.file,
+                                "line": frame.line,
                             }
                         )
                     current_stack.append(frames[frame])
diff --git a/tests/test_profiler.py b/tests/test_profiler.py
index 68d2604169..5feae5cc11 100644
--- a/tests/test_profiler.py
+++ b/tests/test_profiler.py
@@ -1,10 +1,11 @@
+import inspect
 import platform
 import sys
 import threading
 
 import pytest
 
-from sentry_sdk.profiler import setup_profiler
+from sentry_sdk.profiler import extract_stack, get_frame_name, setup_profiler
 
 
 minimum_python_33 = pytest.mark.skipif(
@@ -20,7 +21,6 @@
 def test_profiler_invalid_mode(teardown_profiling):
     with pytest.raises(ValueError):
         setup_profiler({"_experiments": {"profiler_mode": "magic"}})
-    # make sure to clean up at the end of the test
 
 
 @unix_only
@@ -52,10 +52,99 @@ def join(self, timeout=None):
         thread.start()
         thread.join()
 
-    # make sure to clean up at the end of the test
-
 
+@unix_only
 @pytest.mark.parametrize("mode", ["sleep", "event", "sigprof", "sigalrm"])
 def test_profiler_valid_mode(mode, teardown_profiling):
     # should not raise any exceptions
     setup_profiler({"_experiments": {"profiler_mode": mode}})
+
+
+def get_frame(depth=1):
+    """
+    This function is not exactly true to its name. Depending on
+    how it is called, the true depth of the stack can be deeper
+    than the argument implies.
+    """
+    if depth <= 0:
+        raise ValueError("only positive integers allowed")
+    if depth > 1:
+        return get_frame(depth=depth - 1)
+    return inspect.currentframe()
+
+
+class GetFrame:
+    def instance_method(self):
+        return inspect.currentframe()
+
+    @classmethod
+    def class_method(cls):
+        return inspect.currentframe()
+
+    @staticmethod
+    def static_method():
+        return inspect.currentframe()
+
+
+@pytest.mark.parametrize(
+    ("frame", "frame_name"),
+    [
+        pytest.param(
+            get_frame(),
+            "get_frame",
+            id="function",
+        ),
+        pytest.param(
+            (lambda: inspect.currentframe())(),
+            "",
+            id="lambda",
+        ),
+        pytest.param(
+            GetFrame().instance_method(),
+            "GetFrame.instance_method",
+            id="instance_method",
+        ),
+        pytest.param(
+            GetFrame().class_method(),
+            "GetFrame.class_method",
+            id="class_method",
+        ),
+        pytest.param(
+            GetFrame().static_method(),
+            "GetFrame.static_method",
+            id="static_method",
+            marks=pytest.mark.skip(reason="unsupported"),
+        ),
+    ],
+)
+def test_get_frame_name(frame, frame_name):
+    assert get_frame_name(frame) == frame_name
+
+
+@pytest.mark.parametrize(
+    ("depth", "max_stack_depth", "actual_depth"),
+    [
+        pytest.param(1, 128, 1, id="less than"),
+        pytest.param(256, 128, 128, id="greater than"),
+        pytest.param(128, 128, 128, id="equals"),
+    ],
+)
+def test_extract_stack_with_max_depth(depth, max_stack_depth, actual_depth):
+    # introduce a lambda that we'll be looking for in the stack
+    frame = (lambda: get_frame(depth=depth))()
+
+    # plus 1 because we introduced a lambda intentionally that we'll
+    # look for in the final stack to make sure its in the right position
+    base_stack_depth = len(inspect.stack()) + 1
+
+    # increase the max_depth by the `base_stack_depth` to account
+    # for the extra frames pytest will add
+    stack = extract_stack(frame, max_stack_depth + base_stack_depth)
+    assert len(stack) == base_stack_depth + actual_depth
+
+    for i in range(actual_depth):
+        assert stack[i].name == "get_frame", i
+
+    # index 0 contains the inner most frame on the stack, so the lamdba
+    # should be at index `actual_depth`
+    assert stack[actual_depth].name == "", actual_depth

From 40993fe003af118947a73baa1331e6d6aeaf70d2 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Thu, 13 Oct 2022 11:54:45 -0400
Subject: [PATCH 123/209] fix(profiling): Race condition spawning multiple
 profiling threads (#1676)

There is a race condition where multiple profiling threads may be spawned.
Specifically, if `start_profiling` is called immediately after `stop_profiling`.
This happens because `stop_profiling` does not immediately terminate the thread,
instead the thread will check that the event was set and exit at the end of the
current iteration. If `start_profiling` is called during the iteration, the
event gets set again and the old thread will continue running. To fix this, a
new event is created when a profiling thread starts so they can be terminated
independently.
---
 sentry_sdk/profiler.py | 171 +++++++++++++++++++++++------------------
 tests/test_profiler.py |  55 ++++++++++++-
 2 files changed, 151 insertions(+), 75 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index fc409abfe7..38e54b8c5b 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -25,12 +25,14 @@
 
 import sentry_sdk
 from sentry_sdk._compat import PY33
+from sentry_sdk._queue import Queue
 from sentry_sdk._types import MYPY
 from sentry_sdk.utils import nanosecond_time
 
 if MYPY:
     from types import FrameType
     from typing import Any
+    from typing import Callable
     from typing import Deque
     from typing import Dict
     from typing import Generator
@@ -43,8 +45,8 @@
 FrameData = namedtuple("FrameData", ["name", "file", "line"])
 
 
-_sample_buffer = None  # type: Optional[_SampleBuffer]
-_scheduler = None  # type: Optional[_Scheduler]
+_sample_buffer = None  # type: Optional[SampleBuffer]
+_scheduler = None  # type: Optional[Scheduler]
 
 
 def setup_profiler(options):
@@ -70,17 +72,18 @@ def setup_profiler(options):
 
     # To buffer samples for `buffer_secs` at `frequency` Hz, we need
     # a capcity of `buffer_secs * frequency`.
-    _sample_buffer = _SampleBuffer(capacity=buffer_secs * frequency)
-
-    profiler_mode = options["_experiments"].get("profiler_mode", _SigprofScheduler.mode)
-    if profiler_mode == _SigprofScheduler.mode:
-        _scheduler = _SigprofScheduler(frequency=frequency)
-    elif profiler_mode == _SigalrmScheduler.mode:
-        _scheduler = _SigalrmScheduler(frequency=frequency)
-    elif profiler_mode == _SleepScheduler.mode:
-        _scheduler = _SleepScheduler(frequency=frequency)
-    elif profiler_mode == _EventScheduler.mode:
-        _scheduler = _EventScheduler(frequency=frequency)
+    _sample_buffer = SampleBuffer(capacity=buffer_secs * frequency)
+    _sampler = _init_sample_stack_fn(_sample_buffer)
+
+    profiler_mode = options["_experiments"].get("profiler_mode", SigprofScheduler.mode)
+    if profiler_mode == SigprofScheduler.mode:
+        _scheduler = SigprofScheduler(sampler=_sampler, frequency=frequency)
+    elif profiler_mode == SigalrmScheduler.mode:
+        _scheduler = SigalrmScheduler(sampler=_sampler, frequency=frequency)
+    elif profiler_mode == SleepScheduler.mode:
+        _scheduler = SleepScheduler(sampler=_sampler, frequency=frequency)
+    elif profiler_mode == EventScheduler.mode:
+        _scheduler = EventScheduler(sampler=_sampler, frequency=frequency)
     else:
         raise ValueError("Unknown profiler mode: {}".format(profiler_mode))
     _scheduler.setup()
@@ -101,23 +104,27 @@ def teardown_profiler():
     _scheduler = None
 
 
-def _sample_stack(*args, **kwargs):
-    # type: (*Any, **Any) -> None
-    """
-    Take a sample of the stack on all the threads in the process.
-    This should be called at a regular interval to collect samples.
-    """
+def _init_sample_stack_fn(buffer):
+    # type: (SampleBuffer) -> Callable[..., None]
 
-    assert _sample_buffer is not None
-    _sample_buffer.write(
-        (
-            nanosecond_time(),
-            [
-                (tid, extract_stack(frame))
-                for tid, frame in sys._current_frames().items()
-            ],
+    def _sample_stack(*args, **kwargs):
+        # type: (*Any, **Any) -> None
+        """
+        Take a sample of the stack on all the threads in the process.
+        This should be called at a regular interval to collect samples.
+        """
+
+        buffer.write(
+            (
+                nanosecond_time(),
+                [
+                    (tid, extract_stack(frame))
+                    for tid, frame in sys._current_frames().items()
+                ],
+            )
         )
-    )
+
+    return _sample_stack
 
 
 # We want to impose a stack depth limit so that samples aren't too large.
@@ -248,7 +255,7 @@ def to_json(self, event_opt):
         }
 
 
-class _SampleBuffer(object):
+class SampleBuffer(object):
     """
     A simple implementation of a ring buffer to buffer the samples taken.
 
@@ -348,11 +355,12 @@ def slice_profile(self, start_ns, stop_ns):
         }
 
 
-class _Scheduler(object):
+class Scheduler(object):
     mode = "unknown"
 
-    def __init__(self, frequency):
-        # type: (int) -> None
+    def __init__(self, sampler, frequency):
+        # type: (Callable[..., None], int) -> None
+        self.sampler = sampler
         self._lock = threading.Lock()
         self._count = 0
         self._interval = 1.0 / frequency
@@ -378,7 +386,7 @@ def stop_profiling(self):
             return self._count == 0
 
 
-class _ThreadScheduler(_Scheduler):
+class ThreadScheduler(Scheduler):
     """
     This abstract scheduler is based on running a daemon thread that will call
     the sampler at a regular interval.
@@ -387,10 +395,10 @@ class _ThreadScheduler(_Scheduler):
     mode = "thread"
     name = None  # type: Optional[str]
 
-    def __init__(self, frequency):
-        # type: (int) -> None
-        super(_ThreadScheduler, self).__init__(frequency)
-        self.event = threading.Event()
+    def __init__(self, sampler, frequency):
+        # type: (Callable[..., None], int) -> None
+        super(ThreadScheduler, self).__init__(sampler=sampler, frequency=frequency)
+        self.stop_events = Queue()
 
     def setup(self):
         # type: () -> None
@@ -402,34 +410,37 @@ def teardown(self):
 
     def start_profiling(self):
         # type: () -> bool
-        if super(_ThreadScheduler, self).start_profiling():
+        if super(ThreadScheduler, self).start_profiling():
             # make sure to clear the event as we reuse the same event
             # over the lifetime of the scheduler
-            self.event.clear()
+            event = threading.Event()
+            self.stop_events.put_nowait(event)
+            run = self.make_run(event)
 
             # make sure the thread is a daemon here otherwise this
             # can keep the application running after other threads
             # have exited
-            thread = threading.Thread(name=self.name, target=self.run, daemon=True)
+            thread = threading.Thread(name=self.name, target=run, daemon=True)
             thread.start()
             return True
         return False
 
     def stop_profiling(self):
         # type: () -> bool
-        if super(_ThreadScheduler, self).stop_profiling():
+        if super(ThreadScheduler, self).stop_profiling():
             # make sure the set the event here so that the thread
             # can check to see if it should keep running
-            self.event.set()
+            event = self.stop_events.get_nowait()
+            event.set()
             return True
         return False
 
-    def run(self):
-        # type: () -> None
+    def make_run(self, event):
+        # type: (threading.Event) -> Callable[..., None]
         raise NotImplementedError
 
 
-class _SleepScheduler(_ThreadScheduler):
+class SleepScheduler(ThreadScheduler):
     """
     This scheduler uses time.sleep to wait the required interval before calling
     the sampling function.
@@ -438,29 +449,34 @@ class _SleepScheduler(_ThreadScheduler):
     mode = "sleep"
     name = "sentry.profiler.SleepScheduler"
 
-    def run(self):
-        # type: () -> None
-        last = time.perf_counter()
+    def make_run(self, event):
+        # type: (threading.Event) -> Callable[..., None]
 
-        while True:
-            # some time may have elapsed since the last time
-            # we sampled, so we need to account for that and
-            # not sleep for too long
-            now = time.perf_counter()
-            elapsed = max(now - last, 0)
+        def run():
+            # type: () -> None
+            last = time.perf_counter()
 
-            if elapsed < self._interval:
-                time.sleep(self._interval - elapsed)
+            while True:
+                # some time may have elapsed since the last time
+                # we sampled, so we need to account for that and
+                # not sleep for too long
+                now = time.perf_counter()
+                elapsed = max(now - last, 0)
 
-            last = time.perf_counter()
+                if elapsed < self._interval:
+                    time.sleep(self._interval - elapsed)
+
+                last = time.perf_counter()
 
-            if self.event.is_set():
-                break
+                if event.is_set():
+                    break
 
-            _sample_stack()
+            self.sampler()
 
+        return run
 
-class _EventScheduler(_ThreadScheduler):
+
+class EventScheduler(ThreadScheduler):
     """
     This scheduler uses threading.Event to wait the required interval before
     calling the sampling function.
@@ -469,18 +485,25 @@ class _EventScheduler(_ThreadScheduler):
     mode = "event"
     name = "sentry.profiler.EventScheduler"
 
-    def run(self):
-        # type: () -> None
-        while True:
-            self.event.wait(timeout=self._interval)
+    def make_run(self, event):
+        # type: (threading.Event) -> Callable[..., None]
+
+        def run():
+            # type: () -> None
+            while True:
+                event.wait(timeout=self._interval)
+
+                if event.is_set():
+                    break
+
+                self.sampler()
 
-            if self.event.is_set():
-                break
+            self.sampler()
 
-            _sample_stack()
+        return run
 
 
-class _SignalScheduler(_Scheduler):
+class SignalScheduler(Scheduler):
     """
     This abstract scheduler is based on UNIX signals. It sets up a
     signal handler for the specified signal, and the matching itimer in order
@@ -513,7 +536,7 @@ def setup(self):
         # This setups a process wide signal handler that will be called
         # at an interval to record samples.
         try:
-            signal.signal(self.signal_num, _sample_stack)
+            signal.signal(self.signal_num, self.sampler)
         except ValueError:
             raise ValueError(
                 "Signal based profiling can only be enabled from the main thread."
@@ -535,20 +558,20 @@ def teardown(self):
 
     def start_profiling(self):
         # type: () -> bool
-        if super(_SignalScheduler, self).start_profiling():
+        if super(SignalScheduler, self).start_profiling():
             signal.setitimer(self.signal_timer, self._interval, self._interval)
             return True
         return False
 
     def stop_profiling(self):
         # type: () -> bool
-        if super(_SignalScheduler, self).stop_profiling():
+        if super(SignalScheduler, self).stop_profiling():
             signal.setitimer(self.signal_timer, 0)
             return True
         return False
 
 
-class _SigprofScheduler(_SignalScheduler):
+class SigprofScheduler(SignalScheduler):
     """
     This scheduler uses SIGPROF to regularly call a signal handler where the
     samples will be taken.
@@ -581,7 +604,7 @@ def signal_timer(self):
         return signal.ITIMER_PROF
 
 
-class _SigalrmScheduler(_SignalScheduler):
+class SigalrmScheduler(SignalScheduler):
     """
     This scheduler uses SIGALRM to regularly call a signal handler where the
     samples will be taken.
diff --git a/tests/test_profiler.py b/tests/test_profiler.py
index 5feae5cc11..8b5d1fb5a6 100644
--- a/tests/test_profiler.py
+++ b/tests/test_profiler.py
@@ -2,10 +2,16 @@
 import platform
 import sys
 import threading
+import time
 
 import pytest
 
-from sentry_sdk.profiler import extract_stack, get_frame_name, setup_profiler
+from sentry_sdk.profiler import (
+    SleepScheduler,
+    extract_stack,
+    get_frame_name,
+    setup_profiler,
+)
 
 
 minimum_python_33 = pytest.mark.skipif(
@@ -148,3 +154,50 @@ def test_extract_stack_with_max_depth(depth, max_stack_depth, actual_depth):
     # index 0 contains the inner most frame on the stack, so the lamdba
     # should be at index `actual_depth`
     assert stack[actual_depth].name == "", actual_depth
+
+
+def get_scheduler_threads(scheduler):
+    return [thread for thread in threading.enumerate() if thread.name == scheduler.name]
+
+
+@minimum_python_33
+def test_sleep_scheduler_single_background_thread():
+    def sampler():
+        pass
+
+    scheduler = SleepScheduler(sampler=sampler, frequency=1000)
+
+    assert scheduler.start_profiling()
+
+    # the scheduler thread does not immediately exit
+    # but it should exit after the next time it samples
+    assert scheduler.stop_profiling()
+
+    assert scheduler.start_profiling()
+
+    # because the scheduler thread does not immediately exit
+    # after stop_profiling is called, we have to wait a little
+    # otherwise, we'll see an extra scheduler thread in the
+    # following assertion
+    #
+    # one iteration of the scheduler takes 1.0 / frequency seconds
+    # so make sure this sleeps for longer than that to avoid flakes
+    time.sleep(0.002)
+
+    # there should be 1 scheduler thread now because the first
+    # one should be stopped and a new one started
+    assert len(get_scheduler_threads(scheduler)) == 1
+
+    assert scheduler.stop_profiling()
+
+    # because the scheduler thread does not immediately exit
+    # after stop_profiling is called, we have to wait a little
+    # otherwise, we'll see an extra scheduler thread in the
+    # following assertion
+    #
+    # one iteration of the scheduler takes 1.0 / frequency seconds
+    # so make sure this sleeps for longer than that to avoid flakes
+    time.sleep(0.002)
+
+    # there should be 0 scheduler threads now because they stopped
+    assert len(get_scheduler_threads(scheduler)) == 0

From bb879abc2be410dc91e6b67d29a7bccf9aaa00a4 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Thu, 13 Oct 2022 13:01:22 -0400
Subject: [PATCH 124/209] fix(profiling): Need to sample profile correctly
 (#1679)

This is fixing a mistake from #1676, and adding a sample at the start of the
profile instead of waiting 1 interval before getting the first sample.
---
 sentry_sdk/profiler.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 38e54b8c5b..5120be2420 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -454,6 +454,8 @@ def make_run(self, event):
 
         def run():
             # type: () -> None
+            self.sampler()
+
             last = time.perf_counter()
 
             while True:
@@ -471,7 +473,7 @@ def run():
                 if event.is_set():
                     break
 
-            self.sampler()
+                self.sampler()
 
         return run
 
@@ -490,6 +492,8 @@ def make_run(self, event):
 
         def run():
             # type: () -> None
+            self.sampler()
+
             while True:
                 event.wait(timeout=self._interval)
 
@@ -498,8 +502,6 @@ def run():
 
                 self.sampler()
 
-            self.sampler()
-
         return run
 
 

From 17e92b3e12383e429b5bdaa390cca8add7915143 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Thu, 13 Oct 2022 16:08:06 -0400
Subject: [PATCH 125/209] ref(profiling): Rename profiling frame keys (#1680)

Standardizing the names of the keys in the frames across SDKs so we're going to
rename them.
---
 sentry_sdk/profiler.py |  93 ++++++++++----
 tests/test_profiler.py | 274 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 338 insertions(+), 29 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 5120be2420..aafb4129bb 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -29,6 +29,8 @@
 from sentry_sdk._types import MYPY
 from sentry_sdk.utils import nanosecond_time
 
+RawFrameData = namedtuple("RawFrameData", ["function", "abs_path", "lineno"])
+
 if MYPY:
     from types import FrameType
     from typing import Any
@@ -39,10 +41,46 @@
     from typing import List
     from typing import Optional
     from typing import Sequence
+    from typing import Tuple
+    from typing_extensions import TypedDict
     import sentry_sdk.tracing
 
-
-FrameData = namedtuple("FrameData", ["name", "file", "line"])
+    RawSampleData = Tuple[int, Sequence[Tuple[int, Sequence[RawFrameData]]]]
+
+    ProcessedStack = Tuple[int, ...]
+
+    ProcessedSample = TypedDict(
+        "ProcessedSample",
+        {
+            "elapsed_since_start_ns": str,
+            "thread_id": str,
+            "stack_id": int,
+        },
+    )
+
+    ProcessedFrame = TypedDict(
+        "ProcessedFrame",
+        {
+            "function": str,
+            "filename": str,
+            "lineno": int,
+        },
+    )
+
+    ProcessedThreadMetadata = TypedDict(
+        "ProcessedThreadMetadata",
+        {"name": str},
+    )
+
+    ProcessedProfile = TypedDict(
+        "ProcessedProfile",
+        {
+            "frames": List[ProcessedFrame],
+            "stacks": List[ProcessedStack],
+            "samples": List[ProcessedSample],
+            "thread_metadata": Dict[str, ProcessedThreadMetadata],
+        },
+    )
 
 
 _sample_buffer = None  # type: Optional[SampleBuffer]
@@ -132,7 +170,7 @@ def _sample_stack(*args, **kwargs):
 
 
 def extract_stack(frame, max_stack_depth=MAX_STACK_DEPTH):
-    # type: (Optional[FrameType], int) -> Sequence[FrameData]
+    # type: (Optional[FrameType], int) -> Sequence[RawFrameData]
     """
     Extracts the stack starting the specified frame. The extracted stack
     assumes the specified frame is the top of the stack, and works back
@@ -149,10 +187,10 @@ def extract_stack(frame, max_stack_depth=MAX_STACK_DEPTH):
         frame = frame.f_back
 
     return [
-        FrameData(
-            name=get_frame_name(frame),
-            file=frame.f_code.co_filename,
-            line=frame.f_lineno,
+        RawFrameData(
+            function=get_frame_name(frame),
+            abs_path=frame.f_code.co_filename,
+            lineno=frame.f_lineno,
         )
         for frame in stack
     ]
@@ -268,12 +306,12 @@ class SampleBuffer(object):
     def __init__(self, capacity):
         # type: (int) -> None
 
-        self.buffer = [None] * capacity
-        self.capacity = capacity
-        self.idx = 0
+        self.buffer = [None] * capacity  # type: List[Optional[RawSampleData]]
+        self.capacity = capacity  # type: int
+        self.idx = 0  # type: int
 
     def write(self, sample):
-        # type: (Any) -> None
+        # type: (RawSampleData) -> None
         """
         Writing to the buffer is not thread safe. There is the possibility
         that parallel writes will overwrite one another.
@@ -290,12 +328,12 @@ def write(self, sample):
         self.idx = (idx + 1) % self.capacity
 
     def slice_profile(self, start_ns, stop_ns):
-        # type: (int, int) -> Dict[str, Any]
-        samples = []  # type: List[Any]
-        stacks = dict()  # type: Dict[Any, int]
-        stacks_list = list()  # type: List[Any]
-        frames = dict()  # type: Dict[FrameData, int]
-        frames_list = list()  # type: List[Any]
+        # type: (int, int) -> ProcessedProfile
+        samples = []  # type: List[ProcessedSample]
+        stacks = dict()  # type: Dict[ProcessedStack, int]
+        stacks_list = list()  # type: List[ProcessedStack]
+        frames = dict()  # type: Dict[RawFrameData, int]
+        frames_list = list()  # type: List[ProcessedFrame]
 
         # TODO: This is doing an naive iteration over the
         # buffer and extracting the appropriate samples.
@@ -311,10 +349,6 @@ def slice_profile(self, start_ns, stop_ns):
                 continue
 
             for tid, stack in raw_sample[1]:
-                sample = {
-                    "elapsed_since_start_ns": str(ts - start_ns),
-                    "thread_id": str(tid),
-                }
                 current_stack = []
 
                 for frame in stack:
@@ -322,9 +356,9 @@ def slice_profile(self, start_ns, stop_ns):
                         frames[frame] = len(frames)
                         frames_list.append(
                             {
-                                "name": frame.name,
-                                "file": frame.file,
-                                "line": frame.line,
+                                "function": frame.function,
+                                "filename": frame.abs_path,
+                                "lineno": frame.lineno,
                             }
                         )
                     current_stack.append(frames[frame])
@@ -334,8 +368,13 @@ def slice_profile(self, start_ns, stop_ns):
                     stacks[current_stack] = len(stacks)
                     stacks_list.append(current_stack)
 
-                sample["stack_id"] = stacks[current_stack]
-                samples.append(sample)
+                samples.append(
+                    {
+                        "elapsed_since_start_ns": str(ts - start_ns),
+                        "thread_id": str(tid),
+                        "stack_id": stacks[current_stack],
+                    }
+                )
 
         # This collects the thread metadata at the end of a profile. Doing it
         # this way means that any threads that terminate before the profile ends
@@ -345,7 +384,7 @@ def slice_profile(self, start_ns, stop_ns):
                 "name": thread.name,
             }
             for thread in threading.enumerate()
-        }
+        }  # type: Dict[str, ProcessedThreadMetadata]
 
         return {
             "stacks": stacks_list,
diff --git a/tests/test_profiler.py b/tests/test_profiler.py
index 8b5d1fb5a6..2cd50e9a86 100644
--- a/tests/test_profiler.py
+++ b/tests/test_profiler.py
@@ -7,6 +7,8 @@
 import pytest
 
 from sentry_sdk.profiler import (
+    RawFrameData,
+    SampleBuffer,
     SleepScheduler,
     extract_stack,
     get_frame_name,
@@ -149,11 +151,11 @@ def test_extract_stack_with_max_depth(depth, max_stack_depth, actual_depth):
     assert len(stack) == base_stack_depth + actual_depth
 
     for i in range(actual_depth):
-        assert stack[i].name == "get_frame", i
+        assert stack[i].function == "get_frame", i
 
     # index 0 contains the inner most frame on the stack, so the lamdba
     # should be at index `actual_depth`
-    assert stack[actual_depth].name == "", actual_depth
+    assert stack[actual_depth].function == "", actual_depth
 
 
 def get_scheduler_threads(scheduler):
@@ -201,3 +203,271 @@ def sampler():
 
     # there should be 0 scheduler threads now because they stopped
     assert len(get_scheduler_threads(scheduler)) == 0
+
+
+current_thread = threading.current_thread()
+thread_metadata = {
+    str(current_thread.ident): {
+        "name": current_thread.name,
+    },
+}
+
+
+@pytest.mark.parametrize(
+    ("capacity", "start_ns", "stop_ns", "samples", "profile"),
+    [
+        pytest.param(
+            10,
+            0,
+            1,
+            [],
+            {
+                "frames": [],
+                "samples": [],
+                "stacks": [],
+                "thread_metadata": thread_metadata,
+            },
+            id="empty",
+        ),
+        pytest.param(
+            10,
+            0,
+            1,
+            [(2, [(1, [RawFrameData("name", "file", 1)])])],
+            {
+                "frames": [],
+                "samples": [],
+                "stacks": [],
+                "thread_metadata": thread_metadata,
+            },
+            id="single sample out of range",
+        ),
+        pytest.param(
+            10,
+            0,
+            1,
+            [(0, [(1, [RawFrameData("name", "file", 1)])])],
+            {
+                "frames": [
+                    {
+                        "function": "name",
+                        "filename": "file",
+                        "lineno": 1,
+                    },
+                ],
+                "samples": [
+                    {
+                        "elapsed_since_start_ns": "0",
+                        "thread_id": "1",
+                        "stack_id": 0,
+                    },
+                ],
+                "stacks": [(0,)],
+                "thread_metadata": thread_metadata,
+            },
+            id="single sample in range",
+        ),
+        pytest.param(
+            10,
+            0,
+            1,
+            [
+                (0, [(1, [RawFrameData("name", "file", 1)])]),
+                (1, [(1, [RawFrameData("name", "file", 1)])]),
+            ],
+            {
+                "frames": [
+                    {
+                        "function": "name",
+                        "filename": "file",
+                        "lineno": 1,
+                    },
+                ],
+                "samples": [
+                    {
+                        "elapsed_since_start_ns": "0",
+                        "thread_id": "1",
+                        "stack_id": 0,
+                    },
+                    {
+                        "elapsed_since_start_ns": "1",
+                        "thread_id": "1",
+                        "stack_id": 0,
+                    },
+                ],
+                "stacks": [(0,)],
+                "thread_metadata": thread_metadata,
+            },
+            id="two identical stacks",
+        ),
+        pytest.param(
+            10,
+            0,
+            1,
+            [
+                (0, [(1, [RawFrameData("name1", "file", 1)])]),
+                (
+                    1,
+                    [
+                        (
+                            1,
+                            [
+                                RawFrameData("name1", "file", 1),
+                                RawFrameData("name2", "file", 2),
+                            ],
+                        )
+                    ],
+                ),
+            ],
+            {
+                "frames": [
+                    {
+                        "function": "name1",
+                        "filename": "file",
+                        "lineno": 1,
+                    },
+                    {
+                        "function": "name2",
+                        "filename": "file",
+                        "lineno": 2,
+                    },
+                ],
+                "samples": [
+                    {
+                        "elapsed_since_start_ns": "0",
+                        "thread_id": "1",
+                        "stack_id": 0,
+                    },
+                    {
+                        "elapsed_since_start_ns": "1",
+                        "thread_id": "1",
+                        "stack_id": 1,
+                    },
+                ],
+                "stacks": [(0,), (0, 1)],
+                "thread_metadata": thread_metadata,
+            },
+            id="two identical frames",
+        ),
+        pytest.param(
+            10,
+            0,
+            1,
+            [
+                (
+                    0,
+                    [
+                        (
+                            1,
+                            [
+                                RawFrameData("name1", "file", 1),
+                                RawFrameData("name2", "file", 2),
+                            ],
+                        )
+                    ],
+                ),
+                (
+                    1,
+                    [
+                        (
+                            1,
+                            [
+                                RawFrameData("name3", "file", 3),
+                                RawFrameData("name4", "file", 4),
+                            ],
+                        )
+                    ],
+                ),
+            ],
+            {
+                "frames": [
+                    {
+                        "function": "name1",
+                        "filename": "file",
+                        "lineno": 1,
+                    },
+                    {
+                        "function": "name2",
+                        "filename": "file",
+                        "lineno": 2,
+                    },
+                    {
+                        "function": "name3",
+                        "filename": "file",
+                        "lineno": 3,
+                    },
+                    {
+                        "function": "name4",
+                        "filename": "file",
+                        "lineno": 4,
+                    },
+                ],
+                "samples": [
+                    {
+                        "elapsed_since_start_ns": "0",
+                        "thread_id": "1",
+                        "stack_id": 0,
+                    },
+                    {
+                        "elapsed_since_start_ns": "1",
+                        "thread_id": "1",
+                        "stack_id": 1,
+                    },
+                ],
+                "stacks": [(0, 1), (2, 3)],
+                "thread_metadata": thread_metadata,
+            },
+            id="two unique stacks",
+        ),
+        pytest.param(
+            1,
+            0,
+            1,
+            [
+                (0, [(1, [RawFrameData("name1", "file", 1)])]),
+                (
+                    1,
+                    [
+                        (
+                            1,
+                            [
+                                RawFrameData("name2", "file", 2),
+                                RawFrameData("name3", "file", 3),
+                            ],
+                        )
+                    ],
+                ),
+            ],
+            {
+                "frames": [
+                    {
+                        "function": "name2",
+                        "filename": "file",
+                        "lineno": 2,
+                    },
+                    {
+                        "function": "name3",
+                        "filename": "file",
+                        "lineno": 3,
+                    },
+                ],
+                "samples": [
+                    {
+                        "elapsed_since_start_ns": "1",
+                        "thread_id": "1",
+                        "stack_id": 0,
+                    },
+                ],
+                "stacks": [(0, 1)],
+                "thread_metadata": thread_metadata,
+            },
+            id="wraps around buffer",
+        ),
+    ],
+)
+def test_sample_buffer(capacity, start_ns, stop_ns, samples, profile):
+    buffer = SampleBuffer(capacity)
+    for sample in samples:
+        buffer.write(sample)
+    result = buffer.slice_profile(start_ns, stop_ns)
+    assert result == profile

From 1db196db7a06b1c37883d7f631102f5c3b0493e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 11:33:26 +0000
Subject: [PATCH 126/209] build(deps): bump black from 22.8.0 to 22.10.0
 (#1670)

Bumps [black](https://github.com/psf/black) from 22.8.0 to 22.10.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/22.8.0...22.10.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Anton Pirker 
---
 linter-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linter-requirements.txt b/linter-requirements.txt
index e497c212e2..08b633e100 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -1,5 +1,5 @@
 mypy==0.971
-black==22.8.0
+black==22.10.0
 flake8==5.0.4
 types-certifi
 types-redis

From 9886ae4818f5350d8a17d5b621ec728f40278bc4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 14:08:57 +0200
Subject: [PATCH 127/209] build(deps): bump actions/stale from 5 to 6 (#1638)

Bumps [actions/stale](https://github.com/actions/stale) from 5 to 6.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] 

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .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 e195d701a0..b0793b49c3 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@v5
+      - uses: actions/stale@v6
         with:
           repo-token: ${{ github.token }}
           days-before-stale: 21

From af1ece222836a220d963c1adca10e253af985021 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 12:22:02 +0000
Subject: [PATCH 128/209] build(deps): bump sphinx from 5.1.1 to 5.2.3 (#1653)

Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 5.1.1 to 5.2.3.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/5.x/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v5.1.1...v5.2.3)

---
updated-dependencies:
- dependency-name: sphinx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Anton Pirker 
---
 docs-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-requirements.txt b/docs-requirements.txt
index 9b3fbfc0c1..12a756946c 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx==5.1.1
+sphinx==5.2.3
 sphinx-rtd-theme
 sphinx-autodoc-typehints[type_comments]>=1.8.0
 typing-extensions

From b0e6f4ea07614d9b6a6528fb42f14ce7195cc31a Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Fri, 14 Oct 2022 14:43:42 +0200
Subject: [PATCH 129/209] Remove unused node setup from ci. (#1681)

---
 .github/workflows/ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ff9ca8c643..ab698b7d04 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,7 +53,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
       - uses: actions/setup-python@v4
         with:
           python-version: 3.9
@@ -95,7 +94,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
       - uses: actions/setup-python@v4
         with:
           python-version: 3.9

From 7569b5eca871a400405cffb5cba224a4fdf43bd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 13:40:07 +0000
Subject: [PATCH 130/209] build(deps): bump flake8-bugbear from 22.9.11 to
 22.9.23 (#1637)

Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 22.9.11 to 22.9.23.
- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases)
- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/22.9.11...22.9.23)

---
updated-dependencies:
- dependency-name: flake8-bugbear
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Anton Pirker 
---
 linter-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linter-requirements.txt b/linter-requirements.txt
index 08b633e100..e8ed3e36df 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -4,6 +4,6 @@ flake8==5.0.4
 types-certifi
 types-redis
 types-setuptools
-flake8-bugbear==22.9.11
+flake8-bugbear==22.9.23
 pep8-naming==0.13.2
 pre-commit # local linting

From 3f89260c098bfcdcec744bef1d4036c31ec35ed0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Oct 2022 11:45:47 +0200
Subject: [PATCH 131/209] build(deps): bump checkouts/data-schemas from
 `f0a57f2` to `a214fbc` (#1627)

Bumps [checkouts/data-schemas](https://github.com/getsentry/sentry-data-schemas) from `f0a57f2` to `a214fbc`.
- [Release notes](https://github.com/getsentry/sentry-data-schemas/releases)
- [Commits](https://github.com/getsentry/sentry-data-schemas/compare/f0a57f23cf04d0b4b1e19e1398d9712b09759911...a214fbcd78f86dc36930cdf9cd0f866cc5fdb5d3)

---
updated-dependencies:
- dependency-name: checkouts/data-schemas
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 

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 f0a57f23cf..a214fbcd78 160000
--- a/checkouts/data-schemas
+++ b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit f0a57f23cf04d0b4b1e19e1398d9712b09759911
+Subproject commit a214fbcd78f86dc36930cdf9cd0f866cc5fdb5d3

From 9e1e76029551704870746815152a2da669cb5e1b Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 17 Oct 2022 16:22:56 +0200
Subject: [PATCH 132/209] Use Django internal ASGI handling from Channels
 version 4.0.0. (#1688)

* From Channels 4.0.0 on it has no ASGI handling included but utilizes Django's own ASGI handling.
---
 tests/integrations/django/myapp/routing.py | 21 ++++++++++++++-------
 tox.ini                                    |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/tests/integrations/django/myapp/routing.py b/tests/integrations/django/myapp/routing.py
index b5755549ec..30cab968ad 100644
--- a/tests/integrations/django/myapp/routing.py
+++ b/tests/integrations/django/myapp/routing.py
@@ -1,11 +1,18 @@
 import channels
-
-from channels.http import AsgiHandler
 from channels.routing import ProtocolTypeRouter
 
-if channels.__version__ < "3.0.0":
-    channels_handler = AsgiHandler
-else:
-    channels_handler = AsgiHandler()
+try:
+    from channels.http import AsgiHandler
+
+    if channels.__version__ < "3.0.0":
+        django_asgi_app = AsgiHandler
+    else:
+        django_asgi_app = AsgiHandler()
+
+except ModuleNotFoundError:
+    # Since channels 4.0 ASGI handling is done by Django itself
+    from django.core.asgi import get_asgi_application
+
+    django_asgi_app = get_asgi_application()
 
-application = ProtocolTypeRouter({"http": channels_handler})
+application = ProtocolTypeRouter({"http": django_asgi_app})
diff --git a/tox.ini b/tox.ini
index 2b26d2f45a..d2bf7fa2b1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -108,7 +108,7 @@ 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,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}: channels[daphne]>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
 

From 7d004f093025a8c9067b860d0db10d00c3c91536 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 17 Oct 2022 16:42:24 +0200
Subject: [PATCH 133/209] Have instrumentation for ASGI middleware receive/send
 callbacks. (#1673)

* Have instrumentation for ASGI middleware receive/send callbacks.
* Added tests for new callback spans.
---
 sentry_sdk/consts.py                          |  2 +
 sentry_sdk/integrations/starlette.py          | 38 ++++++-
 .../integrations/starlette/test_starlette.py  | 98 +++++++++++++++++++
 tox.ini                                       |  4 +-
 4 files changed, 136 insertions(+), 6 deletions(-)

diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index b6e546e336..3be5fe6779 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -118,6 +118,8 @@ class OP:
     HTTP_SERVER = "http.server"
     MIDDLEWARE_DJANGO = "middleware.django"
     MIDDLEWARE_STARLETTE = "middleware.starlette"
+    MIDDLEWARE_STARLETTE_RECEIVE = "middleware.starlette.receive"
+    MIDDLEWARE_STARLETTE_SEND = "middleware.starlette.send"
     QUEUE_SUBMIT_CELERY = "queue.submit.celery"
     QUEUE_TASK_CELERY = "queue.task.celery"
     QUEUE_TASK_RQ = "queue.task.rq"
diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index dffba5afd5..aaf7fb3dc4 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -85,21 +85,49 @@ 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
+    async def _create_span_call(app, scope, receive, send, **kwargs):
+        # type: (Any, Dict[str, Any], Callable[[], Awaitable[Dict[str, Any]]], Callable[[Dict[str, Any]], Awaitable[None]], Any) -> None
         hub = Hub.current
         integration = hub.get_integration(StarletteIntegration)
         if integration is not None:
-            middleware_name = args[0].__class__.__name__
+            middleware_name = app.__class__.__name__
+
             with hub.start_span(
                 op=OP.MIDDLEWARE_STARLETTE, description=middleware_name
             ) as middleware_span:
                 middleware_span.set_tag("starlette.middleware_name", middleware_name)
 
-                await old_call(*args, **kwargs)
+                # Creating spans for the "receive" callback
+                async def _sentry_receive(*args, **kwargs):
+                    # type: (*Any, **Any) -> Any
+                    hub = Hub.current
+                    with hub.start_span(
+                        op=OP.MIDDLEWARE_STARLETTE_RECEIVE,
+                        description=receive.__qualname__,
+                    ) as span:
+                        span.set_tag("starlette.middleware_name", middleware_name)
+                        await receive(*args, **kwargs)
+
+                receive_patched = receive.__name__ == "_sentry_receive"
+                new_receive = _sentry_receive if not receive_patched else receive
+
+                # Creating spans for the "send" callback
+                async def _sentry_send(*args, **kwargs):
+                    # type: (*Any, **Any) -> Any
+                    hub = Hub.current
+                    with hub.start_span(
+                        op=OP.MIDDLEWARE_STARLETTE_SEND, description=send.__qualname__
+                    ) as span:
+                        span.set_tag("starlette.middleware_name", middleware_name)
+                        await send(*args, **kwargs)
+
+                send_patched = send.__name__ == "_sentry_send"
+                new_send = _sentry_send if not send_patched else send
+
+                await old_call(app, scope, new_receive, new_send, **kwargs)
 
         else:
-            await old_call(*args, **kwargs)
+            await old_call(app, scope, receive, send, **kwargs)
 
     not_yet_patched = old_call.__name__ not in [
         "_create_span_call",
diff --git a/tests/integrations/starlette/test_starlette.py b/tests/integrations/starlette/test_starlette.py
index 24254b69ef..29e5916adb 100644
--- a/tests/integrations/starlette/test_starlette.py
+++ b/tests/integrations/starlette/test_starlette.py
@@ -31,6 +31,8 @@
 from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.testclient import TestClient
 
+STARLETTE_VERSION = tuple([int(x) for x in starlette.__version__.split(".")])
+
 PICTURE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "photo.jpg")
 
 BODY_JSON = {"some": "json", "for": "testing", "nested": {"numbers": 123}}
@@ -152,6 +154,26 @@ async def __anext__(self):
             raise StopAsyncIteration
 
 
+class SampleMiddleware:
+    def __init__(self, app):
+        self.app = app
+
+    async def __call__(self, scope, receive, send):
+        # only handle http requests
+        if scope["type"] != "http":
+            await self.app(scope, receive, send)
+            return
+
+        async def do_stuff(message):
+            if message["type"] == "http.response.start":
+                # do something here.
+                pass
+
+            await send(message)
+
+        await self.app(scope, receive, do_stuff)
+
+
 @pytest.mark.asyncio
 async def test_starlettrequestextractor_content_length(sentry_init):
     with mock.patch(
@@ -546,6 +568,82 @@ def test_middleware_spans(sentry_init, capture_events):
             idx += 1
 
 
+def test_middleware_callback_spans(sentry_init, capture_events):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[StarletteIntegration()],
+    )
+    starlette_app = starlette_app_factory(middleware=[Middleware(SampleMiddleware)])
+    events = capture_events()
+
+    client = TestClient(starlette_app, raise_server_exceptions=False)
+    try:
+        client.get("/message", auth=("Gabriela", "hello123"))
+    except Exception:
+        pass
+
+    (_, transaction_event) = events
+
+    expected = [
+        {
+            "op": "middleware.starlette",
+            "description": "ServerErrorMiddleware",
+            "tags": {"starlette.middleware_name": "ServerErrorMiddleware"},
+        },
+        {
+            "op": "middleware.starlette",
+            "description": "SampleMiddleware",
+            "tags": {"starlette.middleware_name": "SampleMiddleware"},
+        },
+        {
+            "op": "middleware.starlette",
+            "description": "ExceptionMiddleware",
+            "tags": {"starlette.middleware_name": "ExceptionMiddleware"},
+        },
+        {
+            "op": "middleware.starlette.send",
+            "description": "SampleMiddleware.__call__..do_stuff",
+            "tags": {"starlette.middleware_name": "ExceptionMiddleware"},
+        },
+        {
+            "op": "middleware.starlette.send",
+            "description": "ServerErrorMiddleware.__call__.._send",
+            "tags": {"starlette.middleware_name": "SampleMiddleware"},
+        },
+        {
+            "op": "middleware.starlette.send",
+            "description": "_ASGIAdapter.send..send"
+            if STARLETTE_VERSION < (0, 21)
+            else "_TestClientTransport.handle_request..send",
+            "tags": {"starlette.middleware_name": "ServerErrorMiddleware"},
+        },
+        {
+            "op": "middleware.starlette.send",
+            "description": "SampleMiddleware.__call__..do_stuff",
+            "tags": {"starlette.middleware_name": "ExceptionMiddleware"},
+        },
+        {
+            "op": "middleware.starlette.send",
+            "description": "ServerErrorMiddleware.__call__.._send",
+            "tags": {"starlette.middleware_name": "SampleMiddleware"},
+        },
+        {
+            "op": "middleware.starlette.send",
+            "description": "_ASGIAdapter.send..send"
+            if STARLETTE_VERSION < (0, 21)
+            else "_TestClientTransport.handle_request..send",
+            "tags": {"starlette.middleware_name": "ServerErrorMiddleware"},
+        },
+    ]
+
+    idx = 0
+    for span in transaction_event["spans"]:
+        assert span["op"] == expected[idx]["op"]
+        assert span["description"] == expected[idx]["description"]
+        assert span["tags"] == expected[idx]["tags"]
+        idx += 1
+
+
 def test_last_event_id(sentry_init, capture_events):
     sentry_init(
         integrations=[StarletteIntegration()],
diff --git a/tox.ini b/tox.ini
index d2bf7fa2b1..8b19296671 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,7 +36,7 @@ envlist =
 
     {py3.7,py3.8,py3.9,py3.10}-asgi
 
-    {py3.7,py3.8,py3.9,py3.10}-starlette-{0.19.1,0.20}
+    {py3.7,py3.8,py3.9,py3.10}-starlette-{0.19.1,0.20,0.21}
 
     {py3.7,py3.8,py3.9,py3.10}-fastapi
 
@@ -152,8 +152,10 @@ deps =
     starlette: pytest-asyncio
     starlette: python-multipart
     starlette: requests
+    starlette-0.21: httpx
     starlette-0.19.1: starlette==0.19.1
     starlette-0.20: starlette>=0.20.0,<0.21.0
+    starlette-0.21: starlette>=0.21.0,<0.22.0
 
     fastapi: fastapi
     fastapi: pytest-asyncio

From 973b2f6db7386aae50dd4279ffcead9a4c87d8c6 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 17 Oct 2022 16:59:20 +0200
Subject: [PATCH 134/209] asyncio integration (#1671)

* Make sure each asyncio task that is run has its own Hub and also creates a span.
* Make sure to not break custom task factory if there is one set.
---
 sentry_sdk/consts.py                       |   1 +
 sentry_sdk/integrations/asyncio.py         |  64 +++++++++++
 tests/integrations/asyncio/__init__.py     |   0
 tests/integrations/asyncio/test_asyncio.py | 118 +++++++++++++++++++++
 4 files changed, 183 insertions(+)
 create mode 100644 sentry_sdk/integrations/asyncio.py
 create mode 100644 tests/integrations/asyncio/__init__.py
 create mode 100644 tests/integrations/asyncio/test_asyncio.py

diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 3be5fe6779..a0d0184a72 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -111,6 +111,7 @@ class OP:
     DB = "db"
     DB_REDIS = "db.redis"
     EVENT_DJANGO = "event.django"
+    FUNCTION = "function"
     FUNCTION_AWS = "function.aws"
     FUNCTION_GCP = "function.gcp"
     HTTP_CLIENT = "http.client"
diff --git a/sentry_sdk/integrations/asyncio.py b/sentry_sdk/integrations/asyncio.py
new file mode 100644
index 0000000000..ab07ffc3cb
--- /dev/null
+++ b/sentry_sdk/integrations/asyncio.py
@@ -0,0 +1,64 @@
+from __future__ import absolute_import
+
+from sentry_sdk.consts import OP
+from sentry_sdk.hub import Hub
+from sentry_sdk.integrations import Integration, DidNotEnable
+from sentry_sdk._types import MYPY
+
+try:
+    import asyncio
+    from asyncio.tasks import Task
+except ImportError:
+    raise DidNotEnable("asyncio not available")
+
+
+if MYPY:
+    from typing import Any
+
+
+def _sentry_task_factory(loop, coro):
+    # type: (Any, Any) -> Task[None]
+
+    async def _coro_creating_hub_and_span():
+        # type: () -> None
+        hub = Hub(Hub.current)
+        with hub:
+            with hub.start_span(op=OP.FUNCTION, description=coro.__qualname__):
+                await coro
+
+    # Trying to use user set task factory (if there is one)
+    orig_factory = loop.get_task_factory()
+    if orig_factory:
+        return orig_factory(loop, _coro_creating_hub_and_span)
+
+    # The default task factory in `asyncio` does not have its own function
+    # but is just a couple of lines in `asyncio.base_events.create_task()`
+    # Those lines are copied here.
+
+    # WARNING:
+    # If the default behavior of the task creation in asyncio changes,
+    # this will break!
+    task = Task(_coro_creating_hub_and_span, loop=loop)  # type: ignore
+    if task._source_traceback:  # type: ignore
+        del task._source_traceback[-1]  # type: ignore
+
+    return task
+
+
+def patch_asyncio():
+    # type: () -> None
+    try:
+        loop = asyncio.get_running_loop()
+        loop.set_task_factory(_sentry_task_factory)
+    except RuntimeError:
+        # When there is no running loop, we have nothing to patch.
+        pass
+
+
+class AsyncioIntegration(Integration):
+    identifier = "asyncio"
+
+    @staticmethod
+    def setup_once():
+        # type: () -> None
+        patch_asyncio()
diff --git a/tests/integrations/asyncio/__init__.py b/tests/integrations/asyncio/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/integrations/asyncio/test_asyncio.py b/tests/integrations/asyncio/test_asyncio.py
new file mode 100644
index 0000000000..2e0643c4d2
--- /dev/null
+++ b/tests/integrations/asyncio/test_asyncio.py
@@ -0,0 +1,118 @@
+import asyncio
+import sys
+
+import pytest
+import pytest_asyncio
+
+import sentry_sdk
+from sentry_sdk.consts import OP
+from sentry_sdk.integrations.asyncio import AsyncioIntegration
+
+
+minimum_python_36 = pytest.mark.skipif(
+    sys.version_info < (3, 6), reason="ASGI is only supported in Python >= 3.6"
+)
+
+
+async def foo():
+    await asyncio.sleep(0.01)
+
+
+async def bar():
+    await asyncio.sleep(0.01)
+
+
+@pytest_asyncio.fixture(scope="session")
+def event_loop(request):
+    """Create an instance of the default event loop for each test case."""
+    loop = asyncio.get_event_loop_policy().new_event_loop()
+    yield loop
+    loop.close()
+
+
+@minimum_python_36
+@pytest.mark.asyncio
+async def test_create_task(
+    sentry_init,
+    capture_events,
+    event_loop,
+):
+    sentry_init(
+        traces_sample_rate=1.0,
+        send_default_pii=True,
+        debug=True,
+        integrations=[
+            AsyncioIntegration(),
+        ],
+    )
+
+    events = capture_events()
+
+    with sentry_sdk.start_transaction(name="test_transaction_for_create_task"):
+        with sentry_sdk.start_span(op="root", description="not so important"):
+            tasks = [event_loop.create_task(foo()), event_loop.create_task(bar())]
+            await asyncio.wait(tasks, return_when=asyncio.FIRST_EXCEPTION)
+
+            sentry_sdk.flush()
+
+    (transaction_event,) = events
+
+    assert transaction_event["spans"][0]["op"] == "root"
+    assert transaction_event["spans"][0]["description"] == "not so important"
+
+    assert transaction_event["spans"][1]["op"] == OP.FUNCTION
+    assert transaction_event["spans"][1]["description"] == "foo"
+    assert (
+        transaction_event["spans"][1]["parent_span_id"]
+        == transaction_event["spans"][0]["span_id"]
+    )
+
+    assert transaction_event["spans"][2]["op"] == OP.FUNCTION
+    assert transaction_event["spans"][2]["description"] == "bar"
+    assert (
+        transaction_event["spans"][2]["parent_span_id"]
+        == transaction_event["spans"][0]["span_id"]
+    )
+
+
+@minimum_python_36
+@pytest.mark.asyncio
+async def test_gather(
+    sentry_init,
+    capture_events,
+):
+    sentry_init(
+        traces_sample_rate=1.0,
+        send_default_pii=True,
+        debug=True,
+        integrations=[
+            AsyncioIntegration(),
+        ],
+    )
+
+    events = capture_events()
+
+    with sentry_sdk.start_transaction(name="test_transaction_for_gather"):
+        with sentry_sdk.start_span(op="root", description="not so important"):
+            await asyncio.gather(foo(), bar(), return_exceptions=True)
+
+        sentry_sdk.flush()
+
+    (transaction_event,) = events
+
+    assert transaction_event["spans"][0]["op"] == "root"
+    assert transaction_event["spans"][0]["description"] == "not so important"
+
+    assert transaction_event["spans"][1]["op"] == OP.FUNCTION
+    assert transaction_event["spans"][1]["description"] == "foo"
+    assert (
+        transaction_event["spans"][1]["parent_span_id"]
+        == transaction_event["spans"][0]["span_id"]
+    )
+
+    assert transaction_event["spans"][2]["op"] == OP.FUNCTION
+    assert transaction_event["spans"][2]["description"] == "bar"
+    assert (
+        transaction_event["spans"][2]["parent_span_id"]
+        == transaction_event["spans"][0]["span_id"]
+    )

From c471331e524a72248e20c3f166faec8fb26d727c Mon Sep 17 00:00:00 2001
From: Matt Flower 
Date: Thu, 20 Oct 2022 03:25:20 -0400
Subject: [PATCH 135/209] fix(integrations): Fix http putrequest when url is
 None (#1693)

Modifies behavior of putrequest to check for None on real_url prior to using it.

Fixes GH-1678

Co-authored-by: Matthew Flower 
---
 sentry_sdk/integrations/stdlib.py         |  2 +-
 tests/integrations/stdlib/test_httplib.py | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py
index 8790713a8e..3b81b6c2c5 100644
--- a/sentry_sdk/integrations/stdlib.py
+++ b/sentry_sdk/integrations/stdlib.py
@@ -71,7 +71,7 @@ def putrequest(self, method, url, *args, **kwargs):
         default_port = self.default_port
 
         real_url = url
-        if not real_url.startswith(("http://", "https://")):
+        if real_url is None or not real_url.startswith(("http://", "https://")):
             real_url = "%s://%s%s%s" % (
                 default_port == 443 and "https" or "http",
                 host,
diff --git a/tests/integrations/stdlib/test_httplib.py b/tests/integrations/stdlib/test_httplib.py
index 839dc011ab..952bcca371 100644
--- a/tests/integrations/stdlib/test_httplib.py
+++ b/tests/integrations/stdlib/test_httplib.py
@@ -12,10 +12,10 @@
 
 try:
     # py2
-    from httplib import HTTPSConnection
+    from httplib import HTTPConnection, HTTPSConnection
 except ImportError:
     # py3
-    from http.client import HTTPSConnection
+    from http.client import HTTPConnection, HTTPSConnection
 
 try:
     from unittest import mock  # python 3.3 and above
@@ -77,6 +77,16 @@ def before_breadcrumb(crumb, hint):
         assert sys.getrefcount(response) == 2
 
 
+def test_empty_realurl(sentry_init, capture_events):
+    """
+    Ensure that after using sentry_sdk.init you can putrequest a
+    None url.
+    """
+
+    sentry_init(dsn="")
+    HTTPConnection("httpbin.org", port=443).putrequest("POST", None)
+
+
 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

From 5aa243699446c4134fea0b769ef3ba4c62b9f29e Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 20 Oct 2022 13:43:38 +0200
Subject: [PATCH 136/209] Fix asyncio task factory

* Make sure the correct co-routine object is used.
* Make sure that if a users task factory is set, it is used.
---
 sentry_sdk/integrations/asyncio.py | 53 +++++++++++++++---------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/sentry_sdk/integrations/asyncio.py b/sentry_sdk/integrations/asyncio.py
index ab07ffc3cb..c18089a492 100644
--- a/sentry_sdk/integrations/asyncio.py
+++ b/sentry_sdk/integrations/asyncio.py
@@ -16,39 +16,40 @@
     from typing import Any
 
 
-def _sentry_task_factory(loop, coro):
-    # type: (Any, Any) -> Task[None]
+def patch_asyncio():
+    # type: () -> None
+    orig_task_factory = None
+    try:
+        loop = asyncio.get_running_loop()
+        orig_task_factory = loop.get_task_factory()
 
-    async def _coro_creating_hub_and_span():
-        # type: () -> None
-        hub = Hub(Hub.current)
-        with hub:
-            with hub.start_span(op=OP.FUNCTION, description=coro.__qualname__):
-                await coro
+        def _sentry_task_factory(loop, coro):
+            # type: (Any, Any) -> Any
 
-    # Trying to use user set task factory (if there is one)
-    orig_factory = loop.get_task_factory()
-    if orig_factory:
-        return orig_factory(loop, _coro_creating_hub_and_span)
+            async def _coro_creating_hub_and_span():
+                # type: () -> None
+                hub = Hub(Hub.current)
+                with hub:
+                    with hub.start_span(op=OP.FUNCTION, description=coro.__qualname__):
+                        await coro
 
-    # The default task factory in `asyncio` does not have its own function
-    # but is just a couple of lines in `asyncio.base_events.create_task()`
-    # Those lines are copied here.
+            # Trying to use user set task factory (if there is one)
+            if orig_task_factory:
+                return orig_task_factory(loop, _coro_creating_hub_and_span())  # type: ignore
 
-    # WARNING:
-    # If the default behavior of the task creation in asyncio changes,
-    # this will break!
-    task = Task(_coro_creating_hub_and_span, loop=loop)  # type: ignore
-    if task._source_traceback:  # type: ignore
-        del task._source_traceback[-1]  # type: ignore
+            # The default task factory in `asyncio` does not have its own function
+            # but is just a couple of lines in `asyncio.base_events.create_task()`
+            # Those lines are copied here.
 
-    return task
+            # WARNING:
+            # If the default behavior of the task creation in asyncio changes,
+            # this will break!
+            task = Task(_coro_creating_hub_and_span(), loop=loop)
+            if task._source_traceback:  # type: ignore
+                del task._source_traceback[-1]  # type: ignore
 
+            return task
 
-def patch_asyncio():
-    # type: () -> None
-    try:
-        loop = asyncio.get_running_loop()
         loop.set_task_factory(_sentry_task_factory)
     except RuntimeError:
         # When there is no running loop, we have nothing to patch.

From 29431f60d5b3dfdcd01224dd6e3eb3d9f8f7d802 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 20 Oct 2022 14:24:25 +0200
Subject: [PATCH 137/209] Add exception handling to Asyncio Integration (#1695)

Make sure that we also capture exceptions from spawned async Tasks.

Co-authored-by: Neel Shah 
---
 sentry_sdk/integrations/asyncio.py         | 29 +++++++++++++++-
 tests/integrations/asyncio/test_asyncio.py | 39 ++++++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/sentry_sdk/integrations/asyncio.py b/sentry_sdk/integrations/asyncio.py
index c18089a492..2c61b85962 100644
--- a/sentry_sdk/integrations/asyncio.py
+++ b/sentry_sdk/integrations/asyncio.py
@@ -1,9 +1,12 @@
 from __future__ import absolute_import
+import sys
 
+from sentry_sdk._compat import reraise
 from sentry_sdk.consts import OP
 from sentry_sdk.hub import Hub
 from sentry_sdk.integrations import Integration, DidNotEnable
 from sentry_sdk._types import MYPY
+from sentry_sdk.utils import event_from_exception
 
 try:
     import asyncio
@@ -15,6 +18,8 @@
 if MYPY:
     from typing import Any
 
+    from sentry_sdk._types import ExcInfo
+
 
 def patch_asyncio():
     # type: () -> None
@@ -31,7 +36,10 @@ async def _coro_creating_hub_and_span():
                 hub = Hub(Hub.current)
                 with hub:
                     with hub.start_span(op=OP.FUNCTION, description=coro.__qualname__):
-                        await coro
+                        try:
+                            await coro
+                        except Exception:
+                            reraise(*_capture_exception(hub))
 
             # Trying to use user set task factory (if there is one)
             if orig_task_factory:
@@ -56,6 +64,25 @@ async def _coro_creating_hub_and_span():
         pass
 
 
+def _capture_exception(hub):
+    # type: (Hub) -> ExcInfo
+    exc_info = sys.exc_info()
+
+    integration = hub.get_integration(AsyncioIntegration)
+    if integration is not None:
+        # If an integration is there, a client has to be there.
+        client = hub.client  # type: Any
+
+        event, hint = event_from_exception(
+            exc_info,
+            client_options=client.options,
+            mechanism={"type": "asyncio", "handled": False},
+        )
+        hub.capture_event(event, hint=hint)
+
+    return exc_info
+
+
 class AsyncioIntegration(Integration):
     identifier = "asyncio"
 
diff --git a/tests/integrations/asyncio/test_asyncio.py b/tests/integrations/asyncio/test_asyncio.py
index 2e0643c4d2..380c614f65 100644
--- a/tests/integrations/asyncio/test_asyncio.py
+++ b/tests/integrations/asyncio/test_asyncio.py
@@ -22,6 +22,10 @@ async def bar():
     await asyncio.sleep(0.01)
 
 
+async def boom():
+    1 / 0
+
+
 @pytest_asyncio.fixture(scope="session")
 def event_loop(request):
     """Create an instance of the default event loop for each test case."""
@@ -116,3 +120,38 @@ async def test_gather(
         transaction_event["spans"][2]["parent_span_id"]
         == transaction_event["spans"][0]["span_id"]
     )
+
+
+@minimum_python_36
+@pytest.mark.asyncio
+async def test_exception(
+    sentry_init,
+    capture_events,
+    event_loop,
+):
+    sentry_init(
+        traces_sample_rate=1.0,
+        send_default_pii=True,
+        debug=True,
+        integrations=[
+            AsyncioIntegration(),
+        ],
+    )
+
+    events = capture_events()
+
+    with sentry_sdk.start_transaction(name="test_exception"):
+        with sentry_sdk.start_span(op="root", description="not so important"):
+            tasks = [event_loop.create_task(boom()), event_loop.create_task(bar())]
+            await asyncio.wait(tasks, return_when=asyncio.FIRST_EXCEPTION)
+
+            sentry_sdk.flush()
+
+    (error_event, _) = events
+
+    assert error_event["transaction"] == "test_exception"
+    assert error_event["contexts"]["trace"]["op"] == "function"
+    assert error_event["exception"]["values"][0]["type"] == "ZeroDivisionError"
+    assert error_event["exception"]["values"][0]["value"] == "division by zero"
+    assert error_event["exception"]["values"][0]["mechanism"]["handled"] is False
+    assert error_event["exception"]["values"][0]["mechanism"]["type"] == "asyncio"

From d2547eaf2a35045e9fa0b23f8f2e8e7ccdc41fb2 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Thu, 20 Oct 2022 08:39:37 -0400
Subject: [PATCH 138/209] fix(profiling): get_frame_name only look at arguments
 (#1684)

Looking for `self` and `cls` is not sufficient because they may have come from
an outer scope. Make sure to check that they are coming from the frame's
positional arguments.

Co-authored-by: Anton Pirker 
---
 sentry_sdk/profiler.py | 19 ++++++++++++++++---
 tests/test_profiler.py | 25 +++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index aafb4129bb..660e2aac4c 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -202,14 +202,21 @@ def get_frame_name(frame):
     # in 3.11+, there is a frame.f_code.co_qualname that
     # we should consider using instead where possible
 
+    f_code = frame.f_code
     # co_name only contains the frame name.  If the frame was a method,
     # the class name will NOT be included.
-    name = frame.f_code.co_name
+    name = f_code.co_name
 
     # if it was a method, we can get the class name by inspecting
     # the f_locals for the `self` argument
     try:
-        if "self" in frame.f_locals:
+        if (
+            # the co_varnames start with the frame's positional arguments
+            # and we expect the first to be `self` if its an instance method
+            f_code.co_varnames
+            and f_code.co_varnames[0] == "self"
+            and "self" in frame.f_locals
+        ):
             return "{}.{}".format(frame.f_locals["self"].__class__.__name__, name)
     except AttributeError:
         pass
@@ -217,7 +224,13 @@ def get_frame_name(frame):
     # if it was a class method, (decorated with `@classmethod`)
     # we can get the class name by inspecting the f_locals for the `cls` argument
     try:
-        if "cls" in frame.f_locals:
+        if (
+            # the co_varnames start with the frame's positional arguments
+            # and we expect the first to be `cls` if its a class method
+            f_code.co_varnames
+            and f_code.co_varnames[0] == "cls"
+            and "cls" in frame.f_locals
+        ):
             return "{}.{}".format(frame.f_locals["cls"].__name__, name)
     except AttributeError:
         pass
diff --git a/tests/test_profiler.py b/tests/test_profiler.py
index 2cd50e9a86..305d134b14 100644
--- a/tests/test_profiler.py
+++ b/tests/test_profiler.py
@@ -85,10 +85,25 @@ class GetFrame:
     def instance_method(self):
         return inspect.currentframe()
 
+    def instance_method_wrapped(self):
+        def wrapped():
+            self
+            return inspect.currentframe()
+
+        return wrapped
+
     @classmethod
     def class_method(cls):
         return inspect.currentframe()
 
+    @classmethod
+    def class_method_wrapped(cls):
+        def wrapped():
+            cls
+            return inspect.currentframe()
+
+        return wrapped
+
     @staticmethod
     def static_method():
         return inspect.currentframe()
@@ -112,11 +127,21 @@ def static_method():
             "GetFrame.instance_method",
             id="instance_method",
         ),
+        pytest.param(
+            GetFrame().instance_method_wrapped()(),
+            "wrapped",
+            id="instance_method_wrapped",
+        ),
         pytest.param(
             GetFrame().class_method(),
             "GetFrame.class_method",
             id="class_method",
         ),
+        pytest.param(
+            GetFrame().class_method_wrapped()(),
+            "wrapped",
+            id="class_method_wrapped",
+        ),
         pytest.param(
             GetFrame().static_method(),
             "GetFrame.static_method",

From 1c651c6c529f3c57f0138091d74545155991d088 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Thu, 20 Oct 2022 08:56:38 -0400
Subject: [PATCH 139/209] tests(profiling): Add tests for thread schedulers
 (#1683)

* tests(profiling): Add tests for thread schedulers
---
 sentry_sdk/profiler.py | 93 +++++++++++++++++++++++-------------------
 tests/test_profiler.py | 80 ++++++++++++++++++++++++++++++++++--
 2 files changed, 126 insertions(+), 47 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 660e2aac4c..b9fc911878 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -111,17 +111,16 @@ def setup_profiler(options):
     # To buffer samples for `buffer_secs` at `frequency` Hz, we need
     # a capcity of `buffer_secs * frequency`.
     _sample_buffer = SampleBuffer(capacity=buffer_secs * frequency)
-    _sampler = _init_sample_stack_fn(_sample_buffer)
 
     profiler_mode = options["_experiments"].get("profiler_mode", SigprofScheduler.mode)
     if profiler_mode == SigprofScheduler.mode:
-        _scheduler = SigprofScheduler(sampler=_sampler, frequency=frequency)
+        _scheduler = SigprofScheduler(sample_buffer=_sample_buffer, frequency=frequency)
     elif profiler_mode == SigalrmScheduler.mode:
-        _scheduler = SigalrmScheduler(sampler=_sampler, frequency=frequency)
+        _scheduler = SigalrmScheduler(sample_buffer=_sample_buffer, frequency=frequency)
     elif profiler_mode == SleepScheduler.mode:
-        _scheduler = SleepScheduler(sampler=_sampler, frequency=frequency)
+        _scheduler = SleepScheduler(sample_buffer=_sample_buffer, frequency=frequency)
     elif profiler_mode == EventScheduler.mode:
-        _scheduler = EventScheduler(sampler=_sampler, frequency=frequency)
+        _scheduler = EventScheduler(sample_buffer=_sample_buffer, frequency=frequency)
     else:
         raise ValueError("Unknown profiler mode: {}".format(profiler_mode))
     _scheduler.setup()
@@ -142,29 +141,6 @@ def teardown_profiler():
     _scheduler = None
 
 
-def _init_sample_stack_fn(buffer):
-    # type: (SampleBuffer) -> Callable[..., None]
-
-    def _sample_stack(*args, **kwargs):
-        # type: (*Any, **Any) -> None
-        """
-        Take a sample of the stack on all the threads in the process.
-        This should be called at a regular interval to collect samples.
-        """
-
-        buffer.write(
-            (
-                nanosecond_time(),
-                [
-                    (tid, extract_stack(frame))
-                    for tid, frame in sys._current_frames().items()
-                ],
-            )
-        )
-
-    return _sample_stack
-
-
 # We want to impose a stack depth limit so that samples aren't too large.
 MAX_STACK_DEPTH = 128
 
@@ -242,8 +218,14 @@ def get_frame_name(frame):
 
 
 class Profile(object):
-    def __init__(self, transaction, hub=None):
-        # type: (sentry_sdk.tracing.Transaction, Optional[sentry_sdk.Hub]) -> None
+    def __init__(
+        self,
+        scheduler,  # type: Scheduler
+        transaction,  # type: sentry_sdk.tracing.Transaction
+        hub=None,  # type: Optional[sentry_sdk.Hub]
+    ):
+        # type: (...) -> None
+        self.scheduler = scheduler
         self.transaction = transaction
         self.hub = hub
         self._start_ns = None  # type: Optional[int]
@@ -253,19 +235,16 @@ def __init__(self, transaction, hub=None):
 
     def __enter__(self):
         # type: () -> None
-        assert _scheduler is not None
         self._start_ns = nanosecond_time()
-        _scheduler.start_profiling()
+        self.scheduler.start_profiling()
 
     def __exit__(self, ty, value, tb):
         # type: (Optional[Any], Optional[Any], Optional[Any]) -> None
-        assert _scheduler is not None
-        _scheduler.stop_profiling()
+        self.scheduler.stop_profiling()
         self._stop_ns = nanosecond_time()
 
     def to_json(self, event_opt):
         # type: (Any) -> Dict[str, Any]
-        assert _sample_buffer is not None
         assert self._start_ns is not None
         assert self._stop_ns is not None
 
@@ -273,7 +252,9 @@ def to_json(self, event_opt):
             "environment": event_opt.get("environment"),
             "event_id": uuid.uuid4().hex,
             "platform": "python",
-            "profile": _sample_buffer.slice_profile(self._start_ns, self._stop_ns),
+            "profile": self.scheduler.sample_buffer.slice_profile(
+                self._start_ns, self._stop_ns
+            ),
             "release": event_opt.get("release", ""),
             "timestamp": event_opt["timestamp"],
             "version": "1",
@@ -406,13 +387,36 @@ def slice_profile(self, start_ns, stop_ns):
             "thread_metadata": thread_metadata,
         }
 
+    def make_sampler(self):
+        # type: () -> Callable[..., None]
+
+        def _sample_stack(*args, **kwargs):
+            # type: (*Any, **Any) -> None
+            """
+            Take a sample of the stack on all the threads in the process.
+            This should be called at a regular interval to collect samples.
+            """
+
+            self.write(
+                (
+                    nanosecond_time(),
+                    [
+                        (tid, extract_stack(frame))
+                        for tid, frame in sys._current_frames().items()
+                    ],
+                )
+            )
+
+        return _sample_stack
+
 
 class Scheduler(object):
     mode = "unknown"
 
-    def __init__(self, sampler, frequency):
-        # type: (Callable[..., None], int) -> None
-        self.sampler = sampler
+    def __init__(self, sample_buffer, frequency):
+        # type: (SampleBuffer, int) -> None
+        self.sample_buffer = sample_buffer
+        self.sampler = sample_buffer.make_sampler()
         self._lock = threading.Lock()
         self._count = 0
         self._interval = 1.0 / frequency
@@ -447,9 +451,11 @@ class ThreadScheduler(Scheduler):
     mode = "thread"
     name = None  # type: Optional[str]
 
-    def __init__(self, sampler, frequency):
-        # type: (Callable[..., None], int) -> None
-        super(ThreadScheduler, self).__init__(sampler=sampler, frequency=frequency)
+    def __init__(self, sample_buffer, frequency):
+        # type: (SampleBuffer, int) -> None
+        super(ThreadScheduler, self).__init__(
+            sample_buffer=sample_buffer, frequency=frequency
+        )
         self.stop_events = Queue()
 
     def setup(self):
@@ -716,7 +722,8 @@ def start_profiling(transaction, hub=None):
 
     # if profiling was not enabled, this should be a noop
     if _should_profile(transaction, hub):
-        with Profile(transaction, hub=hub):
+        assert _scheduler is not None
+        with Profile(_scheduler, transaction, hub=hub):
             yield
     else:
         yield
diff --git a/tests/test_profiler.py b/tests/test_profiler.py
index 305d134b14..963c8af298 100644
--- a/tests/test_profiler.py
+++ b/tests/test_profiler.py
@@ -7,6 +7,7 @@
 import pytest
 
 from sentry_sdk.profiler import (
+    EventScheduler,
     RawFrameData,
     SampleBuffer,
     SleepScheduler,
@@ -187,12 +188,83 @@ def get_scheduler_threads(scheduler):
     return [thread for thread in threading.enumerate() if thread.name == scheduler.name]
 
 
+class DummySampleBuffer(SampleBuffer):
+    def __init__(self, capacity, sample_data=None):
+        super(DummySampleBuffer, self).__init__(capacity)
+        self.sample_data = [] if sample_data is None else sample_data
+
+    def make_sampler(self):
+        def _sample_stack(*args, **kwargs):
+            print("writing", self.sample_data[0])
+            self.write(self.sample_data.pop(0))
+
+        return _sample_stack
+
+
+@minimum_python_33
+@pytest.mark.parametrize(
+    ("scheduler_class",),
+    [
+        pytest.param(SleepScheduler, id="sleep scheduler"),
+        pytest.param(EventScheduler, id="event scheduler"),
+    ],
+)
+def test_thread_scheduler_takes_first_samples(scheduler_class):
+    sample_buffer = DummySampleBuffer(
+        capacity=1, sample_data=[(0, [(0, [RawFrameData("name", "file", 1)])])]
+    )
+    scheduler = scheduler_class(sample_buffer=sample_buffer, frequency=1000)
+    assert scheduler.start_profiling()
+    # immediately stopping means by the time the sampling thread will exit
+    # before it samples at the end of the first iteration
+    assert scheduler.stop_profiling()
+    time.sleep(0.002)
+    assert len(get_scheduler_threads(scheduler)) == 0
+
+    # there should be exactly 1 sample because we always sample once immediately
+    profile = sample_buffer.slice_profile(0, 1)
+    assert len(profile["samples"]) == 1
+
+
 @minimum_python_33
-def test_sleep_scheduler_single_background_thread():
-    def sampler():
-        pass
+@pytest.mark.parametrize(
+    ("scheduler_class",),
+    [
+        pytest.param(SleepScheduler, id="sleep scheduler"),
+        pytest.param(EventScheduler, id="event scheduler"),
+    ],
+)
+def test_thread_scheduler_takes_more_samples(scheduler_class):
+    sample_buffer = DummySampleBuffer(
+        capacity=10,
+        sample_data=[(i, [(0, [RawFrameData("name", "file", 1)])]) for i in range(3)],
+    )
+    scheduler = scheduler_class(sample_buffer=sample_buffer, frequency=1000)
+    assert scheduler.start_profiling()
+    # waiting a little before stopping the scheduler means the profiling
+    # thread will get a chance to take a few samples before exiting
+    time.sleep(0.002)
+    assert scheduler.stop_profiling()
+    time.sleep(0.002)
+    assert len(get_scheduler_threads(scheduler)) == 0
+
+    # there should be more than 1 sample because we always sample once immediately
+    # plus any samples take afterwards
+    profile = sample_buffer.slice_profile(0, 3)
+    assert len(profile["samples"]) > 1
 
-    scheduler = SleepScheduler(sampler=sampler, frequency=1000)
+
+@minimum_python_33
+@pytest.mark.parametrize(
+    ("scheduler_class",),
+    [
+        pytest.param(SleepScheduler, id="sleep scheduler"),
+        pytest.param(EventScheduler, id="event scheduler"),
+    ],
+)
+def test_thread_scheduler_single_background_thread(scheduler_class):
+    sample_buffer = SampleBuffer(1)
+    scheduler = scheduler_class(sample_buffer=sample_buffer, frequency=1000)
 
     assert scheduler.start_profiling()
 

From 40131a375a73376e59eb9103584e522c9e0c16de Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Thu, 20 Oct 2022 12:58:44 +0000
Subject: [PATCH 140/209] release: 1.10.0

---
 CHANGELOG.md         | 29 +++++++++++++++++++++++++++++
 docs/conf.py         |  2 +-
 sentry_sdk/consts.py |  2 +-
 setup.py             |  2 +-
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47c02117ce..b3e2c69fa9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # Changelog
 
+## 1.10.0
+
+### Various fixes & improvements
+
+- tests(profiling): Add tests for thread schedulers (#1683) by @Zylphrex
+- fix(profiling): get_frame_name only look at arguments (#1684) by @Zylphrex
+- Add exception handling to Asyncio Integration (#1695) by @antonpirker
+- Fix asyncio task factory (#1689) by @antonpirker
+- fix(integrations): Fix http putrequest when url is None (#1693) by @MattFlower
+- asyncio integration (#1671) by @antonpirker
+- Have instrumentation for ASGI middleware receive/send callbacks. (#1673) by @antonpirker
+- Use Django internal ASGI handling from Channels version 4.0.0. (#1688) by @antonpirker
+- build(deps): bump checkouts/data-schemas from `f0a57f2` to `a214fbc` (#1627) by @dependabot
+- build(deps): bump flake8-bugbear from 22.9.11 to 22.9.23 (#1637) by @dependabot
+- Remove unused node setup from ci. (#1681) by @antonpirker
+- build(deps): bump sphinx from 5.1.1 to 5.2.3 (#1653) by @dependabot
+- build(deps): bump actions/stale from 5 to 6 (#1638) by @dependabot
+- build(deps): bump black from 22.8.0 to 22.10.0 (#1670) by @dependabot
+- ref(profiling): Rename profiling frame keys (#1680) by @Zylphrex
+- fix(profiling): Need to sample profile correctly (#1679) by @Zylphrex
+- fix(profiling): Race condition spawning multiple profiling threads (#1676) by @Zylphrex
+- feat(profiling): Extract qualified name for each frame (#1669) by @Zylphrex
+- test(profiling): Add basic profiling tests (#1677) by @Zylphrex
+- Check for Decimal is in_valid_sample_rate (#1672) by @Arvind2222
+- Include framework in SDK name (#1662) by @antonpirker
+- Unified naming for span ops (#1661) by @antonpirker
+- Add session for aiohttp integration (#1605) by @denys-pidlisnyi
+- feat(profiling): Attach thread metadata to profiles (#1660) by @Zylphrex
+
 ## 1.9.11
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 5107e0f061..20108f3525 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.9.10"
+release = "1.10.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index a0d0184a72..2cfe4f2547 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -104,7 +104,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.9.10"
+VERSION = "1.10.0"
 
 
 class OP:
diff --git a/setup.py b/setup.py
index f87a9f2104..c1695cec67 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.9.10",
+    version="1.10.0",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From 8de1aa25ae61344d0f937d5a0d6444622fb11439 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 20 Oct 2022 15:11:59 +0200
Subject: [PATCH 141/209] Updated changelog.

---
 CHANGELOG.md | 60 +++++++++++++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3e2c69fa9..1e5cb56bc3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,42 +4,10 @@
 
 ### Various fixes & improvements
 
-- tests(profiling): Add tests for thread schedulers (#1683) by @Zylphrex
-- fix(profiling): get_frame_name only look at arguments (#1684) by @Zylphrex
-- Add exception handling to Asyncio Integration (#1695) by @antonpirker
-- Fix asyncio task factory (#1689) by @antonpirker
-- fix(integrations): Fix http putrequest when url is None (#1693) by @MattFlower
-- asyncio integration (#1671) by @antonpirker
-- Have instrumentation for ASGI middleware receive/send callbacks. (#1673) by @antonpirker
-- Use Django internal ASGI handling from Channels version 4.0.0. (#1688) by @antonpirker
-- build(deps): bump checkouts/data-schemas from `f0a57f2` to `a214fbc` (#1627) by @dependabot
-- build(deps): bump flake8-bugbear from 22.9.11 to 22.9.23 (#1637) by @dependabot
-- Remove unused node setup from ci. (#1681) by @antonpirker
-- build(deps): bump sphinx from 5.1.1 to 5.2.3 (#1653) by @dependabot
-- build(deps): bump actions/stale from 5 to 6 (#1638) by @dependabot
-- build(deps): bump black from 22.8.0 to 22.10.0 (#1670) by @dependabot
-- ref(profiling): Rename profiling frame keys (#1680) by @Zylphrex
-- fix(profiling): Need to sample profile correctly (#1679) by @Zylphrex
-- fix(profiling): Race condition spawning multiple profiling threads (#1676) by @Zylphrex
-- feat(profiling): Extract qualified name for each frame (#1669) by @Zylphrex
-- test(profiling): Add basic profiling tests (#1677) by @Zylphrex
-- Check for Decimal is in_valid_sample_rate (#1672) by @Arvind2222
-- Include framework in SDK name (#1662) by @antonpirker
 - Unified naming for span ops (#1661) by @antonpirker
-- Add session for aiohttp integration (#1605) by @denys-pidlisnyi
-- feat(profiling): Attach thread metadata to profiles (#1660) by @Zylphrex
-
-## 1.9.11
-
-### Various fixes & improvements
-
-- Unified naming of span "op"s (#1643) by @antonpirker
 
-  We have unified the strings of our span operations. See https://develop.sentry.dev/sdk/performance/span-operations/
-
-  **WARNING:** If you have dashboards defined that use `transaction.op` in their fields, conditions, aggregates or columns please check them before updating to this version of the SDK.
-
-  Here a list of all the changes:
+  **WARNING**: If you have Sentry Dashboards or Sentry Discover queries that use `transaction.op` in their fields, conditions, aggregates or columns this change could potentially break your Dashboards/Discover setup.
+  Here is a list of the changes we made to the `op`s. Please adjust your dashboards and Discover queries accordingly:
 
   | Old operation (`op`)     | New Operation (`op`)   |
   | ------------------------ | ---------------------- |
@@ -59,6 +27,30 @@
   | `serverless.function`    | `function.gcp`         |
   | `starlette.middleware`   | `middleware.starlette` |
 
+- Include framework in SDK name (#1662) by @antonpirker
+- Asyncio integration (#1671) by @antonpirker
+- Add exception handling to Asyncio Integration (#1695) by @antonpirker
+- Fix asyncio task factory (#1689) by @antonpirker
+- Have instrumentation for ASGI middleware receive/send callbacks. (#1673) by @antonpirker
+- Use Django internal ASGI handling from Channels version 4.0.0. (#1688) by @antonpirker
+- fix(integrations): Fix http putrequest when url is None (#1693) by @MattFlower
+- build(deps): bump checkouts/data-schemas from `f0a57f2` to `a214fbc` (#1627) by @dependabot
+- build(deps): bump flake8-bugbear from 22.9.11 to 22.9.23 (#1637) by @dependabot
+- build(deps): bump sphinx from 5.1.1 to 5.2.3 (#1653) by @dependabot
+- build(deps): bump actions/stale from 5 to 6 (#1638) by @dependabot
+- build(deps): bump black from 22.8.0 to 22.10.0 (#1670) by @dependabot
+- Remove unused node setup from ci. (#1681) by @antonpirker
+- Check for Decimal is in_valid_sample_rate (#1672) by @Arvind2222
+- Add session for aiohttp integration (#1605) by @denys-pidlisnyi
+- feat(profiling): Extract qualified name for each frame (#1669) by @Zylphrex
+- feat(profiling): Attach thread metadata to profiles (#1660) by @Zylphrex
+- ref(profiling): Rename profiling frame keys (#1680) by @Zylphrex
+- fix(profiling): get_frame_name only look at arguments (#1684) by @Zylphrex
+- fix(profiling): Need to sample profile correctly (#1679) by @Zylphrex
+- fix(profiling): Race condition spawning multiple profiling threads (#1676) by @Zylphrex
+- tests(profiling): Add basic profiling tests (#1677) by @Zylphrex
+- tests(profiling): Add tests for thread schedulers (#1683) by @Zylphrex
+
 ## 1.9.10
 
 ### Various fixes & improvements

From 6a84a7c5f62b8b67a5553e36904fb44b08052416 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 20 Oct 2022 15:14:04 +0200
Subject: [PATCH 142/209] Added link to develop docs

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e5cb56bc3..c5548f6552 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 - Unified naming for span ops (#1661) by @antonpirker
 
+  We have unified the strings of our span operations. See https://develop.sentry.dev/sdk/performance/span-operations/
+
   **WARNING**: If you have Sentry Dashboards or Sentry Discover queries that use `transaction.op` in their fields, conditions, aggregates or columns this change could potentially break your Dashboards/Discover setup.
   Here is a list of the changes we made to the `op`s. Please adjust your dashboards and Discover queries accordingly:
 

From fdb751217c371882122d14488ecff11a63f85817 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Fri, 21 Oct 2022 14:55:07 +0200
Subject: [PATCH 143/209] The wrapped receive() did not return anything.
 (#1698)

We wrapped the receive() callback of all ASGI middleware to create spans when they where executed.
The receive() callback is used to receive message from the server.

But we forgot to return the value that the original receive() callback returns. So basically swallowing the return of the server.

Refs #1696
---
 sentry_sdk/integrations/starlette.py          |  8 ++---
 .../integrations/starlette/test_starlette.py  | 34 +++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index aaf7fb3dc4..0bcaf2602f 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -106,7 +106,7 @@ async def _sentry_receive(*args, **kwargs):
                         description=receive.__qualname__,
                     ) as span:
                         span.set_tag("starlette.middleware_name", middleware_name)
-                        await receive(*args, **kwargs)
+                        return await receive(*args, **kwargs)
 
                 receive_patched = receive.__name__ == "_sentry_receive"
                 new_receive = _sentry_receive if not receive_patched else receive
@@ -119,15 +119,15 @@ async def _sentry_send(*args, **kwargs):
                         op=OP.MIDDLEWARE_STARLETTE_SEND, description=send.__qualname__
                     ) as span:
                         span.set_tag("starlette.middleware_name", middleware_name)
-                        await send(*args, **kwargs)
+                        return await send(*args, **kwargs)
 
                 send_patched = send.__name__ == "_sentry_send"
                 new_send = _sentry_send if not send_patched else send
 
-                await old_call(app, scope, new_receive, new_send, **kwargs)
+                return await old_call(app, scope, new_receive, new_send, **kwargs)
 
         else:
-            await old_call(app, scope, receive, send, **kwargs)
+            return await old_call(app, scope, receive, send, **kwargs)
 
     not_yet_patched = old_call.__name__ not in [
         "_create_span_call",
diff --git a/tests/integrations/starlette/test_starlette.py b/tests/integrations/starlette/test_starlette.py
index 29e5916adb..713505c61d 100644
--- a/tests/integrations/starlette/test_starlette.py
+++ b/tests/integrations/starlette/test_starlette.py
@@ -174,6 +174,21 @@ async def do_stuff(message):
         await self.app(scope, receive, do_stuff)
 
 
+class SampleReceiveSendMiddleware:
+    def __init__(self, app):
+        self.app = app
+
+    async def __call__(self, scope, receive, send):
+        message = await receive()
+        assert message
+        assert message["type"] == "http.request"
+
+        send_output = await send({"type": "something-unimportant"})
+        assert send_output is None
+
+        await self.app(scope, receive, send)
+
+
 @pytest.mark.asyncio
 async def test_starlettrequestextractor_content_length(sentry_init):
     with mock.patch(
@@ -644,6 +659,25 @@ def test_middleware_callback_spans(sentry_init, capture_events):
         idx += 1
 
 
+@pytest.mark.asyncio
+async def test_middleware_receive_send(sentry_init, capture_events):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[StarletteIntegration()],
+    )
+    starlette_app = starlette_app_factory(
+        middleware=[Middleware(SampleReceiveSendMiddleware)]
+    )
+
+    client = TestClient(starlette_app, raise_server_exceptions=False)
+    try:
+        # NOTE: the assert statements checking
+        # for correct behaviour are in `SampleReceiveSendMiddleware`!
+        client.get("/message", auth=("Gabriela", "hello123"))
+    except Exception:
+        pass
+
+
 def test_last_event_id(sentry_init, capture_events):
     sentry_init(
         integrations=[StarletteIntegration()],

From 2c0ff93816f2c1901d9962def06a8e8af50072d9 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Fri, 21 Oct 2022 15:45:44 +0200
Subject: [PATCH 144/209] Bug fixes for FastAPI and Sentry SDK 1.10.0 (#1699)

Make sure receive/send callbacks can also be functools.partial objects (or other objects that are not having a __name__)

Refs #1697
---
 sentry_sdk/integrations/starlette.py          |  11 +-
 .../integrations/starlette/test_starlette.py  | 101 +++++++++++++++++-
 2 files changed, 106 insertions(+), 6 deletions(-)

diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index 0bcaf2602f..323ac64210 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -103,12 +103,13 @@ async def _sentry_receive(*args, **kwargs):
                     hub = Hub.current
                     with hub.start_span(
                         op=OP.MIDDLEWARE_STARLETTE_RECEIVE,
-                        description=receive.__qualname__,
+                        description=getattr(receive, "__qualname__", str(receive)),
                     ) as span:
                         span.set_tag("starlette.middleware_name", middleware_name)
                         return await receive(*args, **kwargs)
 
-                receive_patched = receive.__name__ == "_sentry_receive"
+                receive_name = getattr(receive, "__name__", str(receive))
+                receive_patched = receive_name == "_sentry_receive"
                 new_receive = _sentry_receive if not receive_patched else receive
 
                 # Creating spans for the "send" callback
@@ -116,12 +117,14 @@ async def _sentry_send(*args, **kwargs):
                     # type: (*Any, **Any) -> Any
                     hub = Hub.current
                     with hub.start_span(
-                        op=OP.MIDDLEWARE_STARLETTE_SEND, description=send.__qualname__
+                        op=OP.MIDDLEWARE_STARLETTE_SEND,
+                        description=getattr(send, "__qualname__", str(send)),
                     ) as span:
                         span.set_tag("starlette.middleware_name", middleware_name)
                         return await send(*args, **kwargs)
 
-                send_patched = send.__name__ == "_sentry_send"
+                send_name = getattr(send, "__name__", str(send))
+                send_patched = send_name == "_sentry_send"
                 new_send = _sentry_send if not send_patched else send
 
                 return await old_call(app, scope, new_receive, new_send, **kwargs)
diff --git a/tests/integrations/starlette/test_starlette.py b/tests/integrations/starlette/test_starlette.py
index 713505c61d..cc3b38edf5 100644
--- a/tests/integrations/starlette/test_starlette.py
+++ b/tests/integrations/starlette/test_starlette.py
@@ -1,5 +1,6 @@
 import asyncio
 import base64
+import functools
 import json
 import os
 
@@ -189,6 +190,30 @@ async def __call__(self, scope, receive, send):
         await self.app(scope, receive, send)
 
 
+class SamplePartialReceiveSendMiddleware:
+    def __init__(self, app):
+        self.app = app
+
+    async def __call__(self, scope, receive, send):
+        message = await receive()
+        assert message
+        assert message["type"] == "http.request"
+
+        send_output = await send({"type": "something-unimportant"})
+        assert send_output is None
+
+        async def my_receive(*args, **kwargs):
+            pass
+
+        async def my_send(*args, **kwargs):
+            pass
+
+        partial_receive = functools.partial(my_receive)
+        partial_send = functools.partial(my_send)
+
+        await self.app(scope, partial_receive, partial_send)
+
+
 @pytest.mark.asyncio
 async def test_starlettrequestextractor_content_length(sentry_init):
     with mock.patch(
@@ -659,8 +684,7 @@ def test_middleware_callback_spans(sentry_init, capture_events):
         idx += 1
 
 
-@pytest.mark.asyncio
-async def test_middleware_receive_send(sentry_init, capture_events):
+def test_middleware_receive_send(sentry_init, capture_events):
     sentry_init(
         traces_sample_rate=1.0,
         integrations=[StarletteIntegration()],
@@ -678,6 +702,79 @@ async def test_middleware_receive_send(sentry_init, capture_events):
         pass
 
 
+def test_middleware_partial_receive_send(sentry_init, capture_events):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[StarletteIntegration()],
+    )
+    starlette_app = starlette_app_factory(
+        middleware=[Middleware(SamplePartialReceiveSendMiddleware)]
+    )
+    events = capture_events()
+
+    client = TestClient(starlette_app, raise_server_exceptions=False)
+    try:
+        client.get("/message", auth=("Gabriela", "hello123"))
+    except Exception:
+        pass
+
+    (_, transaction_event) = events
+
+    expected = [
+        {
+            "op": "middleware.starlette",
+            "description": "ServerErrorMiddleware",
+            "tags": {"starlette.middleware_name": "ServerErrorMiddleware"},
+        },
+        {
+            "op": "middleware.starlette",
+            "description": "SamplePartialReceiveSendMiddleware",
+            "tags": {"starlette.middleware_name": "SamplePartialReceiveSendMiddleware"},
+        },
+        {
+            "op": "middleware.starlette.receive",
+            "description": "_ASGIAdapter.send..receive"
+            if STARLETTE_VERSION < (0, 21)
+            else "_TestClientTransport.handle_request..receive",
+            "tags": {"starlette.middleware_name": "ServerErrorMiddleware"},
+        },
+        {
+            "op": "middleware.starlette.send",
+            "description": "ServerErrorMiddleware.__call__.._send",
+            "tags": {"starlette.middleware_name": "SamplePartialReceiveSendMiddleware"},
+        },
+        {
+            "op": "middleware.starlette.send",
+            "description": "_ASGIAdapter.send..send"
+            if STARLETTE_VERSION < (0, 21)
+            else "_TestClientTransport.handle_request..send",
+            "tags": {"starlette.middleware_name": "ServerErrorMiddleware"},
+        },
+        {
+            "op": "middleware.starlette",
+            "description": "ExceptionMiddleware",
+            "tags": {"starlette.middleware_name": "ExceptionMiddleware"},
+        },
+        {
+            "op": "middleware.starlette.send",
+            "description": "functools.partial(.my_send at ",
+            "tags": {"starlette.middleware_name": "ExceptionMiddleware"},
+        },
+        {
+            "op": "middleware.starlette.send",
+            "description": "functools.partial(.my_send at ",
+            "tags": {"starlette.middleware_name": "ExceptionMiddleware"},
+        },
+    ]
+
+    idx = 0
+    for span in transaction_event["spans"]:
+        assert span["op"] == expected[idx]["op"]
+        assert span["description"].startswith(expected[idx]["description"])
+        assert span["tags"] == expected[idx]["tags"]
+        idx += 1
+
+
 def test_last_event_id(sentry_init, capture_events):
     sentry_init(
         integrations=[StarletteIntegration()],

From 9165a3e2476829058cab643da49709d0ee189700 Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Fri, 21 Oct 2022 14:14:26 +0000
Subject: [PATCH 145/209] release: 1.10.1

---
 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 c5548f6552..9a5853d8e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.10.1
+
+### Various fixes & improvements
+
+- Bug fixes for FastAPI and Sentry SDK 1.10.0 (#1699) by @antonpirker
+- The wrapped receive() did not return anything. (#1698) by @antonpirker
+
 ## 1.10.0
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 20108f3525..395bf125bf 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.10.0"
+release = "1.10.1"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 2cfe4f2547..c920fc8fa5 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -104,7 +104,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.10.0"
+VERSION = "1.10.1"
 
 
 class OP:
diff --git a/setup.py b/setup.py
index c1695cec67..40fa607c1f 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.10.0",
+    version="1.10.1",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From a8fdcb0f128cc7de7e52e925d88fa3e148ecb344 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Fri, 21 Oct 2022 12:42:01 -0400
Subject: [PATCH 146/209] perf(profiling): Tune the sample profile generation
 code for performance (#1694)

We noticed that generating the sample format at the end of a profile can get
rather slow and this aims to improve what we can here with minimal changes. A
few things we took advantage of to accomplish this:

- Turning the extracted stack into a tuple so it is hashable so it can be used
  as a dictionary key. This let's us check if the stack is indexed first, and
  skip indexing the frames again. This is especially effective in profiles where
  it's blocking on a network request for example, since there will be many
  identical stacks.
- Using the hash of the stack as the dictionary key. Hashing the entire stack
  can be an expensive operation since a stack can have up to 128 frames. Using
  it as a dictionary key means it needs to be rehashed each time. To avoid this,
  we pre-hash the stack and use the hash as a dictionary key which is more
  efficient.
- Convert numbers to strings ahead of time if we know have to. Values like the
  tid and elapsed since start ns needs to be sent as a string. However, many
  samples share the same value for it, and we're doing the conversion each time.
  Instead, we convert them to a string upfront and reuse it as needed in order
  to minimize unnecessary calculations.
---
 sentry_sdk/profiler.py | 71 ++++++++++++++++++++++--------------------
 tests/test_profiler.py | 42 ++++++++++++-------------
 2 files changed, 59 insertions(+), 54 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index b9fc911878..cfe7ff2494 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -45,7 +45,7 @@
     from typing_extensions import TypedDict
     import sentry_sdk.tracing
 
-    RawSampleData = Tuple[int, Sequence[Tuple[int, Sequence[RawFrameData]]]]
+    RawSampleData = Tuple[int, Sequence[Tuple[str, Sequence[RawFrameData]]]]
 
     ProcessedStack = Tuple[int, ...]
 
@@ -162,14 +162,14 @@ def extract_stack(frame, max_stack_depth=MAX_STACK_DEPTH):
         stack.append(frame)
         frame = frame.f_back
 
-    return [
+    return tuple(
         RawFrameData(
             function=get_frame_name(frame),
             abs_path=frame.f_code.co_filename,
             lineno=frame.f_lineno,
         )
         for frame in stack
-    ]
+    )
 
 
 def get_frame_name(frame):
@@ -324,7 +324,7 @@ def write(self, sample):
     def slice_profile(self, start_ns, stop_ns):
         # type: (int, int) -> ProcessedProfile
         samples = []  # type: List[ProcessedSample]
-        stacks = dict()  # type: Dict[ProcessedStack, int]
+        stacks = dict()  # type: Dict[int, int]
         stacks_list = list()  # type: List[ProcessedStack]
         frames = dict()  # type: Dict[RawFrameData, int]
         frames_list = list()  # type: List[ProcessedFrame]
@@ -334,39 +334,44 @@ def slice_profile(self, start_ns, stop_ns):
         #
         # Is it safe to assume that the samples are always in
         # chronological order and binary search the buffer?
-        for raw_sample in self.buffer:
-            if raw_sample is None:
-                continue
-
-            ts = raw_sample[0]
+        for ts, sample in filter(None, self.buffer):
             if start_ns > ts or ts > stop_ns:
                 continue
 
-            for tid, stack in raw_sample[1]:
-                current_stack = []
-
-                for frame in stack:
-                    if frame not in frames:
-                        frames[frame] = len(frames)
-                        frames_list.append(
-                            {
-                                "function": frame.function,
-                                "filename": frame.abs_path,
-                                "lineno": frame.lineno,
-                            }
-                        )
-                    current_stack.append(frames[frame])
-
-                current_stack = tuple(current_stack)
-                if current_stack not in stacks:
-                    stacks[current_stack] = len(stacks)
-                    stacks_list.append(current_stack)
+            elapsed_since_start_ns = str(ts - start_ns)
+
+            for tid, stack in sample:
+                # Instead of mapping the stack into frame ids and hashing
+                # that as a tuple, we can directly hash the stack.
+                # This saves us from having to generate yet another list.
+                # Additionally, using the stack as the key directly is
+                # costly because the stack can be large, so we pre-hash
+                # the stack, and use the hash as the key as this will be
+                # needed a few times to improve performance.
+                hashed_stack = hash(stack)
+
+                # Check if the stack is indexed first, this lets us skip
+                # indexing frames if it's not necessary
+                if hashed_stack not in stacks:
+                    for frame in stack:
+                        if frame not in frames:
+                            frames[frame] = len(frames)
+                            frames_list.append(
+                                {
+                                    "function": frame.function,
+                                    "filename": frame.abs_path,
+                                    "lineno": frame.lineno,
+                                }
+                            )
+
+                    stacks[hashed_stack] = len(stacks)
+                    stacks_list.append(tuple(frames[frame] for frame in stack))
 
                 samples.append(
                     {
-                        "elapsed_since_start_ns": str(ts - start_ns),
-                        "thread_id": str(tid),
-                        "stack_id": stacks[current_stack],
+                        "elapsed_since_start_ns": elapsed_since_start_ns,
+                        "thread_id": tid,
+                        "stack_id": stacks[hashed_stack],
                     }
                 )
 
@@ -375,7 +380,7 @@ def slice_profile(self, start_ns, stop_ns):
         # will not have any metadata associated with it.
         thread_metadata = {
             str(thread.ident): {
-                "name": thread.name,
+                "name": str(thread.name),
             }
             for thread in threading.enumerate()
         }  # type: Dict[str, ProcessedThreadMetadata]
@@ -401,7 +406,7 @@ def _sample_stack(*args, **kwargs):
                 (
                     nanosecond_time(),
                     [
-                        (tid, extract_stack(frame))
+                        (str(tid), extract_stack(frame))
                         for tid, frame in sys._current_frames().items()
                     ],
                 )
diff --git a/tests/test_profiler.py b/tests/test_profiler.py
index 963c8af298..d0d3221020 100644
--- a/tests/test_profiler.py
+++ b/tests/test_profiler.py
@@ -211,7 +211,7 @@ def _sample_stack(*args, **kwargs):
 )
 def test_thread_scheduler_takes_first_samples(scheduler_class):
     sample_buffer = DummySampleBuffer(
-        capacity=1, sample_data=[(0, [(0, [RawFrameData("name", "file", 1)])])]
+        capacity=1, sample_data=[(0, [(0, (RawFrameData("name", "file", 1),))])]
     )
     scheduler = scheduler_class(sample_buffer=sample_buffer, frequency=1000)
     assert scheduler.start_profiling()
@@ -237,7 +237,7 @@ def test_thread_scheduler_takes_first_samples(scheduler_class):
 def test_thread_scheduler_takes_more_samples(scheduler_class):
     sample_buffer = DummySampleBuffer(
         capacity=10,
-        sample_data=[(i, [(0, [RawFrameData("name", "file", 1)])]) for i in range(3)],
+        sample_data=[(i, [(0, (RawFrameData("name", "file", 1),))]) for i in range(3)],
     )
     scheduler = scheduler_class(sample_buffer=sample_buffer, frequency=1000)
     assert scheduler.start_profiling()
@@ -305,7 +305,7 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
 current_thread = threading.current_thread()
 thread_metadata = {
     str(current_thread.ident): {
-        "name": current_thread.name,
+        "name": str(current_thread.name),
     },
 }
 
@@ -330,7 +330,7 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
             10,
             0,
             1,
-            [(2, [(1, [RawFrameData("name", "file", 1)])])],
+            [(2, [("1", (RawFrameData("name", "file", 1),))])],
             {
                 "frames": [],
                 "samples": [],
@@ -343,7 +343,7 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
             10,
             0,
             1,
-            [(0, [(1, [RawFrameData("name", "file", 1)])])],
+            [(0, [("1", (RawFrameData("name", "file", 1),))])],
             {
                 "frames": [
                     {
@@ -369,8 +369,8 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
             0,
             1,
             [
-                (0, [(1, [RawFrameData("name", "file", 1)])]),
-                (1, [(1, [RawFrameData("name", "file", 1)])]),
+                (0, [("1", (RawFrameData("name", "file", 1),))]),
+                (1, [("1", (RawFrameData("name", "file", 1),))]),
             ],
             {
                 "frames": [
@@ -402,16 +402,16 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
             0,
             1,
             [
-                (0, [(1, [RawFrameData("name1", "file", 1)])]),
+                (0, [("1", (RawFrameData("name1", "file", 1),))]),
                 (
                     1,
                     [
                         (
-                            1,
-                            [
+                            "1",
+                            (
                                 RawFrameData("name1", "file", 1),
                                 RawFrameData("name2", "file", 2),
-                            ],
+                            ),
                         )
                     ],
                 ),
@@ -455,11 +455,11 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                     0,
                     [
                         (
-                            1,
-                            [
+                            "1",
+                            (
                                 RawFrameData("name1", "file", 1),
                                 RawFrameData("name2", "file", 2),
-                            ],
+                            ),
                         )
                     ],
                 ),
@@ -467,11 +467,11 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                     1,
                     [
                         (
-                            1,
-                            [
+                            "1",
+                            (
                                 RawFrameData("name3", "file", 3),
                                 RawFrameData("name4", "file", 4),
-                            ],
+                            ),
                         )
                     ],
                 ),
@@ -521,16 +521,16 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
             0,
             1,
             [
-                (0, [(1, [RawFrameData("name1", "file", 1)])]),
+                (0, [("1", (RawFrameData("name1", "file", 1),))]),
                 (
                     1,
                     [
                         (
-                            1,
-                            [
+                            "1",
+                            (
                                 RawFrameData("name2", "file", 2),
                                 RawFrameData("name3", "file", 3),
-                            ],
+                            ),
                         )
                     ],
                 ),

From fdc80247a1b3fd9ca13027f682dd16788e1b33cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 07:56:27 +0000
Subject: [PATCH 147/209] build(deps): bump checkouts/data-schemas from
 `a214fbc` to `20ff3b9` (#1703)

Bumps [checkouts/data-schemas](https://github.com/getsentry/sentry-data-schemas) from `a214fbc` to `20ff3b9`.
- [Release notes](https://github.com/getsentry/sentry-data-schemas/releases)
- [Commits](https://github.com/getsentry/sentry-data-schemas/compare/a214fbcd78f86dc36930cdf9cd0f866cc5fdb5d3...20ff3b9f53a58efc39888c2d36b51f842e8b3f58)

---
updated-dependencies:
- dependency-name: checkouts/data-schemas
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 

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 a214fbcd78..20ff3b9f53 160000
--- a/checkouts/data-schemas
+++ b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit a214fbcd78f86dc36930cdf9cd0f866cc5fdb5d3
+Subproject commit 20ff3b9f53a58efc39888c2d36b51f842e8b3f58

From 12407434d84238ce70e20d59d0678f059266c495 Mon Sep 17 00:00:00 2001
From: Vladan Paunovic 
Date: Mon, 24 Oct 2022 04:48:16 -0700
Subject: [PATCH 148/209] chore: remove jira workflow (#1707)

---
 .github/workflows/jira.yml | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 .github/workflows/jira.yml

diff --git a/.github/workflows/jira.yml b/.github/workflows/jira.yml
deleted file mode 100644
index 485915ba5e..0000000000
--- a/.github/workflows/jira.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-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 e2674d4006df4f50b82cb41405f5d78ab18a2719 Mon Sep 17 00:00:00 2001
From: Marcelo Galigniana 
Date: Thu, 27 Oct 2022 10:13:45 -0300
Subject: [PATCH 149/209] fix(utils): strip_string() checks text length
 counting bytes not chars (#1711)

The truncation and indexes in the AnnotatedValues it's done by number of bytes
and not number of characters.

Fixes GH-1691
---
 sentry_sdk/utils.py         |  2 +-
 tests/utils/test_general.py | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 9b970a307d..c000a3bd2c 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -841,7 +841,7 @@ def strip_string(value, max_length=None):
         # This is intentionally not just the default such that one can patch `MAX_STRING_LENGTH` and affect `strip_string`.
         max_length = MAX_STRING_LENGTH
 
-    length = len(value)
+    length = len(value.encode("utf-8"))
 
     if length > max_length:
         return AnnotatedValue(
diff --git a/tests/utils/test_general.py b/tests/utils/test_general.py
index b85975b4bb..f2d0069ba3 100644
--- a/tests/utils/test_general.py
+++ b/tests/utils/test_general.py
@@ -15,6 +15,8 @@
     iter_event_stacktraces,
     to_base64,
     from_base64,
+    strip_string,
+    AnnotatedValue,
 )
 from sentry_sdk._compat import text_type, string_types
 
@@ -217,3 +219,22 @@ def test_failed_base64_conversion(input):
     # failures
     if type(input) not in string_types:
         assert to_base64(input) is None
+
+
+def test_strip_string():
+    # If value is None returns None.
+    assert strip_string(None) is None
+
+    # If max_length is not passed, returns the full text (up to 1024 bytes).
+    text_1024_long = "a" * 1024
+    assert strip_string(text_1024_long).count("a") == 1024
+
+    # If value exceeds the max_length, returns an AnnotatedValue.
+    text_1025_long = "a" * 1025
+    stripped_text = strip_string(text_1025_long)
+    assert isinstance(stripped_text, AnnotatedValue)
+    assert stripped_text.value.count("a") == 1021  # + '...' is 1024
+
+    # If text has unicode characters, it counts bytes and not number of characters.
+    text_with_unicode_character = "ÊÃĒ"
+    assert strip_string(text_with_unicode_character, max_length=2).value == "Ê..."

From d196a43f0693a7a0e7dca65ca0298594d2aa3e5c Mon Sep 17 00:00:00 2001
From: Neel Shah 
Date: Wed, 2 Nov 2022 10:25:18 +0100
Subject: [PATCH 150/209] Move relay to port 5333 to avoid collisions (#1716)

* Move relay to port 5333 to avoid collisions
* Ignoring type checking for .last_token because it is present in EnhancedAST...

Co-authored-by: Anton Pirker 
---
 scripts/init_serverless_sdk.py       | 2 +-
 sentry_sdk/integrations/pure_eval.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/init_serverless_sdk.py b/scripts/init_serverless_sdk.py
index 70e28c4d92..7fc7f64d05 100644
--- a/scripts/init_serverless_sdk.py
+++ b/scripts/init_serverless_sdk.py
@@ -21,7 +21,7 @@
 def extension_relay_dsn(original_dsn):
     dsn = Dsn(original_dsn)
     dsn.host = "localhost"
-    dsn.port = 3000
+    dsn.port = 5333
     dsn.scheme = "http"
     return str(dsn)
 
diff --git a/sentry_sdk/integrations/pure_eval.py b/sentry_sdk/integrations/pure_eval.py
index 9d3fe66822..c804447796 100644
--- a/sentry_sdk/integrations/pure_eval.py
+++ b/sentry_sdk/integrations/pure_eval.py
@@ -116,7 +116,7 @@ def start(n):
             return (n.lineno, n.col_offset)
 
         nodes_before_stmt = [
-            node for node in nodes if start(node) < stmt.last_token.end
+            node for node in nodes if start(node) < stmt.last_token.end  # type: ignore
         ]
         if nodes_before_stmt:
             # The position of the last node before or in the statement

From fa1b964ec1bba362c78c2d2f9a7d158a65d6259a Mon Sep 17 00:00:00 2001
From: Agalin <6164461+Agalin@users.noreply.github.com>
Date: Fri, 4 Nov 2022 11:04:15 +0100
Subject: [PATCH 151/209] feat(pymongo): add PyMongo integration (#1590)

* feat(pymongo): add PyMongo integration

Adds breadcrumbs and performance traces for PyMongo queries using an
official monitoring API. Integration is similar to the one available in
OpenTelemetry, tags set to values recommended for attributes by OT as
specified in `Span Operations` guidelines.

Personal identifiable information (PII) will be stripped from all PyMongo commands. (This was tested in the PyMongo versions below, but "should" also be future proof)

PyMongo version selection explanation:
* 3.1 - introduction of monitoring API. Only Python 2.7 and 3.6
supported.
* 3.12 - latest 3.x release, support for 2.7, 3.6-3.9 (3.7-3.9 added in
various minor releases between 3.1 and 3.12).
* 4.0 - no support for 2.7, added support for 3.10.
* 4.1 - no support for 3.6.0-3.6.1.
* 4.2 - no support for any 3.6.

Co-authored-by: Szymon Soloch 
Co-authored-by: Anton Pirker 
---
 .../workflows/test-integration-pymongo.yml    |  62 +++
 linter-requirements.txt                       |   1 +
 sentry_sdk/integrations/pymongo.py            | 183 ++++++++
 setup.py                                      |   1 +
 tests/integrations/pymongo/__init__.py        |   3 +
 tests/integrations/pymongo/test_pymongo.py    | 419 ++++++++++++++++++
 tox.ini                                       |  14 +
 7 files changed, 683 insertions(+)
 create mode 100644 .github/workflows/test-integration-pymongo.yml
 create mode 100644 sentry_sdk/integrations/pymongo.py
 create mode 100644 tests/integrations/pymongo/__init__.py
 create mode 100644 tests/integrations/pymongo/test_pymongo.py

diff --git a/.github/workflows/test-integration-pymongo.yml b/.github/workflows/test-integration-pymongo.yml
new file mode 100644
index 0000000000..b2e82b7fb3
--- /dev/null
+++ b/.github/workflows/test-integration-pymongo.yml
@@ -0,0 +1,62 @@
+name: Test pymongo
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: pymongo, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        python-version: ["2.7","3.6","3.7","3.8","3.9","3.10"]
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        env:
+          PGHOST: localhost
+          PGPASSWORD: sentry
+        run: |
+          pip install codecov tox
+
+      - name: Test pymongo
+        env:
+          CI_PYTHON_VERSION: ${{ matrix.python-version }}
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-pymongo" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
diff --git a/linter-requirements.txt b/linter-requirements.txt
index e8ed3e36df..1b0829ae83 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -4,6 +4,7 @@ flake8==5.0.4
 types-certifi
 types-redis
 types-setuptools
+pymongo # There is no separate types module.
 flake8-bugbear==22.9.23
 pep8-naming==0.13.2
 pre-commit # local linting
diff --git a/sentry_sdk/integrations/pymongo.py b/sentry_sdk/integrations/pymongo.py
new file mode 100644
index 0000000000..ca4669ec9e
--- /dev/null
+++ b/sentry_sdk/integrations/pymongo.py
@@ -0,0 +1,183 @@
+from __future__ import absolute_import
+import copy
+
+from sentry_sdk import Hub
+from sentry_sdk.hub import _should_send_default_pii
+from sentry_sdk.integrations import DidNotEnable, Integration
+from sentry_sdk.tracing import Span
+from sentry_sdk.utils import capture_internal_exceptions
+
+from sentry_sdk._types import MYPY
+
+try:
+    from pymongo import monitoring
+except ImportError:
+    raise DidNotEnable("Pymongo not installed")
+
+if MYPY:
+    from typing import Any, Dict, Union
+
+    from pymongo.monitoring import (
+        CommandFailedEvent,
+        CommandStartedEvent,
+        CommandSucceededEvent,
+    )
+
+
+SAFE_COMMAND_ATTRIBUTES = [
+    "insert",
+    "ordered",
+    "find",
+    "limit",
+    "singleBatch",
+    "aggregate",
+    "createIndexes",
+    "indexes",
+    "delete",
+    "findAndModify",
+    "renameCollection",
+    "to",
+    "drop",
+]
+
+
+def _strip_pii(command):
+    # type: (Dict[str, Any]) -> Dict[str, Any]
+    for key in command:
+        is_safe_field = key in SAFE_COMMAND_ATTRIBUTES
+        if is_safe_field:
+            # Skip if safe key
+            continue
+
+        update_db_command = key == "update" and "findAndModify" not in command
+        if update_db_command:
+            # Also skip "update" db command because it is save.
+            # There is also an "update" key in the "findAndModify" command, which is NOT safe!
+            continue
+
+        # Special stripping for documents
+        is_document = key == "documents"
+        if is_document:
+            for doc in command[key]:
+                for doc_key in doc:
+                    doc[doc_key] = "%s"
+            continue
+
+        # Special stripping for dict style fields
+        is_dict_field = key in ["filter", "query", "update"]
+        if is_dict_field:
+            for item_key in command[key]:
+                command[key][item_key] = "%s"
+            continue
+
+        # For pipeline fields strip the `$match` dict
+        is_pipeline_field = key == "pipeline"
+        if is_pipeline_field:
+            for pipeline in command[key]:
+                for match_key in pipeline["$match"] if "$match" in pipeline else []:
+                    pipeline["$match"][match_key] = "%s"
+            continue
+
+        # Default stripping
+        command[key] = "%s"
+
+    return command
+
+
+class CommandTracer(monitoring.CommandListener):
+    def __init__(self):
+        # type: () -> None
+        self._ongoing_operations = {}  # type: Dict[int, Span]
+
+    def _operation_key(self, event):
+        # type: (Union[CommandFailedEvent, CommandStartedEvent, CommandSucceededEvent]) -> int
+        return event.request_id
+
+    def started(self, event):
+        # type: (CommandStartedEvent) -> None
+        hub = Hub.current
+        if hub.get_integration(PyMongoIntegration) is None:
+            return
+        with capture_internal_exceptions():
+            command = dict(copy.deepcopy(event.command))
+
+            command.pop("$db", None)
+            command.pop("$clusterTime", None)
+            command.pop("$signature", None)
+
+            op = "db.query"
+
+            tags = {
+                "db.name": event.database_name,
+                "db.system": "mongodb",
+                "db.operation": event.command_name,
+            }
+
+            try:
+                tags["net.peer.name"] = event.connection_id[0]
+                tags["net.peer.port"] = str(event.connection_id[1])
+            except TypeError:
+                pass
+
+            data = {"operation_ids": {}}  # type: Dict[str, Dict[str, Any]]
+
+            data["operation_ids"]["operation"] = event.operation_id
+            data["operation_ids"]["request"] = event.request_id
+
+            try:
+                lsid = command.pop("lsid")["id"]
+                data["operation_ids"]["session"] = str(lsid)
+            except KeyError:
+                pass
+
+            if not _should_send_default_pii():
+                command = _strip_pii(command)
+
+            query = "{} {}".format(event.command_name, command)
+            span = hub.start_span(op=op, description=query)
+
+            for tag, value in tags.items():
+                span.set_tag(tag, value)
+
+            for key, value in data.items():
+                span.set_data(key, value)
+
+            with capture_internal_exceptions():
+                hub.add_breadcrumb(message=query, category="query", type=op, data=tags)
+
+            self._ongoing_operations[self._operation_key(event)] = span.__enter__()
+
+    def failed(self, event):
+        # type: (CommandFailedEvent) -> None
+        hub = Hub.current
+        if hub.get_integration(PyMongoIntegration) is None:
+            return
+
+        try:
+            span = self._ongoing_operations.pop(self._operation_key(event))
+            span.set_status("internal_error")
+            span.__exit__(None, None, None)
+        except KeyError:
+            return
+
+    def succeeded(self, event):
+        # type: (CommandSucceededEvent) -> None
+        hub = Hub.current
+        if hub.get_integration(PyMongoIntegration) is None:
+            return
+
+        try:
+            span = self._ongoing_operations.pop(self._operation_key(event))
+            span.set_status("ok")
+            span.__exit__(None, None, None)
+        except KeyError:
+            pass
+
+
+class PyMongoIntegration(Integration):
+    identifier = "pymongo"
+
+    @staticmethod
+    def setup_once():
+        # type: () -> None
+        monitoring.register(CommandTracer())
diff --git a/setup.py b/setup.py
index 40fa607c1f..62f2d10eec 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@ def get_file_text(file_name):
         "httpx": ["httpx>=0.16.0"],
         "starlette": ["starlette>=0.19.1"],
         "fastapi": ["fastapi>=0.79.0"],
+        "pymongo": ["pymongo>=3.1"],
     },
     classifiers=[
         "Development Status :: 5 - Production/Stable",
diff --git a/tests/integrations/pymongo/__init__.py b/tests/integrations/pymongo/__init__.py
new file mode 100644
index 0000000000..91223b0630
--- /dev/null
+++ b/tests/integrations/pymongo/__init__.py
@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("pymongo")
diff --git a/tests/integrations/pymongo/test_pymongo.py b/tests/integrations/pymongo/test_pymongo.py
new file mode 100644
index 0000000000..16438ac971
--- /dev/null
+++ b/tests/integrations/pymongo/test_pymongo.py
@@ -0,0 +1,419 @@
+from sentry_sdk import capture_message, start_transaction
+from sentry_sdk.integrations.pymongo import PyMongoIntegration, _strip_pii
+
+from mockupdb import MockupDB, OpQuery
+from pymongo import MongoClient
+import pytest
+
+
+@pytest.fixture(scope="session")
+def mongo_server():
+    server = MockupDB(verbose=True)
+    server.autoresponds("ismaster", maxWireVersion=6)
+    server.run()
+    server.autoresponds(
+        {"find": "test_collection"}, cursor={"id": 123, "firstBatch": []}
+    )
+    # Find query changed somewhere between PyMongo 3.1 and 3.12.
+    # This line is to respond to "find" queries sent by old PyMongo the same way it's done above.
+    server.autoresponds(OpQuery({"foobar": 1}), cursor={"id": 123, "firstBatch": []})
+    server.autoresponds({"insert": "test_collection"}, ok=1)
+    server.autoresponds({"insert": "erroneous"}, ok=0, errmsg="test error")
+    yield server
+    server.stop()
+
+
+@pytest.mark.parametrize("with_pii", [False, True])
+def test_transactions(sentry_init, capture_events, mongo_server, with_pii):
+    sentry_init(
+        integrations=[PyMongoIntegration()],
+        traces_sample_rate=1.0,
+        send_default_pii=with_pii,
+    )
+    events = capture_events()
+
+    connection = MongoClient(mongo_server.uri)
+
+    with start_transaction():
+        list(
+            connection["test_db"]["test_collection"].find({"foobar": 1})
+        )  # force query execution
+        connection["test_db"]["test_collection"].insert_one({"foo": 2})
+        try:
+            connection["test_db"]["erroneous"].insert_many([{"bar": 3}, {"baz": 4}])
+            pytest.fail("Request should raise")
+        except Exception:
+            pass
+
+    (event,) = events
+    (find, insert_success, insert_fail) = event["spans"]
+
+    common_tags = {
+        "db.name": "test_db",
+        "db.system": "mongodb",
+        "net.peer.name": mongo_server.host,
+        "net.peer.port": str(mongo_server.port),
+    }
+    for span in find, insert_success, insert_fail:
+        for field, value in common_tags.items():
+            assert span["tags"][field] == value
+
+    assert find["op"] == "db.query"
+    assert insert_success["op"] == "db.query"
+    assert insert_fail["op"] == "db.query"
+
+    assert find["tags"]["db.operation"] == "find"
+    assert insert_success["tags"]["db.operation"] == "insert"
+    assert insert_fail["tags"]["db.operation"] == "insert"
+
+    assert find["description"].startswith("find {")
+    assert insert_success["description"].startswith("insert {")
+    assert insert_fail["description"].startswith("insert {")
+    if with_pii:
+        assert "1" in find["description"]
+        assert "2" in insert_success["description"]
+        assert "3" in insert_fail["description"] and "4" in insert_fail["description"]
+    else:
+        # All values in filter replaced by "%s"
+        assert "1" not in find["description"]
+        # All keys below top level replaced by "%s"
+        assert "2" not in insert_success["description"]
+        assert (
+            "3" not in insert_fail["description"]
+            and "4" not in insert_fail["description"]
+        )
+
+    assert find["tags"]["status"] == "ok"
+    assert insert_success["tags"]["status"] == "ok"
+    assert insert_fail["tags"]["status"] == "internal_error"
+
+
+@pytest.mark.parametrize("with_pii", [False, True])
+def test_breadcrumbs(sentry_init, capture_events, mongo_server, with_pii):
+    sentry_init(
+        integrations=[PyMongoIntegration()],
+        traces_sample_rate=1.0,
+        send_default_pii=with_pii,
+    )
+    events = capture_events()
+
+    connection = MongoClient(mongo_server.uri)
+
+    list(
+        connection["test_db"]["test_collection"].find({"foobar": 1})
+    )  # force query execution
+    capture_message("hi")
+
+    (event,) = events
+    (crumb,) = event["breadcrumbs"]["values"]
+
+    assert crumb["category"] == "query"
+    assert crumb["message"].startswith("find {")
+    if with_pii:
+        assert "1" in crumb["message"]
+    else:
+        assert "1" not in crumb["message"]
+    assert crumb["type"] == "db.query"
+    assert crumb["data"] == {
+        "db.name": "test_db",
+        "db.system": "mongodb",
+        "db.operation": "find",
+        "net.peer.name": mongo_server.host,
+        "net.peer.port": str(mongo_server.port),
+    }
+
+
+@pytest.mark.parametrize(
+    "testcase",
+    [
+        {
+            "command": {
+                "insert": "my_collection",
+                "ordered": True,
+                "documents": [
+                    {
+                        "username": "anton2",
+                        "email": "anton@somewhere.io",
+                        "password": "c4e86722fb56d946f7ddeecdae47e1c4458bf98a0a3ee5d5113111adf7bf0175",
+                        "_id": "635bc7403cb4f8a736f61cf2",
+                    }
+                ],
+            },
+            "command_stripped": {
+                "insert": "my_collection",
+                "ordered": True,
+                "documents": [
+                    {"username": "%s", "email": "%s", "password": "%s", "_id": "%s"}
+                ],
+            },
+        },
+        {
+            "command": {
+                "insert": "my_collection",
+                "ordered": True,
+                "documents": [
+                    {
+                        "username": "indiana4",
+                        "email": "indy@jones.org",
+                        "password": "63e86722fb56d946f7ddeecdae47e1c4458bf98a0a3ee5d5113111adf7bf016b",
+                        "_id": "635bc7403cb4f8a736f61cf3",
+                    }
+                ],
+            },
+            "command_stripped": {
+                "insert": "my_collection",
+                "ordered": True,
+                "documents": [
+                    {"username": "%s", "email": "%s", "password": "%s", "_id": "%s"}
+                ],
+            },
+        },
+        {
+            "command": {
+                "find": "my_collection",
+                "filter": {},
+                "limit": 1,
+                "singleBatch": True,
+            },
+            "command_stripped": {
+                "find": "my_collection",
+                "filter": {},
+                "limit": 1,
+                "singleBatch": True,
+            },
+        },
+        {
+            "command": {
+                "find": "my_collection",
+                "filter": {"username": "notthere"},
+                "limit": 1,
+                "singleBatch": True,
+            },
+            "command_stripped": {
+                "find": "my_collection",
+                "filter": {"username": "%s"},
+                "limit": 1,
+                "singleBatch": True,
+            },
+        },
+        {
+            "command": {
+                "insert": "my_collection",
+                "ordered": True,
+                "documents": [
+                    {
+                        "username": "userx1",
+                        "email": "x@somewhere.io",
+                        "password": "ccc86722fb56d946f7ddeecdae47e1c4458bf98a0a3ee5d5113111adf7bf0175",
+                        "_id": "635bc7403cb4f8a736f61cf4",
+                    },
+                    {
+                        "username": "userx2",
+                        "email": "x@somewhere.io",
+                        "password": "xxx86722fb56d946f7ddeecdae47e1c4458bf98a0a3ee5d5113111adf7bf0175",
+                        "_id": "635bc7403cb4f8a736f61cf5",
+                    },
+                ],
+            },
+            "command_stripped": {
+                "insert": "my_collection",
+                "ordered": True,
+                "documents": [
+                    {"username": "%s", "email": "%s", "password": "%s", "_id": "%s"},
+                    {"username": "%s", "email": "%s", "password": "%s", "_id": "%s"},
+                ],
+            },
+        },
+        {
+            "command": {
+                "find": "my_collection",
+                "filter": {"email": "ada@lovelace.com"},
+            },
+            "command_stripped": {"find": "my_collection", "filter": {"email": "%s"}},
+        },
+        {
+            "command": {
+                "aggregate": "my_collection",
+                "pipeline": [{"$match": {}}, {"$group": {"_id": 1, "n": {"$sum": 1}}}],
+                "cursor": {},
+            },
+            "command_stripped": {
+                "aggregate": "my_collection",
+                "pipeline": [{"$match": {}}, {"$group": {"_id": 1, "n": {"$sum": 1}}}],
+                "cursor": "%s",
+            },
+        },
+        {
+            "command": {
+                "aggregate": "my_collection",
+                "pipeline": [
+                    {"$match": {"email": "x@somewhere.io"}},
+                    {"$group": {"_id": 1, "n": {"$sum": 1}}},
+                ],
+                "cursor": {},
+            },
+            "command_stripped": {
+                "aggregate": "my_collection",
+                "pipeline": [
+                    {"$match": {"email": "%s"}},
+                    {"$group": {"_id": 1, "n": {"$sum": 1}}},
+                ],
+                "cursor": "%s",
+            },
+        },
+        {
+            "command": {
+                "createIndexes": "my_collection",
+                "indexes": [{"name": "username_1", "key": [("username", 1)]}],
+            },
+            "command_stripped": {
+                "createIndexes": "my_collection",
+                "indexes": [{"name": "username_1", "key": [("username", 1)]}],
+            },
+        },
+        {
+            "command": {
+                "update": "my_collection",
+                "ordered": True,
+                "updates": [
+                    ("q", {"email": "anton@somewhere.io"}),
+                    (
+                        "u",
+                        {
+                            "email": "anton2@somwehre.io",
+                            "extra_field": "extra_content",
+                            "new": "bla",
+                        },
+                    ),
+                    ("multi", False),
+                    ("upsert", False),
+                ],
+            },
+            "command_stripped": {
+                "update": "my_collection",
+                "ordered": True,
+                "updates": "%s",
+            },
+        },
+        {
+            "command": {
+                "update": "my_collection",
+                "ordered": True,
+                "updates": [
+                    ("q", {"email": "anton2@somwehre.io"}),
+                    ("u", {"$rename": {"new": "new_field"}}),
+                    ("multi", False),
+                    ("upsert", False),
+                ],
+            },
+            "command_stripped": {
+                "update": "my_collection",
+                "ordered": True,
+                "updates": "%s",
+            },
+        },
+        {
+            "command": {
+                "update": "my_collection",
+                "ordered": True,
+                "updates": [
+                    ("q", {"email": "x@somewhere.io"}),
+                    ("u", {"$rename": {"password": "pwd"}}),
+                    ("multi", True),
+                    ("upsert", False),
+                ],
+            },
+            "command_stripped": {
+                "update": "my_collection",
+                "ordered": True,
+                "updates": "%s",
+            },
+        },
+        {
+            "command": {
+                "delete": "my_collection",
+                "ordered": True,
+                "deletes": [("q", {"username": "userx2"}), ("limit", 1)],
+            },
+            "command_stripped": {
+                "delete": "my_collection",
+                "ordered": True,
+                "deletes": "%s",
+            },
+        },
+        {
+            "command": {
+                "delete": "my_collection",
+                "ordered": True,
+                "deletes": [("q", {"email": "xplus@somewhere.io"}), ("limit", 0)],
+            },
+            "command_stripped": {
+                "delete": "my_collection",
+                "ordered": True,
+                "deletes": "%s",
+            },
+        },
+        {
+            "command": {
+                "findAndModify": "my_collection",
+                "query": {"email": "ada@lovelace.com"},
+                "new": False,
+                "remove": True,
+            },
+            "command_stripped": {
+                "findAndModify": "my_collection",
+                "query": {"email": "%s"},
+                "new": "%s",
+                "remove": "%s",
+            },
+        },
+        {
+            "command": {
+                "findAndModify": "my_collection",
+                "query": {"email": "anton2@somewhere.io"},
+                "new": False,
+                "update": {"email": "anton3@somwehre.io", "extra_field": "xxx"},
+                "upsert": False,
+            },
+            "command_stripped": {
+                "findAndModify": "my_collection",
+                "query": {"email": "%s"},
+                "new": "%s",
+                "update": {"email": "%s", "extra_field": "%s"},
+                "upsert": "%s",
+            },
+        },
+        {
+            "command": {
+                "findAndModify": "my_collection",
+                "query": {"email": "anton3@somewhere.io"},
+                "new": False,
+                "update": {"$rename": {"extra_field": "extra_field2"}},
+                "upsert": False,
+            },
+            "command_stripped": {
+                "findAndModify": "my_collection",
+                "query": {"email": "%s"},
+                "new": "%s",
+                "update": {"$rename": "%s"},
+                "upsert": "%s",
+            },
+        },
+        {
+            "command": {
+                "renameCollection": "test.my_collection",
+                "to": "test.new_collection",
+            },
+            "command_stripped": {
+                "renameCollection": "test.my_collection",
+                "to": "test.new_collection",
+            },
+        },
+        {
+            "command": {"drop": "new_collection"},
+            "command_stripped": {"drop": "new_collection"},
+        },
+    ],
+)
+def test_strip_pii(testcase):
+    assert _strip_pii(testcase["command"]) == testcase["command_stripped"]
diff --git a/tox.ini b/tox.ini
index 8b19296671..2067ff8916 100644
--- a/tox.ini
+++ b/tox.ini
@@ -96,6 +96,11 @@ envlist =
 
     {py3.6,py3.7,py3.8,py3.9,py3.10}-httpx-{0.16,0.17}
 
+    {py2.7,py3.6}-pymongo-{3.1}
+    {py2.7,py3.6,py3.7,py3.8,py3.9}-pymongo-{3.12}
+    {py3.6,py3.7,py3.8,py3.9,py3.10}-pymongo-{4.0}
+    {py3.7,py3.8,py3.9,py3.10}-pymongo-{4.1,4.2}
+
 [testenv]
 deps =
     # if you change test-requirements.txt and your change is not being reflected
@@ -280,6 +285,13 @@ deps =
     httpx-0.16: httpx>=0.16,<0.17
     httpx-0.17: httpx>=0.17,<0.18
 
+    pymongo: mockupdb
+    pymongo-3.1: pymongo>=3.1,<3.2
+    pymongo-3.12: pymongo>=3.12,<4.0
+    pymongo-4.0: pymongo>=4.0,<4.1
+    pymongo-4.1: pymongo>=4.1,<4.2
+    pymongo-4.2: pymongo>=4.2,<4.3
+
 setenv =
     PYTHONDONTWRITEBYTECODE=1
     TESTPATH=tests
@@ -309,6 +321,7 @@ setenv =
     chalice: TESTPATH=tests/integrations/chalice
     boto3: TESTPATH=tests/integrations/boto3
     httpx: TESTPATH=tests/integrations/httpx
+    pymongo: TESTPATH=tests/integrations/pymongo
 
     COVERAGE_FILE=.coverage-{envname}
 passenv =
@@ -324,6 +337,7 @@ extras =
     bottle: bottle
     falcon: falcon
     quart: quart
+    pymongo: pymongo
 
 basepython =
     py2.7: python2.7

From 76b413a7b109c76df8100f0aea64699fd568226e Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Fri, 4 Nov 2022 17:58:45 +0100
Subject: [PATCH 152/209] Performance optimizations (#1725)

* Made function faster
---
 sentry_sdk/_compat.py                              |  1 +
 sentry_sdk/integrations/django/signals_handlers.py | 10 +++++++---
 test-requirements.txt                              |  3 ++-
 tests/integrations/django/test_basic.py            |  7 +++++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/sentry_sdk/_compat.py b/sentry_sdk/_compat.py
index 2061774464..f8c579e984 100644
--- a/sentry_sdk/_compat.py
+++ b/sentry_sdk/_compat.py
@@ -15,6 +15,7 @@
 PY2 = sys.version_info[0] == 2
 PY33 = sys.version_info[0] == 3 and sys.version_info[1] >= 3
 PY37 = sys.version_info[0] == 3 and sys.version_info[1] >= 7
+PY310 = sys.version_info[0] == 3 and sys.version_info[1] >= 10
 
 if PY2:
     import urlparse
diff --git a/sentry_sdk/integrations/django/signals_handlers.py b/sentry_sdk/integrations/django/signals_handlers.py
index e207a4b711..3f58cc3329 100644
--- a/sentry_sdk/integrations/django/signals_handlers.py
+++ b/sentry_sdk/integrations/django/signals_handlers.py
@@ -19,13 +19,17 @@ def _get_receiver_name(receiver):
     name = ""
 
     if hasattr(receiver, "__qualname__"):
-        name += receiver.__qualname__
+        name = receiver.__qualname__
     elif hasattr(receiver, "__name__"):  # Python 2.7 has no __qualname__
-        name += receiver.__name__
+        name = receiver.__name__
+    elif hasattr(
+        receiver, "func"
+    ):  # certain functions (like partials) dont have a name
+        name = "partial()"  # type: ignore
 
     if (
         name == ""
-    ):  # certain functions (like partials) dont have a name so return the string representation
+    ):  # In case nothing was found, return the string representation (this is the slowest case)
         return str(receiver)
 
     if hasattr(receiver, "__module__"):  # prepend with module, if there is one
diff --git a/test-requirements.txt b/test-requirements.txt
index 74332d9629..4c40e801bf 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,4 +10,5 @@ Werkzeug<2.1.0
 jsonschema==3.2.0
 pyrsistent==0.16.0 # TODO(py3): 0.17.0 requires python3, see https://github.com/tobgu/pyrsistent/issues/205
 executing
-asttokens
\ No newline at end of file
+asttokens
+ipdb
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index bb99b92f94..fc2783fb5c 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -16,7 +16,7 @@
 except ImportError:
     from django.core.urlresolvers import reverse
 
-from sentry_sdk._compat import PY2
+from sentry_sdk._compat import PY2, PY310
 from sentry_sdk import capture_message, capture_exception, configure_scope
 from sentry_sdk.integrations.django import DjangoIntegration
 from sentry_sdk.integrations.django.signals_handlers import _get_receiver_name
@@ -834,4 +834,7 @@ def dummy(a, b):
 
     a_partial = partial(dummy)
     name = _get_receiver_name(a_partial)
-    assert name == str(a_partial)
+    if PY310:
+        assert name == "functools.partial()"
+    else:
+        assert name == "partial()"

From f3f2eb007f00f2ee61d1b43e81326037bb1353e1 Mon Sep 17 00:00:00 2001
From: "Matt Gaunt-Seo @ Sentry.io"
 <112419115+mattgauntseo-sentry@users.noreply.github.com>
Date: Mon, 7 Nov 2022 05:46:09 -0800
Subject: [PATCH 153/209] Update actions/upload-artifact to v3.1.1 (#1718)

Update actions/upload-artifact to v3.1.1

Co-authored-by: Anton Pirker 
---
 .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 ab698b7d04..45e26fbf21 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,7 +103,7 @@ jobs:
           make apidocs
           cd docs/_build && zip -r gh-pages ./
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3.1.1
         with:
           name: ${{ github.sha }}
           path: docs/_build/gh-pages.zip

From d8a69fde7a86004937df61444b4b90b5084beb05 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Tue, 8 Nov 2022 09:28:42 -0500
Subject: [PATCH 154/209] feat(profiling): Extract more frame info (#1702)

This extracts a little more information around the frame that we'll use to improve the visualization/groupings including
- in_app
- module
---
 sentry_sdk/client.py   |   2 +-
 sentry_sdk/profiler.py |  62 +++++++++----
 tests/test_profiler.py | 194 +++++++++++++++++++++++++++++++++++------
 3 files changed, 214 insertions(+), 44 deletions(-)

diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 02741a2f10..bf1e483634 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -429,7 +429,7 @@ def capture_event(
 
             if is_transaction:
                 if profile is not None:
-                    envelope.add_profile(profile.to_json(event_opt))
+                    envelope.add_profile(profile.to_json(event_opt, self.options))
                 envelope.add_transaction(event_opt)
             else:
                 envelope.add_event(event_opt)
diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index cfe7ff2494..dbb6df53ce 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -13,6 +13,7 @@
 """
 
 import atexit
+import os
 import platform
 import random
 import signal
@@ -27,9 +28,15 @@
 from sentry_sdk._compat import PY33
 from sentry_sdk._queue import Queue
 from sentry_sdk._types import MYPY
-from sentry_sdk.utils import nanosecond_time
+from sentry_sdk.utils import (
+    filename_for_module,
+    handle_in_app_impl,
+    nanosecond_time,
+)
 
-RawFrameData = namedtuple("RawFrameData", ["function", "abs_path", "lineno"])
+RawFrameData = namedtuple(
+    "RawFrameData", ["abs_path", "filename", "function", "lineno", "module"]
+)
 
 if MYPY:
     from types import FrameType
@@ -61,9 +68,11 @@
     ProcessedFrame = TypedDict(
         "ProcessedFrame",
         {
+            "abs_path": str,
+            "filename": Optional[str],
             "function": str,
-            "filename": str,
             "lineno": int,
+            "module": Optional[str],
         },
     )
 
@@ -162,13 +171,24 @@ def extract_stack(frame, max_stack_depth=MAX_STACK_DEPTH):
         stack.append(frame)
         frame = frame.f_back
 
-    return tuple(
-        RawFrameData(
-            function=get_frame_name(frame),
-            abs_path=frame.f_code.co_filename,
-            lineno=frame.f_lineno,
-        )
-        for frame in stack
+    return tuple(extract_frame(frame) for frame in stack)
+
+
+def extract_frame(frame):
+    # type: (FrameType) -> RawFrameData
+    abs_path = frame.f_code.co_filename
+
+    try:
+        module = frame.f_globals["__name__"]
+    except Exception:
+        module = None
+
+    return RawFrameData(
+        abs_path=os.path.abspath(abs_path),
+        filename=filename_for_module(module, abs_path) or None,
+        function=get_frame_name(frame),
+        lineno=frame.f_lineno,
+        module=module,
     )
 
 
@@ -243,18 +263,24 @@ def __exit__(self, ty, value, tb):
         self.scheduler.stop_profiling()
         self._stop_ns = nanosecond_time()
 
-    def to_json(self, event_opt):
-        # type: (Any) -> Dict[str, Any]
+    def to_json(self, event_opt, options):
+        # type: (Any, Dict[str, Any]) -> Dict[str, Any]
         assert self._start_ns is not None
         assert self._stop_ns is not None
 
+        profile = self.scheduler.sample_buffer.slice_profile(
+            self._start_ns, self._stop_ns
+        )
+
+        handle_in_app_impl(
+            profile["frames"], options["in_app_exclude"], options["in_app_include"]
+        )
+
         return {
             "environment": event_opt.get("environment"),
             "event_id": uuid.uuid4().hex,
             "platform": "python",
-            "profile": self.scheduler.sample_buffer.slice_profile(
-                self._start_ns, self._stop_ns
-            ),
+            "profile": profile,
             "release": event_opt.get("release", ""),
             "timestamp": event_opt["timestamp"],
             "version": "1",
@@ -358,9 +384,11 @@ def slice_profile(self, start_ns, stop_ns):
                             frames[frame] = len(frames)
                             frames_list.append(
                                 {
-                                    "function": frame.function,
-                                    "filename": frame.abs_path,
+                                    "abs_path": frame.abs_path,
+                                    "function": frame.function or "",
+                                    "filename": frame.filename,
                                     "lineno": frame.lineno,
+                                    "module": frame.module,
                                 }
                             )
 
diff --git a/tests/test_profiler.py b/tests/test_profiler.py
index d0d3221020..11e92630cf 100644
--- a/tests/test_profiler.py
+++ b/tests/test_profiler.py
@@ -211,7 +211,22 @@ def _sample_stack(*args, **kwargs):
 )
 def test_thread_scheduler_takes_first_samples(scheduler_class):
     sample_buffer = DummySampleBuffer(
-        capacity=1, sample_data=[(0, [(0, (RawFrameData("name", "file", 1),))])]
+        capacity=1,
+        sample_data=[
+            (
+                0,
+                [
+                    (
+                        0,
+                        (
+                            RawFrameData(
+                                "/path/to/file.py", "file.py", "name", 1, "file"
+                            ),
+                        ),
+                    )
+                ],
+            )
+        ],
     )
     scheduler = scheduler_class(sample_buffer=sample_buffer, frequency=1000)
     assert scheduler.start_profiling()
@@ -237,7 +252,22 @@ def test_thread_scheduler_takes_first_samples(scheduler_class):
 def test_thread_scheduler_takes_more_samples(scheduler_class):
     sample_buffer = DummySampleBuffer(
         capacity=10,
-        sample_data=[(i, [(0, (RawFrameData("name", "file", 1),))]) for i in range(3)],
+        sample_data=[
+            (
+                i,
+                [
+                    (
+                        0,
+                        (
+                            RawFrameData(
+                                "/path/to/file.py", "file.py", "name", 1, "file"
+                            ),
+                        ),
+                    )
+                ],
+            )
+            for i in range(3)
+        ],
     )
     scheduler = scheduler_class(sample_buffer=sample_buffer, frequency=1000)
     assert scheduler.start_profiling()
@@ -330,7 +360,21 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
             10,
             0,
             1,
-            [(2, [("1", (RawFrameData("name", "file", 1),))])],
+            [
+                (
+                    2,
+                    [
+                        (
+                            "1",
+                            (
+                                RawFrameData(
+                                    "/path/to/file.py", "file.py", "name", 1, "file"
+                                ),
+                            ),
+                        )
+                    ],
+                )
+            ],
             {
                 "frames": [],
                 "samples": [],
@@ -343,13 +387,29 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
             10,
             0,
             1,
-            [(0, [("1", (RawFrameData("name", "file", 1),))])],
+            [
+                (
+                    0,
+                    [
+                        (
+                            "1",
+                            (
+                                RawFrameData(
+                                    "/path/to/file.py", "file.py", "name", 1, "file"
+                                ),
+                            ),
+                        )
+                    ],
+                )
+            ],
             {
                 "frames": [
                     {
+                        "abs_path": "/path/to/file.py",
                         "function": "name",
-                        "filename": "file",
+                        "filename": "file.py",
                         "lineno": 1,
+                        "module": "file",
                     },
                 ],
                 "samples": [
@@ -369,15 +429,41 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
             0,
             1,
             [
-                (0, [("1", (RawFrameData("name", "file", 1),))]),
-                (1, [("1", (RawFrameData("name", "file", 1),))]),
+                (
+                    0,
+                    [
+                        (
+                            "1",
+                            (
+                                RawFrameData(
+                                    "/path/to/file.py", "file.py", "name", 1, "file"
+                                ),
+                            ),
+                        )
+                    ],
+                ),
+                (
+                    1,
+                    [
+                        (
+                            "1",
+                            (
+                                RawFrameData(
+                                    "/path/to/file.py", "file.py", "name", 1, "file"
+                                ),
+                            ),
+                        )
+                    ],
+                ),
             ],
             {
                 "frames": [
                     {
+                        "abs_path": "/path/to/file.py",
                         "function": "name",
-                        "filename": "file",
+                        "filename": "file.py",
                         "lineno": 1,
+                        "module": "file",
                     },
                 ],
                 "samples": [
@@ -402,15 +488,31 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
             0,
             1,
             [
-                (0, [("1", (RawFrameData("name1", "file", 1),))]),
+                (
+                    0,
+                    [
+                        (
+                            "1",
+                            (
+                                RawFrameData(
+                                    "/path/to/file.py", "file.py", "name1", 1, "file"
+                                ),
+                            ),
+                        )
+                    ],
+                ),
                 (
                     1,
                     [
                         (
                             "1",
                             (
-                                RawFrameData("name1", "file", 1),
-                                RawFrameData("name2", "file", 2),
+                                RawFrameData(
+                                    "/path/to/file.py", "file.py", "name1", 1, "file"
+                                ),
+                                RawFrameData(
+                                    "/path/to/file.py", "file.py", "name2", 2, "file"
+                                ),
                             ),
                         )
                     ],
@@ -419,14 +521,18 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
             {
                 "frames": [
                     {
+                        "abs_path": "/path/to/file.py",
                         "function": "name1",
-                        "filename": "file",
+                        "filename": "file.py",
                         "lineno": 1,
+                        "module": "file",
                     },
                     {
+                        "abs_path": "/path/to/file.py",
                         "function": "name2",
-                        "filename": "file",
+                        "filename": "file.py",
                         "lineno": 2,
+                        "module": "file",
                     },
                 ],
                 "samples": [
@@ -457,8 +563,12 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                         (
                             "1",
                             (
-                                RawFrameData("name1", "file", 1),
-                                RawFrameData("name2", "file", 2),
+                                RawFrameData(
+                                    "/path/to/file.py", "file.py", "name1", 1, "file"
+                                ),
+                                RawFrameData(
+                                    "/path/to/file.py", "file.py", "name2", 2, "file"
+                                ),
                             ),
                         )
                     ],
@@ -469,8 +579,12 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                         (
                             "1",
                             (
-                                RawFrameData("name3", "file", 3),
-                                RawFrameData("name4", "file", 4),
+                                RawFrameData(
+                                    "/path/to/file.py", "file.py", "name3", 3, "file"
+                                ),
+                                RawFrameData(
+                                    "/path/to/file.py", "file.py", "name4", 4, "file"
+                                ),
                             ),
                         )
                     ],
@@ -479,24 +593,32 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
             {
                 "frames": [
                     {
+                        "abs_path": "/path/to/file.py",
                         "function": "name1",
-                        "filename": "file",
+                        "filename": "file.py",
                         "lineno": 1,
+                        "module": "file",
                     },
                     {
+                        "abs_path": "/path/to/file.py",
                         "function": "name2",
-                        "filename": "file",
+                        "filename": "file.py",
                         "lineno": 2,
+                        "module": "file",
                     },
                     {
+                        "abs_path": "/path/to/file.py",
                         "function": "name3",
-                        "filename": "file",
+                        "filename": "file.py",
                         "lineno": 3,
+                        "module": "file",
                     },
                     {
+                        "abs_path": "/path/to/file.py",
                         "function": "name4",
-                        "filename": "file",
+                        "filename": "file.py",
                         "lineno": 4,
+                        "module": "file",
                     },
                 ],
                 "samples": [
@@ -521,15 +643,31 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
             0,
             1,
             [
-                (0, [("1", (RawFrameData("name1", "file", 1),))]),
+                (
+                    0,
+                    [
+                        (
+                            "1",
+                            (
+                                RawFrameData(
+                                    "/path/to/file.py", "file.py", "name1", 1, "file"
+                                ),
+                            ),
+                        )
+                    ],
+                ),
                 (
                     1,
                     [
                         (
                             "1",
                             (
-                                RawFrameData("name2", "file", 2),
-                                RawFrameData("name3", "file", 3),
+                                RawFrameData(
+                                    "/path/to/file.py", "file.py", "name2", 2, "file"
+                                ),
+                                RawFrameData(
+                                    "/path/to/file.py", "file.py", "name3", 3, "file"
+                                ),
                             ),
                         )
                     ],
@@ -538,14 +676,18 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
             {
                 "frames": [
                     {
+                        "abs_path": "/path/to/file.py",
                         "function": "name2",
-                        "filename": "file",
+                        "filename": "file.py",
                         "lineno": 2,
+                        "module": "file",
                     },
                     {
+                        "abs_path": "/path/to/file.py",
                         "function": "name3",
-                        "filename": "file",
+                        "filename": "file.py",
                         "lineno": 3,
+                        "module": "file",
                     },
                 ],
                 "samples": [

From e6238d828e11d63833b9a1400aaf8286b05d1c02 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Tue, 8 Nov 2022 12:28:38 -0500
Subject: [PATCH 155/209] ref(profiling): Use sleep scheduler by default
 (#1729)

The sleep scheduler is the most reliable of the available schedulers, make it
the default.
---
 sentry_sdk/profiler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index dbb6df53ce..68705cd5bc 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -121,7 +121,7 @@ def setup_profiler(options):
     # a capcity of `buffer_secs * frequency`.
     _sample_buffer = SampleBuffer(capacity=buffer_secs * frequency)
 
-    profiler_mode = options["_experiments"].get("profiler_mode", SigprofScheduler.mode)
+    profiler_mode = options["_experiments"].get("profiler_mode", SleepScheduler.mode)
     if profiler_mode == SigprofScheduler.mode:
         _scheduler = SigprofScheduler(sample_buffer=_sample_buffer, frequency=frequency)
     elif profiler_mode == SigalrmScheduler.mode:

From 0923d031e3b60f1286aa91038b17d522db05e145 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Wed, 9 Nov 2022 11:50:23 -0500
Subject: [PATCH 156/209] ref(profiling): Do not error if already setup (#1731)

We currently error if profiling is already setup which can be error prone
depending on the end user's setup. This change ensures that we only setup
profiling once and once setup, it's reused.
---
 sentry_sdk/profiler.py | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 68705cd5bc..28e96016ca 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -31,6 +31,7 @@
 from sentry_sdk.utils import (
     filename_for_module,
     handle_in_app_impl,
+    logger,
     nanosecond_time,
 )
 
@@ -92,7 +93,6 @@
     )
 
 
-_sample_buffer = None  # type: Optional[SampleBuffer]
 _scheduler = None  # type: Optional[Scheduler]
 
 
@@ -103,33 +103,33 @@ def setup_profiler(options):
     `buffer_secs` determines the max time a sample will be buffered for
     `frequency` determines the number of samples to take per second (Hz)
     """
-    buffer_secs = 30
-    frequency = 101
 
-    if not PY33:
-        from sentry_sdk.utils import logger
+    global _scheduler
 
-        logger.warn("profiling is only supported on Python >= 3.3")
+    if _scheduler is not None:
+        logger.debug("profiling is already setup")
         return
 
-    global _sample_buffer
-    global _scheduler
+    if not PY33:
+        logger.warn("profiling is only supported on Python >= 3.3")
+        return
 
-    assert _sample_buffer is None and _scheduler is None
+    buffer_secs = 30
+    frequency = 101
 
     # To buffer samples for `buffer_secs` at `frequency` Hz, we need
     # a capcity of `buffer_secs * frequency`.
-    _sample_buffer = SampleBuffer(capacity=buffer_secs * frequency)
+    buffer = SampleBuffer(capacity=buffer_secs * frequency)
 
     profiler_mode = options["_experiments"].get("profiler_mode", SleepScheduler.mode)
     if profiler_mode == SigprofScheduler.mode:
-        _scheduler = SigprofScheduler(sample_buffer=_sample_buffer, frequency=frequency)
+        _scheduler = SigprofScheduler(sample_buffer=buffer, frequency=frequency)
     elif profiler_mode == SigalrmScheduler.mode:
-        _scheduler = SigalrmScheduler(sample_buffer=_sample_buffer, frequency=frequency)
+        _scheduler = SigalrmScheduler(sample_buffer=buffer, frequency=frequency)
     elif profiler_mode == SleepScheduler.mode:
-        _scheduler = SleepScheduler(sample_buffer=_sample_buffer, frequency=frequency)
+        _scheduler = SleepScheduler(sample_buffer=buffer, frequency=frequency)
     elif profiler_mode == EventScheduler.mode:
-        _scheduler = EventScheduler(sample_buffer=_sample_buffer, frequency=frequency)
+        _scheduler = EventScheduler(sample_buffer=buffer, frequency=frequency)
     else:
         raise ValueError("Unknown profiler mode: {}".format(profiler_mode))
     _scheduler.setup()
@@ -140,13 +140,11 @@ def setup_profiler(options):
 def teardown_profiler():
     # type: () -> None
 
-    global _sample_buffer
     global _scheduler
 
     if _scheduler is not None:
         _scheduler.teardown()
 
-    _sample_buffer = None
     _scheduler = None
 
 
@@ -728,7 +726,7 @@ def _should_profile(transaction, hub):
         return False
 
     # The profiler hasn't been properly initialized.
-    if _sample_buffer is None or _scheduler is None:
+    if _scheduler is None:
         return False
 
     hub = hub or sentry_sdk.Hub.current

From f222c9df63c62b82dcacb2f1d9823d8616a4195f Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 10 Nov 2022 13:27:21 +0100
Subject: [PATCH 157/209] Fix reading FastAPI request body twice.  (#1724)

Starlette/FastAPI is internally caching the request body if read via request.json() or request.body() but NOT when using request.form(). This leads to a problem when our Sentry Starlette integration wants to read the body data and also the users code wants to read the same data.

Solution:
Force caching of request body for .form() calls too, to prevent error when body is read twice.

The tests where mocking .stream() and thus hiding this problem. So the tests have been refactored to mock the underlying ._receive() function instead.

Co-authored-by: hasier 
---
 sentry_sdk/integrations/starlette.py          |  98 ++++----
 .../integrations/starlette/test_starlette.py  | 221 +++++++++---------
 2 files changed, 159 insertions(+), 160 deletions(-)

diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index 323ac64210..109b048bd3 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -22,7 +22,7 @@
 )
 
 if MYPY:
-    from typing import Any, Awaitable, Callable, Dict, Optional, Union
+    from typing import Any, Awaitable, Callable, Dict, Optional
 
     from sentry_sdk._types import Event
 
@@ -367,10 +367,10 @@ def _make_request_event_processor(req, integration):
                         def event_processor(event, hint):
                             # type: (Dict[str, Any], Dict[str, Any]) -> Dict[str, Any]
 
-                            # Extract information from request
+                            # Add info from request to event
                             request_info = event.get("request", {})
                             if info:
-                                if "cookies" in info and _should_send_default_pii():
+                                if "cookies" in info:
                                     request_info["cookies"] = info["cookies"]
                                 if "data" in info:
                                     request_info["data"] = info["data"]
@@ -473,30 +473,46 @@ async def extract_request_info(self):
         request_info = {}  # type: Dict[str, Any]
 
         with capture_internal_exceptions():
+            # Add cookies
             if _should_send_default_pii():
                 request_info["cookies"] = self.cookies()
 
+            # If there is no body, just return the cookies
             content_length = await self.content_length()
-
-            if content_length:
-                data = None  # type: Union[Dict[str, Any], AnnotatedValue, None]
-
-                if not request_body_within_bounds(client, content_length):
-                    data = AnnotatedValue.removed_because_over_size_limit()
-
-                else:
-                    parsed_body = await self.parsed_body()
-                    if parsed_body is not None:
-                        data = parsed_body
-                    elif await self.raw_data():
-                        data = AnnotatedValue.removed_because_raw_data()
-                    else:
-                        data = None
-
-                if data is not None:
-                    request_info["data"] = data
-
-        return request_info
+            if not content_length:
+                return request_info
+
+            # Add annotation if body is too big
+            if content_length and not request_body_within_bounds(
+                client, content_length
+            ):
+                request_info["data"] = AnnotatedValue.removed_because_over_size_limit()
+                return request_info
+
+            # Add JSON body, if it is a JSON request
+            json = await self.json()
+            if json:
+                request_info["data"] = json
+                return request_info
+
+            # Add form as key/value pairs, if request has form data
+            form = await self.form()
+            if form:
+                form_data = {}
+                for key, val in iteritems(form):
+                    is_file = isinstance(val, UploadFile)
+                    form_data[key] = (
+                        val
+                        if not is_file
+                        else AnnotatedValue.removed_because_raw_data()
+                    )
+
+                request_info["data"] = form_data
+                return request_info
+
+            # Raw data, do not add body just an annotation
+            request_info["data"] = AnnotatedValue.removed_because_raw_data()
+            return request_info
 
     async def content_length(self):
         # type: (StarletteRequestExtractor) -> Optional[int]
@@ -509,19 +525,17 @@ 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
-        """
         if multipart is None:
             return None
 
+        # Parse the body first to get it cached, as Starlette does not cache form() as it
+        # does with body() and json() https://github.com/encode/starlette/discussions/1933
+        # Calling `.form()` without calling `.body()` first will
+        # potentially break the users project.
+        await self.request.body()
+
         return await self.request.form()
 
     def is_json(self):
@@ -530,33 +544,11 @@ def is_json(self):
 
     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):
-                    data[key] = AnnotatedValue.removed_because_raw_data()
-                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
diff --git a/tests/integrations/starlette/test_starlette.py b/tests/integrations/starlette/test_starlette.py
index cc3b38edf5..e41e6d5d19 100644
--- a/tests/integrations/starlette/test_starlette.py
+++ b/tests/integrations/starlette/test_starlette.py
@@ -19,7 +19,6 @@
     StarletteIntegration,
     StarletteRequestExtractor,
 )
-from sentry_sdk.utils import AnnotatedValue
 
 starlette = pytest.importorskip("starlette")
 from starlette.authentication import (
@@ -42,6 +41,16 @@
     "{{image_data}}", str(base64.b64encode(open(PICTURE, "rb").read()))
 )
 
+FORM_RECEIVE_MESSAGES = [
+    {"type": "http.request", "body": BODY_FORM.encode("utf-8")},
+    {"type": "http.disconnect"},
+]
+
+JSON_RECEIVE_MESSAGES = [
+    {"type": "http.request", "body": json.dumps(BODY_JSON).encode("utf-8")},
+    {"type": "http.disconnect"},
+]
+
 PARSED_FORM = starlette.datastructures.FormData(
     [
         ("username", "Jane"),
@@ -56,11 +65,6 @@
         ),
     ]
 )
-PARSED_BODY = {
-    "username": "Jane",
-    "password": "hello123",
-    "photo": AnnotatedValue("", {"rem": [["!raw", "x"]]}),
-}
 
 # Dummy ASGI scope for creating mock Starlette requests
 SCOPE = {
@@ -84,6 +88,10 @@
 }
 
 
+async def _mock_receive(msg):
+    return msg
+
+
 def starlette_app_factory(middleware=None, debug=True):
     async def _homepage(request):
         1 / 0
@@ -216,18 +224,14 @@ async def my_send(*args, **kwargs):
 
 @pytest.mark.asyncio
 async def test_starlettrequestextractor_content_length(sentry_init):
-    with mock.patch(
-        "starlette.requests.Request.stream",
-        return_value=AsyncIterator(json.dumps(BODY_JSON)),
-    ):
-        scope = SCOPE.copy()
-        scope["headers"] = [
-            [b"content-length", str(len(json.dumps(BODY_JSON))).encode()],
-        ]
-        starlette_request = starlette.requests.Request(scope)
-        extractor = StarletteRequestExtractor(starlette_request)
+    scope = SCOPE.copy()
+    scope["headers"] = [
+        [b"content-length", str(len(json.dumps(BODY_JSON))).encode()],
+    ]
+    starlette_request = starlette.requests.Request(scope)
+    extractor = StarletteRequestExtractor(starlette_request)
 
-        assert await extractor.content_length() == len(json.dumps(BODY_JSON))
+    assert await extractor.content_length() == len(json.dumps(BODY_JSON))
 
 
 @pytest.mark.asyncio
@@ -243,82 +247,82 @@ async def test_starlettrequestextractor_cookies(sentry_init):
 
 @pytest.mark.asyncio
 async def test_starlettrequestextractor_json(sentry_init):
-    with mock.patch(
-        "starlette.requests.Request.stream",
-        return_value=AsyncIterator(json.dumps(BODY_JSON)),
-    ):
-        starlette_request = starlette.requests.Request(SCOPE)
-        extractor = StarletteRequestExtractor(starlette_request)
-
-        assert extractor.is_json()
-        assert await extractor.json() == BODY_JSON
+    starlette_request = starlette.requests.Request(SCOPE)
 
+    # Mocking async `_receive()` that works in Python 3.7+
+    side_effect = [_mock_receive(msg) for msg in JSON_RECEIVE_MESSAGES]
+    starlette_request._receive = mock.Mock(side_effect=side_effect)
 
-@pytest.mark.asyncio
-async def test_starlettrequestextractor_parsed_body_json(sentry_init):
-    with mock.patch(
-        "starlette.requests.Request.stream",
-        return_value=AsyncIterator(json.dumps(BODY_JSON)),
-    ):
-        starlette_request = starlette.requests.Request(SCOPE)
-        extractor = StarletteRequestExtractor(starlette_request)
+    extractor = StarletteRequestExtractor(starlette_request)
 
-        parsed_body = await extractor.parsed_body()
-        assert parsed_body == BODY_JSON
+    assert extractor.is_json()
+    assert await extractor.json() == BODY_JSON
 
 
 @pytest.mark.asyncio
-async def test_starlettrequestextractor_parsed_body_form(sentry_init):
+async def test_starlettrequestextractor_form(sentry_init):
     scope = SCOPE.copy()
     scope["headers"] = [
         [b"content-type", b"multipart/form-data; boundary=fd721ef49ea403a6"],
     ]
-    with mock.patch(
-        "starlette.requests.Request.stream",
-        return_value=AsyncIterator(BODY_FORM),
-    ):
-        starlette_request = starlette.requests.Request(scope)
-        extractor = StarletteRequestExtractor(starlette_request)
+    # TODO add test for content-type: "application/x-www-form-urlencoded"
 
-        parsed_body = await extractor.parsed_body()
-        assert parsed_body.keys() == PARSED_BODY.keys()
-        assert parsed_body["username"] == PARSED_BODY["username"]
-        assert parsed_body["password"] == PARSED_BODY["password"]
-        assert parsed_body["photo"].metadata == PARSED_BODY["photo"].metadata
+    starlette_request = starlette.requests.Request(scope)
+
+    # Mocking async `_receive()` that works in Python 3.7+
+    side_effect = [_mock_receive(msg) for msg in FORM_RECEIVE_MESSAGES]
+    starlette_request._receive = mock.Mock(side_effect=side_effect)
+
+    extractor = StarletteRequestExtractor(starlette_request)
+
+    form_data = await extractor.form()
+    assert form_data.keys() == PARSED_FORM.keys()
+    assert form_data["username"] == PARSED_FORM["username"]
+    assert form_data["password"] == PARSED_FORM["password"]
+    assert form_data["photo"].filename == PARSED_FORM["photo"].filename
+
+    # Make sure we still can read the body
+    # after alreading it with extractor.form() above.
+    body = await extractor.request.body()
+    assert body
 
 
 @pytest.mark.asyncio
-async def test_starlettrequestextractor_form(sentry_init):
+async def test_starlettrequestextractor_body_consumed_twice(
+    sentry_init, capture_events
+):
+    """
+    Starlette does cache when you read the request data via `request.json()`
+    or `request.body()`, but it does NOT when using `request.form()`.
+    So we have an edge case when the Sentry Starlette reads the body using `.form()`
+    and the user wants to read the body using `.body()`.
+    Because the underlying stream can not be consumed twice and is not cached.
+
+    We have fixed this in `StarletteRequestExtractor.form()` by consuming the body
+    first with `.body()` (to put it into the `_body` cache and then consume it with `.form()`.
+
+    If this behavior is changed in Starlette and the `request.form()` in Starlette
+    is also caching the body, this test will fail.
+
+    See also https://github.com/encode/starlette/discussions/1933
+    """
     scope = SCOPE.copy()
     scope["headers"] = [
         [b"content-type", b"multipart/form-data; boundary=fd721ef49ea403a6"],
     ]
-    # TODO add test for content-type: "application/x-www-form-urlencoded"
 
-    with mock.patch(
-        "starlette.requests.Request.stream",
-        return_value=AsyncIterator(BODY_FORM),
-    ):
-        starlette_request = starlette.requests.Request(scope)
-        extractor = StarletteRequestExtractor(starlette_request)
+    starlette_request = starlette.requests.Request(scope)
 
-        form_data = await extractor.form()
-        assert form_data.keys() == PARSED_FORM.keys()
-        assert form_data["username"] == PARSED_FORM["username"]
-        assert form_data["password"] == PARSED_FORM["password"]
-        assert form_data["photo"].filename == PARSED_FORM["photo"].filename
+    # Mocking async `_receive()` that works in Python 3.7+
+    side_effect = [_mock_receive(msg) for msg in FORM_RECEIVE_MESSAGES]
+    starlette_request._receive = mock.Mock(side_effect=side_effect)
 
+    extractor = StarletteRequestExtractor(starlette_request)
 
-@pytest.mark.asyncio
-async def test_starlettrequestextractor_raw_data(sentry_init):
-    with mock.patch(
-        "starlette.requests.Request.stream",
-        return_value=AsyncIterator(json.dumps(BODY_JSON)),
-    ):
-        starlette_request = starlette.requests.Request(SCOPE)
-        extractor = StarletteRequestExtractor(starlette_request)
+    await extractor.request.form()
 
-        assert await extractor.raw_data() == bytes(json.dumps(BODY_JSON), "utf-8")
+    with pytest.raises(RuntimeError):
+        await extractor.request.body()
 
 
 @pytest.mark.asyncio
@@ -333,22 +337,23 @@ async def test_starlettrequestextractor_extract_request_info_too_big(sentry_init
         [b"content-length", str(len(BODY_FORM)).encode()],
         [b"cookie", b"yummy_cookie=choco; tasty_cookie=strawberry"],
     ]
-    with mock.patch(
-        "starlette.requests.Request.stream",
-        return_value=AsyncIterator(BODY_FORM),
-    ):
-        starlette_request = starlette.requests.Request(scope)
-        extractor = StarletteRequestExtractor(starlette_request)
+    starlette_request = starlette.requests.Request(scope)
+
+    # Mocking async `_receive()` that works in Python 3.7+
+    side_effect = [_mock_receive(msg) for msg in FORM_RECEIVE_MESSAGES]
+    starlette_request._receive = mock.Mock(side_effect=side_effect)
 
-        request_info = await extractor.extract_request_info()
+    extractor = StarletteRequestExtractor(starlette_request)
 
-        assert request_info
-        assert request_info["cookies"] == {
-            "tasty_cookie": "strawberry",
-            "yummy_cookie": "choco",
-        }
-        # Because request is too big only the AnnotatedValue is extracted.
-        assert request_info["data"].metadata == {"rem": [["!config", "x"]]}
+    request_info = await extractor.extract_request_info()
+
+    assert request_info
+    assert request_info["cookies"] == {
+        "tasty_cookie": "strawberry",
+        "yummy_cookie": "choco",
+    }
+    # Because request is too big only the AnnotatedValue is extracted.
+    assert request_info["data"].metadata == {"rem": [["!config", "x"]]}
 
 
 @pytest.mark.asyncio
@@ -364,21 +369,22 @@ async def test_starlettrequestextractor_extract_request_info(sentry_init):
         [b"cookie", b"yummy_cookie=choco; tasty_cookie=strawberry"],
     ]
 
-    with mock.patch(
-        "starlette.requests.Request.stream",
-        return_value=AsyncIterator(json.dumps(BODY_JSON)),
-    ):
-        starlette_request = starlette.requests.Request(scope)
-        extractor = StarletteRequestExtractor(starlette_request)
+    starlette_request = starlette.requests.Request(scope)
 
-        request_info = await extractor.extract_request_info()
+    # Mocking async `_receive()` that works in Python 3.7+
+    side_effect = [_mock_receive(msg) for msg in JSON_RECEIVE_MESSAGES]
+    starlette_request._receive = mock.Mock(side_effect=side_effect)
 
-        assert request_info
-        assert request_info["cookies"] == {
-            "tasty_cookie": "strawberry",
-            "yummy_cookie": "choco",
-        }
-        assert request_info["data"] == BODY_JSON
+    extractor = StarletteRequestExtractor(starlette_request)
+
+    request_info = await extractor.extract_request_info()
+
+    assert request_info
+    assert request_info["cookies"] == {
+        "tasty_cookie": "strawberry",
+        "yummy_cookie": "choco",
+    }
+    assert request_info["data"] == BODY_JSON
 
 
 @pytest.mark.asyncio
@@ -394,18 +400,19 @@ async def test_starlettrequestextractor_extract_request_info_no_pii(sentry_init)
         [b"cookie", b"yummy_cookie=choco; tasty_cookie=strawberry"],
     ]
 
-    with mock.patch(
-        "starlette.requests.Request.stream",
-        return_value=AsyncIterator(json.dumps(BODY_JSON)),
-    ):
-        starlette_request = starlette.requests.Request(scope)
-        extractor = StarletteRequestExtractor(starlette_request)
+    starlette_request = starlette.requests.Request(scope)
+
+    # Mocking async `_receive()` that works in Python 3.7+
+    side_effect = [_mock_receive(msg) for msg in JSON_RECEIVE_MESSAGES]
+    starlette_request._receive = mock.Mock(side_effect=side_effect)
+
+    extractor = StarletteRequestExtractor(starlette_request)
 
-        request_info = await extractor.extract_request_info()
+    request_info = await extractor.extract_request_info()
 
-        assert request_info
-        assert "cookies" not in request_info
-        assert request_info["data"] == BODY_JSON
+    assert request_info
+    assert "cookies" not in request_info
+    assert request_info["data"] == BODY_JSON
 
 
 @pytest.mark.parametrize(

From a5ee1bd8c5b456704b9629fc430fb5203602f3c7 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 10 Nov 2022 15:26:00 +0100
Subject: [PATCH 158/209] Fix signals problem on sentry.io (#1732)

When using the newest version of the Python SDK on the sentry backend we get the following error:

name = "partial()"  # type: ignore
AttributeError: __name__

This change gets the __name__ attribute in a very defensive way, to not raise any errors what so ever.
---
 sentry_sdk/integrations/django/signals_handlers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sentry_sdk/integrations/django/signals_handlers.py b/sentry_sdk/integrations/django/signals_handlers.py
index 3f58cc3329..77e820ce32 100644
--- a/sentry_sdk/integrations/django/signals_handlers.py
+++ b/sentry_sdk/integrations/django/signals_handlers.py
@@ -25,7 +25,8 @@ def _get_receiver_name(receiver):
     elif hasattr(
         receiver, "func"
     ):  # certain functions (like partials) dont have a name
-        name = "partial()"  # type: ignore
+        if hasattr(receiver, "func") and hasattr(receiver.func, "__name__"):  # type: ignore
+            name = "partial()"  # type: ignore
 
     if (
         name == ""

From 281452156e902ce89c24e60ac750d3e1bdbbfca8 Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Mon, 14 Nov 2022 09:05:01 +0000
Subject: [PATCH 159/209] release: 1.11.0

---
 CHANGELOG.md         | 18 ++++++++++++++++++
 docs/conf.py         |  2 +-
 sentry_sdk/consts.py |  2 +-
 setup.py             |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a5853d8e4..48b2ff1814 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## 1.11.0
+
+### Various fixes & improvements
+
+- Fix signals problem on sentry.io (#1732) by @antonpirker
+- Fix reading FastAPI request body twice.  (#1724) by @antonpirker
+- ref(profiling): Do not error if already setup (#1731) by @Zylphrex
+- ref(profiling): Use sleep scheduler by default (#1729) by @Zylphrex
+- feat(profiling): Extract more frame info (#1702) by @Zylphrex
+- Update actions/upload-artifact to v3.1.1 (#1718) by @mattgauntseo-sentry
+- Performance optimizations (#1725) by @antonpirker
+- feat(pymongo): add PyMongo integration (#1590) by @Agalin
+- Move relay to port 5333 to avoid collisions (#1716) by @sl0thentr0py
+- fix(utils): strip_string() checks text length counting bytes not chars (#1711) by @mgaligniana
+- chore: remove jira workflow (#1707) by @vladanpaunovic
+- build(deps): bump checkouts/data-schemas from `a214fbc` to `20ff3b9` (#1703) by @dependabot
+- perf(profiling): Tune the sample profile generation code for performance (#1694) by @Zylphrex
+
 ## 1.10.1
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 395bf125bf..7ff2d79373 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.10.1"
+release = "1.11.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index c920fc8fa5..d07bec23da 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -104,7 +104,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.10.1"
+VERSION = "1.11.0"
 
 
 class OP:
diff --git a/setup.py b/setup.py
index 62f2d10eec..b0157ab9e9 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.10.1",
+    version="1.11.0",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From 914aa8ffc609efa230ed92dcaac35fb201bb8761 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 14 Nov 2022 11:38:19 +0100
Subject: [PATCH 160/209] Fixed test setup.

---
 Makefile                               | 2 +-
 tests/integrations/asyncio/__init__.py | 3 +++
 tox.ini                                | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index bf13e1117c..339a68c069 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ format: .venv
 .PHONY: format
 
 test: .venv
-	@$(VENV_PATH)/bin/tox -e py2.7,py3.7
+	@$(VENV_PATH)/bin/tox -e py3.9
 .PHONY: test
 
 test-all: .venv
diff --git a/tests/integrations/asyncio/__init__.py b/tests/integrations/asyncio/__init__.py
index e69de29bb2..1b887a03fe 100644
--- a/tests/integrations/asyncio/__init__.py
+++ b/tests/integrations/asyncio/__init__.py
@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("pytest_asyncio")
diff --git a/tox.ini b/tox.ini
index 2067ff8916..7ea7169e71 100644
--- a/tox.ini
+++ b/tox.ini
@@ -111,6 +111,8 @@ deps =
     py3.4: colorama==0.4.1
     py3.4: watchdog==0.10.7
 
+    {py3.8,py3.9,py3.10}: pytest-asyncio
+
     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[daphne]>2

From 954e8f4648e207febd7cd41e3f55344d58516221 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 14 Nov 2022 11:44:00 +0100
Subject: [PATCH 161/209] Added httpx to fastapi test requirements

---
 tox.ini | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tox.ini b/tox.ini
index 7ea7169e71..eb723f2c00 100644
--- a/tox.ini
+++ b/tox.ini
@@ -116,7 +116,6 @@ 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,py3.10}-django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: channels[daphne]>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.8,1.9,1.10,1.11,2.0,2.1}: pytest-django<4.0
@@ -124,7 +123,6 @@ deps =
     django-{2.2,3.0,3.1,3.2}: Werkzeug<2.0
 
     django-{4.0,4.1}: djangorestframework
-    django-{4.0,4.1}: pytest-asyncio
     django-{4.0,4.1}: psycopg2-binary
     django-{4.0,4.1}: pytest-django
     django-{4.0,4.1}: Werkzeug
@@ -149,14 +147,11 @@ deps =
     flask-1.1: Flask>=1.1,<1.2
     flask-2.0: Flask>=2.0,<2.1
 
-    asgi: pytest-asyncio
     asgi: async-asgi-testclient
 
     quart: quart>=0.16.1
     quart: quart-auth
-    quart: pytest-asyncio
 
-    starlette: pytest-asyncio
     starlette: python-multipart
     starlette: requests
     starlette-0.21: httpx
@@ -165,7 +160,7 @@ deps =
     starlette-0.21: starlette>=0.21.0,<0.22.0
 
     fastapi: fastapi
-    fastapi: pytest-asyncio
+    fastapi: httpx
     fastapi: python-multipart
     fastapi: requests
 

From fe44f0957eb6186de59f9405f814a567a4eb4a4b Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 14 Nov 2022 11:48:09 +0100
Subject: [PATCH 162/209] Fixed test requirements

---
 tox.ini | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index eb723f2c00..98505caab1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -111,11 +111,10 @@ deps =
     py3.4: colorama==0.4.1
     py3.4: watchdog==0.10.7
 
-    {py3.8,py3.9,py3.10}: pytest-asyncio
-
     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[daphne]>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.8,1.9,1.10,1.11,2.0,2.1}: pytest-django<4.0
@@ -123,6 +122,7 @@ deps =
     django-{2.2,3.0,3.1,3.2}: Werkzeug<2.0
 
     django-{4.0,4.1}: djangorestframework
+    django-{4.0,4.1}: pytest-asyncio
     django-{4.0,4.1}: psycopg2-binary
     django-{4.0,4.1}: pytest-django
     django-{4.0,4.1}: Werkzeug
@@ -147,11 +147,14 @@ deps =
     flask-1.1: Flask>=1.1,<1.2
     flask-2.0: Flask>=2.0,<2.1
 
+    asgi: pytest-asyncio
     asgi: async-asgi-testclient
 
     quart: quart>=0.16.1
     quart: quart-auth
+    quart: pytest-asyncio
 
+    starlette: pytest-asyncio
     starlette: python-multipart
     starlette: requests
     starlette-0.21: httpx
@@ -161,6 +164,7 @@ deps =
 
     fastapi: fastapi
     fastapi: httpx
+    fastapi: pytest-asyncio
     fastapi: python-multipart
     fastapi: requests
 

From bd99d4e560b5a6d1bdf933e90c73c298f73b4904 Mon Sep 17 00:00:00 2001
From: Neel Shah 
Date: Fri, 18 Nov 2022 12:12:28 +0100
Subject: [PATCH 163/209] Expose proxy_headers as top level config and use in
 ProxyManager (#1746)

---
 sentry_sdk/consts.py    |  1 +
 sentry_sdk/transport.py |  5 +++++
 tests/test_client.py    | 15 +++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index d07bec23da..3393f491d4 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -81,6 +81,7 @@ def __init__(
         auto_session_tracking=True,  # type: bool
         send_client_reports=True,  # type: bool
         _experiments={},  # type: Experiments  # noqa: B006
+        proxy_headers=None,  # type: Optional[Dict[str, str]]
     ):
         # type: (...) -> None
         pass
diff --git a/sentry_sdk/transport.py b/sentry_sdk/transport.py
index fca6fa8aec..4937668cc7 100644
--- a/sentry_sdk/transport.py
+++ b/sentry_sdk/transport.py
@@ -156,6 +156,7 @@ def __init__(
             http_proxy=options["http_proxy"],
             https_proxy=options["https_proxy"],
             ca_certs=options["ca_certs"],
+            proxy_headers=options["proxy_headers"],
         )
 
         from sentry_sdk import Hub
@@ -420,6 +421,7 @@ def _make_pool(
         http_proxy,  # type: Optional[str]
         https_proxy,  # type: Optional[str]
         ca_certs,  # type: Optional[Any]
+        proxy_headers,  # type: Optional[Dict[str, str]]
     ):
         # type: (...) -> Union[PoolManager, ProxyManager]
         proxy = None
@@ -436,6 +438,9 @@ def _make_pool(
         opts = self._get_pool_options(ca_certs)
 
         if proxy:
+            if proxy_headers:
+                opts["proxy_headers"] = proxy_headers
+
             return urllib3.ProxyManager(proxy, **opts)
         else:
             return urllib3.PoolManager(**opts)
diff --git a/tests/test_client.py b/tests/test_client.py
index 5523647870..c0f380d770 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -227,6 +227,16 @@ def test_transport_option(monkeypatch):
             "arg_https_proxy": "https://localhost/123",
             "expected_proxy_scheme": "https",
         },
+        {
+            "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",
+            "arg_proxy_headers": {"Test-Header": "foo-bar"},
+        },
     ],
 )
 def test_proxy(monkeypatch, testcase):
@@ -241,12 +251,17 @@ def test_proxy(monkeypatch, testcase):
         kwargs["http_proxy"] = testcase["arg_http_proxy"]
     if testcase["arg_https_proxy"] is not None:
         kwargs["https_proxy"] = testcase["arg_https_proxy"]
+    if testcase.get("arg_proxy_headers") is not None:
+        kwargs["proxy_headers"] = testcase["arg_proxy_headers"]
     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"]
 
+        if testcase.get("arg_proxy_headers") is not None:
+            assert client.transport._pool.proxy_headers == testcase["arg_proxy_headers"]
+
 
 def test_simple_transport(sentry_init):
     events = []

From 19cb5f250fdbc57da5edeff2cc830d7459bc25d1 Mon Sep 17 00:00:00 2001
From: Neel Shah 
Date: Tue, 22 Nov 2022 13:17:26 +0100
Subject: [PATCH 164/209] Move set_transaction_name out of event processor in
 fastapi/starlette (#1751)

---
 sentry_sdk/integrations/fastapi.py   | 25 +++++++++---------
 sentry_sdk/integrations/starlette.py | 38 +++++++++++++++-------------
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/sentry_sdk/integrations/fastapi.py b/sentry_sdk/integrations/fastapi.py
index 1c21196b76..d38e978fbf 100644
--- a/sentry_sdk/integrations/fastapi.py
+++ b/sentry_sdk/integrations/fastapi.py
@@ -11,7 +11,7 @@
 if MYPY:
     from typing import Any, Callable, Dict
 
-    from sentry_sdk._types import Event
+    from sentry_sdk.scope import Scope
 
 try:
     import fastapi  # type: ignore
@@ -31,8 +31,8 @@ def setup_once():
         patch_get_request_handler()
 
 
-def _set_transaction_name_and_source(event, transaction_style, request):
-    # type: (Event, str, Any) -> None
+def _set_transaction_name_and_source(scope, transaction_style, request):
+    # type: (Scope, str, Any) -> None
     name = ""
 
     if transaction_style == "endpoint":
@@ -48,12 +48,12 @@ def _set_transaction_name_and_source(event, transaction_style, request):
                 name = path
 
     if not name:
-        event["transaction"] = _DEFAULT_TRANSACTION_NAME
-        event["transaction_info"] = {"source": TRANSACTION_SOURCE_ROUTE}
-        return
+        name = _DEFAULT_TRANSACTION_NAME
+        source = TRANSACTION_SOURCE_ROUTE
+    else:
+        source = SOURCE_FOR_STYLE[transaction_style]
 
-    event["transaction"] = name
-    event["transaction_info"] = {"source": SOURCE_FOR_STYLE[transaction_style]}
+    scope.set_transaction_name(name, source=source)
 
 
 def patch_get_request_handler():
@@ -73,6 +73,11 @@ async def _sentry_app(*args, **kwargs):
 
             with hub.configure_scope() as sentry_scope:
                 request = args[0]
+
+                _set_transaction_name_and_source(
+                    sentry_scope, integration.transaction_style, request
+                )
+
                 extractor = StarletteRequestExtractor(request)
                 info = await extractor.extract_request_info()
 
@@ -90,10 +95,6 @@ def event_processor(event, hint):
                                 request_info["data"] = info["data"]
                         event["request"] = request_info
 
-                        _set_transaction_name_and_source(
-                            event, integration.transaction_style, req
-                        )
-
                         return event
 
                     return event_processor
diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index 109b048bd3..155c840461 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -24,7 +24,7 @@
 if MYPY:
     from typing import Any, Awaitable, Callable, Dict, Optional
 
-    from sentry_sdk._types import Event
+    from sentry_sdk.scope import Scope as SentryScope
 
 try:
     import starlette  # type: ignore
@@ -36,7 +36,7 @@
     )
     from starlette.requests import Request  # type: ignore
     from starlette.routing import Match  # type: ignore
-    from starlette.types import ASGIApp, Receive, Scope, Send  # type: ignore
+    from starlette.types import ASGIApp, Receive, Scope as StarletteScope, Send  # type: ignore
 except ImportError:
     raise DidNotEnable("Starlette is not installed")
 
@@ -312,7 +312,7 @@ def patch_asgi_app():
     old_app = Starlette.__call__
 
     async def _sentry_patched_asgi_app(self, scope, receive, send):
-        # type: (Starlette, Scope, Receive, Send) -> None
+        # type: (Starlette, StarletteScope, Receive, Send) -> None
         if Hub.current.get_integration(StarletteIntegration) is None:
             return await old_app(self, scope, receive, send)
 
@@ -359,6 +359,11 @@ async def _sentry_async_func(*args, **kwargs):
 
                 with hub.configure_scope() as sentry_scope:
                     request = args[0]
+
+                    _set_transaction_name_and_source(
+                        sentry_scope, integration.transaction_style, request
+                    )
+
                     extractor = StarletteRequestExtractor(request)
                     info = await extractor.extract_request_info()
 
@@ -376,10 +381,6 @@ def event_processor(event, hint):
                                     request_info["data"] = info["data"]
                             event["request"] = request_info
 
-                            _set_transaction_name_and_source(
-                                event, integration.transaction_style, req
-                            )
-
                             return event
 
                         return event_processor
@@ -403,6 +404,11 @@ def _sentry_sync_func(*args, **kwargs):
 
                 with hub.configure_scope() as sentry_scope:
                     request = args[0]
+
+                    _set_transaction_name_and_source(
+                        sentry_scope, integration.transaction_style, request
+                    )
+
                     extractor = StarletteRequestExtractor(request)
                     cookies = extractor.extract_cookies_from_request()
 
@@ -418,10 +424,6 @@ def event_processor(event, hint):
 
                             event["request"] = request_info
 
-                            _set_transaction_name_and_source(
-                                event, integration.transaction_style, req
-                            )
-
                             return event
 
                         return event_processor
@@ -550,8 +552,8 @@ async def json(self):
         return await self.request.json()
 
 
-def _set_transaction_name_and_source(event, transaction_style, request):
-    # type: (Event, str, Any) -> None
+def _set_transaction_name_and_source(scope, transaction_style, request):
+    # type: (SentryScope, str, Any) -> None
     name = ""
 
     if transaction_style == "endpoint":
@@ -573,9 +575,9 @@ def _set_transaction_name_and_source(event, transaction_style, request):
                     break
 
     if not name:
-        event["transaction"] = _DEFAULT_TRANSACTION_NAME
-        event["transaction_info"] = {"source": TRANSACTION_SOURCE_ROUTE}
-        return
+        name = _DEFAULT_TRANSACTION_NAME
+        source = TRANSACTION_SOURCE_ROUTE
+    else:
+        source = SOURCE_FOR_STYLE[transaction_style]
 
-    event["transaction"] = name
-    event["transaction_info"] = {"source": SOURCE_FOR_STYLE[transaction_style]}
+    scope.set_transaction_name(name, source=source)

From 607dfb11c6629e799dbcc7ca65802e6244c2b188 Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Tue, 22 Nov 2022 12:31:13 +0000
Subject: [PATCH 165/209] release: 1.11.1

---
 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 48b2ff1814..7eecd3ed7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.11.1
+
+### Various fixes & improvements
+
+- Move set_transaction_name out of event processor in fastapi/starlette (#1751) by @sl0thentr0py
+- Expose proxy_headers as top level config and use in ProxyManager (#1746) by @sl0thentr0py
+
 ## 1.11.0
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 7ff2d79373..0d60cb6656 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.11.0"
+release = "1.11.1"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 3393f491d4..6d463f3dc5 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -105,7 +105,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.11.0"
+VERSION = "1.11.1"
 
 
 class OP:
diff --git a/setup.py b/setup.py
index b0157ab9e9..687111566b 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.11.0",
+    version="1.11.1",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From ab3b8fe6397a240ee3efa371ed559363e8db92ee Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Tue, 22 Nov 2022 13:34:45 +0100
Subject: [PATCH 166/209] Added link to docs

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7eecd3ed7b..0a03c0104b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,14 +5,14 @@
 ### Various fixes & improvements
 
 - Move set_transaction_name out of event processor in fastapi/starlette (#1751) by @sl0thentr0py
-- Expose proxy_headers as top level config and use in ProxyManager (#1746) by @sl0thentr0py
+- Expose proxy_headers as top level config and use in ProxyManager: https://docs.sentry.io/platforms/python/configuration/options/#proxy-headers (#1746) by @sl0thentr0py
 
 ## 1.11.0
 
 ### Various fixes & improvements
 
 - Fix signals problem on sentry.io (#1732) by @antonpirker
-- Fix reading FastAPI request body twice.  (#1724) by @antonpirker
+- Fix reading FastAPI request body twice. (#1724) by @antonpirker
 - ref(profiling): Do not error if already setup (#1731) by @Zylphrex
 - ref(profiling): Use sleep scheduler by default (#1729) by @Zylphrex
 - feat(profiling): Extract more frame info (#1702) by @Zylphrex

From 1c886e623f7cbb941acb4dc2ec508d684ce8b442 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Tue, 29 Nov 2022 09:37:48 -0800
Subject: [PATCH 167/209] fix(profiling): Resolve inherited method class names
 (#1756)

Methods may be inherited from a parent class. If multiple classes inherit from
the same class and uses the inherited method, we'd want it to report the parent
class's name instead of the individual child classes since they'd have the same
filename and lineno of the parent class and not the children.
---
 sentry_sdk/profiler.py |  8 ++++--
 tests/test_profiler.py | 56 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 28e96016ca..3d3b7cf5a0 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -211,7 +211,9 @@ def get_frame_name(frame):
             and f_code.co_varnames[0] == "self"
             and "self" in frame.f_locals
         ):
-            return "{}.{}".format(frame.f_locals["self"].__class__.__name__, name)
+            for cls in frame.f_locals["self"].__class__.__mro__:
+                if name in cls.__dict__:
+                    return "{}.{}".format(cls.__name__, name)
     except AttributeError:
         pass
 
@@ -225,7 +227,9 @@ def get_frame_name(frame):
             and f_code.co_varnames[0] == "cls"
             and "cls" in frame.f_locals
         ):
-            return "{}.{}".format(frame.f_locals["cls"].__name__, name)
+            for cls in frame.f_locals["cls"].__mro__:
+                if name in cls.__dict__:
+                    return "{}.{}".format(cls.__name__, name)
     except AttributeError:
         pass
 
diff --git a/tests/test_profiler.py b/tests/test_profiler.py
index 11e92630cf..42721044ce 100644
--- a/tests/test_profiler.py
+++ b/tests/test_profiler.py
@@ -82,7 +82,35 @@ def get_frame(depth=1):
     return inspect.currentframe()
 
 
-class GetFrame:
+class GetFrameBase:
+    def inherited_instance_method(self):
+        return inspect.currentframe()
+
+    def inherited_instance_method_wrapped(self):
+        def wrapped():
+            self
+            return inspect.currentframe()
+
+        return wrapped
+
+    @classmethod
+    def inherited_class_method(cls):
+        return inspect.currentframe()
+
+    @classmethod
+    def inherited_class_method_wrapped(cls):
+        def wrapped():
+            cls
+            return inspect.currentframe()
+
+        return wrapped
+
+    @staticmethod
+    def inherited_static_method():
+        return inspect.currentframe()
+
+
+class GetFrame(GetFrameBase):
     def instance_method(self):
         return inspect.currentframe()
 
@@ -149,6 +177,32 @@ def static_method():
             id="static_method",
             marks=pytest.mark.skip(reason="unsupported"),
         ),
+        pytest.param(
+            GetFrame().inherited_instance_method(),
+            "GetFrameBase.inherited_instance_method",
+            id="inherited_instance_method",
+        ),
+        pytest.param(
+            GetFrame().inherited_instance_method_wrapped()(),
+            "wrapped",
+            id="instance_method_wrapped",
+        ),
+        pytest.param(
+            GetFrame().inherited_class_method(),
+            "GetFrameBase.inherited_class_method",
+            id="inherited_class_method",
+        ),
+        pytest.param(
+            GetFrame().inherited_class_method_wrapped()(),
+            "wrapped",
+            id="inherited_class_method_wrapped",
+        ),
+        pytest.param(
+            GetFrame().inherited_static_method(),
+            "GetFrameBase.static_method",
+            id="inherited_static_method",
+            marks=pytest.mark.skip(reason="unsupported"),
+        ),
     ],
 )
 def test_get_frame_name(frame, frame_name):

From 905b3fdd4282120d18dab9137807e83746d28577 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Wed, 30 Nov 2022 16:22:25 +0100
Subject: [PATCH 168/209] Add constants for sentry-trace and baggage headers
 (#1765)

* Introduced SENTRY_TRACE_HEADER_NAME variable
* Introduced +BAGGAGE_HEADER_NAME variable
---
 .vscode/settings.json             |  6 ++--
 sentry_sdk/consts.py              | 50 +++++++++++++++----------------
 sentry_sdk/integrations/flask.py  |  9 ++++--
 sentry_sdk/integrations/stdlib.py |  1 -
 sentry_sdk/tracing.py             | 21 ++++++++-----
 5 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index c167a13dc2..ba2472c4c9 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,6 @@
 {
     "python.pythonPath": ".venv/bin/python",
-    "python.formatting.provider": "black"
-}
\ No newline at end of file
+    "python.formatting.provider": "black",
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 6d463f3dc5..6fd61d395b 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -44,6 +44,31 @@
 DEFAULT_MAX_BREADCRUMBS = 100
 
 
+class OP:
+    DB = "db"
+    DB_REDIS = "db.redis"
+    EVENT_DJANGO = "event.django"
+    FUNCTION = "function"
+    FUNCTION_AWS = "function.aws"
+    FUNCTION_GCP = "function.gcp"
+    HTTP_CLIENT = "http.client"
+    HTTP_CLIENT_STREAM = "http.client.stream"
+    HTTP_SERVER = "http.server"
+    MIDDLEWARE_DJANGO = "middleware.django"
+    MIDDLEWARE_STARLETTE = "middleware.starlette"
+    MIDDLEWARE_STARLETTE_RECEIVE = "middleware.starlette.receive"
+    MIDDLEWARE_STARLETTE_SEND = "middleware.starlette.send"
+    QUEUE_SUBMIT_CELERY = "queue.submit.celery"
+    QUEUE_TASK_CELERY = "queue.task.celery"
+    QUEUE_TASK_RQ = "queue.task.rq"
+    SUBPROCESS = "subprocess"
+    SUBPROCESS_WAIT = "subprocess.wait"
+    SUBPROCESS_COMMUNICATE = "subprocess.communicate"
+    TEMPLATE_RENDER = "template.render"
+    VIEW_RENDER = "view.render"
+    WEBSOCKET_SERVER = "websocket.server"
+
+
 # This type exists to trick mypy and PyCharm into thinking `init` and `Client`
 # take these arguments (even though they take opaque **kwargs)
 class ClientConstructor(object):
@@ -106,28 +131,3 @@ def _get_default_options():
 
 
 VERSION = "1.11.1"
-
-
-class OP:
-    DB = "db"
-    DB_REDIS = "db.redis"
-    EVENT_DJANGO = "event.django"
-    FUNCTION = "function"
-    FUNCTION_AWS = "function.aws"
-    FUNCTION_GCP = "function.gcp"
-    HTTP_CLIENT = "http.client"
-    HTTP_CLIENT_STREAM = "http.client.stream"
-    HTTP_SERVER = "http.server"
-    MIDDLEWARE_DJANGO = "middleware.django"
-    MIDDLEWARE_STARLETTE = "middleware.starlette"
-    MIDDLEWARE_STARLETTE_RECEIVE = "middleware.starlette.receive"
-    MIDDLEWARE_STARLETTE_SEND = "middleware.starlette.send"
-    QUEUE_SUBMIT_CELERY = "queue.submit.celery"
-    QUEUE_TASK_CELERY = "queue.task.celery"
-    QUEUE_TASK_RQ = "queue.task.rq"
-    SUBPROCESS = "subprocess"
-    SUBPROCESS_WAIT = "subprocess.wait"
-    SUBPROCESS_COMMUNICATE = "subprocess.communicate"
-    TEMPLATE_RENDER = "template.render"
-    VIEW_RENDER = "view.render"
-    WEBSOCKET_SERVER = "websocket.server"
diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py
index 52cce0b4b4..67c87b64f6 100644
--- a/sentry_sdk/integrations/flask.py
+++ b/sentry_sdk/integrations/flask.py
@@ -6,7 +6,7 @@
 from sentry_sdk.integrations._wsgi_common import RequestExtractor
 from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
 from sentry_sdk.scope import Scope
-from sentry_sdk.tracing import SOURCE_FOR_STYLE
+from sentry_sdk.tracing import SENTRY_TRACE_HEADER_NAME, SOURCE_FOR_STYLE
 from sentry_sdk.utils import (
     capture_internal_exceptions,
     event_from_exception,
@@ -101,8 +101,11 @@ def _add_sentry_trace(sender, template, context, **extra):
     sentry_span = Hub.current.scope.span
     context["sentry_trace"] = (
         Markup(
-            ''
-            % (sentry_span.to_traceparent(),)
+            ''
+            % (
+                SENTRY_TRACE_HEADER_NAME,
+                sentry_span.to_traceparent(),
+            )
         )
         if sentry_span
         else ""
diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py
index 3b81b6c2c5..687d9dd2c1 100644
--- a/sentry_sdk/integrations/stdlib.py
+++ b/sentry_sdk/integrations/stdlib.py
@@ -187,7 +187,6 @@ def sentry_patched_popen_init(self, *a, **kw):
         env = None
 
         with hub.start_span(op=OP.SUBPROCESS, description=description) as span:
-
             for k, v in hub.iter_trace_propagation_headers(span):
                 if env is None:
                     env = _init_argument(
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index aacb3a5bb3..8be9028aa5 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -6,7 +6,6 @@
 from datetime import datetime, timedelta
 
 import sentry_sdk
-
 from sentry_sdk.utils import logger
 from sentry_sdk._types import MYPY
 
@@ -24,6 +23,9 @@
     import sentry_sdk.profiler
     from sentry_sdk._types import Event, SamplingContext, MeasurementUnit
 
+BAGGAGE_HEADER_NAME = "baggage"
+SENTRY_TRACE_HEADER_NAME = "sentry-trace"
+
 
 # Transaction source
 # see https://develop.sentry.dev/sdk/event-payloads/transaction/#transaction-annotations
@@ -278,10 +280,12 @@ def continue_from_headers(
 
         # 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})
+        baggage = Baggage.from_incoming_header(headers.get(BAGGAGE_HEADER_NAME))
+        kwargs.update({BAGGAGE_HEADER_NAME: baggage})
 
-        sentrytrace_kwargs = extract_sentrytrace_data(headers.get("sentry-trace"))
+        sentrytrace_kwargs = extract_sentrytrace_data(
+            headers.get(SENTRY_TRACE_HEADER_NAME)
+        )
 
         if sentrytrace_kwargs is not None:
             kwargs.update(sentrytrace_kwargs)
@@ -308,7 +312,7 @@ def iter_headers(self):
         `sentry_tracestate` value, this will cause one to be generated and
         stored.
         """
-        yield "sentry-trace", self.to_traceparent()
+        yield SENTRY_TRACE_HEADER_NAME, 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
@@ -320,7 +324,7 @@ def iter_headers(self):
         if self.containing_transaction:
             baggage = self.containing_transaction.get_baggage().serialize()
             if baggage:
-                yield "baggage", baggage
+                yield BAGGAGE_HEADER_NAME, baggage
 
     @classmethod
     def from_traceparent(
@@ -344,7 +348,9 @@ def from_traceparent(
         if not traceparent:
             return None
 
-        return cls.continue_from_headers({"sentry-trace": traceparent}, **kwargs)
+        return cls.continue_from_headers(
+            {SENTRY_TRACE_HEADER_NAME: traceparent}, **kwargs
+        )
 
     def to_traceparent(self):
         # type: () -> str
@@ -653,6 +659,7 @@ def finish(self, hub=None):
             # to a concrete decision.
             if self.sampled is None:
                 logger.warning("Discarding transaction without sampling decision.")
+
             return None
 
         finished_spans = [

From 01dc7ee45c93ff3193b5fc28ea6ce51d0d74c700 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Wed, 30 Nov 2022 08:51:24 -0800
Subject: [PATCH 169/209] ref(profiling): Eagerly hash stack for profiles
 (#1755)

Hashing the stack is an expensive operation and the same stack is used for
parallel transactions happening on various threads. Instead of hashing it each
time it's used.
---
 sentry_sdk/profiler.py | 61 +++++++++++++++++++++++-------------------
 tests/test_profiler.py |  8 +++---
 2 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 3d3b7cf5a0..b38b7af962 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -53,7 +53,9 @@
     from typing_extensions import TypedDict
     import sentry_sdk.tracing
 
-    RawSampleData = Tuple[int, Sequence[Tuple[str, Sequence[RawFrameData]]]]
+    RawStack = Tuple[RawFrameData, ...]
+    RawSample = Sequence[Tuple[str, RawStack]]
+    RawSampleWithId = Sequence[Tuple[str, int, RawStack]]
 
     ProcessedStack = Tuple[int, ...]
 
@@ -153,7 +155,7 @@ def teardown_profiler():
 
 
 def extract_stack(frame, max_stack_depth=MAX_STACK_DEPTH):
-    # type: (Optional[FrameType], int) -> Sequence[RawFrameData]
+    # type: (Optional[FrameType], int) -> Tuple[RawFrameData, ...]
     """
     Extracts the stack starting the specified frame. The extracted stack
     assumes the specified frame is the top of the stack, and works back
@@ -328,12 +330,14 @@ class SampleBuffer(object):
     def __init__(self, capacity):
         # type: (int) -> None
 
-        self.buffer = [None] * capacity  # type: List[Optional[RawSampleData]]
+        self.buffer = [
+            None
+        ] * capacity  # type: List[Optional[Tuple[int, RawSampleWithId]]]
         self.capacity = capacity  # type: int
         self.idx = 0  # type: int
 
-    def write(self, sample):
-        # type: (RawSampleData) -> None
+    def write(self, ts, raw_sample):
+        # type: (int, RawSample) -> None
         """
         Writing to the buffer is not thread safe. There is the possibility
         that parallel writes will overwrite one another.
@@ -346,7 +350,24 @@ def write(self, sample):
         any synchronization mechanisms here like locks.
         """
         idx = self.idx
-        self.buffer[idx] = sample
+
+        sample = [
+            (
+                thread_id,
+                # Instead of mapping the stack into frame ids and hashing
+                # that as a tuple, we can directly hash the stack.
+                # This saves us from having to generate yet another list.
+                # Additionally, using the stack as the key directly is
+                # costly because the stack can be large, so we pre-hash
+                # the stack, and use the hash as the key as this will be
+                # needed a few times to improve performance.
+                hash(stack),
+                stack,
+            )
+            for thread_id, stack in raw_sample
+        ]
+
+        self.buffer[idx] = (ts, sample)
         self.idx = (idx + 1) % self.capacity
 
     def slice_profile(self, start_ns, stop_ns):
@@ -357,27 +378,13 @@ def slice_profile(self, start_ns, stop_ns):
         frames = dict()  # type: Dict[RawFrameData, int]
         frames_list = list()  # type: List[ProcessedFrame]
 
-        # TODO: This is doing an naive iteration over the
-        # buffer and extracting the appropriate samples.
-        #
-        # Is it safe to assume that the samples are always in
-        # chronological order and binary search the buffer?
         for ts, sample in filter(None, self.buffer):
             if start_ns > ts or ts > stop_ns:
                 continue
 
             elapsed_since_start_ns = str(ts - start_ns)
 
-            for tid, stack in sample:
-                # Instead of mapping the stack into frame ids and hashing
-                # that as a tuple, we can directly hash the stack.
-                # This saves us from having to generate yet another list.
-                # Additionally, using the stack as the key directly is
-                # costly because the stack can be large, so we pre-hash
-                # the stack, and use the hash as the key as this will be
-                # needed a few times to improve performance.
-                hashed_stack = hash(stack)
-
+            for tid, hashed_stack, stack in sample:
                 # Check if the stack is indexed first, this lets us skip
                 # indexing frames if it's not necessary
                 if hashed_stack not in stacks:
@@ -433,13 +440,11 @@ def _sample_stack(*args, **kwargs):
             """
 
             self.write(
-                (
-                    nanosecond_time(),
-                    [
-                        (str(tid), extract_stack(frame))
-                        for tid, frame in sys._current_frames().items()
-                    ],
-                )
+                nanosecond_time(),
+                [
+                    (str(tid), extract_stack(frame))
+                    for tid, frame in sys._current_frames().items()
+                ],
             )
 
         return _sample_stack
diff --git a/tests/test_profiler.py b/tests/test_profiler.py
index 42721044ce..9a268713c8 100644
--- a/tests/test_profiler.py
+++ b/tests/test_profiler.py
@@ -249,8 +249,8 @@ def __init__(self, capacity, sample_data=None):
 
     def make_sampler(self):
         def _sample_stack(*args, **kwargs):
-            print("writing", self.sample_data[0])
-            self.write(self.sample_data.pop(0))
+            ts, sample = self.sample_data.pop(0)
+            self.write(ts, sample)
 
         return _sample_stack
 
@@ -760,7 +760,7 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
 )
 def test_sample_buffer(capacity, start_ns, stop_ns, samples, profile):
     buffer = SampleBuffer(capacity)
-    for sample in samples:
-        buffer.write(sample)
+    for ts, sample in samples:
+        buffer.write(ts, sample)
     result = buffer.slice_profile(start_ns, stop_ns)
     assert result == profile

From 46697ddeb19f2d5989c8bae88dbad41f68797dca Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 1 Dec 2022 12:04:41 +0100
Subject: [PATCH 170/209] Add instrumenter config to switch between Otel and
 Sentry instrumentation. (#1766)

* Add instrumenter config to switch between Sentry and OTel instrumentation.
* Add API to set arbitrary context in Transaction. (#1769)
* Add API to set custom Span timestamps (#1770)
---
 sentry_sdk/api.py     |  3 +-
 sentry_sdk/client.py  |  4 ++
 sentry_sdk/consts.py  |  6 +++
 sentry_sdk/hub.py     | 17 +++++++-
 sentry_sdk/tracing.py | 90 +++++++++++++++++++++++++++++++++++++------
 5 files changed, 106 insertions(+), 14 deletions(-)

diff --git a/sentry_sdk/api.py b/sentry_sdk/api.py
index cec914aca1..ffa017cfc1 100644
--- a/sentry_sdk/api.py
+++ b/sentry_sdk/api.py
@@ -4,6 +4,7 @@
 from sentry_sdk.scope import Scope
 
 from sentry_sdk._types import MYPY
+from sentry_sdk.tracing import NoOpSpan
 
 if MYPY:
     from typing import Any
@@ -210,5 +211,5 @@ def start_transaction(
     transaction=None,  # type: Optional[Transaction]
     **kwargs  # type: Any
 ):
-    # type: (...) -> Transaction
+    # type: (...) -> Union[Transaction, NoOpSpan]
     return Hub.current.start_transaction(transaction, **kwargs)
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index bf1e483634..8af7003156 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -20,6 +20,7 @@
 from sentry_sdk.transport import make_transport
 from sentry_sdk.consts import (
     DEFAULT_OPTIONS,
+    INSTRUMENTER,
     VERSION,
     ClientConstructor,
 )
@@ -86,6 +87,9 @@ def _get_options(*args, **kwargs):
     if rv["server_name"] is None and hasattr(socket, "gethostname"):
         rv["server_name"] = socket.gethostname()
 
+    if rv["instrumenter"] is None:
+        rv["instrumenter"] = INSTRUMENTER.SENTRY
+
     return rv
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 6fd61d395b..47d630dee3 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -44,6 +44,11 @@
 DEFAULT_MAX_BREADCRUMBS = 100
 
 
+class INSTRUMENTER:
+    SENTRY = "sentry"
+    OTEL = "otel"
+
+
 class OP:
     DB = "db"
     DB_REDIS = "db.redis"
@@ -107,6 +112,7 @@ def __init__(
         send_client_reports=True,  # type: bool
         _experiments={},  # type: Experiments  # noqa: B006
         proxy_headers=None,  # type: Optional[Dict[str, str]]
+        instrumenter=INSTRUMENTER.SENTRY,  # type: Optional[str]
     ):
         # type: (...) -> None
         pass
diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py
index 3d4a28d526..df9de10fe4 100644
--- a/sentry_sdk/hub.py
+++ b/sentry_sdk/hub.py
@@ -5,9 +5,10 @@
 from contextlib import contextmanager
 
 from sentry_sdk._compat import with_metaclass
+from sentry_sdk.consts import INSTRUMENTER
 from sentry_sdk.scope import Scope
 from sentry_sdk.client import Client
-from sentry_sdk.tracing import Span, Transaction
+from sentry_sdk.tracing import NoOpSpan, Span, Transaction
 from sentry_sdk.session import Session
 from sentry_sdk.utils import (
     exc_info_from_error,
@@ -450,6 +451,7 @@ def add_breadcrumb(
     def start_span(
         self,
         span=None,  # type: Optional[Span]
+        instrumenter=INSTRUMENTER.SENTRY,  # type: str
         **kwargs  # type: Any
     ):
         # type: (...) -> Span
@@ -464,6 +466,11 @@ def start_span(
         for every incoming HTTP request. Use `start_transaction` to start a new
         transaction when one is not already in progress.
         """
+        configuration_instrumenter = self.client and self.client.options["instrumenter"]
+
+        if instrumenter != configuration_instrumenter:
+            return NoOpSpan()
+
         # TODO: consider removing this in a future release.
         # This is for backwards compatibility with releases before
         # start_transaction existed, to allow for a smoother transition.
@@ -494,9 +501,10 @@ def start_span(
     def start_transaction(
         self,
         transaction=None,  # type: Optional[Transaction]
+        instrumenter=INSTRUMENTER.SENTRY,  # type: str
         **kwargs  # type: Any
     ):
-        # type: (...) -> Transaction
+        # type: (...) -> Union[Transaction, NoOpSpan]
         """
         Start and return a transaction.
 
@@ -519,6 +527,11 @@ def start_transaction(
         When the transaction is finished, it will be sent to Sentry with all its
         finished child spans.
         """
+        configuration_instrumenter = self.client and self.client.options["instrumenter"]
+
+        if instrumenter != configuration_instrumenter:
+            return NoOpSpan()
+
         custom_sampling_context = kwargs.pop("custom_sampling_context", {})
 
         # if we haven't been given a transaction, make one
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 8be9028aa5..93d22dc758 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -6,6 +6,7 @@
 from datetime import datetime, timedelta
 
 import sentry_sdk
+from sentry_sdk.consts import INSTRUMENTER
 from sentry_sdk.utils import logger
 from sentry_sdk._types import MYPY
 
@@ -125,6 +126,7 @@ def __init__(
         status=None,  # type: Optional[str]
         transaction=None,  # type: Optional[str] # deprecated
         containing_transaction=None,  # type: Optional[Transaction]
+        start_timestamp=None,  # type: Optional[datetime]
     ):
         # type: (...) -> None
         self.trace_id = trace_id or uuid.uuid4().hex
@@ -139,7 +141,7 @@ def __init__(
         self._tags = {}  # type: Dict[str, str]
         self._data = {}  # type: Dict[str, Any]
         self._containing_transaction = containing_transaction
-        self.start_timestamp = datetime.utcnow()
+        self.start_timestamp = start_timestamp or datetime.utcnow()
         try:
             # TODO: For Python 3.7+, we could use a clock with ns resolution:
             # self._start_timestamp_monotonic = time.perf_counter_ns()
@@ -206,8 +208,8 @@ def containing_transaction(self):
         # referencing themselves)
         return self._containing_transaction
 
-    def start_child(self, **kwargs):
-        # type: (**Any) -> Span
+    def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
+        # type: (str, **Any) -> Span
         """
         Start a sub-span from the current span or transaction.
 
@@ -215,6 +217,13 @@ def start_child(self, **kwargs):
         trace id, sampling decision, transaction pointer, and span recorder are
         inherited from the current span/transaction.
         """
+        hub = self.hub or sentry_sdk.Hub.current
+        client = hub.client
+        configuration_instrumenter = client and client.options["instrumenter"]
+
+        if instrumenter != configuration_instrumenter:
+            return NoOpSpan()
+
         kwargs.setdefault("sampled", self.sampled)
 
         child = Span(
@@ -461,8 +470,8 @@ def is_success(self):
         # type: () -> bool
         return self.status == "ok"
 
-    def finish(self, hub=None):
-        # type: (Optional[sentry_sdk.Hub]) -> Optional[str]
+    def finish(self, hub=None, end_timestamp=None):
+        # type: (Optional[sentry_sdk.Hub], Optional[datetime]) -> Optional[str]
         # XXX: would be type: (Optional[sentry_sdk.Hub]) -> None, but that leads
         # to incompatible return types for Span.finish and Transaction.finish.
         if self.timestamp is not None:
@@ -472,8 +481,13 @@ def finish(self, hub=None):
         hub = hub or self.hub or sentry_sdk.Hub.current
 
         try:
-            duration_seconds = time.perf_counter() - self._start_timestamp_monotonic
-            self.timestamp = self.start_timestamp + timedelta(seconds=duration_seconds)
+            if end_timestamp:
+                self.timestamp = end_timestamp
+            else:
+                duration_seconds = time.perf_counter() - self._start_timestamp_monotonic
+                self.timestamp = self.start_timestamp + timedelta(
+                    seconds=duration_seconds
+                )
         except AttributeError:
             self.timestamp = datetime.utcnow()
 
@@ -550,6 +564,7 @@ class Transaction(Span):
         # tracestate data from other vendors, of the form `dogs=yes,cats=maybe`
         "_third_party_tracestate",
         "_measurements",
+        "_contexts",
         "_profile",
         "_baggage",
         "_active_thread_id",
@@ -575,7 +590,9 @@ def __init__(
                 "instead of Span(transaction=...)."
             )
             name = kwargs.pop("transaction")
+
         Span.__init__(self, **kwargs)
+
         self.name = name
         self.source = source
         self.sample_rate = None  # type: Optional[float]
@@ -586,6 +603,7 @@ def __init__(
         self._sentry_tracestate = sentry_tracestate
         self._third_party_tracestate = third_party_tracestate
         self._measurements = {}  # type: Dict[str, Any]
+        self._contexts = {}  # type: Dict[str, Any]
         self._profile = None  # type: Optional[sentry_sdk.profiler.Profile]
         self._baggage = baggage
         # for profiling, we want to know on which thread a transaction is started
@@ -619,8 +637,8 @@ def containing_transaction(self):
         # reference.
         return self
 
-    def finish(self, hub=None):
-        # type: (Optional[sentry_sdk.Hub]) -> Optional[str]
+    def finish(self, hub=None, end_timestamp=None):
+        # type: (Optional[sentry_sdk.Hub], Optional[datetime]) -> Optional[str]
         if self.timestamp is not None:
             # This transaction is already finished, ignore.
             return None
@@ -652,7 +670,7 @@ def finish(self, hub=None):
             )
             self.name = ""
 
-        Span.finish(self, hub)
+        Span.finish(self, hub, end_timestamp)
 
         if not self.sampled:
             # At this point a `sampled = None` should have already been resolved
@@ -674,11 +692,15 @@ def finish(self, hub=None):
         # to be garbage collected
         self._span_recorder = None
 
+        contexts = {}
+        contexts.update(self._contexts)
+        contexts.update({"trace": self.get_trace_context()})
+
         event = {
             "type": "transaction",
             "transaction": self.name,
             "transaction_info": {"source": self.source},
-            "contexts": {"trace": self.get_trace_context()},
+            "contexts": contexts,
             "tags": self._tags,
             "timestamp": self.timestamp,
             "start_timestamp": self.start_timestamp,
@@ -703,6 +725,10 @@ def set_measurement(self, name, value, unit=""):
 
         self._measurements[name] = {"value": value, "unit": unit}
 
+    def set_context(self, key, value):
+        # type: (str, Any) -> None
+        self._contexts[key] = value
+
     def to_json(self):
         # type: () -> Dict[str, Any]
         rv = super(Transaction, self).to_json()
@@ -828,6 +854,48 @@ def _set_initial_sampling_decision(self, sampling_context):
             )
 
 
+class NoOpSpan(Span):
+    def __repr__(self):
+        # type: () -> Any
+        return self.__class__.__name__
+
+    def __enter__(self):
+        # type: () -> Any
+        return self
+
+    def __exit__(self, ty, value, tb):
+        # type: (Any, Any, Any) -> Any
+        pass
+
+    def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
+        # type: (str, **Any) -> Any
+        pass
+
+    def new_span(self, **kwargs):
+        # type: (**Any) -> Any
+        pass
+
+    def set_tag(self, key, value):
+        # type: (Any, Any) -> Any
+        pass
+
+    def set_data(self, key, value):
+        # type: (Any, Any) -> Any
+        pass
+
+    def set_status(self, value):
+        # type: (Any) -> Any
+        pass
+
+    def set_http_status(self, http_status):
+        # type: (Any) -> Any
+        pass
+
+    def finish(self, hub=None, end_timestamp=None):
+        # type: (Any, Any) -> Any
+        pass
+
+
 # Circular imports
 
 from sentry_sdk.tracing_utils import (

From b1290c60208997b082287c724454949ae0166b54 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Wed, 7 Dec 2022 06:11:24 -0800
Subject: [PATCH 171/209] feat(profiling): Introduce active thread id on scope
 (#1764)

Up to this point, simply taking the current thread when the transaction/profile
was started was good enough. When using ASGI apps with non async handlers, the
request is received on the main thread. This is also where the transaction or
profile was started. However, the request is handled on another thread using a
thread pool. To support this use case, we want to be able to set the active
thread id on the scope where we can read it when we need it to allow the active
thread id to be set elsewhere.
---
 sentry_sdk/client.py   |  4 +++-
 sentry_sdk/profiler.py | 14 +++++++++++---
 sentry_sdk/scope.py    | 21 +++++++++++++++++++++
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 8af7003156..d32d014d96 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -433,7 +433,9 @@ def capture_event(
 
             if is_transaction:
                 if profile is not None:
-                    envelope.add_profile(profile.to_json(event_opt, self.options))
+                    envelope.add_profile(
+                        profile.to_json(event_opt, self.options, scope)
+                    )
                 envelope.add_transaction(event_opt)
             else:
                 envelope.add_event(event_opt)
diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index b38b7af962..21313c9f73 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -51,6 +51,7 @@
     from typing import Sequence
     from typing import Tuple
     from typing_extensions import TypedDict
+    import sentry_sdk.scope
     import sentry_sdk.tracing
 
     RawStack = Tuple[RawFrameData, ...]
@@ -267,8 +268,8 @@ def __exit__(self, ty, value, tb):
         self.scheduler.stop_profiling()
         self._stop_ns = nanosecond_time()
 
-    def to_json(self, event_opt, options):
-        # type: (Any, Dict[str, Any]) -> Dict[str, Any]
+    def to_json(self, event_opt, options, scope):
+        # type: (Any, Dict[str, Any], Optional[sentry_sdk.scope.Scope]) -> Dict[str, Any]
         assert self._start_ns is not None
         assert self._stop_ns is not None
 
@@ -280,6 +281,9 @@ def to_json(self, event_opt, options):
             profile["frames"], options["in_app_exclude"], options["in_app_include"]
         )
 
+        # the active thread id from the scope always take priorty if it exists
+        active_thread_id = None if scope is None else scope.active_thread_id
+
         return {
             "environment": event_opt.get("environment"),
             "event_id": uuid.uuid4().hex,
@@ -311,7 +315,11 @@ def to_json(self, event_opt, options):
                     # because we end the transaction after the profile
                     "relative_end_ns": str(self._stop_ns - self._start_ns),
                     "trace_id": self.transaction.trace_id,
-                    "active_thread_id": str(self.transaction._active_thread_id),
+                    "active_thread_id": str(
+                        self.transaction._active_thread_id
+                        if active_thread_id is None
+                        else active_thread_id
+                    ),
                 }
             ],
         }
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
index e0a2dc7a8d..f5ac270914 100644
--- a/sentry_sdk/scope.py
+++ b/sentry_sdk/scope.py
@@ -94,6 +94,10 @@ class Scope(object):
         "_session",
         "_attachments",
         "_force_auto_session_tracking",
+        # The thread that is handling the bulk of the work. This can just
+        # be the main thread, but that's not always true. For web frameworks,
+        # this would be the thread handling the request.
+        "_active_thread_id",
     )
 
     def __init__(self):
@@ -125,6 +129,8 @@ def clear(self):
         self._session = None  # type: Optional[Session]
         self._force_auto_session_tracking = None  # type: Optional[bool]
 
+        self._active_thread_id = None  # type: Optional[int]
+
     @_attr_setter
     def level(self, value):
         # type: (Optional[str]) -> None
@@ -228,6 +234,17 @@ def span(self, span):
             if transaction.name:
                 self._transaction = transaction.name
 
+    @property
+    def active_thread_id(self):
+        # type: () -> Optional[int]
+        """Get/set the current active thread id."""
+        return self._active_thread_id
+
+    def set_active_thread_id(self, active_thread_id):
+        # type: (Optional[int]) -> None
+        """Set the current active thread id."""
+        self._active_thread_id = active_thread_id
+
     def set_tag(
         self,
         key,  # type: str
@@ -447,6 +464,8 @@ def update_from_scope(self, scope):
             self._span = scope._span
         if scope._attachments:
             self._attachments.extend(scope._attachments)
+        if scope._active_thread_id is not None:
+            self._active_thread_id = scope._active_thread_id
 
     def update_from_kwargs(
         self,
@@ -496,6 +515,8 @@ def __copy__(self):
         rv._force_auto_session_tracking = self._force_auto_session_tracking
         rv._attachments = list(self._attachments)
 
+        rv._active_thread_id = self._active_thread_id
+
         return rv
 
     def __repr__(self):

From dd26fbe757854dc2bac62742ed6dbc0710c19642 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Wed, 14 Dec 2022 03:44:32 -0500
Subject: [PATCH 172/209] fix(ci): Fix Github action checks (#1780)

The checks are failing for 2 reasons:
1. GitHub actions dropped python3.7 support on the latest hosted runners.
   https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
2. New release of Tox was validation the python version in the environment name
   and the trailing framework version being used in the environment name was
   being treated as a python version and validated causing an issue.

Further changes:
* Added one GitHub job to check if all tests have passed. Makes it easier to configure required checks in GitHub.
* Pinning Tox to <4

Co-authored-by: Anton Pirker 
---
 .github/workflows/test-common.yml             |  11 +-
 .../workflows/test-integration-aiohttp.yml    |  25 +-
 .github/workflows/test-integration-asgi.yml   |  25 +-
 .../workflows/test-integration-aws_lambda.yml |  25 +-
 .github/workflows/test-integration-beam.yml   |  25 +-
 .github/workflows/test-integration-boto3.yml  |  25 +-
 .github/workflows/test-integration-bottle.yml |  25 +-
 .github/workflows/test-integration-celery.yml |  25 +-
 .../workflows/test-integration-chalice.yml    |  25 +-
 .github/workflows/test-integration-django.yml |  25 +-
 .github/workflows/test-integration-falcon.yml |  25 +-
 .../workflows/test-integration-fastapi.yml    |  25 +-
 .github/workflows/test-integration-flask.yml  |  25 +-
 .github/workflows/test-integration-gcp.yml    |  25 +-
 .github/workflows/test-integration-httpx.yml  |  25 +-
 .../workflows/test-integration-pure_eval.yml  |  25 +-
 .../workflows/test-integration-pymongo.yml    |  25 +-
 .../workflows/test-integration-pyramid.yml    |  25 +-
 .github/workflows/test-integration-quart.yml  |  25 +-
 .github/workflows/test-integration-redis.yml  |  25 +-
 .../test-integration-rediscluster.yml         |  25 +-
 .../workflows/test-integration-requests.yml   |  25 +-
 .github/workflows/test-integration-rq.yml     |  25 +-
 .github/workflows/test-integration-sanic.yml  |  25 +-
 .../workflows/test-integration-sqlalchemy.yml |  25 +-
 .../workflows/test-integration-starlette.yml  |  25 +-
 .../workflows/test-integration-tornado.yml    |  25 +-
 .../workflows/test-integration-trytond.yml    |  25 +-
 scripts/split-tox-gh-actions/ci-yaml.txt      |  18 +-
 .../split-tox-gh-actions.py                   |  11 +-
 tox.ini                                       | 347 +++++++++---------
 31 files changed, 715 insertions(+), 347 deletions(-)

diff --git a/.github/workflows/test-common.yml b/.github/workflows/test-common.yml
index 2c8964d4ae..d3922937fe 100644
--- a/.github/workflows/test-common.yml
+++ b/.github/workflows/test-common.yml
@@ -24,7 +24,11 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
         python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
     services:
       postgres:
@@ -51,9 +55,6 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
           pip install codecov tox
 
@@ -69,4 +70,4 @@ jobs:
           ./scripts/runtox.sh "py${{ matrix.python-version }}$" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch --ignore=tests/integrations
           coverage combine .coverage*
           coverage xml -i
-          codecov --file coverage.xml
\ No newline at end of file
+          codecov --file coverage.xml
diff --git a/.github/workflows/test-integration-aiohttp.yml b/.github/workflows/test-integration-aiohttp.yml
index 62f0a48ebf..73483454c2 100644
--- a/.github/workflows/test-integration-aiohttp.yml
+++ b/.github/workflows/test-integration-aiohttp.yml
@@ -27,12 +27,16 @@ jobs:
     name: aiohttp, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test aiohttp
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All aiohttp tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-asgi.yml b/.github/workflows/test-integration-asgi.yml
index 069ebbf3aa..16715ca230 100644
--- a/.github/workflows/test-integration-asgi.yml
+++ b/.github/workflows/test-integration-asgi.yml
@@ -27,12 +27,16 @@ jobs:
     name: asgi, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test asgi
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All asgi tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-aws_lambda.yml b/.github/workflows/test-integration-aws_lambda.yml
index 5e40fed7e6..4d795a642d 100644
--- a/.github/workflows/test-integration-aws_lambda.yml
+++ b/.github/workflows/test-integration-aws_lambda.yml
@@ -27,12 +27,16 @@ jobs:
     name: aws_lambda, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.7"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test aws_lambda
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All aws_lambda tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-beam.yml b/.github/workflows/test-integration-beam.yml
index 55f8e015be..0f6df2df0b 100644
--- a/.github/workflows/test-integration-beam.yml
+++ b/.github/workflows/test-integration-beam.yml
@@ -27,12 +27,16 @@ jobs:
     name: beam, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.7"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test beam
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All beam tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-boto3.yml b/.github/workflows/test-integration-boto3.yml
index 9b8747c5f8..8f390fb309 100644
--- a/.github/workflows/test-integration-boto3.yml
+++ b/.github/workflows/test-integration-boto3.yml
@@ -27,12 +27,16 @@ jobs:
     name: boto3, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["2.7","3.6","3.7","3.8"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test boto3
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All boto3 tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-bottle.yml b/.github/workflows/test-integration-bottle.yml
index 834638213b..b2c3fcc92b 100644
--- a/.github/workflows/test-integration-bottle.yml
+++ b/.github/workflows/test-integration-bottle.yml
@@ -27,12 +27,16 @@ jobs:
     name: bottle, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test bottle
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All bottle tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-celery.yml b/.github/workflows/test-integration-celery.yml
index 17feb5a4ba..927a0371cd 100644
--- a/.github/workflows/test-integration-celery.yml
+++ b/.github/workflows/test-integration-celery.yml
@@ -27,12 +27,16 @@ jobs:
     name: celery, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test celery
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All celery tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-chalice.yml b/.github/workflows/test-integration-chalice.yml
index 36067fc7ca..44fe01e19f 100644
--- a/.github/workflows/test-integration-chalice.yml
+++ b/.github/workflows/test-integration-chalice.yml
@@ -27,12 +27,16 @@ jobs:
     name: chalice, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.6","3.7","3.8"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test chalice
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All chalice tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-django.yml b/.github/workflows/test-integration-django.yml
index db659728a8..93c792b7b7 100644
--- a/.github/workflows/test-integration-django.yml
+++ b/.github/workflows/test-integration-django.yml
@@ -27,12 +27,16 @@ jobs:
     name: django, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
     services:
       postgres:
         image: postgres
@@ -58,11 +62,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test django
         env:
@@ -77,3 +78,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All django tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-falcon.yml b/.github/workflows/test-integration-falcon.yml
index af4c701e1a..956e8d5ba7 100644
--- a/.github/workflows/test-integration-falcon.yml
+++ b/.github/workflows/test-integration-falcon.yml
@@ -27,12 +27,16 @@ jobs:
     name: falcon, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test falcon
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All falcon tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-fastapi.yml b/.github/workflows/test-integration-fastapi.yml
index 6352d134e4..2dc8f1e171 100644
--- a/.github/workflows/test-integration-fastapi.yml
+++ b/.github/workflows/test-integration-fastapi.yml
@@ -27,12 +27,16 @@ jobs:
     name: fastapi, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test fastapi
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All fastapi tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-flask.yml b/.github/workflows/test-integration-flask.yml
index 8e353814ff..96263508da 100644
--- a/.github/workflows/test-integration-flask.yml
+++ b/.github/workflows/test-integration-flask.yml
@@ -27,12 +27,16 @@ jobs:
     name: flask, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test flask
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All flask tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-gcp.yml b/.github/workflows/test-integration-gcp.yml
index 8aa4e12b7a..eefdfe1aae 100644
--- a/.github/workflows/test-integration-gcp.yml
+++ b/.github/workflows/test-integration-gcp.yml
@@ -27,12 +27,16 @@ jobs:
     name: gcp, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.7"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test gcp
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All gcp tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-httpx.yml b/.github/workflows/test-integration-httpx.yml
index f9e1b4ec31..9f5ac92a3f 100644
--- a/.github/workflows/test-integration-httpx.yml
+++ b/.github/workflows/test-integration-httpx.yml
@@ -27,12 +27,16 @@ jobs:
     name: httpx, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.6","3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test httpx
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All httpx tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-pure_eval.yml b/.github/workflows/test-integration-pure_eval.yml
index ef39704c43..1d8f7e1beb 100644
--- a/.github/workflows/test-integration-pure_eval.yml
+++ b/.github/workflows/test-integration-pure_eval.yml
@@ -27,12 +27,16 @@ jobs:
     name: pure_eval, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.5","3.6","3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test pure_eval
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All pure_eval tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-pymongo.yml b/.github/workflows/test-integration-pymongo.yml
index b2e82b7fb3..fb961558ac 100644
--- a/.github/workflows/test-integration-pymongo.yml
+++ b/.github/workflows/test-integration-pymongo.yml
@@ -27,12 +27,16 @@ jobs:
     name: pymongo, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["2.7","3.6","3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test pymongo
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All pymongo tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-pyramid.yml b/.github/workflows/test-integration-pyramid.yml
index bbd017b66f..ad7bc43e85 100644
--- a/.github/workflows/test-integration-pyramid.yml
+++ b/.github/workflows/test-integration-pyramid.yml
@@ -27,12 +27,16 @@ jobs:
     name: pyramid, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test pyramid
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All pyramid tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-quart.yml b/.github/workflows/test-integration-quart.yml
index de7671dbda..b9d82e53bc 100644
--- a/.github/workflows/test-integration-quart.yml
+++ b/.github/workflows/test-integration-quart.yml
@@ -27,12 +27,16 @@ jobs:
     name: quart, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test quart
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All quart tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-redis.yml b/.github/workflows/test-integration-redis.yml
index 60352088cd..074c41fe5b 100644
--- a/.github/workflows/test-integration-redis.yml
+++ b/.github/workflows/test-integration-redis.yml
@@ -27,12 +27,16 @@ jobs:
     name: redis, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["2.7","3.7","3.8","3.9"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test redis
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All redis tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-rediscluster.yml b/.github/workflows/test-integration-rediscluster.yml
index 5866637176..06962926fa 100644
--- a/.github/workflows/test-integration-rediscluster.yml
+++ b/.github/workflows/test-integration-rediscluster.yml
@@ -27,12 +27,16 @@ jobs:
     name: rediscluster, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["2.7","3.7","3.8","3.9"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test rediscluster
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All rediscluster tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-requests.yml b/.github/workflows/test-integration-requests.yml
index 7e33b446db..5650121a51 100644
--- a/.github/workflows/test-integration-requests.yml
+++ b/.github/workflows/test-integration-requests.yml
@@ -27,12 +27,16 @@ jobs:
     name: requests, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["2.7","3.8","3.9"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test requests
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All requests tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-rq.yml b/.github/workflows/test-integration-rq.yml
index e2a0ebaff8..3e3ead8118 100644
--- a/.github/workflows/test-integration-rq.yml
+++ b/.github/workflows/test-integration-rq.yml
@@ -27,12 +27,16 @@ jobs:
     name: rq, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test rq
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All rq tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-sanic.yml b/.github/workflows/test-integration-sanic.yml
index aa99f54a90..37ffd84bb9 100644
--- a/.github/workflows/test-integration-sanic.yml
+++ b/.github/workflows/test-integration-sanic.yml
@@ -27,12 +27,16 @@ jobs:
     name: sanic, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.5","3.6","3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test sanic
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All sanic tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-sqlalchemy.yml b/.github/workflows/test-integration-sqlalchemy.yml
index ea36e0f562..c57fc950b7 100644
--- a/.github/workflows/test-integration-sqlalchemy.yml
+++ b/.github/workflows/test-integration-sqlalchemy.yml
@@ -27,12 +27,16 @@ jobs:
     name: sqlalchemy, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["2.7","3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test sqlalchemy
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All sqlalchemy tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-starlette.yml b/.github/workflows/test-integration-starlette.yml
index a35544e9e9..e4083f72d5 100644
--- a/.github/workflows/test-integration-starlette.yml
+++ b/.github/workflows/test-integration-starlette.yml
@@ -27,12 +27,16 @@ jobs:
     name: starlette, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test starlette
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All starlette tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-tornado.yml b/.github/workflows/test-integration-tornado.yml
index 17c1f18a8e..de5d02f6e7 100644
--- a/.github/workflows/test-integration-tornado.yml
+++ b/.github/workflows/test-integration-tornado.yml
@@ -27,12 +27,16 @@ jobs:
     name: tornado, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test tornado
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All tornado tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.github/workflows/test-integration-trytond.yml b/.github/workflows/test-integration-trytond.yml
index 12771ffd21..10853341e2 100644
--- a/.github/workflows/test-integration-trytond.yml
+++ b/.github/workflows/test-integration-trytond.yml
@@ -27,12 +27,16 @@ jobs:
     name: trytond, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.5","3.6","3.7","3.8","3.9","3.10"]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,11 +45,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test trytond
         env:
@@ -60,3 +61,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All trytond tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/scripts/split-tox-gh-actions/ci-yaml.txt b/scripts/split-tox-gh-actions/ci-yaml.txt
index 2e14cb5062..f2b6f97c27 100644
--- a/scripts/split-tox-gh-actions/ci-yaml.txt
+++ b/scripts/split-tox-gh-actions/ci-yaml.txt
@@ -27,7 +27,6 @@ jobs:
     name: {{ framework }}, python ${{ matrix.python-version }}, ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
-    continue-on-error: true
 {{ strategy_matrix }}
 {{ services }}
 
@@ -38,11 +37,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Setup Test Env
-        env:
-          PGHOST: localhost
-          PGPASSWORD: sentry
         run: |
-          pip install codecov tox
+          pip install codecov "tox>=3,<4"
 
       - name: Test {{ framework }}
         env:
@@ -57,3 +53,15 @@ jobs:
           coverage combine .coverage*
           coverage xml -i
           codecov --file coverage.xml
+
+  check_required_tests:
+    name: All {{ framework }} tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/scripts/split-tox-gh-actions/split-tox-gh-actions.py b/scripts/split-tox-gh-actions/split-tox-gh-actions.py
index 6e0018d0ff..2458fe06af 100755
--- a/scripts/split-tox-gh-actions/split-tox-gh-actions.py
+++ b/scripts/split-tox-gh-actions/split-tox-gh-actions.py
@@ -32,9 +32,14 @@
 
 MATRIX_DEFINITION = """
     strategy:
+      fail-fast: false
       matrix:
         python-version: [{{ python-version }}]
-        os: [ubuntu-latest]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
 """
 
 
@@ -77,7 +82,7 @@ def get_yaml_files_hash():
     """Calculate a hash of all the yaml configuration files"""
 
     hasher = hashlib.md5()
-    path_pattern = (OUT_DIR / f"test-integration-*.yml").as_posix()
+    path_pattern = (OUT_DIR / "test-integration-*.yml").as_posix()
     for file in glob(path_pattern):
         with open(file, "rb") as f:
             buf = f.read()
@@ -127,7 +132,7 @@ def main(fail_on_changes):
                 if python_version not in python_versions[framework]:
                     python_versions[framework].append(python_version)
 
-        except ValueError as err:
+        except ValueError:
             print(f"ERROR reading line {line}")
 
     for framework in python_versions:
diff --git a/tox.ini b/tox.ini
index 98505caab1..22eac59db8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,97 +9,97 @@ envlist =
     py{2.7,3.4,3.5,3.6,3.7,3.8,3.9,3.10}
 
     # === Integrations ===
-    # General format is {pythonversion}-{integrationname}-{frameworkversion}
+    # General format is {pythonversion}-{integrationname}-v{frameworkversion}
     # 1 blank line between different integrations
     # Each framework version should only be mentioned once. I.e:
-    #   {py3.7,py3.10}-django-{3.2}
-    #   {py3.10}-django-{4.0}
+    #   {py3.7,py3.10}-django-v{3.2}
+    #   {py3.10}-django-v{4.0}
     # instead of:
-    #   {py3.7}-django-{3.2}
-    #   {py3.7,py3.10}-django-{3.2,4.0}
+    #   {py3.7}-django-v{3.2}
+    #   {py3.7,py3.10}-django-v{3.2,4.0}
 
     # Django 1.x
-    {py2.7,py3.5}-django-{1.8,1.9,1.10}
-    {py2.7,py3.5,py3.6,py3.7}-django-{1.11}
+    {py2.7,py3.5}-django-v{1.8,1.9,1.10}
+    {py2.7,py3.5,py3.6,py3.7}-django-v{1.11}
     # Django 2.x
-    {py3.5,py3.6,py3.7}-django-{2.0,2.1}
-    {py3.5,py3.6,py3.7,py3.8,py3.9}-django-{2.2}
+    {py3.5,py3.6,py3.7}-django-v{2.0,2.1}
+    {py3.5,py3.6,py3.7,py3.8,py3.9}-django-v{2.2}
     # Django 3.x
-    {py3.6,py3.7,py3.8,py3.9}-django-{3.0,3.1}
-    {py3.6,py3.7,py3.8,py3.9,py3.10}-django-{3.2}
+    {py3.6,py3.7,py3.8,py3.9}-django-v{3.0,3.1}
+    {py3.6,py3.7,py3.8,py3.9,py3.10}-django-v{3.2}
     # Django 4.x
-    {py3.8,py3.9,py3.10}-django-{4.0,4.1}
+    {py3.8,py3.9,py3.10}-django-v{4.0,4.1}
 
-    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.11,0.12,1.0}
-    {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
+    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-v{0.11,0.12,1.0}
+    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-flask-v1.1
+    {py3.6,py3.8,py3.9,py3.10}-flask-v2.0
 
     {py3.7,py3.8,py3.9,py3.10}-asgi
 
-    {py3.7,py3.8,py3.9,py3.10}-starlette-{0.19.1,0.20,0.21}
+    {py3.7,py3.8,py3.9,py3.10}-starlette-v{0.19.1,0.20,0.21}
 
     {py3.7,py3.8,py3.9,py3.10}-fastapi
 
     {py3.7,py3.8,py3.9,py3.10}-quart
 
-    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-bottle-0.12
+    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-bottle-v0.12
 
-    {py2.7,py3.5,py3.6,py3.7}-falcon-1.4
-    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-falcon-2.0
+    {py2.7,py3.5,py3.6,py3.7}-falcon-v1.4
+    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-falcon-v2.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,py3.10}-sanic-21
-    {py3.7,py3.8,py3.9,py3.10}-sanic-22
+    {py3.5,py3.6,py3.7}-sanic-v{0.8,18}
+    {py3.6,py3.7}-sanic-v19
+    {py3.6,py3.7,py3.8}-sanic-v20
+    {py3.7,py3.8,py3.9,py3.10}-sanic-v21
+    {py3.7,py3.8,py3.9,py3.10}-sanic-v22
 
-    {py2.7}-celery-3
-    {py2.7,py3.5,py3.6}-celery-{4.1,4.2}
-    {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,py3.8,py3.9,py3.10}-celery-{5.1,5.2}
+    {py2.7}-celery-v3
+    {py2.7,py3.5,py3.6}-celery-v{4.1,4.2}
+    {py2.7,py3.5,py3.6,py3.7,py3.8}-celery-v{4.3,4.4}
+    {py3.6,py3.7,py3.8}-celery-v{5.0}
+    {py3.7,py3.8,py3.9,py3.10}-celery-v{5.1,5.2}
 
-    py3.7-beam-{2.12,2.13,2.32,2.33}
+    py3.7-beam-v{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
 
     py3.7-gcp
 
-    {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}
+    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-pyramid-v{1.6,1.7,1.8,1.9,1.10}
 
-    {py2.7,py3.5,py3.6}-rq-{0.6,0.7,0.8,0.9,0.10,0.11}
-    {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,py3.10}-rq-{1.4,1.5}
+    {py2.7,py3.5,py3.6}-rq-v{0.6,0.7,0.8,0.9,0.10,0.11}
+    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-rq-v{0.12,0.13,1.0,1.1,1.2,1.3}
+    {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-rq-v{1.4,1.5}
 
-    py3.7-aiohttp-3.5
-    {py3.7,py3.8,py3.9,py3.10}-aiohttp-3.6
+    py3.7-aiohttp-v3.5
+    {py3.7,py3.8,py3.9,py3.10}-aiohttp-v3.6
 
-    {py3.7,py3.8,py3.9}-tornado-{5}
-    {py3.7,py3.8,py3.9,py3.10}-tornado-{6}
+    {py3.7,py3.8,py3.9}-tornado-v{5}
+    {py3.7,py3.8,py3.9,py3.10}-tornado-v{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,py3.10}-trytond-{5.4}
+    {py3.5,py3.6,py3.7,py3.8,py3.9}-trytond-v{4.6,5.0,5.2}
+    {py3.6,py3.7,py3.8,py3.9,py3.10}-trytond-v{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.1.0,2}
+    {py2.7,py3.7,py3.8,py3.9}-rediscluster-v{1,2.1.0,2}
 
-    {py2.7,py3.7,py3.8,py3.9,py3.10}-sqlalchemy-{1.2,1.3}
+    {py2.7,py3.7,py3.8,py3.9,py3.10}-sqlalchemy-v{1.2,1.3}
 
     {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}
+    {py3.6,py3.7,py3.8}-chalice-v{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}
+    {py2.7,py3.6,py3.7,py3.8}-boto3-v{1.9,1.10,1.11,1.12,1.13,1.14,1.15,1.16}
 
-    {py3.6,py3.7,py3.8,py3.9,py3.10}-httpx-{0.16,0.17}
+    {py3.6,py3.7,py3.8,py3.9,py3.10}-httpx-v{0.16,0.17}
 
-    {py2.7,py3.6}-pymongo-{3.1}
-    {py2.7,py3.6,py3.7,py3.8,py3.9}-pymongo-{3.12}
-    {py3.6,py3.7,py3.8,py3.9,py3.10}-pymongo-{4.0}
-    {py3.7,py3.8,py3.9,py3.10}-pymongo-{4.1,4.2}
+    {py2.7,py3.6}-pymongo-v{3.1}
+    {py2.7,py3.6,py3.7,py3.8,py3.9}-pymongo-v{3.12}
+    {py3.6,py3.7,py3.8,py3.9,py3.10}-pymongo-v{4.0}
+    {py3.7,py3.8,py3.9,py3.10}-pymongo-v{4.1,4.2}
 
 [testenv]
 deps =
@@ -111,41 +111,41 @@ deps =
     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[daphne]>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.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-{4.0,4.1}: djangorestframework
-    django-{4.0,4.1}: pytest-asyncio
-    django-{4.0,4.1}: psycopg2-binary
-    django-{4.0,4.1}: pytest-django
-    django-{4.0,4.1}: Werkzeug
-
-    django-1.8: Django>=1.8,<1.9
-    django-1.9: Django>=1.9,<1.10
-    django-1.10: Django>=1.10,<1.11
-    django-1.11: Django>=1.11,<1.12
-    django-2.0: Django>=2.0,<2.1
-    django-2.1: Django>=2.1,<2.2
-    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.2,<3.3
-    django-4.0: Django>=4.0,<4.1
-    django-4.1: Django>=4.1,<4.2
+    django-v{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-v{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: channels[daphne]>2
+    {py3.7,py3.8,py3.9,py3.10}-django-v{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-v{1.11,2.2,3.0,3.1,3.2}: psycopg2-binary
+
+    django-v{1.8,1.9,1.10,1.11,2.0,2.1}: pytest-django<4.0
+    django-v{2.2,3.0,3.1,3.2}: pytest-django>=4.0
+    django-v{2.2,3.0,3.1,3.2}: Werkzeug<2.0
+
+    django-v{4.0,4.1}: djangorestframework
+    django-v{4.0,4.1}: pytest-asyncio
+    django-v{4.0,4.1}: psycopg2-binary
+    django-v{4.0,4.1}: pytest-django
+    django-v{4.0,4.1}: Werkzeug
+
+    django-v1.8: Django>=1.8,<1.9
+    django-v1.9: Django>=1.9,<1.10
+    django-v1.10: Django>=1.10,<1.11
+    django-v1.11: Django>=1.11,<1.12
+    django-v2.0: Django>=2.0,<2.1
+    django-v2.1: Django>=2.1,<2.2
+    django-v2.2: Django>=2.2,<2.3
+    django-v3.0: Django>=3.0,<3.1
+    django-v3.1: Django>=3.1,<3.2
+    django-v3.2: Django>=3.2,<3.3
+    django-v4.0: Django>=4.0,<4.1
+    django-v4.1: Django>=4.1,<4.2
 
     flask: flask-login
-    flask-0.11: Flask>=0.11,<0.12
-    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-2.0: Flask>=2.0,<2.1
+    flask-v0.11: Flask>=0.11,<0.12
+    flask-v0.12: Flask>=0.12,<0.13
+    flask-v1.0: Flask>=1.0,<1.1
+    flask-v1.1: Flask>=1.1,<1.2
+    flask-v2.0: Flask>=2.0,<2.1
 
     asgi: pytest-asyncio
     asgi: async-asgi-testclient
@@ -157,10 +157,10 @@ deps =
     starlette: pytest-asyncio
     starlette: python-multipart
     starlette: requests
-    starlette-0.21: httpx
-    starlette-0.19.1: starlette==0.19.1
-    starlette-0.20: starlette>=0.20.0,<0.21.0
-    starlette-0.21: starlette>=0.21.0,<0.22.0
+    starlette-v0.21: httpx
+    starlette-v0.19.1: starlette==0.19.1
+    starlette-v0.20: starlette>=0.20.0,<0.21.0
+    starlette-v0.21: starlette>=0.21.0,<0.22.0
 
     fastapi: fastapi
     fastapi: httpx
@@ -168,42 +168,42 @@ deps =
     fastapi: python-multipart
     fastapi: requests
 
-    bottle-0.12: bottle>=0.12,<0.13
+    bottle-v0.12: bottle>=0.12,<0.13
 
-    falcon-1.4: falcon>=1.4,<1.5
-    falcon-2.0: falcon>=2.0.0rc3,<3.0
+    falcon-v1.4: falcon>=1.4,<1.5
+    falcon-v2.0: falcon>=2.0.0rc3,<3.0
 
-    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
-    sanic-22: sanic>=22.0,<22.9.0
+    sanic-v0.8: sanic>=0.8,<0.9
+    sanic-v18: sanic>=18.0,<19.0
+    sanic-v19: sanic>=19.0,<20.0
+    sanic-v20: sanic>=20.0,<21.0
+    sanic-v21: sanic>=21.0,<22.0
+    sanic-v22: sanic>=22.0,<22.9.0
 
     sanic: aiohttp
-    sanic-21: sanic_testing<22
-    sanic-22: sanic_testing<22.9.0
+    sanic-v21: sanic_testing<22
+    sanic-v22: sanic_testing<22.9.0
     {py3.5,py3.6}-sanic: aiocontextvars==0.2.1
     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
-    beam-2.32: apache-beam>=2.32.0, <2.33.0
-    beam-2.33: apache-beam>=2.33.0, <2.34.0
+    beam-v2.12: apache-beam>=2.12.0, <2.13.0
+    beam-v2.13: apache-beam>=2.13.0, <2.14.0
+    beam-v2.32: apache-beam>=2.32.0, <2.33.0
+    beam-v2.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
-    celery-3: Celery>=3.1,<4.0
-    celery-4.1: Celery>=4.1,<4.2
-    celery-4.2: Celery>=4.2,<4.3
-    celery-4.3: Celery>=4.3,<4.4
+    celery-v3: Celery>=3.1,<4.0
+    celery-v4.1: Celery>=4.1,<4.2
+    celery-v4.2: Celery>=4.2,<4.3
+    celery-v4.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
-    celery-5.0: Celery>=5.0,<5.1
-    celery-5.1: Celery>=5.1,<5.2
-    celery-5.2: Celery>=5.2,<5.3
+    celery-v4.4: Celery>=4.4,<4.5,!=4.4.4
+    celery-v5.0: Celery>=5.0,<5.1
+    celery-v5.1: Celery>=5.1,<5.2
+    celery-v5.2: Celery>=5.2,<5.3
 
     py3.5-celery: newrelic<6.0.0
     {py3.7}-celery: importlib-metadata<5.0
@@ -213,85 +213,85 @@ deps =
 
     aws_lambda: boto3
 
-    pyramid-1.6: pyramid>=1.6,<1.7
-    pyramid-1.7: pyramid>=1.7,<1.8
-    pyramid-1.8: pyramid>=1.8,<1.9
-    pyramid-1.9: pyramid>=1.9,<1.10
-    pyramid-1.10: pyramid>=1.10,<1.11
+    pyramid-v1.6: pyramid>=1.6,<1.7
+    pyramid-v1.7: pyramid>=1.7,<1.8
+    pyramid-v1.8: pyramid>=1.8,<1.9
+    pyramid-v1.9: pyramid>=1.9,<1.10
+    pyramid-v1.10: pyramid>=1.10,<1.11
 
     # 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,<1.7.4
-
-    rq-0.6: rq>=0.6,<0.7
-    rq-0.7: rq>=0.7,<0.8
-    rq-0.8: rq>=0.8,<0.9
-    rq-0.9: rq>=0.9,<0.10
-    rq-0.10: rq>=0.10,<0.11
-    rq-0.11: rq>=0.11,<0.12
-    rq-0.12: rq>=0.12,<0.13
-    rq-0.13: rq>=0.13,<0.14
-    rq-1.0: rq>=1.0,<1.1
-    rq-1.1: rq>=1.1,<1.2
-    rq-1.2: rq>=1.2,<1.3
-    rq-1.3: rq>=1.3,<1.4
-    rq-1.4: rq>=1.4,<1.5
-    rq-1.5: rq>=1.5,<1.6
-
-    aiohttp-3.4: aiohttp>=3.4.0,<3.5.0
-    aiohttp-3.5: aiohttp>=3.5.0,<3.6.0
+    rq-v{0.6,0.7,0.8,0.9,0.10,0.11,0.12}: fakeredis<1.0
+    rq-v{0.6,0.7,0.8,0.9,0.10,0.11,0.12}: redis<3.2.2
+    rq-v{0.13,1.0,1.1,1.2,1.3,1.4,1.5}: fakeredis>=1.0,<1.7.4
+
+    rq-v0.6: rq>=0.6,<0.7
+    rq-v0.7: rq>=0.7,<0.8
+    rq-v0.8: rq>=0.8,<0.9
+    rq-v0.9: rq>=0.9,<0.10
+    rq-v0.10: rq>=0.10,<0.11
+    rq-v0.11: rq>=0.11,<0.12
+    rq-v0.12: rq>=0.12,<0.13
+    rq-v0.13: rq>=0.13,<0.14
+    rq-v1.0: rq>=1.0,<1.1
+    rq-v1.1: rq>=1.1,<1.2
+    rq-v1.2: rq>=1.2,<1.3
+    rq-v1.3: rq>=1.3,<1.4
+    rq-v1.4: rq>=1.4,<1.5
+    rq-v1.5: rq>=1.5,<1.6
+
+    aiohttp-v3.4: aiohttp>=3.4.0,<3.5.0
+    aiohttp-v3.5: aiohttp>=3.5.0,<3.6.0
     aiohttp: pytest-aiohttp
 
-    tornado-5: tornado>=5,<6
-    tornado-6: tornado>=6.0a1
+    tornado-v5: tornado>=5,<6
+    tornado-v6: tornado>=6.0a1
 
-    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.6: trytond>=4.6,<4.7
+    trytond-v5.4: trytond>=5.4,<5.5
+    trytond-v5.2: trytond>=5.2,<5.3
+    trytond-v5.0: trytond>=5.0,<5.1
+    trytond-v4.6: trytond>=4.6,<4.7
 
-    trytond-{4.6,4.8,5.0,5.2,5.4}: werkzeug<2.0
+    trytond-v{4.6,4.8,5.0,5.2,5.4}: werkzeug<2.0
 
     redis: fakeredis<1.7.4
 
-    rediscluster-1: redis-py-cluster>=1.0.0,<2.0.0
-    rediscluster-2.1.0: redis-py-cluster>=2.0.0,<2.1.1
-    rediscluster-2: redis-py-cluster>=2.1.1,<3.0.0
+    rediscluster-v1: redis-py-cluster>=1.0.0,<2.0.0
+    rediscluster-v2.1.0: redis-py-cluster>=2.0.0,<2.1.1
+    rediscluster-v2: redis-py-cluster>=2.1.1,<3.0.0
 
-    sqlalchemy-1.2: sqlalchemy>=1.2,<1.3
-    sqlalchemy-1.3: sqlalchemy>=1.3,<1.4
+    sqlalchemy-v1.2: sqlalchemy>=1.2,<1.3
+    sqlalchemy-v1.3: sqlalchemy>=1.3,<1.4
 
     linters: -r linter-requirements.txt
 
     py3.8: hypothesis
 
     pure_eval: pure_eval
-    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-1.20: chalice>=1.20.0,<1.21.0
+    chalice-v1.16: chalice>=1.16.0,<1.17.0
+    chalice-v1.17: chalice>=1.17.0,<1.18.0
+    chalice-v1.18: chalice>=1.18.0,<1.19.0
+    chalice-v1.19: chalice>=1.19.0,<1.20.0
+    chalice-v1.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
+    boto3-v1.9: boto3>=1.9,<1.10
+    boto3-v1.10: boto3>=1.10,<1.11
+    boto3-v1.11: boto3>=1.11,<1.12
+    boto3-v1.12: boto3>=1.12,<1.13
+    boto3-v1.13: boto3>=1.13,<1.14
+    boto3-v1.14: boto3>=1.14,<1.15
+    boto3-v1.15: boto3>=1.15,<1.16
+    boto3-v1.16: boto3>=1.16,<1.17
 
-    httpx-0.16: httpx>=0.16,<0.17
-    httpx-0.17: httpx>=0.17,<0.18
+    httpx-v0.16: httpx>=0.16,<0.17
+    httpx-v0.17: httpx>=0.17,<0.18
 
     pymongo: mockupdb
-    pymongo-3.1: pymongo>=3.1,<3.2
-    pymongo-3.12: pymongo>=3.12,<4.0
-    pymongo-4.0: pymongo>=4.0,<4.1
-    pymongo-4.1: pymongo>=4.1,<4.2
-    pymongo-4.2: pymongo>=4.2,<4.3
+    pymongo-v3.1: pymongo>=3.1,<3.2
+    pymongo-v3.12: pymongo>=3.12,<4.0
+    pymongo-v4.0: pymongo>=4.0,<4.1
+    pymongo-v4.1: pymongo>=4.1,<4.2
+    pymongo-v4.2: pymongo>=4.2,<4.3
 
 setenv =
     PYTHONDONTWRITEBYTECODE=1
@@ -359,19 +359,22 @@ basepython =
 
 commands =
     ; https://github.com/pytest-dev/pytest/issues/5532
-    {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
+    {py3.5,py3.6,py3.7,py3.8,py3.9}-flask-v{0.11,0.12}: pip install pytest<5
+    {py3.6,py3.7,py3.8,py3.9}-flask-v{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"
+    {py3.7,py3.8,py3.9,py3.10}-flask-v{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.11,0.12}: pip install more-itertools<8.11.0
+    py3.5-flask-v{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 --durations=5 {env:TESTPATH} {posargs}
+    ; Running `py.test` as an executable suffers from an import error
+    ; when loading tests in scenarios. In particular, django fails to
+    ; load the settings from the test module.
+    python -m pytest --durations=5 -vvv {env:TESTPATH} {posargs}
 
 [testenv:linters]
 commands =

From eb0db0a86d7e0584d80d73ac29f5188305971ab9 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Wed, 14 Dec 2022 13:28:23 +0100
Subject: [PATCH 173/209] Tox Cleanup (#1749)

* Removed dead code from runtox shell script
* Removed unused CI_PYTHON_VERSION
---
 .github/workflows/test-common.yml             |  2 -
 .../workflows/test-integration-aiohttp.yml    |  2 -
 .github/workflows/test-integration-asgi.yml   |  2 -
 .../workflows/test-integration-aws_lambda.yml |  2 -
 .github/workflows/test-integration-beam.yml   |  2 -
 .github/workflows/test-integration-boto3.yml  |  2 -
 .github/workflows/test-integration-bottle.yml |  2 -
 .github/workflows/test-integration-celery.yml |  2 -
 .../workflows/test-integration-chalice.yml    |  2 -
 .github/workflows/test-integration-django.yml |  2 -
 .github/workflows/test-integration-falcon.yml |  2 -
 .../workflows/test-integration-fastapi.yml    |  2 -
 .github/workflows/test-integration-flask.yml  |  2 -
 .github/workflows/test-integration-gcp.yml    |  2 -
 .github/workflows/test-integration-httpx.yml  |  2 -
 .../workflows/test-integration-pure_eval.yml  |  2 -
 .../workflows/test-integration-pymongo.yml    |  2 -
 .../workflows/test-integration-pyramid.yml    |  2 -
 .github/workflows/test-integration-quart.yml  |  2 -
 .github/workflows/test-integration-redis.yml  |  2 -
 .../test-integration-rediscluster.yml         |  2 -
 .../workflows/test-integration-requests.yml   |  2 -
 .github/workflows/test-integration-rq.yml     |  2 -
 .github/workflows/test-integration-sanic.yml  |  2 -
 .../workflows/test-integration-sqlalchemy.yml |  2 -
 .../workflows/test-integration-starlette.yml  |  2 -
 .../workflows/test-integration-tornado.yml    |  2 -
 .../workflows/test-integration-trytond.yml    |  2 -
 scripts/runtox.sh                             | 23 ++-----
 scripts/split-tox-gh-actions/ci-yaml.txt      |  2 -
 tox.ini                                       | 65 +++++++++++++------
 31 files changed, 51 insertions(+), 95 deletions(-)

diff --git a/.github/workflows/test-common.yml b/.github/workflows/test-common.yml
index d3922937fe..06a5b1f80f 100644
--- a/.github/workflows/test-common.yml
+++ b/.github/workflows/test-common.yml
@@ -59,8 +59,6 @@ jobs:
           pip install codecov tox
 
       - name: Run Tests
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-aiohttp.yml b/.github/workflows/test-integration-aiohttp.yml
index 73483454c2..5d67bc70ce 100644
--- a/.github/workflows/test-integration-aiohttp.yml
+++ b/.github/workflows/test-integration-aiohttp.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test aiohttp
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-asgi.yml b/.github/workflows/test-integration-asgi.yml
index 16715ca230..a84a0cf8d1 100644
--- a/.github/workflows/test-integration-asgi.yml
+++ b/.github/workflows/test-integration-asgi.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test asgi
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-aws_lambda.yml b/.github/workflows/test-integration-aws_lambda.yml
index 4d795a642d..22ed7f4945 100644
--- a/.github/workflows/test-integration-aws_lambda.yml
+++ b/.github/workflows/test-integration-aws_lambda.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test aws_lambda
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-beam.yml b/.github/workflows/test-integration-beam.yml
index 0f6df2df0b..03a484537c 100644
--- a/.github/workflows/test-integration-beam.yml
+++ b/.github/workflows/test-integration-beam.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test beam
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-boto3.yml b/.github/workflows/test-integration-boto3.yml
index 8f390fb309..cbb4ec7db1 100644
--- a/.github/workflows/test-integration-boto3.yml
+++ b/.github/workflows/test-integration-boto3.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test boto3
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-bottle.yml b/.github/workflows/test-integration-bottle.yml
index b2c3fcc92b..2fee720f4d 100644
--- a/.github/workflows/test-integration-bottle.yml
+++ b/.github/workflows/test-integration-bottle.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test bottle
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-celery.yml b/.github/workflows/test-integration-celery.yml
index 927a0371cd..7042f8d493 100644
--- a/.github/workflows/test-integration-celery.yml
+++ b/.github/workflows/test-integration-celery.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test celery
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-chalice.yml b/.github/workflows/test-integration-chalice.yml
index 44fe01e19f..d8240fe024 100644
--- a/.github/workflows/test-integration-chalice.yml
+++ b/.github/workflows/test-integration-chalice.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test chalice
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-django.yml b/.github/workflows/test-integration-django.yml
index 93c792b7b7..b309b3fec5 100644
--- a/.github/workflows/test-integration-django.yml
+++ b/.github/workflows/test-integration-django.yml
@@ -66,8 +66,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test django
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-falcon.yml b/.github/workflows/test-integration-falcon.yml
index 956e8d5ba7..6141dc2917 100644
--- a/.github/workflows/test-integration-falcon.yml
+++ b/.github/workflows/test-integration-falcon.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test falcon
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-fastapi.yml b/.github/workflows/test-integration-fastapi.yml
index 2dc8f1e171..838cc43e4a 100644
--- a/.github/workflows/test-integration-fastapi.yml
+++ b/.github/workflows/test-integration-fastapi.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test fastapi
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-flask.yml b/.github/workflows/test-integration-flask.yml
index 96263508da..16e318cedc 100644
--- a/.github/workflows/test-integration-flask.yml
+++ b/.github/workflows/test-integration-flask.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test flask
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-gcp.yml b/.github/workflows/test-integration-gcp.yml
index eefdfe1aae..ca6275a537 100644
--- a/.github/workflows/test-integration-gcp.yml
+++ b/.github/workflows/test-integration-gcp.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test gcp
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-httpx.yml b/.github/workflows/test-integration-httpx.yml
index 9f5ac92a3f..05347aa5a4 100644
--- a/.github/workflows/test-integration-httpx.yml
+++ b/.github/workflows/test-integration-httpx.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test httpx
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-pure_eval.yml b/.github/workflows/test-integration-pure_eval.yml
index 1d8f7e1beb..4118ce7ecc 100644
--- a/.github/workflows/test-integration-pure_eval.yml
+++ b/.github/workflows/test-integration-pure_eval.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test pure_eval
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-pymongo.yml b/.github/workflows/test-integration-pymongo.yml
index fb961558ac..a691e69d1c 100644
--- a/.github/workflows/test-integration-pymongo.yml
+++ b/.github/workflows/test-integration-pymongo.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test pymongo
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-pyramid.yml b/.github/workflows/test-integration-pyramid.yml
index ad7bc43e85..59fbaf88ee 100644
--- a/.github/workflows/test-integration-pyramid.yml
+++ b/.github/workflows/test-integration-pyramid.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test pyramid
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-quart.yml b/.github/workflows/test-integration-quart.yml
index b9d82e53bc..aae555648e 100644
--- a/.github/workflows/test-integration-quart.yml
+++ b/.github/workflows/test-integration-quart.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test quart
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-redis.yml b/.github/workflows/test-integration-redis.yml
index 074c41fe5b..7d5eb18fb9 100644
--- a/.github/workflows/test-integration-redis.yml
+++ b/.github/workflows/test-integration-redis.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test redis
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-rediscluster.yml b/.github/workflows/test-integration-rediscluster.yml
index 06962926fa..453d4984a9 100644
--- a/.github/workflows/test-integration-rediscluster.yml
+++ b/.github/workflows/test-integration-rediscluster.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test rediscluster
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-requests.yml b/.github/workflows/test-integration-requests.yml
index 5650121a51..d07b8a7ec1 100644
--- a/.github/workflows/test-integration-requests.yml
+++ b/.github/workflows/test-integration-requests.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test requests
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-rq.yml b/.github/workflows/test-integration-rq.yml
index 3e3ead8118..0a1b1da443 100644
--- a/.github/workflows/test-integration-rq.yml
+++ b/.github/workflows/test-integration-rq.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test rq
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-sanic.yml b/.github/workflows/test-integration-sanic.yml
index 37ffd84bb9..a3966087c6 100644
--- a/.github/workflows/test-integration-sanic.yml
+++ b/.github/workflows/test-integration-sanic.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test sanic
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-sqlalchemy.yml b/.github/workflows/test-integration-sqlalchemy.yml
index c57fc950b7..a1a535089f 100644
--- a/.github/workflows/test-integration-sqlalchemy.yml
+++ b/.github/workflows/test-integration-sqlalchemy.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test sqlalchemy
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-starlette.yml b/.github/workflows/test-integration-starlette.yml
index e4083f72d5..0e34d851a4 100644
--- a/.github/workflows/test-integration-starlette.yml
+++ b/.github/workflows/test-integration-starlette.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test starlette
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-tornado.yml b/.github/workflows/test-integration-tornado.yml
index de5d02f6e7..cfe39f06d1 100644
--- a/.github/workflows/test-integration-tornado.yml
+++ b/.github/workflows/test-integration-tornado.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test tornado
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/.github/workflows/test-integration-trytond.yml b/.github/workflows/test-integration-trytond.yml
index 10853341e2..bb5997f27d 100644
--- a/.github/workflows/test-integration-trytond.yml
+++ b/.github/workflows/test-integration-trytond.yml
@@ -49,8 +49,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test trytond
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/scripts/runtox.sh b/scripts/runtox.sh
index a658da4132..8b4c4a1bef 100755
--- a/scripts/runtox.sh
+++ b/scripts/runtox.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+
+# Usage: sh scripts/runtox.sh py3.7 
+# Runs all environments with substring py3.7 and the given arguments for pytest
+
 set -ex
 
 if [ -n "$TOXPATH" ]; then
@@ -9,22 +13,7 @@ else
     TOXPATH=./.venv/bin/tox
 fi
 
-# Usage: sh scripts/runtox.sh py3.7 
-# Runs all environments with substring py3.7 and the given arguments for pytest
-
-if [ -n "$1" ]; then
-    searchstring="$1"
-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
-        searchstring=pypy
-    fi
-fi
+searchstring="$1"
 
 export TOX_PARALLEL_NO_SPINNER=1
-exec $TOXPATH -p auto -e $($TOXPATH -l | grep "$searchstring" | tr $'\n' ',') -- "${@:2}"
+exec $TOXPATH -p auto -e "$($TOXPATH -l | grep "$searchstring" | tr $'\n' ',')" -- "${@:2}"
diff --git a/scripts/split-tox-gh-actions/ci-yaml.txt b/scripts/split-tox-gh-actions/ci-yaml.txt
index f2b6f97c27..b9ecdf39e7 100644
--- a/scripts/split-tox-gh-actions/ci-yaml.txt
+++ b/scripts/split-tox-gh-actions/ci-yaml.txt
@@ -41,8 +41,6 @@ jobs:
           pip install codecov "tox>=3,<4"
 
       - name: Test {{ framework }}
-        env:
-          CI_PYTHON_VERSION: ${{ matrix.python-version }}
         timeout-minutes: 45
         shell: bash
         run: |
diff --git a/tox.ini b/tox.ini
index 22eac59db8..51a92a07c9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,77 +30,104 @@ envlist =
     # Django 4.x
     {py3.8,py3.9,py3.10}-django-v{4.0,4.1}
 
+    # Flask
     {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-v{0.11,0.12,1.0}
     {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-flask-v1.1
     {py3.6,py3.8,py3.9,py3.10}-flask-v2.0
 
-    {py3.7,py3.8,py3.9,py3.10}-asgi
+    # FastAPI
+    {py3.7,py3.8,py3.9,py3.10}-fastapi
 
+    # Starlette
     {py3.7,py3.8,py3.9,py3.10}-starlette-v{0.19.1,0.20,0.21}
 
-    {py3.7,py3.8,py3.9,py3.10}-fastapi
-
+    # Quart
     {py3.7,py3.8,py3.9,py3.10}-quart
 
+    # Bottle
     {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-bottle-v0.12
 
+    # Falcon
     {py2.7,py3.5,py3.6,py3.7}-falcon-v1.4
     {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-falcon-v2.0
 
+    # Sanic
     {py3.5,py3.6,py3.7}-sanic-v{0.8,18}
     {py3.6,py3.7}-sanic-v19
     {py3.6,py3.7,py3.8}-sanic-v20
     {py3.7,py3.8,py3.9,py3.10}-sanic-v21
     {py3.7,py3.8,py3.9,py3.10}-sanic-v22
 
+    # Beam
+    py3.7-beam-v{2.12,2.13,2.32,2.33}
+
+    # Celery
     {py2.7}-celery-v3
     {py2.7,py3.5,py3.6}-celery-v{4.1,4.2}
     {py2.7,py3.5,py3.6,py3.7,py3.8}-celery-v{4.3,4.4}
     {py3.6,py3.7,py3.8}-celery-v{5.0}
     {py3.7,py3.8,py3.9,py3.10}-celery-v{5.1,5.2}
 
-    py3.7-beam-v{2.12,2.13,2.32,2.33}
+    # Chalice
+    {py3.6,py3.7,py3.8}-chalice-v{1.16,1.17,1.18,1.19,1.20}
+
+    # Asgi
+    {py3.7,py3.8,py3.9,py3.10}-asgi
 
+    # AWS Lambda
     # The aws_lambda tests deploy to the real AWS and have their own matrix of Python versions.
     py3.7-aws_lambda
 
+    # GCP
     py3.7-gcp
 
+    # Pyramid
     {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-pyramid-v{1.6,1.7,1.8,1.9,1.10}
 
-    {py2.7,py3.5,py3.6}-rq-v{0.6,0.7,0.8,0.9,0.10,0.11}
-    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-rq-v{0.12,0.13,1.0,1.1,1.2,1.3}
-    {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-rq-v{1.4,1.5}
-
+    # AIOHTTP
     py3.7-aiohttp-v3.5
     {py3.7,py3.8,py3.9,py3.10}-aiohttp-v3.6
 
+    # Tornado
     {py3.7,py3.8,py3.9}-tornado-v{5}
     {py3.7,py3.8,py3.9,py3.10}-tornado-v{6}
 
+    # Trytond
     {py3.5,py3.6,py3.7,py3.8,py3.9}-trytond-v{4.6,5.0,5.2}
     {py3.6,py3.7,py3.8,py3.9,py3.10}-trytond-v{5.4}
 
-    {py2.7,py3.8,py3.9}-requests
-
+    # Redis
     {py2.7,py3.7,py3.8,py3.9}-redis
-    {py2.7,py3.7,py3.8,py3.9}-rediscluster-v{1,2.1.0,2}
 
-    {py2.7,py3.7,py3.8,py3.9,py3.10}-sqlalchemy-v{1.2,1.3}
-
-    {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-pure_eval
-
-    {py3.6,py3.7,py3.8}-chalice-v{1.16,1.17,1.18,1.19,1.20}
+    # Redis Cluster
+    {py2.7,py3.7,py3.8,py3.9}-rediscluster-v{1,2.1.0,2}
 
-    {py2.7,py3.6,py3.7,py3.8}-boto3-v{1.9,1.10,1.11,1.12,1.13,1.14,1.15,1.16}
+    # RQ (Redis Queue)
+    {py2.7,py3.5,py3.6}-rq-v{0.6,0.7,0.8,0.9,0.10,0.11}
+    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-rq-v{0.12,0.13,1.0,1.1,1.2,1.3}
+    {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-rq-v{1.4,1.5}
 
-    {py3.6,py3.7,py3.8,py3.9,py3.10}-httpx-v{0.16,0.17}
+    # SQL Alchemy
+    {py2.7,py3.7,py3.8,py3.9,py3.10}-sqlalchemy-v{1.2,1.3}
 
+    # Mongo DB
     {py2.7,py3.6}-pymongo-v{3.1}
     {py2.7,py3.6,py3.7,py3.8,py3.9}-pymongo-v{3.12}
     {py3.6,py3.7,py3.8,py3.9,py3.10}-pymongo-v{4.0}
     {py3.7,py3.8,py3.9,py3.10}-pymongo-v{4.1,4.2}
 
+    # HTTPX
+    {py3.6,py3.7,py3.8,py3.9,py3.10}-httpx-v{0.16,0.17}
+
+    # Requests
+    {py2.7,py3.8,py3.9}-requests
+
+    # pure_eval
+    {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-pure_eval
+
+    # Boto3
+    {py2.7,py3.6,py3.7,py3.8}-boto3-v{1.9,1.10,1.11,1.12,1.13,1.14,1.15,1.16}
+
 [testenv]
 deps =
     # if you change test-requirements.txt and your change is not being reflected
@@ -361,10 +388,8 @@ commands =
     ; https://github.com/pytest-dev/pytest/issues/5532
     {py3.5,py3.6,py3.7,py3.8,py3.9}-flask-v{0.11,0.12}: pip install pytest<5
     {py3.6,py3.7,py3.8,py3.9}-flask-v{0.11}: pip install Werkzeug<2
-
     ; https://github.com/pallets/flask/issues/4455
     {py3.7,py3.8,py3.9,py3.10}-flask-v{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-v{0.11,0.12}: pip install more-itertools<8.11.0
 

From d0eed0ee828684f22fe2a2b28b02cf7f4ce8c74a Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Wed, 14 Dec 2022 16:12:04 +0100
Subject: [PATCH 174/209] Basic OTel support (#1772)

Adding basic OpenTelementry (OTel) support to the Sentry SDK:
- Adding a OTel SpanProcessor that can receive spans form OTel and then convert them into Sentry Spans and send them to Sentry.
- Adding a OTel Propagator that can receive and propagate trace headers (Baggage) to keep distributed tracing intact.
---
 .../test-integration-opentelemetry.yml        |  73 ++++
 .../integrations/opentelemetry/__init__.py    |   7 +
 .../integrations/opentelemetry/consts.py      |   6 +
 .../integrations/opentelemetry/propagator.py  | 113 +++++
 .../opentelemetry/span_processor.py           | 236 ++++++++++
 sentry_sdk/tracing.py                         |  22 +-
 setup.py                                      |   1 +
 tests/integrations/opentelemetry/__init__.py  |   3 +
 .../opentelemetry/test_propagator.py          | 248 +++++++++++
 .../opentelemetry/test_span_processor.py      | 405 ++++++++++++++++++
 tests/tracing/test_noop_span.py               |  46 ++
 tox.ini                                       |   5 +
 12 files changed, 1154 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/test-integration-opentelemetry.yml
 create mode 100644 sentry_sdk/integrations/opentelemetry/__init__.py
 create mode 100644 sentry_sdk/integrations/opentelemetry/consts.py
 create mode 100644 sentry_sdk/integrations/opentelemetry/propagator.py
 create mode 100644 sentry_sdk/integrations/opentelemetry/span_processor.py
 create mode 100644 tests/integrations/opentelemetry/__init__.py
 create mode 100644 tests/integrations/opentelemetry/test_propagator.py
 create mode 100644 tests/integrations/opentelemetry/test_span_processor.py
 create mode 100644 tests/tracing/test_noop_span.py

diff --git a/.github/workflows/test-integration-opentelemetry.yml b/.github/workflows/test-integration-opentelemetry.yml
new file mode 100644
index 0000000000..73a16098e4
--- /dev/null
+++ b/.github/workflows/test-integration-opentelemetry.yml
@@ -0,0 +1,73 @@
+name: Test opentelemetry
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: opentelemetry, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.7","3.8","3.9","3.10"]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        run: |
+          pip install codecov "tox>=3,<4"
+
+      - name: Test opentelemetry
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-opentelemetry" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
+
+  check_required_tests:
+    name: All opentelemetry tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/sentry_sdk/integrations/opentelemetry/__init__.py b/sentry_sdk/integrations/opentelemetry/__init__.py
new file mode 100644
index 0000000000..e0020204d5
--- /dev/null
+++ b/sentry_sdk/integrations/opentelemetry/__init__.py
@@ -0,0 +1,7 @@
+from sentry_sdk.integrations.opentelemetry.span_processor import (  # noqa: F401
+    SentrySpanProcessor,
+)
+
+from sentry_sdk.integrations.opentelemetry.propagator import (  # noqa: F401
+    SentryPropagator,
+)
diff --git a/sentry_sdk/integrations/opentelemetry/consts.py b/sentry_sdk/integrations/opentelemetry/consts.py
new file mode 100644
index 0000000000..79663dd670
--- /dev/null
+++ b/sentry_sdk/integrations/opentelemetry/consts.py
@@ -0,0 +1,6 @@
+from opentelemetry.context import (  # type: ignore
+    create_key,
+)
+
+SENTRY_TRACE_KEY = create_key("sentry-trace")
+SENTRY_BAGGAGE_KEY = create_key("sentry-baggage")
diff --git a/sentry_sdk/integrations/opentelemetry/propagator.py b/sentry_sdk/integrations/opentelemetry/propagator.py
new file mode 100644
index 0000000000..7b2a88e347
--- /dev/null
+++ b/sentry_sdk/integrations/opentelemetry/propagator.py
@@ -0,0 +1,113 @@
+from opentelemetry import trace  # type: ignore
+from opentelemetry.context import (  # type: ignore
+    Context,
+    get_current,
+    set_value,
+)
+from opentelemetry.propagators.textmap import (  # type: ignore
+    CarrierT,
+    Getter,
+    Setter,
+    TextMapPropagator,
+    default_getter,
+    default_setter,
+)
+from opentelemetry.trace import (  # type: ignore
+    TraceFlags,
+    NonRecordingSpan,
+    SpanContext,
+)
+from sentry_sdk.integrations.opentelemetry.consts import (
+    SENTRY_BAGGAGE_KEY,
+    SENTRY_TRACE_KEY,
+)
+from sentry_sdk.integrations.opentelemetry.span_processor import (
+    SentrySpanProcessor,
+)
+
+from sentry_sdk.tracing import (
+    BAGGAGE_HEADER_NAME,
+    SENTRY_TRACE_HEADER_NAME,
+)
+from sentry_sdk.tracing_utils import Baggage, extract_sentrytrace_data
+from sentry_sdk._types import MYPY
+
+if MYPY:
+    from typing import Optional
+    from typing import Set
+
+
+class SentryPropagator(TextMapPropagator):  # type: ignore
+    """
+    Propagates tracing headers for Sentry's tracing system in a way OTel understands.
+    """
+
+    def extract(self, carrier, context=None, getter=default_getter):
+        # type: (CarrierT, Optional[Context], Getter) -> Context
+        if context is None:
+            context = get_current()
+
+        sentry_trace = getter.get(carrier, SENTRY_TRACE_HEADER_NAME)
+        if not sentry_trace:
+            return context
+
+        sentrytrace = extract_sentrytrace_data(sentry_trace[0])
+        if not sentrytrace:
+            return context
+
+        context = set_value(SENTRY_TRACE_KEY, sentrytrace, context)
+
+        trace_id, span_id = sentrytrace["trace_id"], sentrytrace["parent_span_id"]
+
+        span_context = SpanContext(
+            trace_id=int(trace_id, 16),  # type: ignore
+            span_id=int(span_id, 16),  # type: ignore
+            # we simulate a sampled trace on the otel side and leave the sampling to sentry
+            trace_flags=TraceFlags(TraceFlags.SAMPLED),
+            is_remote=True,
+        )
+
+        baggage_header = getter.get(carrier, BAGGAGE_HEADER_NAME)
+
+        if baggage_header:
+            baggage = Baggage.from_incoming_header(baggage_header[0])
+        else:
+            # If there's an incoming sentry-trace but no incoming baggage header,
+            # for instance in traces coming from older SDKs,
+            # baggage will be empty and frozen and won't be populated as head SDK.
+            baggage = Baggage(sentry_items={})
+
+        baggage.freeze()
+        context = set_value(SENTRY_BAGGAGE_KEY, baggage, context)
+
+        span = NonRecordingSpan(span_context)
+        modified_context = trace.set_span_in_context(span, context)
+        return modified_context
+
+    def inject(self, carrier, context=None, setter=default_setter):
+        # type: (CarrierT, Optional[Context], Setter) -> None
+        if context is None:
+            context = get_current()
+
+        current_span = trace.get_current_span(context)
+
+        if not current_span.context.is_valid:
+            return
+
+        span_id = trace.format_span_id(current_span.context.span_id)
+
+        span_map = SentrySpanProcessor().otel_span_map
+        sentry_span = span_map.get(span_id, None)
+        if not sentry_span:
+            return
+
+        setter.set(carrier, SENTRY_TRACE_HEADER_NAME, sentry_span.to_traceparent())
+
+        baggage = sentry_span.containing_transaction.get_baggage()
+        if baggage:
+            setter.set(carrier, BAGGAGE_HEADER_NAME, baggage.serialize())
+
+    @property
+    def fields(self):
+        # type: () -> Set[str]
+        return {SENTRY_TRACE_HEADER_NAME, BAGGAGE_HEADER_NAME}
diff --git a/sentry_sdk/integrations/opentelemetry/span_processor.py b/sentry_sdk/integrations/opentelemetry/span_processor.py
new file mode 100644
index 0000000000..0ec9c620af
--- /dev/null
+++ b/sentry_sdk/integrations/opentelemetry/span_processor.py
@@ -0,0 +1,236 @@
+from datetime import datetime
+
+from opentelemetry.context import get_value  # type: ignore
+from opentelemetry.sdk.trace import SpanProcessor  # type: ignore
+from opentelemetry.semconv.trace import SpanAttributes  # type: ignore
+from opentelemetry.trace import (  # type: ignore
+    format_span_id,
+    format_trace_id,
+    SpanContext,
+    Span as OTelSpan,
+    SpanKind,
+)
+from sentry_sdk.consts import INSTRUMENTER
+from sentry_sdk.hub import Hub
+from sentry_sdk.integrations.opentelemetry.consts import (
+    SENTRY_BAGGAGE_KEY,
+    SENTRY_TRACE_KEY,
+)
+from sentry_sdk.tracing import Transaction, Span as SentrySpan
+from sentry_sdk.utils import Dsn
+from sentry_sdk._types import MYPY
+
+from urllib3.util import parse_url as urlparse  # type: ignore
+
+if MYPY:
+    from typing import Any
+    from typing import Dict
+    from typing import Union
+
+OPEN_TELEMETRY_CONTEXT = "otel"
+
+
+class SentrySpanProcessor(SpanProcessor):  # type: ignore
+    """
+    Converts OTel spans into Sentry spans so they can be sent to the Sentry backend.
+    """
+
+    # The mapping from otel span ids to sentry spans
+    otel_span_map = {}  # type: Dict[str, Union[Transaction, OTelSpan]]
+
+    def __new__(cls):
+        # type: () -> SentrySpanProcessor
+        if not hasattr(cls, "instance"):
+            cls.instance = super(SentrySpanProcessor, cls).__new__(cls)
+
+        return cls.instance
+
+    def on_start(self, otel_span, parent_context=None):
+        # type: (OTelSpan, SpanContext) -> None
+        hub = Hub.current
+        if not hub:
+            return
+
+        if hub.client and hub.client.options["instrumenter"] != INSTRUMENTER.OTEL:
+            return
+
+        if not otel_span.context.is_valid:
+            return
+
+        if self._is_sentry_span(hub, otel_span):
+            return
+
+        trace_data = self._get_trace_data(otel_span, parent_context)
+
+        parent_span_id = trace_data["parent_span_id"]
+        sentry_parent_span = (
+            self.otel_span_map.get(parent_span_id, None) if parent_span_id else None
+        )
+
+        sentry_span = None
+        if sentry_parent_span:
+            sentry_span = sentry_parent_span.start_child(
+                span_id=trace_data["span_id"],
+                description=otel_span.name,
+                start_timestamp=datetime.fromtimestamp(otel_span.start_time / 1e9),
+                instrumenter=INSTRUMENTER.OTEL,
+            )
+        else:
+            sentry_span = hub.start_transaction(
+                name=otel_span.name,
+                span_id=trace_data["span_id"],
+                parent_span_id=parent_span_id,
+                trace_id=trace_data["trace_id"],
+                baggage=trace_data["baggage"],
+                start_timestamp=datetime.fromtimestamp(otel_span.start_time / 1e9),
+                instrumenter=INSTRUMENTER.OTEL,
+            )
+
+        self.otel_span_map[trace_data["span_id"]] = sentry_span
+
+    def on_end(self, otel_span):
+        # type: (OTelSpan) -> None
+        hub = Hub.current
+        if not hub:
+            return
+
+        if hub.client and hub.client.options["instrumenter"] != INSTRUMENTER.OTEL:
+            return
+
+        if not otel_span.context.is_valid:
+            return
+
+        span_id = format_span_id(otel_span.context.span_id)
+        sentry_span = self.otel_span_map.pop(span_id, None)
+        if not sentry_span:
+            return
+
+        sentry_span.op = otel_span.name
+
+        if isinstance(sentry_span, Transaction):
+            sentry_span.name = otel_span.name
+            sentry_span.set_context(
+                OPEN_TELEMETRY_CONTEXT, self._get_otel_context(otel_span)
+            )
+
+        else:
+            self._update_span_with_otel_data(sentry_span, otel_span)
+
+        sentry_span.finish(
+            end_timestamp=datetime.fromtimestamp(otel_span.end_time / 1e9)
+        )
+
+    def _is_sentry_span(self, hub, otel_span):
+        # type: (Hub, OTelSpan) -> bool
+        """
+        Break infinite loop:
+        HTTP requests to Sentry are caught by OTel and send again to Sentry.
+        """
+        otel_span_url = otel_span.attributes.get(SpanAttributes.HTTP_URL, None)
+        dsn_url = hub.client and Dsn(hub.client.dsn or "").netloc
+
+        if otel_span_url and dsn_url in otel_span_url:
+            return True
+
+        return False
+
+    def _get_otel_context(self, otel_span):
+        # type: (OTelSpan) -> Dict[str, Any]
+        """
+        Returns the OTel context for Sentry.
+        See: https://develop.sentry.dev/sdk/performance/opentelemetry/#step-5-add-opentelemetry-context
+        """
+        ctx = {}
+
+        if otel_span.attributes:
+            ctx["attributes"] = dict(otel_span.attributes)
+
+        if otel_span.resource.attributes:
+            ctx["resource"] = dict(otel_span.resource.attributes)
+
+        return ctx
+
+    def _get_trace_data(self, otel_span, parent_context):
+        # type: (OTelSpan, SpanContext) -> Dict[str, Any]
+        """
+        Extracts tracing information from one OTel span and its parent OTel context.
+        """
+        trace_data = {}
+
+        span_id = format_span_id(otel_span.context.span_id)
+        trace_data["span_id"] = span_id
+
+        trace_id = format_trace_id(otel_span.context.trace_id)
+        trace_data["trace_id"] = trace_id
+
+        parent_span_id = (
+            format_span_id(otel_span.parent.span_id) if otel_span.parent else None
+        )
+        trace_data["parent_span_id"] = parent_span_id
+
+        sentry_trace_data = get_value(SENTRY_TRACE_KEY, parent_context)
+        trace_data["parent_sampled"] = (
+            sentry_trace_data[2] if sentry_trace_data else None
+        )
+
+        baggage = get_value(SENTRY_BAGGAGE_KEY, parent_context)
+        trace_data["baggage"] = baggage
+
+        return trace_data
+
+    def _update_span_with_otel_data(self, sentry_span, otel_span):
+        # type: (SentrySpan, OTelSpan) -> None
+        """
+        Convert OTel span data and update the Sentry span with it.
+        This should eventually happen on the server when ingesting the spans.
+        """
+        for key, val in otel_span.attributes.items():
+            sentry_span.set_data(key, val)
+
+        sentry_span.set_data("otel.kind", otel_span.kind)
+
+        op = otel_span.name
+        description = otel_span.name
+
+        http_method = otel_span.attributes.get(SpanAttributes.HTTP_METHOD, None)
+        db_query = otel_span.attributes.get(SpanAttributes.DB_SYSTEM, None)
+
+        if http_method:
+            op = "http"
+
+            if otel_span.kind == SpanKind.SERVER:
+                op += ".server"
+            elif otel_span.kind == SpanKind.CLIENT:
+                op += ".client"
+
+            description = http_method
+
+            peer_name = otel_span.attributes.get(SpanAttributes.NET_PEER_NAME, None)
+            if peer_name:
+                description += " {}".format(peer_name)
+
+            target = otel_span.attributes.get(SpanAttributes.HTTP_TARGET, None)
+            if target:
+                description += " {}".format(target)
+
+            if not peer_name and not target:
+                url = otel_span.attributes.get(SpanAttributes.HTTP_URL, None)
+                if url:
+                    parsed_url = urlparse(url)
+                    url = f"{parsed_url.scheme}://{parsed_url.netloc}{parsed_url.path}"
+                    description += " {}".format(url)
+
+            status_code = otel_span.attributes.get(
+                SpanAttributes.HTTP_STATUS_CODE, None
+            )
+            if status_code:
+                sentry_span.set_http_status(status_code)
+
+        elif db_query:
+            op = "db"
+            statement = otel_span.attributes.get(SpanAttributes.DB_STATEMENT, None)
+            if statement:
+                description = statement
+
+        sentry_span.op = op
+        sentry_span.description = description
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index 93d22dc758..dc65ea5fd7 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -856,43 +856,43 @@ def _set_initial_sampling_decision(self, sampling_context):
 
 class NoOpSpan(Span):
     def __repr__(self):
-        # type: () -> Any
+        # type: () -> str
         return self.__class__.__name__
 
     def __enter__(self):
-        # type: () -> Any
+        # type: () -> NoOpSpan
         return self
 
     def __exit__(self, ty, value, tb):
-        # type: (Any, Any, Any) -> Any
+        # type: (Optional[Any], Optional[Any], Optional[Any]) -> None
         pass
 
     def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
-        # type: (str, **Any) -> Any
-        pass
+        # type: (str, **Any) -> NoOpSpan
+        return NoOpSpan()
 
     def new_span(self, **kwargs):
-        # type: (**Any) -> Any
+        # type: (**Any) -> NoOpSpan
         pass
 
     def set_tag(self, key, value):
-        # type: (Any, Any) -> Any
+        # type: (str, Any) -> None
         pass
 
     def set_data(self, key, value):
-        # type: (Any, Any) -> Any
+        # type: (str, Any) -> None
         pass
 
     def set_status(self, value):
-        # type: (Any) -> Any
+        # type: (str) -> None
         pass
 
     def set_http_status(self, http_status):
-        # type: (Any) -> Any
+        # type: (int) -> None
         pass
 
     def finish(self, hub=None, end_timestamp=None):
-        # type: (Any, Any) -> Any
+        # type: (Optional[sentry_sdk.Hub], Optional[datetime]) -> Optional[str]
         pass
 
 
diff --git a/setup.py b/setup.py
index 687111566b..318c9dc837 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ def get_file_text(file_name):
         "starlette": ["starlette>=0.19.1"],
         "fastapi": ["fastapi>=0.79.0"],
         "pymongo": ["pymongo>=3.1"],
+        "opentelemetry": ["opentelemetry-distro>=0.350b0"],
     },
     classifiers=[
         "Development Status :: 5 - Production/Stable",
diff --git a/tests/integrations/opentelemetry/__init__.py b/tests/integrations/opentelemetry/__init__.py
new file mode 100644
index 0000000000..39ecc610d5
--- /dev/null
+++ b/tests/integrations/opentelemetry/__init__.py
@@ -0,0 +1,3 @@
+import pytest
+
+django = pytest.importorskip("opentelemetry")
diff --git a/tests/integrations/opentelemetry/test_propagator.py b/tests/integrations/opentelemetry/test_propagator.py
new file mode 100644
index 0000000000..529aa99c09
--- /dev/null
+++ b/tests/integrations/opentelemetry/test_propagator.py
@@ -0,0 +1,248 @@
+from mock import MagicMock
+import mock
+
+from opentelemetry.context import get_current
+from opentelemetry.trace.propagation import get_current_span
+from opentelemetry.trace import (
+    set_span_in_context,
+    TraceFlags,
+    SpanContext,
+)
+from sentry_sdk.integrations.opentelemetry.consts import (
+    SENTRY_BAGGAGE_KEY,
+    SENTRY_TRACE_KEY,
+)
+
+from sentry_sdk.integrations.opentelemetry.propagator import SentryPropagator
+from sentry_sdk.integrations.opentelemetry.span_processor import SentrySpanProcessor
+from sentry_sdk.tracing_utils import Baggage
+
+
+def test_extract_no_context_no_sentry_trace_header():
+    """
+    No context and NO Sentry trace data in getter.
+    Extract should return empty context.
+    """
+    carrier = None
+    context = None
+    getter = MagicMock()
+    getter.get.return_value = None
+
+    modified_context = SentryPropagator().extract(carrier, context, getter)
+
+    assert modified_context == {}
+
+
+def test_extract_context_no_sentry_trace_header():
+    """
+    Context but NO Sentry trace data in getter.
+    Extract should return context as is.
+    """
+    carrier = None
+    context = {"some": "value"}
+    getter = MagicMock()
+    getter.get.return_value = None
+
+    modified_context = SentryPropagator().extract(carrier, context, getter)
+
+    assert modified_context == context
+
+
+def test_extract_empty_context_sentry_trace_header_no_baggage():
+    """
+    Empty context but Sentry trace data but NO Baggage in getter.
+    Extract should return context that has empty baggage in it and also a NoopSpan with span_id and trace_id.
+    """
+    carrier = None
+    context = {}
+    getter = MagicMock()
+    getter.get.side_effect = [
+        ["1234567890abcdef1234567890abcdef-1234567890abcdef-1"],
+        None,
+    ]
+
+    modified_context = SentryPropagator().extract(carrier, context, getter)
+
+    assert len(modified_context.keys()) == 3
+
+    assert modified_context[SENTRY_TRACE_KEY] == {
+        "trace_id": "1234567890abcdef1234567890abcdef",
+        "parent_span_id": "1234567890abcdef",
+        "parent_sampled": True,
+    }
+    assert modified_context[SENTRY_BAGGAGE_KEY].serialize() == ""
+
+    span_context = get_current_span(modified_context).get_span_context()
+    assert span_context.span_id == int("1234567890abcdef", 16)
+    assert span_context.trace_id == int("1234567890abcdef1234567890abcdef", 16)
+
+
+def test_extract_context_sentry_trace_header_baggage():
+    """
+    Empty context but Sentry trace data and Baggage in getter.
+    Extract should return context that has baggage in it and also a NoopSpan with span_id and trace_id.
+    """
+    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;"
+    )
+
+    carrier = None
+    context = {"some": "value"}
+    getter = MagicMock()
+    getter.get.side_effect = [
+        ["1234567890abcdef1234567890abcdef-1234567890abcdef-1"],
+        [baggage_header],
+    ]
+
+    modified_context = SentryPropagator().extract(carrier, context, getter)
+
+    assert len(modified_context.keys()) == 4
+
+    assert modified_context[SENTRY_TRACE_KEY] == {
+        "trace_id": "1234567890abcdef1234567890abcdef",
+        "parent_span_id": "1234567890abcdef",
+        "parent_sampled": True,
+    }
+
+    assert modified_context[SENTRY_BAGGAGE_KEY].serialize() == (
+        "sentry-trace_id=771a43a4192642f0b136d5159a501700,"
+        "sentry-public_key=49d0f7386ad645858ae85020e393bef3,"
+        "sentry-sample_rate=0.01337,sentry-user_id=Am%C3%A9lie"
+    )
+
+    span_context = get_current_span(modified_context).get_span_context()
+    assert span_context.span_id == int("1234567890abcdef", 16)
+    assert span_context.trace_id == int("1234567890abcdef1234567890abcdef", 16)
+
+
+def test_inject_empty_otel_span_map():
+    """
+    Empty otel_span_map.
+    So there is no sentry_span to be found in inject()
+    and the function is returned early and no setters are called.
+    """
+    carrier = None
+    context = get_current()
+    setter = MagicMock()
+    setter.set = MagicMock()
+
+    span_context = SpanContext(
+        trace_id=int("1234567890abcdef1234567890abcdef", 16),
+        span_id=int("1234567890abcdef", 16),
+        trace_flags=TraceFlags(TraceFlags.SAMPLED),
+        is_remote=True,
+    )
+    span = MagicMock()
+    span.context = span_context
+
+    with mock.patch(
+        "sentry_sdk.integrations.opentelemetry.propagator.trace.get_current_span",
+        return_value=span,
+    ):
+        full_context = set_span_in_context(span, context)
+        SentryPropagator().inject(carrier, full_context, setter)
+
+        setter.set.assert_not_called()
+
+
+def test_inject_sentry_span_no_baggage():
+    """
+    Inject a sentry span with no baggage.
+    """
+    carrier = None
+    context = get_current()
+    setter = MagicMock()
+    setter.set = MagicMock()
+
+    trace_id = "1234567890abcdef1234567890abcdef"
+    span_id = "1234567890abcdef"
+
+    span_context = SpanContext(
+        trace_id=int(trace_id, 16),
+        span_id=int(span_id, 16),
+        trace_flags=TraceFlags(TraceFlags.SAMPLED),
+        is_remote=True,
+    )
+    span = MagicMock()
+    span.context = span_context
+
+    sentry_span = MagicMock()
+    sentry_span.to_traceparent = mock.Mock(
+        return_value="1234567890abcdef1234567890abcdef-1234567890abcdef-1"
+    )
+    sentry_span.containing_transaction.get_baggage = mock.Mock(return_value=None)
+
+    span_processor = SentrySpanProcessor()
+    span_processor.otel_span_map[span_id] = sentry_span
+
+    with mock.patch(
+        "sentry_sdk.integrations.opentelemetry.propagator.trace.get_current_span",
+        return_value=span,
+    ):
+        full_context = set_span_in_context(span, context)
+        SentryPropagator().inject(carrier, full_context, setter)
+
+        setter.set.assert_called_once_with(
+            carrier,
+            "sentry-trace",
+            "1234567890abcdef1234567890abcdef-1234567890abcdef-1",
+        )
+
+
+def test_inject_sentry_span_baggage():
+    """
+    Inject a sentry span with baggage.
+    """
+    carrier = None
+    context = get_current()
+    setter = MagicMock()
+    setter.set = MagicMock()
+
+    trace_id = "1234567890abcdef1234567890abcdef"
+    span_id = "1234567890abcdef"
+
+    span_context = SpanContext(
+        trace_id=int(trace_id, 16),
+        span_id=int(span_id, 16),
+        trace_flags=TraceFlags(TraceFlags.SAMPLED),
+        is_remote=True,
+    )
+    span = MagicMock()
+    span.context = span_context
+
+    sentry_span = MagicMock()
+    sentry_span.to_traceparent = mock.Mock(
+        return_value="1234567890abcdef1234567890abcdef-1234567890abcdef-1"
+    )
+    sentry_items = {
+        "sentry-trace_id": "771a43a4192642f0b136d5159a501700",
+        "sentry-public_key": "49d0f7386ad645858ae85020e393bef3",
+        "sentry-sample_rate": 0.01337,
+        "sentry-user_id": "AmÊlie",
+    }
+    baggage = Baggage(sentry_items=sentry_items)
+    sentry_span.containing_transaction.get_baggage = MagicMock(return_value=baggage)
+
+    span_processor = SentrySpanProcessor()
+    span_processor.otel_span_map[span_id] = sentry_span
+
+    with mock.patch(
+        "sentry_sdk.integrations.opentelemetry.propagator.trace.get_current_span",
+        return_value=span,
+    ):
+        full_context = set_span_in_context(span, context)
+        SentryPropagator().inject(carrier, full_context, setter)
+
+        setter.set.assert_any_call(
+            carrier,
+            "sentry-trace",
+            "1234567890abcdef1234567890abcdef-1234567890abcdef-1",
+        )
+
+        setter.set.assert_any_call(
+            carrier,
+            "baggage",
+            baggage.serialize(),
+        )
diff --git a/tests/integrations/opentelemetry/test_span_processor.py b/tests/integrations/opentelemetry/test_span_processor.py
new file mode 100644
index 0000000000..6d151c9cfe
--- /dev/null
+++ b/tests/integrations/opentelemetry/test_span_processor.py
@@ -0,0 +1,405 @@
+from datetime import datetime
+from mock import MagicMock
+import mock
+import time
+from sentry_sdk.integrations.opentelemetry.span_processor import SentrySpanProcessor
+from sentry_sdk.tracing import Span, Transaction
+
+from opentelemetry.trace import SpanKind
+
+
+def test_is_sentry_span():
+    otel_span = MagicMock()
+
+    hub = MagicMock()
+    hub.client = None
+
+    span_processor = SentrySpanProcessor()
+    assert not span_processor._is_sentry_span(hub, otel_span)
+
+    client = MagicMock()
+    client.options = {"instrumenter": "otel"}
+    client.dsn = "https://1234567890abcdef@o123456.ingest.sentry.io/123456"
+
+    hub.client = client
+    assert not span_processor._is_sentry_span(hub, otel_span)
+
+    otel_span.attributes = {
+        "http.url": "https://example.com",
+    }
+    assert not span_processor._is_sentry_span(hub, otel_span)
+
+    otel_span.attributes = {
+        "http.url": "https://o123456.ingest.sentry.io/api/123/envelope",
+    }
+    assert span_processor._is_sentry_span(hub, otel_span)
+
+
+def test_get_otel_context():
+    otel_span = MagicMock()
+    otel_span.attributes = {"foo": "bar"}
+    otel_span.resource = MagicMock()
+    otel_span.resource.attributes = {"baz": "qux"}
+
+    span_processor = SentrySpanProcessor()
+    otel_context = span_processor._get_otel_context(otel_span)
+
+    assert otel_context == {
+        "attributes": {"foo": "bar"},
+        "resource": {"baz": "qux"},
+    }
+
+
+def test_get_trace_data_with_span_and_trace():
+    otel_span = MagicMock()
+    otel_span.context = MagicMock()
+    otel_span.context.trace_id = int("1234567890abcdef1234567890abcdef", 16)
+    otel_span.context.span_id = int("1234567890abcdef", 16)
+    otel_span.parent = None
+
+    parent_context = {}
+
+    span_processor = SentrySpanProcessor()
+    sentry_trace_data = span_processor._get_trace_data(otel_span, parent_context)
+    assert sentry_trace_data["trace_id"] == "1234567890abcdef1234567890abcdef"
+    assert sentry_trace_data["span_id"] == "1234567890abcdef"
+    assert sentry_trace_data["parent_span_id"] is None
+    assert sentry_trace_data["parent_sampled"] is None
+    assert sentry_trace_data["baggage"] is None
+
+
+def test_get_trace_data_with_span_and_trace_and_parent():
+    otel_span = MagicMock()
+    otel_span.context = MagicMock()
+    otel_span.context.trace_id = int("1234567890abcdef1234567890abcdef", 16)
+    otel_span.context.span_id = int("1234567890abcdef", 16)
+    otel_span.parent = MagicMock()
+    otel_span.parent.span_id = int("abcdef1234567890", 16)
+
+    parent_context = {}
+
+    span_processor = SentrySpanProcessor()
+    sentry_trace_data = span_processor._get_trace_data(otel_span, parent_context)
+    assert sentry_trace_data["trace_id"] == "1234567890abcdef1234567890abcdef"
+    assert sentry_trace_data["span_id"] == "1234567890abcdef"
+    assert sentry_trace_data["parent_span_id"] == "abcdef1234567890"
+    assert sentry_trace_data["parent_sampled"] is None
+    assert sentry_trace_data["baggage"] is None
+
+
+def test_get_trace_data_with_sentry_trace():
+    otel_span = MagicMock()
+    otel_span.context = MagicMock()
+    otel_span.context.trace_id = int("1234567890abcdef1234567890abcdef", 16)
+    otel_span.context.span_id = int("1234567890abcdef", 16)
+    otel_span.parent = MagicMock()
+    otel_span.parent.span_id = int("abcdef1234567890", 16)
+
+    parent_context = {}
+
+    with mock.patch(
+        "sentry_sdk.integrations.opentelemetry.span_processor.get_value",
+        side_effect=[
+            ("1234567890abcdef1234567890abcdef", "1234567890abcdef", True),
+            None,
+        ],
+    ):
+        span_processor = SentrySpanProcessor()
+        sentry_trace_data = span_processor._get_trace_data(otel_span, parent_context)
+        assert sentry_trace_data["trace_id"] == "1234567890abcdef1234567890abcdef"
+        assert sentry_trace_data["span_id"] == "1234567890abcdef"
+        assert sentry_trace_data["parent_span_id"] == "abcdef1234567890"
+        assert sentry_trace_data["parent_sampled"] is True
+        assert sentry_trace_data["baggage"] is None
+
+    with mock.patch(
+        "sentry_sdk.integrations.opentelemetry.span_processor.get_value",
+        side_effect=[
+            ("1234567890abcdef1234567890abcdef", "1234567890abcdef", False),
+            None,
+        ],
+    ):
+        span_processor = SentrySpanProcessor()
+        sentry_trace_data = span_processor._get_trace_data(otel_span, parent_context)
+        assert sentry_trace_data["trace_id"] == "1234567890abcdef1234567890abcdef"
+        assert sentry_trace_data["span_id"] == "1234567890abcdef"
+        assert sentry_trace_data["parent_span_id"] == "abcdef1234567890"
+        assert sentry_trace_data["parent_sampled"] is False
+        assert sentry_trace_data["baggage"] is None
+
+
+def test_get_trace_data_with_sentry_trace_and_baggage():
+    otel_span = MagicMock()
+    otel_span.context = MagicMock()
+    otel_span.context.trace_id = int("1234567890abcdef1234567890abcdef", 16)
+    otel_span.context.span_id = int("1234567890abcdef", 16)
+    otel_span.parent = MagicMock()
+    otel_span.parent.span_id = int("abcdef1234567890", 16)
+
+    parent_context = {}
+
+    baggage = (
+        "sentry-trace_id=771a43a4192642f0b136d5159a501700,"
+        "sentry-public_key=49d0f7386ad645858ae85020e393bef3,"
+        "sentry-sample_rate=0.01337,sentry-user_id=Am%C3%A9lie"
+    )
+
+    with mock.patch(
+        "sentry_sdk.integrations.opentelemetry.span_processor.get_value",
+        side_effect=[
+            ("1234567890abcdef1234567890abcdef", "1234567890abcdef", True),
+            baggage,
+        ],
+    ):
+        span_processor = SentrySpanProcessor()
+        sentry_trace_data = span_processor._get_trace_data(otel_span, parent_context)
+        assert sentry_trace_data["trace_id"] == "1234567890abcdef1234567890abcdef"
+        assert sentry_trace_data["span_id"] == "1234567890abcdef"
+        assert sentry_trace_data["parent_span_id"] == "abcdef1234567890"
+        assert sentry_trace_data["parent_sampled"]
+        assert sentry_trace_data["baggage"] == baggage
+
+
+def test_update_span_with_otel_data_http_method():
+    sentry_span = Span()
+
+    otel_span = MagicMock()
+    otel_span.name = "Test OTel Span"
+    otel_span.kind = SpanKind.CLIENT
+    otel_span.attributes = {
+        "http.method": "GET",
+        "http.status_code": 429,
+        "http.status_text": "xxx",
+        "http.user_agent": "curl/7.64.1",
+        "net.peer.name": "example.com",
+        "http.target": "/",
+    }
+
+    span_processor = SentrySpanProcessor()
+    span_processor._update_span_with_otel_data(sentry_span, otel_span)
+
+    assert sentry_span.op == "http.client"
+    assert sentry_span.description == "GET example.com /"
+    assert sentry_span._tags["http.status_code"] == "429"
+    assert sentry_span.status == "resource_exhausted"
+
+    assert sentry_span._data["http.method"] == "GET"
+    assert sentry_span._data["http.status_code"] == 429
+    assert sentry_span._data["http.status_text"] == "xxx"
+    assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
+    assert sentry_span._data["net.peer.name"] == "example.com"
+    assert sentry_span._data["http.target"] == "/"
+
+
+def test_update_span_with_otel_data_http_method2():
+    sentry_span = Span()
+
+    otel_span = MagicMock()
+    otel_span.name = "Test OTel Span"
+    otel_span.kind = SpanKind.SERVER
+    otel_span.attributes = {
+        "http.method": "GET",
+        "http.status_code": 429,
+        "http.status_text": "xxx",
+        "http.user_agent": "curl/7.64.1",
+        "http.url": "https://httpbin.org/status/403?password=123&username=test@example.com&author=User123&auth=1234567890abcdef",
+    }
+
+    span_processor = SentrySpanProcessor()
+    span_processor._update_span_with_otel_data(sentry_span, otel_span)
+
+    assert sentry_span.op == "http.server"
+    assert sentry_span.description == "GET https://httpbin.org/status/403"
+    assert sentry_span._tags["http.status_code"] == "429"
+    assert sentry_span.status == "resource_exhausted"
+
+    assert sentry_span._data["http.method"] == "GET"
+    assert sentry_span._data["http.status_code"] == 429
+    assert sentry_span._data["http.status_text"] == "xxx"
+    assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
+    assert (
+        sentry_span._data["http.url"]
+        == "https://httpbin.org/status/403?password=123&username=test@example.com&author=User123&auth=1234567890abcdef"
+    )
+
+
+def test_update_span_with_otel_data_db_query():
+    sentry_span = Span()
+
+    otel_span = MagicMock()
+    otel_span.name = "Test OTel Span"
+    otel_span.attributes = {
+        "db.system": "postgresql",
+        "db.statement": "SELECT * FROM table where pwd = '123456'",
+    }
+
+    span_processor = SentrySpanProcessor()
+    span_processor._update_span_with_otel_data(sentry_span, otel_span)
+
+    assert sentry_span.op == "db"
+    assert sentry_span.description == "SELECT * FROM table where pwd = '123456'"
+
+    assert sentry_span._data["db.system"] == "postgresql"
+    assert (
+        sentry_span._data["db.statement"] == "SELECT * FROM table where pwd = '123456'"
+    )
+
+
+def test_on_start_transaction():
+    otel_span = MagicMock()
+    otel_span.name = "Sample OTel Span"
+    otel_span.start_time = time.time_ns()
+    otel_span.context = MagicMock()
+    otel_span.context.trace_id = int("1234567890abcdef1234567890abcdef", 16)
+    otel_span.context.span_id = int("1234567890abcdef", 16)
+    otel_span.parent = MagicMock()
+    otel_span.parent.span_id = int("abcdef1234567890", 16)
+
+    parent_context = {}
+
+    fake_client = MagicMock()
+    fake_client.options = {"instrumenter": "otel"}
+    fake_client.dsn = "https://1234567890abcdef@o123456.ingest.sentry.io/123456"
+
+    current_hub = MagicMock()
+    current_hub.client = fake_client
+
+    fake_hub = MagicMock()
+    fake_hub.current = current_hub
+
+    with mock.patch(
+        "sentry_sdk.integrations.opentelemetry.span_processor.Hub", fake_hub
+    ):
+        span_processor = SentrySpanProcessor()
+        span_processor.on_start(otel_span, parent_context)
+
+        fake_hub.current.start_transaction.assert_called_once_with(
+            name="Sample OTel Span",
+            span_id="1234567890abcdef",
+            parent_span_id="abcdef1234567890",
+            trace_id="1234567890abcdef1234567890abcdef",
+            baggage=None,
+            start_timestamp=datetime.fromtimestamp(otel_span.start_time / 1e9),
+            instrumenter="otel",
+        )
+
+        assert len(span_processor.otel_span_map.keys()) == 1
+        assert list(span_processor.otel_span_map.keys())[0] == "1234567890abcdef"
+
+
+def test_on_start_child():
+    otel_span = MagicMock()
+    otel_span.name = "Sample OTel Span"
+    otel_span.start_time = time.time_ns()
+    otel_span.context = MagicMock()
+    otel_span.context.trace_id = int("1234567890abcdef1234567890abcdef", 16)
+    otel_span.context.span_id = int("1234567890abcdef", 16)
+    otel_span.parent = MagicMock()
+    otel_span.parent.span_id = int("abcdef1234567890", 16)
+
+    parent_context = {}
+
+    fake_client = MagicMock()
+    fake_client.options = {"instrumenter": "otel"}
+    fake_client.dsn = "https://1234567890abcdef@o123456.ingest.sentry.io/123456"
+
+    current_hub = MagicMock()
+    current_hub.client = fake_client
+
+    fake_hub = MagicMock()
+    fake_hub.current = current_hub
+
+    with mock.patch(
+        "sentry_sdk.integrations.opentelemetry.span_processor.Hub", fake_hub
+    ):
+        fake_span = MagicMock()
+
+        span_processor = SentrySpanProcessor()
+        span_processor.otel_span_map["abcdef1234567890"] = fake_span
+        span_processor.on_start(otel_span, parent_context)
+
+        fake_span.start_child.assert_called_once_with(
+            span_id="1234567890abcdef",
+            description="Sample OTel Span",
+            start_timestamp=datetime.fromtimestamp(otel_span.start_time / 1e9),
+            instrumenter="otel",
+        )
+
+        assert len(span_processor.otel_span_map.keys()) == 2
+        assert "abcdef1234567890" in span_processor.otel_span_map.keys()
+        assert "1234567890abcdef" in span_processor.otel_span_map.keys()
+
+
+def test_on_end_no_sentry_span():
+    """
+    If on_end is called on a span that is not in the otel_span_map, it should be a no-op.
+    """
+    otel_span = MagicMock()
+    otel_span.name = "Sample OTel Span"
+    otel_span.end_time = time.time_ns()
+    otel_span.context = MagicMock()
+    otel_span.context.span_id = int("1234567890abcdef", 16)
+
+    span_processor = SentrySpanProcessor()
+    span_processor.otel_span_map = {}
+    span_processor._get_otel_context = MagicMock()
+    span_processor._update_span_with_otel_data = MagicMock()
+
+    span_processor.on_end(otel_span)
+
+    span_processor._get_otel_context.assert_not_called()
+    span_processor._update_span_with_otel_data.assert_not_called()
+
+
+def test_on_end_sentry_transaction():
+    """
+    Test on_end for a sentry Transaction.
+    """
+    otel_span = MagicMock()
+    otel_span.name = "Sample OTel Span"
+    otel_span.end_time = time.time_ns()
+    otel_span.context = MagicMock()
+    otel_span.context.span_id = int("1234567890abcdef", 16)
+
+    fake_sentry_span = MagicMock(spec=Transaction)
+    fake_sentry_span.set_context = MagicMock()
+    fake_sentry_span.finish = MagicMock()
+
+    span_processor = SentrySpanProcessor()
+    span_processor._get_otel_context = MagicMock()
+    span_processor._update_span_with_otel_data = MagicMock()
+    span_processor.otel_span_map["1234567890abcdef"] = fake_sentry_span
+
+    span_processor.on_end(otel_span)
+
+    fake_sentry_span.set_context.assert_called_once()
+    span_processor._update_span_with_otel_data.assert_not_called()
+    fake_sentry_span.finish.assert_called_once()
+
+
+def test_on_end_sentry_span():
+    """
+    Test on_end for a sentry Span.
+    """
+    otel_span = MagicMock()
+    otel_span.name = "Sample OTel Span"
+    otel_span.end_time = time.time_ns()
+    otel_span.context = MagicMock()
+    otel_span.context.span_id = int("1234567890abcdef", 16)
+
+    fake_sentry_span = MagicMock(spec=Span)
+    fake_sentry_span.set_context = MagicMock()
+    fake_sentry_span.finish = MagicMock()
+
+    span_processor = SentrySpanProcessor()
+    span_processor._get_otel_context = MagicMock()
+    span_processor._update_span_with_otel_data = MagicMock()
+    span_processor.otel_span_map["1234567890abcdef"] = fake_sentry_span
+
+    span_processor.on_end(otel_span)
+
+    fake_sentry_span.set_context.assert_not_called()
+    span_processor._update_span_with_otel_data.assert_called_once_with(
+        fake_sentry_span, otel_span
+    )
+    fake_sentry_span.finish.assert_called_once()
diff --git a/tests/tracing/test_noop_span.py b/tests/tracing/test_noop_span.py
new file mode 100644
index 0000000000..3dc148f848
--- /dev/null
+++ b/tests/tracing/test_noop_span.py
@@ -0,0 +1,46 @@
+import sentry_sdk
+from sentry_sdk.tracing import NoOpSpan
+
+# This tests make sure, that the examples from the documentation [1]
+# are working when OTel (OpenTelementry) instrumentation is turned on
+# and therefore the Senntry tracing should not do anything.
+#
+# 1: https://docs.sentry.io/platforms/python/performance/instrumentation/custom-instrumentation/
+
+
+def test_noop_start_transaction(sentry_init):
+    sentry_init(instrumenter="otel", debug=True)
+
+    transaction = sentry_sdk.start_transaction(op="task", name="test_transaction_name")
+    assert isinstance(transaction, NoOpSpan)
+
+    transaction.name = "new name"
+
+
+def test_noop_start_span(sentry_init):
+    sentry_init(instrumenter="otel", debug=True)
+
+    with sentry_sdk.start_span(op="http", description="GET /") as span:
+        assert isinstance(span, NoOpSpan)
+
+        span.set_tag("http.status_code", "418")
+        span.set_data("http.entity_type", "teapot")
+
+
+def test_noop_transaction_start_child(sentry_init):
+    sentry_init(instrumenter="otel", debug=True)
+
+    transaction = sentry_sdk.start_transaction(name="task")
+    assert isinstance(transaction, NoOpSpan)
+
+    with transaction.start_child(op="child_task") as child:
+        assert isinstance(child, NoOpSpan)
+
+
+def test_noop_span_start_child(sentry_init):
+    sentry_init(instrumenter="otel", debug=True)
+    span = sentry_sdk.start_span(name="task")
+    assert isinstance(span, NoOpSpan)
+
+    with span.start_child(op="child_task") as child:
+        assert isinstance(child, NoOpSpan)
diff --git a/tox.ini b/tox.ini
index 51a92a07c9..d2e87cb1f7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -128,6 +128,9 @@ envlist =
     # Boto3
     {py2.7,py3.6,py3.7,py3.8}-boto3-v{1.9,1.10,1.11,1.12,1.13,1.14,1.15,1.16}
 
+    # OpenTelemetry (OTel)
+    {py3.7,py3.8,py3.9,py3.10}-opentelemetry
+
 [testenv]
 deps =
     # if you change test-requirements.txt and your change is not being reflected
@@ -320,6 +323,8 @@ deps =
     pymongo-v4.1: pymongo>=4.1,<4.2
     pymongo-v4.2: pymongo>=4.2,<4.3
 
+    opentelemetry: opentelemetry-distro
+
 setenv =
     PYTHONDONTWRITEBYTECODE=1
     TESTPATH=tests

From 0a029155c9e3b222cb4f6a447dcf2a1d3d01625b Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Wed, 14 Dec 2022 15:20:32 +0000
Subject: [PATCH 175/209] release: 1.12.0

---
 CHANGELOG.md         | 14 ++++++++++++++
 docs/conf.py         |  2 +-
 sentry_sdk/consts.py |  2 +-
 setup.py             |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a03c0104b..2185c2fe14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## 1.12.0
+
+### Basic OTel support (ongoing)
+
+By: @antonpirker (#1772, #1766, #1765)
+
+### Various fixes & improvements
+
+- Tox Cleanup (#1749) by @antonpirker
+- fix(ci): Fix Github action checks (#1780) by @Zylphrex
+- feat(profiling): Introduce active thread id on scope (#1764) by @Zylphrex
+- ref(profiling): Eagerly hash stack for profiles (#1755) by @Zylphrex
+- fix(profiling): Resolve inherited method class names (#1756) by @Zylphrex
+
 ## 1.11.1
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 0d60cb6656..93eb542d59 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.11.1"
+release = "1.12.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 47d630dee3..9b76cd9072 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -136,4 +136,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.11.1"
+VERSION = "1.12.0"
diff --git a/setup.py b/setup.py
index 318c9dc837..6eed498332 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.11.1",
+    version="1.12.0",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From abfdce8118768b78db608bc4be15b655b95fc6d5 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 15 Dec 2022 09:08:58 +0100
Subject: [PATCH 176/209] Updated changelog

---
 CHANGELOG.md | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2185c2fe14..2a182032b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,17 +2,24 @@
 
 ## 1.12.0
 
-### Basic OTel support (ongoing)
+### Basic OTel support
+
+This adds support to automatically integrate OpenTelemetry performance tracing with Sentry.
+
+See the documentation on how to set it up:
+https://docs.sentry.io/platforms/python/performance/instrumentation/opentelemetry/
+
+Give it a try and let us know if you have any feedback or problems with using it.
 
 By: @antonpirker (#1772, #1766, #1765)
 
 ### Various fixes & improvements
 
 - Tox Cleanup (#1749) by @antonpirker
-- fix(ci): Fix Github action checks (#1780) by @Zylphrex
-- feat(profiling): Introduce active thread id on scope (#1764) by @Zylphrex
-- ref(profiling): Eagerly hash stack for profiles (#1755) by @Zylphrex
-- fix(profiling): Resolve inherited method class names (#1756) by @Zylphrex
+- CI: Fix Github action checks (#1780) by @Zylphrex
+- Profiling: Introduce active thread id on scope (#1764) by @Zylphrex
+- Profiling: Eagerly hash stack for profiles (#1755) by @Zylphrex
+- Profiling: Resolve inherited method class names (#1756) by @Zylphrex
 
 ## 1.11.1
 

From 6959941afc0f9bf3c13ffdc7069fabba1b47bc10 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 19 Dec 2022 10:08:51 +0100
Subject: [PATCH 177/209] Link errors to OTel spans (#1787)

Link Sentry captured issue events to performance events from Otel. (This makes Sentry issues visible in Otel performance data)
---
 .../opentelemetry/span_processor.py           | 47 +++++++++++++++
 .../opentelemetry/test_span_processor.py      | 60 ++++++++++++++++++-
 2 files changed, 105 insertions(+), 2 deletions(-)

diff --git a/sentry_sdk/integrations/opentelemetry/span_processor.py b/sentry_sdk/integrations/opentelemetry/span_processor.py
index 0ec9c620af..5b80efbca5 100644
--- a/sentry_sdk/integrations/opentelemetry/span_processor.py
+++ b/sentry_sdk/integrations/opentelemetry/span_processor.py
@@ -6,16 +6,22 @@
 from opentelemetry.trace import (  # type: ignore
     format_span_id,
     format_trace_id,
+    get_current_span,
     SpanContext,
     Span as OTelSpan,
     SpanKind,
 )
+from opentelemetry.trace.span import (  # type: ignore
+    INVALID_SPAN_ID,
+    INVALID_TRACE_ID,
+)
 from sentry_sdk.consts import INSTRUMENTER
 from sentry_sdk.hub import Hub
 from sentry_sdk.integrations.opentelemetry.consts import (
     SENTRY_BAGGAGE_KEY,
     SENTRY_TRACE_KEY,
 )
+from sentry_sdk.scope import add_global_event_processor
 from sentry_sdk.tracing import Transaction, Span as SentrySpan
 from sentry_sdk.utils import Dsn
 from sentry_sdk._types import MYPY
@@ -26,10 +32,44 @@
     from typing import Any
     from typing import Dict
     from typing import Union
+    from sentry_sdk._types import Event, Hint
 
 OPEN_TELEMETRY_CONTEXT = "otel"
 
 
+def link_trace_context_to_error_event(event, otel_span_map):
+    # type: (Event, Dict[str, Union[Transaction, OTelSpan]]) -> Event
+    hub = Hub.current
+    if not hub:
+        return event
+
+    if hub.client and hub.client.options["instrumenter"] != INSTRUMENTER.OTEL:
+        return event
+
+    if hasattr(event, "type") and event["type"] == "transaction":
+        return event
+
+    otel_span = get_current_span()
+    if not otel_span:
+        return event
+
+    ctx = otel_span.get_span_context()
+    trace_id = format_trace_id(ctx.trace_id)
+    span_id = format_span_id(ctx.span_id)
+
+    if trace_id == INVALID_TRACE_ID or span_id == INVALID_SPAN_ID:
+        return event
+
+    sentry_span = otel_span_map.get(span_id, None)
+    if not sentry_span:
+        return event
+
+    contexts = event.setdefault("contexts", {})
+    contexts.setdefault("trace", {}).update(sentry_span.get_trace_context())
+
+    return event
+
+
 class SentrySpanProcessor(SpanProcessor):  # type: ignore
     """
     Converts OTel spans into Sentry spans so they can be sent to the Sentry backend.
@@ -45,6 +85,13 @@ def __new__(cls):
 
         return cls.instance
 
+    def __init__(self):
+        # type: () -> None
+        @add_global_event_processor
+        def global_event_processor(event, hint):
+            # type: (Event, Hint) -> Event
+            return link_trace_context_to_error_event(event, self.otel_span_map)
+
     def on_start(self, otel_span, parent_context=None):
         # type: (OTelSpan, SpanContext) -> None
         hub = Hub.current
diff --git a/tests/integrations/opentelemetry/test_span_processor.py b/tests/integrations/opentelemetry/test_span_processor.py
index 6d151c9cfe..7ba6f59e6c 100644
--- a/tests/integrations/opentelemetry/test_span_processor.py
+++ b/tests/integrations/opentelemetry/test_span_processor.py
@@ -2,10 +2,13 @@
 from mock import MagicMock
 import mock
 import time
-from sentry_sdk.integrations.opentelemetry.span_processor import SentrySpanProcessor
+from sentry_sdk.integrations.opentelemetry.span_processor import (
+    SentrySpanProcessor,
+    link_trace_context_to_error_event,
+)
 from sentry_sdk.tracing import Span, Transaction
 
-from opentelemetry.trace import SpanKind
+from opentelemetry.trace import SpanKind, SpanContext
 
 
 def test_is_sentry_span():
@@ -403,3 +406,56 @@ def test_on_end_sentry_span():
         fake_sentry_span, otel_span
     )
     fake_sentry_span.finish.assert_called_once()
+
+
+def test_link_trace_context_to_error_event():
+    """
+    Test that the trace context is added to the error event.
+    """
+    fake_client = MagicMock()
+    fake_client.options = {"instrumenter": "otel"}
+    fake_client
+
+    current_hub = MagicMock()
+    current_hub.client = fake_client
+
+    fake_hub = MagicMock()
+    fake_hub.current = current_hub
+
+    span_id = "1234567890abcdef"
+    trace_id = "1234567890abcdef1234567890abcdef"
+
+    fake_trace_context = {
+        "bla": "blub",
+        "foo": "bar",
+        "baz": 123,
+    }
+
+    sentry_span = MagicMock()
+    sentry_span.get_trace_context = MagicMock(return_value=fake_trace_context)
+
+    otel_span_map = {
+        span_id: sentry_span,
+    }
+
+    span_context = SpanContext(
+        trace_id=int(trace_id, 16),
+        span_id=int(span_id, 16),
+        is_remote=True,
+    )
+    otel_span = MagicMock()
+    otel_span.get_span_context = MagicMock(return_value=span_context)
+
+    fake_event = {"event_id": "1234567890abcdef1234567890abcdef"}
+
+    with mock.patch(
+        "sentry_sdk.integrations.opentelemetry.span_processor.get_current_span",
+        return_value=otel_span,
+    ):
+        event = link_trace_context_to_error_event(fake_event, otel_span_map)
+
+        assert event
+        assert event == fake_event  # the event is changed in place inside the function
+        assert "contexts" in event
+        assert "trace" in event["contexts"]
+        assert event["contexts"]["trace"] == fake_trace_context

From ab1496fdf2a899715fbad9f4a4144cf1dfcac651 Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Mon, 19 Dec 2022 09:10:12 +0000
Subject: [PATCH 178/209] release: 1.12.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 2a182032b8..42ce1a1848 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.12.1
+
+### Various fixes & improvements
+
+- Link errors to OTel spans (#1787) by @antonpirker
+
 ## 1.12.0
 
 ### Basic OTel support
diff --git a/docs/conf.py b/docs/conf.py
index 93eb542d59..44180fade1 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.12.0"
+release = "1.12.1"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 9b76cd9072..afb4b975bb 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -136,4 +136,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.12.0"
+VERSION = "1.12.1"
diff --git a/setup.py b/setup.py
index 6eed498332..86680690ce 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.12.0",
+    version="1.12.1",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From e2e0de10a0614bb8fb8768757849dce584f381cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Dec 2022 13:34:50 +0100
Subject: [PATCH 179/209] build(deps): bump sphinx from 5.2.3 to 5.3.0 (#1686)

Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 5.2.3 to 5.3.0.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v5.2.3...v5.3.0)

---
updated-dependencies:
- dependency-name: sphinx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Anton Pirker 
---
 docs-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-requirements.txt b/docs-requirements.txt
index 12a756946c..1842226f8b 100644
--- a/docs-requirements.txt
+++ b/docs-requirements.txt
@@ -1,4 +1,4 @@
-sphinx==5.2.3
+sphinx==5.3.0
 sphinx-rtd-theme
 sphinx-autodoc-typehints[type_comments]>=1.8.0
 typing-extensions

From 55b29020e853bc29b1f6ab8969037c2bcb9d12ad Mon Sep 17 00:00:00 2001
From: Anton Ovchinnikov 
Date: Tue, 3 Jan 2023 09:11:28 +0100
Subject: [PATCH 180/209] doc: Use .venv (not .env) as a virtual env location
 in CONTRIBUTING.md (#1790)

---
 CONTRIBUTING.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 48e9aacce2..e1749587b7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,9 +34,9 @@ Make sure that you have Python 3 installed. Version 3.7 or higher is required to
 ```bash
 cd sentry-python
 
-python -m venv .env
+python -m venv .venv
 
-source .env/bin/activate
+source .venv/bin/activate
 ```
 
 ### Install `sentry-python` in editable mode
@@ -88,10 +88,10 @@ specific tests:
 cd sentry-python
 
 # create virtual environment
-python -m venv .env
+python -m venv .venv
 
 # activate virtual environment
-source .env/bin/activate
+source .venv/bin/activate
 
 # install sentry-python
 pip install -e .

From c318b90f50daa57581a5e80b76b490d23fdc4443 Mon Sep 17 00:00:00 2001
From: Peter Schutt 
Date: Tue, 3 Jan 2023 20:14:37 +1000
Subject: [PATCH 181/209] Handle `"rc"` in SQLAlchemy version. (#1812)

Co-authored-by: Neel Shah 
---
 sentry_sdk/integrations/sqlalchemy.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sentry_sdk/integrations/sqlalchemy.py b/sentry_sdk/integrations/sqlalchemy.py
index deb97c05ad..68e671cd92 100644
--- a/sentry_sdk/integrations/sqlalchemy.py
+++ b/sentry_sdk/integrations/sqlalchemy.py
@@ -1,5 +1,7 @@
 from __future__ import absolute_import
 
+import re
+
 from sentry_sdk._types import MYPY
 from sentry_sdk.hub import Hub
 from sentry_sdk.integrations import Integration, DidNotEnable
@@ -28,7 +30,9 @@ def setup_once():
         # type: () -> None
 
         try:
-            version = tuple(map(int, SQLALCHEMY_VERSION.split("b")[0].split(".")))
+            version = tuple(
+                map(int, re.split("b|rc", SQLALCHEMY_VERSION)[0].split("."))
+            )
         except (TypeError, ValueError):
             raise DidNotEnable(
                 "Unparsable SQLAlchemy version: {}".format(SQLALCHEMY_VERSION)

From 729204fe98e641e8ee5c1ed36c413bea7be028d5 Mon Sep 17 00:00:00 2001
From: Alexander Petrov 
Date: Tue, 3 Jan 2023 16:05:24 +0400
Subject: [PATCH 182/209] Use @wraps for Django Signal receivers (#1815)

Co-authored-by: Neel Shah 
---
 sentry_sdk/integrations/django/signals_handlers.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sentry_sdk/integrations/django/signals_handlers.py b/sentry_sdk/integrations/django/signals_handlers.py
index 77e820ce32..a5687c897d 100644
--- a/sentry_sdk/integrations/django/signals_handlers.py
+++ b/sentry_sdk/integrations/django/signals_handlers.py
@@ -4,6 +4,7 @@
 from django.dispatch import Signal
 
 from sentry_sdk import Hub
+from sentry_sdk._functools import wraps
 from sentry_sdk._types import MYPY
 from sentry_sdk.consts import OP
 
@@ -52,6 +53,7 @@ def _sentry_live_receivers(self, sender):
 
         def sentry_receiver_wrapper(receiver):
             # type: (Callable[..., Any]) -> Callable[..., Any]
+            @wraps(receiver)
             def wrapper(*args, **kwargs):
                 # type: (Any, Any) -> Any
                 signal_name = _get_receiver_name(receiver)

From c067c33309dcc9ec07ac05fabd9be63299741fb3 Mon Sep 17 00:00:00 2001
From: Neel Shah 
Date: Tue, 3 Jan 2023 13:40:55 +0100
Subject: [PATCH 183/209] Remove sanic v22 pin (#1819)

---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index d2e87cb1f7..82d66b8d6d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -208,11 +208,11 @@ deps =
     sanic-v19: sanic>=19.0,<20.0
     sanic-v20: sanic>=20.0,<21.0
     sanic-v21: sanic>=21.0,<22.0
-    sanic-v22: sanic>=22.0,<22.9.0
+    sanic-v22: sanic>=22.0
 
     sanic: aiohttp
     sanic-v21: sanic_testing<22
-    sanic-v22: sanic_testing<22.9.0
+    sanic-v22: sanic_testing>=22
     {py3.5,py3.6}-sanic: aiocontextvars==0.2.1
     py3.5-sanic: ujson<4
 

From 1578832b446714fff91bb22cfe247832317624ba Mon Sep 17 00:00:00 2001
From: Vasiliy Kovalev 
Date: Wed, 4 Jan 2023 10:53:13 +0300
Subject: [PATCH 184/209] Add enqueued_at and started_at to rq job extra
 (#1024)

started_at is not persisted in rq<0.9 so it will be missing in older versions

Co-authored-by: Neel Shah 
---
 sentry_sdk/integrations/rq.py    | 11 ++++++++++-
 tests/integrations/rq/test_rq.py | 19 ++++++++++++-------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/sentry_sdk/integrations/rq.py b/sentry_sdk/integrations/rq.py
index 8b174c46ef..3b74d8f9be 100644
--- a/sentry_sdk/integrations/rq.py
+++ b/sentry_sdk/integrations/rq.py
@@ -7,7 +7,11 @@
 from sentry_sdk.integrations import DidNotEnable, Integration
 from sentry_sdk.integrations.logging import ignore_logger
 from sentry_sdk.tracing import Transaction, TRANSACTION_SOURCE_TASK
-from sentry_sdk.utils import capture_internal_exceptions, event_from_exception
+from sentry_sdk.utils import (
+    capture_internal_exceptions,
+    event_from_exception,
+    format_timestamp,
+)
 
 try:
     from rq.queue import Queue
@@ -129,6 +133,11 @@ def event_processor(event, hint):
                     "description": job.description,
                 }
 
+                if job.enqueued_at:
+                    extra["rq-job"]["enqueued_at"] = format_timestamp(job.enqueued_at)
+                if job.started_at:
+                    extra["rq-job"]["started_at"] = format_timestamp(job.started_at)
+
         if "exc_info" in hint:
             with capture_internal_exceptions():
                 if issubclass(hint["exc_info"][0], JobTimeoutException):
diff --git a/tests/integrations/rq/test_rq.py b/tests/integrations/rq/test_rq.py
index b6aec29daa..fb25b65a03 100644
--- a/tests/integrations/rq/test_rq.py
+++ b/tests/integrations/rq/test_rq.py
@@ -58,13 +58,18 @@ def test_basic(sentry_init, capture_events):
     assert exception["stacktrace"]["frames"][-1]["vars"]["foo"] == "42"
 
     assert event["transaction"] == "tests.integrations.rq.test_rq.crashing_job"
-    assert event["extra"]["rq-job"] == {
-        "args": [],
-        "description": "tests.integrations.rq.test_rq.crashing_job(foo=42)",
-        "func": "tests.integrations.rq.test_rq.crashing_job",
-        "job_id": event["extra"]["rq-job"]["job_id"],
-        "kwargs": {"foo": 42},
-    }
+
+    extra = event["extra"]["rq-job"]
+    assert extra["args"] == []
+    assert extra["kwargs"] == {"foo": 42}
+    assert extra["description"] == "tests.integrations.rq.test_rq.crashing_job(foo=42)"
+    assert extra["func"] == "tests.integrations.rq.test_rq.crashing_job"
+    assert "job_id" in extra
+    assert "enqueued_at" in extra
+
+    # older versions don't persist started_at correctly
+    if tuple(map(int, rq.VERSION.split("."))) >= (0, 9):
+        assert "started_at" in extra
 
 
 def test_transport_shutdown(sentry_init, capture_events_forksafe):

From dfb04f594f7790b54f7fbdab93f407f70dd2d204 Mon Sep 17 00:00:00 2001
From: Christopher Dignam 
Date: Wed, 4 Jan 2023 03:06:01 -0500
Subject: [PATCH 185/209] Add span for Django SimpleTemplateResponse rendering
 (#1818)

---
 sentry_sdk/consts.py                     |  1 +
 sentry_sdk/integrations/django/views.py  | 11 +++++++++++
 tests/integrations/django/myapp/urls.py  |  3 +++
 tests/integrations/django/myapp/views.py |  5 +++++
 tests/integrations/django/test_basic.py  | 19 +++++++++++++++++++
 5 files changed, 39 insertions(+)

diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index afb4b975bb..00b2994ce1 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -71,6 +71,7 @@ class OP:
     SUBPROCESS_COMMUNICATE = "subprocess.communicate"
     TEMPLATE_RENDER = "template.render"
     VIEW_RENDER = "view.render"
+    VIEW_RESPONSE_RENDER = "view.response.render"
     WEBSOCKET_SERVER = "websocket.server"
 
 
diff --git a/sentry_sdk/integrations/django/views.py b/sentry_sdk/integrations/django/views.py
index fdec84b086..33ddce24d6 100644
--- a/sentry_sdk/integrations/django/views.py
+++ b/sentry_sdk/integrations/django/views.py
@@ -23,9 +23,19 @@ def patch_views():
     # type: () -> None
 
     from django.core.handlers.base import BaseHandler
+    from django.template.response import SimpleTemplateResponse
     from sentry_sdk.integrations.django import DjangoIntegration
 
     old_make_view_atomic = BaseHandler.make_view_atomic
+    old_render = SimpleTemplateResponse.render
+
+    def sentry_patched_render(self):
+        # type: (SimpleTemplateResponse) -> Any
+        hub = Hub.current
+        with hub.start_span(
+            op=OP.VIEW_RESPONSE_RENDER, description="serialize response"
+        ):
+            return old_render(self)
 
     @_functools.wraps(old_make_view_atomic)
     def sentry_patched_make_view_atomic(self, *args, **kwargs):
@@ -54,6 +64,7 @@ def sentry_patched_make_view_atomic(self, *args, **kwargs):
 
         return sentry_wrapped_callback
 
+    SimpleTemplateResponse.render = sentry_patched_render
     BaseHandler.make_view_atomic = sentry_patched_make_view_atomic
 
 
diff --git a/tests/integrations/django/myapp/urls.py b/tests/integrations/django/myapp/urls.py
index 8e43460bba..376261abcf 100644
--- a/tests/integrations/django/myapp/urls.py
+++ b/tests/integrations/django/myapp/urls.py
@@ -80,6 +80,9 @@ def path(path, *args, **kwargs):
         )
     )
     urlpatterns.append(path("rest-hello", views.rest_hello, name="rest_hello"))
+    urlpatterns.append(
+        path("rest-json-response", views.rest_json_response, name="rest_json_response")
+    )
     urlpatterns.append(
         path(
             "rest-permission-denied-exc",
diff --git a/tests/integrations/django/myapp/views.py b/tests/integrations/django/myapp/views.py
index 02c67ca150..bee5e656d3 100644
--- a/tests/integrations/django/myapp/views.py
+++ b/tests/integrations/django/myapp/views.py
@@ -11,6 +11,7 @@
 
 try:
     from rest_framework.decorators import api_view
+    from rest_framework.response import Response
 
     @api_view(["POST"])
     def rest_framework_exc(request):
@@ -29,6 +30,10 @@ def rest_hello(request):
     def rest_permission_denied_exc(request):
         raise PermissionDenied("bye")
 
+    @api_view(["GET"])
+    def rest_json_response(request):
+        return Response(dict(ok=True))
+
 except ImportError:
     pass
 
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
index fc2783fb5c..fee2b34afc 100644
--- a/tests/integrations/django/test_basic.py
+++ b/tests/integrations/django/test_basic.py
@@ -300,6 +300,25 @@ def test_sql_dict_query_params(sentry_init, capture_events):
     assert crumb["data"]["db.params"] == {"my_foo": 10}
 
 
+@pytest.mark.forked
+@pytest_mark_django_db_decorator()
+def test_response_trace(sentry_init, client, capture_events, render_span_tree):
+    pytest.importorskip("rest_framework")
+    sentry_init(
+        integrations=[DjangoIntegration()],
+        traces_sample_rate=1.0,
+    )
+
+    events = capture_events()
+    content, status, headers = client.get(reverse("rest_json_response"))
+    assert status == "200 OK"
+
+    assert (
+        '- op="view.response.render": description="serialize response"'
+        in render_span_tree(events[0])
+    )
+
+
 @pytest.mark.parametrize(
     "query",
     [

From 2f916d3452178c105f081f21524bdb026f341b79 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Thu, 5 Jan 2023 10:56:14 -0500
Subject: [PATCH 186/209] perf(profiling): Performance tweaks to profile
 sampler (#1789)

This contains some small tweaks to speed up the profiler.
- changed from a namedtuple to a regular tuple as namedtuples were much slower
  but the tradeoff here is that it's more legible
- moved away from `os.path.abspath` as it was doing some extra operations that
  were unnecessary for our use case
- use the previous sample as a cache while sampling
---
 sentry_sdk/profiler.py | 173 ++++++++++++++++++++++++++---------------
 tests/test_profiler.py | 157 +++++++++++++++++++++----------------
 2 files changed, 201 insertions(+), 129 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 21313c9f73..43bedcf383 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -21,7 +21,7 @@
 import threading
 import time
 import uuid
-from collections import deque, namedtuple
+from collections import deque
 from contextlib import contextmanager
 
 import sentry_sdk
@@ -35,10 +35,6 @@
     nanosecond_time,
 )
 
-RawFrameData = namedtuple(
-    "RawFrameData", ["abs_path", "filename", "function", "lineno", "module"]
-)
-
 if MYPY:
     from types import FrameType
     from typing import Any
@@ -54,9 +50,17 @@
     import sentry_sdk.scope
     import sentry_sdk.tracing
 
-    RawStack = Tuple[RawFrameData, ...]
-    RawSample = Sequence[Tuple[str, RawStack]]
-    RawSampleWithId = Sequence[Tuple[str, int, RawStack]]
+    StackId = int
+
+    RawFrame = Tuple[
+        str,  # abs_path
+        Optional[str],  # module
+        Optional[str],  # filename
+        str,  # function
+        int,  # lineno
+    ]
+    RawStack = Tuple[RawFrame, ...]
+    RawSample = Sequence[Tuple[str, Tuple[StackId, RawStack]]]
 
     ProcessedStack = Tuple[int, ...]
 
@@ -155,8 +159,13 @@ def teardown_profiler():
 MAX_STACK_DEPTH = 128
 
 
-def extract_stack(frame, max_stack_depth=MAX_STACK_DEPTH):
-    # type: (Optional[FrameType], int) -> Tuple[RawFrameData, ...]
+def extract_stack(
+    frame,  # type: Optional[FrameType]
+    cwd,  # type: str
+    prev_cache=None,  # type: Optional[Tuple[StackId, RawStack, Deque[FrameType]]]
+    max_stack_depth=MAX_STACK_DEPTH,  # type: int
+):
+    # type: (...) -> Tuple[StackId, RawStack, Deque[FrameType]]
     """
     Extracts the stack starting the specified frame. The extracted stack
     assumes the specified frame is the top of the stack, and works back
@@ -166,17 +175,47 @@ def extract_stack(frame, max_stack_depth=MAX_STACK_DEPTH):
     only the first `MAX_STACK_DEPTH` frames will be returned.
     """
 
-    stack = deque(maxlen=max_stack_depth)  # type: Deque[FrameType]
+    frames = deque(maxlen=max_stack_depth)  # type: Deque[FrameType]
 
     while frame is not None:
-        stack.append(frame)
+        frames.append(frame)
         frame = frame.f_back
 
-    return tuple(extract_frame(frame) for frame in stack)
+    if prev_cache is None:
+        stack = tuple(extract_frame(frame, cwd) for frame in frames)
+    else:
+        _, prev_stack, prev_frames = prev_cache
+        prev_depth = len(prev_frames)
+        depth = len(frames)
+
+        # We want to match the frame found in this sample to the frames found in the
+        # previous sample. If they are the same (using the `is` operator), we can
+        # skip the expensive work of extracting the frame information and reuse what
+        # we extracted during the last sample.
+        #
+        # Make sure to keep in mind that the stack is ordered from the inner most
+        # from to the outer most frame so be careful with the indexing.
+        stack = tuple(
+            prev_stack[i]
+            if i >= 0 and frame is prev_frames[i]
+            else extract_frame(frame, cwd)
+            for i, frame in zip(range(prev_depth - depth, prev_depth), frames)
+        )
+
+    # Instead of mapping the stack into frame ids and hashing
+    # that as a tuple, we can directly hash the stack.
+    # This saves us from having to generate yet another list.
+    # Additionally, using the stack as the key directly is
+    # costly because the stack can be large, so we pre-hash
+    # the stack, and use the hash as the key as this will be
+    # needed a few times to improve performance.
+    stack_id = hash(stack)
 
+    return stack_id, stack, frames
 
-def extract_frame(frame):
-    # type: (FrameType) -> RawFrameData
+
+def extract_frame(frame, cwd):
+    # type: (FrameType, str) -> RawFrame
     abs_path = frame.f_code.co_filename
 
     try:
@@ -184,12 +223,23 @@ def extract_frame(frame):
     except Exception:
         module = None
 
-    return RawFrameData(
-        abs_path=os.path.abspath(abs_path),
-        filename=filename_for_module(module, abs_path) or None,
-        function=get_frame_name(frame),
-        lineno=frame.f_lineno,
-        module=module,
+    # namedtuples can be many times slower when initialing
+    # and accessing attribute so we opt to use a tuple here instead
+    return (
+        # This originally was `os.path.abspath(abs_path)` but that had
+        # a large performance overhead.
+        #
+        # According to docs, this is equivalent to
+        # `os.path.normpath(os.path.join(os.getcwd(), path))`.
+        # The `os.getcwd()` call is slow here, so we precompute it.
+        #
+        # Additionally, since we are using normalized path already,
+        # we skip calling `os.path.normpath` entirely.
+        os.path.join(cwd, abs_path),
+        module,
+        filename_for_module(module, abs_path) or None,
+        get_frame_name(frame),
+        frame.f_lineno,
     )
 
 
@@ -200,6 +250,8 @@ def get_frame_name(frame):
     # we should consider using instead where possible
 
     f_code = frame.f_code
+    co_varnames = f_code.co_varnames
+
     # co_name only contains the frame name.  If the frame was a method,
     # the class name will NOT be included.
     name = f_code.co_name
@@ -210,8 +262,8 @@ def get_frame_name(frame):
         if (
             # the co_varnames start with the frame's positional arguments
             # and we expect the first to be `self` if its an instance method
-            f_code.co_varnames
-            and f_code.co_varnames[0] == "self"
+            co_varnames
+            and co_varnames[0] == "self"
             and "self" in frame.f_locals
         ):
             for cls in frame.f_locals["self"].__class__.__mro__:
@@ -226,8 +278,8 @@ def get_frame_name(frame):
         if (
             # the co_varnames start with the frame's positional arguments
             # and we expect the first to be `cls` if its a class method
-            f_code.co_varnames
-            and f_code.co_varnames[0] == "cls"
+            co_varnames
+            and co_varnames[0] == "cls"
             and "cls" in frame.f_locals
         ):
             for cls in frame.f_locals["cls"].__mro__:
@@ -338,13 +390,11 @@ class SampleBuffer(object):
     def __init__(self, capacity):
         # type: (int) -> None
 
-        self.buffer = [
-            None
-        ] * capacity  # type: List[Optional[Tuple[int, RawSampleWithId]]]
+        self.buffer = [None] * capacity  # type: List[Optional[Tuple[int, RawSample]]]
         self.capacity = capacity  # type: int
         self.idx = 0  # type: int
 
-    def write(self, ts, raw_sample):
+    def write(self, ts, sample):
         # type: (int, RawSample) -> None
         """
         Writing to the buffer is not thread safe. There is the possibility
@@ -359,32 +409,16 @@ def write(self, ts, raw_sample):
         """
         idx = self.idx
 
-        sample = [
-            (
-                thread_id,
-                # Instead of mapping the stack into frame ids and hashing
-                # that as a tuple, we can directly hash the stack.
-                # This saves us from having to generate yet another list.
-                # Additionally, using the stack as the key directly is
-                # costly because the stack can be large, so we pre-hash
-                # the stack, and use the hash as the key as this will be
-                # needed a few times to improve performance.
-                hash(stack),
-                stack,
-            )
-            for thread_id, stack in raw_sample
-        ]
-
         self.buffer[idx] = (ts, sample)
         self.idx = (idx + 1) % self.capacity
 
     def slice_profile(self, start_ns, stop_ns):
         # type: (int, int) -> ProcessedProfile
         samples = []  # type: List[ProcessedSample]
-        stacks = dict()  # type: Dict[int, int]
-        stacks_list = list()  # type: List[ProcessedStack]
-        frames = dict()  # type: Dict[RawFrameData, int]
-        frames_list = list()  # type: List[ProcessedFrame]
+        stacks = {}  # type: Dict[StackId, int]
+        stacks_list = []  # type: List[ProcessedStack]
+        frames = {}  # type: Dict[RawFrame, int]
+        frames_list = []  # type: List[ProcessedFrame]
 
         for ts, sample in filter(None, self.buffer):
             if start_ns > ts or ts > stop_ns:
@@ -392,7 +426,7 @@ def slice_profile(self, start_ns, stop_ns):
 
             elapsed_since_start_ns = str(ts - start_ns)
 
-            for tid, hashed_stack, stack in sample:
+            for tid, (hashed_stack, stack) in sample:
                 # Check if the stack is indexed first, this lets us skip
                 # indexing frames if it's not necessary
                 if hashed_stack not in stacks:
@@ -401,11 +435,11 @@ def slice_profile(self, start_ns, stop_ns):
                             frames[frame] = len(frames)
                             frames_list.append(
                                 {
-                                    "abs_path": frame.abs_path,
-                                    "function": frame.function or "",
-                                    "filename": frame.filename,
-                                    "lineno": frame.lineno,
-                                    "module": frame.module,
+                                    "abs_path": frame[0],
+                                    "module": frame[1],
+                                    "filename": frame[2],
+                                    "function": frame[3],
+                                    "lineno": frame[4],
                                 }
                             )
 
@@ -439,6 +473,14 @@ def slice_profile(self, start_ns, stop_ns):
 
     def make_sampler(self):
         # type: () -> Callable[..., None]
+        cwd = os.getcwd()
+
+        # In Python3+, we can use the `nonlocal` keyword to rebind the value,
+        # but this is not possible in Python2. To get around this, we wrap
+        # the value in a list to allow updating this value each sample.
+        last_sample = [
+            {}
+        ]  # type: List[Dict[int, Tuple[StackId, RawStack, Deque[FrameType]]]]
 
         def _sample_stack(*args, **kwargs):
             # type: (*Any, **Any) -> None
@@ -447,13 +489,20 @@ def _sample_stack(*args, **kwargs):
             This should be called at a regular interval to collect samples.
             """
 
-            self.write(
-                nanosecond_time(),
-                [
-                    (str(tid), extract_stack(frame))
-                    for tid, frame in sys._current_frames().items()
-                ],
-            )
+            now = nanosecond_time()
+            raw_sample = {
+                tid: extract_stack(frame, cwd, last_sample[0].get(tid))
+                for tid, frame in sys._current_frames().items()
+            }
+
+            last_sample[0] = raw_sample
+
+            sample = [
+                (str(tid), (stack_id, stack))
+                for tid, (stack_id, stack, _) in raw_sample.items()
+            ]
+
+            self.write(now, sample)
 
         return _sample_stack
 
diff --git a/tests/test_profiler.py b/tests/test_profiler.py
index 9a268713c8..9ee49bb035 100644
--- a/tests/test_profiler.py
+++ b/tests/test_profiler.py
@@ -1,4 +1,5 @@
 import inspect
+import os
 import platform
 import sys
 import threading
@@ -8,9 +9,9 @@
 
 from sentry_sdk.profiler import (
     EventScheduler,
-    RawFrameData,
     SampleBuffer,
     SleepScheduler,
+    extract_frame,
     extract_stack,
     get_frame_name,
     setup_profiler,
@@ -26,6 +27,10 @@
 )
 
 
+def process_test_sample(sample):
+    return [(tid, (stack, stack)) for tid, stack in sample]
+
+
 @minimum_python_33
 def test_profiler_invalid_mode(teardown_profiling):
     with pytest.raises(ValueError):
@@ -209,6 +214,33 @@ def test_get_frame_name(frame, frame_name):
     assert get_frame_name(frame) == frame_name
 
 
+@pytest.mark.parametrize(
+    ("get_frame", "function"),
+    [
+        pytest.param(lambda: get_frame(depth=1), "get_frame", id="simple"),
+    ],
+)
+def test_extract_frame(get_frame, function):
+    cwd = os.getcwd()
+    frame = get_frame()
+    extracted_frame = extract_frame(frame, cwd)
+
+    # the abs_path should be equal toe the normalized path of the co_filename
+    assert extracted_frame[0] == os.path.normpath(frame.f_code.co_filename)
+
+    # the module should be pull from this test module
+    assert extracted_frame[1] == __name__
+
+    # the filename should be the file starting after the cwd
+    assert extracted_frame[2] == __file__[len(cwd) + 1 :]
+
+    assert extracted_frame[3] == function
+
+    # the lineno will shift over time as this file is modified so just check
+    # that it is an int
+    assert isinstance(extracted_frame[4], int)
+
+
 @pytest.mark.parametrize(
     ("depth", "max_stack_depth", "actual_depth"),
     [
@@ -227,15 +259,33 @@ def test_extract_stack_with_max_depth(depth, max_stack_depth, actual_depth):
 
     # increase the max_depth by the `base_stack_depth` to account
     # for the extra frames pytest will add
-    stack = extract_stack(frame, max_stack_depth + base_stack_depth)
+    _, stack, _ = extract_stack(
+        frame, os.getcwd(), max_stack_depth=max_stack_depth + base_stack_depth
+    )
     assert len(stack) == base_stack_depth + actual_depth
 
     for i in range(actual_depth):
-        assert stack[i].function == "get_frame", i
+        assert stack[i][3] == "get_frame", i
 
     # index 0 contains the inner most frame on the stack, so the lamdba
     # should be at index `actual_depth`
-    assert stack[actual_depth].function == "", actual_depth
+    assert stack[actual_depth][3] == "", actual_depth
+
+
+def test_extract_stack_with_cache():
+    frame = get_frame(depth=1)
+
+    prev_cache = extract_stack(frame, os.getcwd())
+    _, stack1, _ = prev_cache
+    _, stack2, _ = extract_stack(frame, os.getcwd(), prev_cache)
+
+    assert len(stack1) == len(stack2)
+    for i, (frame1, frame2) in enumerate(zip(stack1, stack2)):
+        # DO NOT use `==` for the assertion here since we are
+        # testing for identity, and using `==` would test for
+        # equality which would always pass since we're extract
+        # the same stack.
+        assert frame1 is frame2, i
 
 
 def get_scheduler_threads(scheduler):
@@ -250,7 +300,7 @@ def __init__(self, capacity, sample_data=None):
     def make_sampler(self):
         def _sample_stack(*args, **kwargs):
             ts, sample = self.sample_data.pop(0)
-            self.write(ts, sample)
+            self.write(ts, process_test_sample(sample))
 
         return _sample_stack
 
@@ -272,11 +322,7 @@ def test_thread_scheduler_takes_first_samples(scheduler_class):
                 [
                     (
                         0,
-                        (
-                            RawFrameData(
-                                "/path/to/file.py", "file.py", "name", 1, "file"
-                            ),
-                        ),
+                        (("/path/to/file.py", "file", "file.py", "name", 1),),
                     )
                 ],
             )
@@ -312,11 +358,7 @@ def test_thread_scheduler_takes_more_samples(scheduler_class):
                 [
                     (
                         0,
-                        (
-                            RawFrameData(
-                                "/path/to/file.py", "file.py", "name", 1, "file"
-                            ),
-                        ),
+                        (("/path/to/file.py", "file", "file.py", "name", 1),),
                     )
                 ],
             )
@@ -420,11 +462,7 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                     [
                         (
                             "1",
-                            (
-                                RawFrameData(
-                                    "/path/to/file.py", "file.py", "name", 1, "file"
-                                ),
-                            ),
+                            (("/path/to/file.py", "file", "file.py", "name", 1),),
                         )
                     ],
                 )
@@ -447,11 +485,7 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                     [
                         (
                             "1",
-                            (
-                                RawFrameData(
-                                    "/path/to/file.py", "file.py", "name", 1, "file"
-                                ),
-                            ),
+                            (("/path/to/file.py", "file", "file.py", "name", 1),),
                         )
                     ],
                 )
@@ -488,11 +522,7 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                     [
                         (
                             "1",
-                            (
-                                RawFrameData(
-                                    "/path/to/file.py", "file.py", "name", 1, "file"
-                                ),
-                            ),
+                            (("/path/to/file.py", "file", "file.py", "name", 1),),
                         )
                     ],
                 ),
@@ -501,11 +531,7 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                     [
                         (
                             "1",
-                            (
-                                RawFrameData(
-                                    "/path/to/file.py", "file.py", "name", 1, "file"
-                                ),
-                            ),
+                            (("/path/to/file.py", "file", "file.py", "name", 1),),
                         )
                     ],
                 ),
@@ -547,11 +573,7 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                     [
                         (
                             "1",
-                            (
-                                RawFrameData(
-                                    "/path/to/file.py", "file.py", "name1", 1, "file"
-                                ),
-                            ),
+                            (("/path/to/file.py", "file", "file.py", "name1", 1),),
                         )
                     ],
                 ),
@@ -561,12 +583,8 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                         (
                             "1",
                             (
-                                RawFrameData(
-                                    "/path/to/file.py", "file.py", "name1", 1, "file"
-                                ),
-                                RawFrameData(
-                                    "/path/to/file.py", "file.py", "name2", 2, "file"
-                                ),
+                                ("/path/to/file.py", "file", "file.py", "name1", 1),
+                                ("/path/to/file.py", "file", "file.py", "name2", 2),
                             ),
                         )
                     ],
@@ -617,11 +635,14 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                         (
                             "1",
                             (
-                                RawFrameData(
-                                    "/path/to/file.py", "file.py", "name1", 1, "file"
-                                ),
-                                RawFrameData(
-                                    "/path/to/file.py", "file.py", "name2", 2, "file"
+                                ("/path/to/file.py", "file", "file.py", "name1", 1),
+                                (
+                                    "/path/to/file.py",
+                                    "file",
+                                    "file.py",
+                                    "name2",
+                                    2,
+                                    "file",
                                 ),
                             ),
                         )
@@ -633,11 +654,21 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                         (
                             "1",
                             (
-                                RawFrameData(
-                                    "/path/to/file.py", "file.py", "name3", 3, "file"
+                                (
+                                    "/path/to/file.py",
+                                    "file",
+                                    "file.py",
+                                    "name3",
+                                    3,
+                                    "file",
                                 ),
-                                RawFrameData(
-                                    "/path/to/file.py", "file.py", "name4", 4, "file"
+                                (
+                                    "/path/to/file.py",
+                                    "file",
+                                    "file.py",
+                                    "name4",
+                                    4,
+                                    "file",
                                 ),
                             ),
                         )
@@ -702,11 +733,7 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                     [
                         (
                             "1",
-                            (
-                                RawFrameData(
-                                    "/path/to/file.py", "file.py", "name1", 1, "file"
-                                ),
-                            ),
+                            (("/path/to/file.py", "file", "file.py", "name1", 1),),
                         )
                     ],
                 ),
@@ -716,12 +743,8 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                         (
                             "1",
                             (
-                                RawFrameData(
-                                    "/path/to/file.py", "file.py", "name2", 2, "file"
-                                ),
-                                RawFrameData(
-                                    "/path/to/file.py", "file.py", "name3", 3, "file"
-                                ),
+                                ("/path/to/file.py", "file", "file.py", "name2", 2),
+                                ("/path/to/file.py", "file", "file.py", "name3", 3),
                             ),
                         )
                     ],
@@ -761,6 +784,6 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
 def test_sample_buffer(capacity, start_ns, stop_ns, samples, profile):
     buffer = SampleBuffer(capacity)
     for ts, sample in samples:
-        buffer.write(ts, sample)
+        buffer.write(ts, process_test_sample(sample))
     result = buffer.slice_profile(start_ns, stop_ns)
     assert result == profile

From 2f67f12e405f8a6f89418d96071158367fcf516f Mon Sep 17 00:00:00 2001
From: anthony sottile <103459774+asottile-sentry@users.noreply.github.com>
Date: Fri, 6 Jan 2023 01:47:27 -0500
Subject: [PATCH 187/209] Auto publish to internal pypi on release (#1823)

---
 .craft.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.craft.yml b/.craft.yml
index 353b02f77e..43bbfdd7bd 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -1,4 +1,4 @@
-minVersion: 0.28.1
+minVersion: 0.34.1
 targets:
   - name: pypi
     includeNames: /^sentry[_\-]sdk.*$/
@@ -23,5 +23,7 @@ targets:
           - python3.8
           - python3.9
     license: MIT
+  - name: sentry-pypi
+    internalPypiRepo: getsentry/pypi
 changelog: CHANGELOG.md
 changelogPolicy: auto

From b300b10df5aff2f4822b4ba8a75e62ee5f8798fb Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Tue, 10 Jan 2023 11:11:06 -0500
Subject: [PATCH 188/209] ref(profiling): Remove sample buffer from profiler
 (#1791)

The sample buffer kept 30s of samples around in memory. This introduces a
noticeable memory overhead on systems with less memory available. This change
removes the buffer and directly writes to the profile itself where the sample is
processed on the fly instead of at the end.
---
 sentry_sdk/profiler.py | 624 ++++++++++++++++-------------------------
 tests/test_profiler.py | 278 ++++--------------
 2 files changed, 283 insertions(+), 619 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 43bedcf383..81ba8f5753 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -16,7 +16,6 @@
 import os
 import platform
 import random
-import signal
 import sys
 import threading
 import time
@@ -26,7 +25,6 @@
 
 import sentry_sdk
 from sentry_sdk._compat import PY33
-from sentry_sdk._queue import Queue
 from sentry_sdk._types import MYPY
 from sentry_sdk.utils import (
     filename_for_module,
@@ -44,13 +42,20 @@
     from typing import Generator
     from typing import List
     from typing import Optional
+    from typing import Set
     from typing import Sequence
     from typing import Tuple
     from typing_extensions import TypedDict
     import sentry_sdk.scope
     import sentry_sdk.tracing
 
-    StackId = int
+    ThreadId = str
+
+    # The exact value of this id is not very meaningful. The purpose
+    # of this id is to give us a compact and unique identifier for a
+    # raw stack that can be used as a key to a dictionary so that it
+    # can be used during the sampled format generation.
+    RawStackId = Tuple[int, int]
 
     RawFrame = Tuple[
         str,  # abs_path
@@ -60,19 +65,19 @@
         int,  # lineno
     ]
     RawStack = Tuple[RawFrame, ...]
-    RawSample = Sequence[Tuple[str, Tuple[StackId, RawStack]]]
-
-    ProcessedStack = Tuple[int, ...]
+    RawSample = Sequence[Tuple[str, Tuple[RawStackId, RawStack]]]
 
     ProcessedSample = TypedDict(
         "ProcessedSample",
         {
             "elapsed_since_start_ns": str,
-            "thread_id": str,
+            "thread_id": ThreadId,
             "stack_id": int,
         },
     )
 
+    ProcessedStack = List[int]
+
     ProcessedFrame = TypedDict(
         "ProcessedFrame",
         {
@@ -95,7 +100,7 @@
             "frames": List[ProcessedFrame],
             "stacks": List[ProcessedStack],
             "samples": List[ProcessedSample],
-            "thread_metadata": Dict[str, ProcessedThreadMetadata],
+            "thread_metadata": Dict[ThreadId, ProcessedThreadMetadata],
         },
     )
 
@@ -121,22 +126,11 @@ def setup_profiler(options):
         logger.warn("profiling is only supported on Python >= 3.3")
         return
 
-    buffer_secs = 30
     frequency = 101
 
-    # To buffer samples for `buffer_secs` at `frequency` Hz, we need
-    # a capcity of `buffer_secs * frequency`.
-    buffer = SampleBuffer(capacity=buffer_secs * frequency)
-
     profiler_mode = options["_experiments"].get("profiler_mode", SleepScheduler.mode)
-    if profiler_mode == SigprofScheduler.mode:
-        _scheduler = SigprofScheduler(sample_buffer=buffer, frequency=frequency)
-    elif profiler_mode == SigalrmScheduler.mode:
-        _scheduler = SigalrmScheduler(sample_buffer=buffer, frequency=frequency)
-    elif profiler_mode == SleepScheduler.mode:
-        _scheduler = SleepScheduler(sample_buffer=buffer, frequency=frequency)
-    elif profiler_mode == EventScheduler.mode:
-        _scheduler = EventScheduler(sample_buffer=buffer, frequency=frequency)
+    if profiler_mode == SleepScheduler.mode:
+        _scheduler = SleepScheduler(frequency=frequency)
     else:
         raise ValueError("Unknown profiler mode: {}".format(profiler_mode))
     _scheduler.setup()
@@ -162,10 +156,10 @@ def teardown_profiler():
 def extract_stack(
     frame,  # type: Optional[FrameType]
     cwd,  # type: str
-    prev_cache=None,  # type: Optional[Tuple[StackId, RawStack, Deque[FrameType]]]
+    prev_cache=None,  # type: Optional[Tuple[RawStackId, RawStack, Deque[FrameType]]]
     max_stack_depth=MAX_STACK_DEPTH,  # type: int
 ):
-    # type: (...) -> Tuple[StackId, RawStack, Deque[FrameType]]
+    # type: (...) -> Tuple[RawStackId, RawStack, Deque[FrameType]]
     """
     Extracts the stack starting the specified frame. The extracted stack
     assumes the specified frame is the top of the stack, and works back
@@ -209,7 +203,11 @@ def extract_stack(
     # costly because the stack can be large, so we pre-hash
     # the stack, and use the hash as the key as this will be
     # needed a few times to improve performance.
-    stack_id = hash(stack)
+    #
+    # To Reduce the likelihood of hash collisions, we include
+    # the stack depth. This means that only stacks of the same
+    # depth can suffer from hash collisions.
+    stack_id = len(stack), hash(stack)
 
     return stack_id, stack, frames
 
@@ -294,40 +292,103 @@ def get_frame_name(frame):
     return name
 
 
+MAX_PROFILE_DURATION_NS = int(3e10)  # 30 seconds
+
+
 class Profile(object):
     def __init__(
         self,
         scheduler,  # type: Scheduler
         transaction,  # type: sentry_sdk.tracing.Transaction
-        hub=None,  # type: Optional[sentry_sdk.Hub]
     ):
         # type: (...) -> None
         self.scheduler = scheduler
         self.transaction = transaction
-        self.hub = hub
-        self._start_ns = None  # type: Optional[int]
-        self._stop_ns = None  # type: Optional[int]
+        self.start_ns = 0  # type: int
+        self.stop_ns = 0  # type: int
+        self.active = False  # type: bool
+
+        self.indexed_frames = {}  # type: Dict[RawFrame, int]
+        self.indexed_stacks = {}  # type: Dict[RawStackId, int]
+        self.frames = []  # type: List[ProcessedFrame]
+        self.stacks = []  # type: List[ProcessedStack]
+        self.samples = []  # type: List[ProcessedSample]
 
         transaction._profile = self
 
     def __enter__(self):
         # type: () -> None
-        self._start_ns = nanosecond_time()
-        self.scheduler.start_profiling()
+        self.start_ns = nanosecond_time()
+        self.scheduler.start_profiling(self)
 
     def __exit__(self, ty, value, tb):
         # type: (Optional[Any], Optional[Any], Optional[Any]) -> None
-        self.scheduler.stop_profiling()
-        self._stop_ns = nanosecond_time()
+        self.scheduler.stop_profiling(self)
+        self.stop_ns = nanosecond_time()
+
+    def write(self, ts, sample):
+        # type: (int, RawSample) -> None
+        if ts < self.start_ns:
+            return
+
+        offset = ts - self.start_ns
+        if offset > MAX_PROFILE_DURATION_NS:
+            return
+
+        elapsed_since_start_ns = str(offset)
+
+        for tid, (stack_id, stack) in sample:
+            # Check if the stack is indexed first, this lets us skip
+            # indexing frames if it's not necessary
+            if stack_id not in self.indexed_stacks:
+                for frame in stack:
+                    if frame not in self.indexed_frames:
+                        self.indexed_frames[frame] = len(self.indexed_frames)
+                        self.frames.append(
+                            {
+                                "abs_path": frame[0],
+                                "module": frame[1],
+                                "filename": frame[2],
+                                "function": frame[3],
+                                "lineno": frame[4],
+                            }
+                        )
+
+                self.indexed_stacks[stack_id] = len(self.indexed_stacks)
+                self.stacks.append([self.indexed_frames[frame] for frame in stack])
+
+            self.samples.append(
+                {
+                    "elapsed_since_start_ns": elapsed_since_start_ns,
+                    "thread_id": tid,
+                    "stack_id": self.indexed_stacks[stack_id],
+                }
+            )
+
+    def process(self):
+        # type: () -> ProcessedProfile
+
+        # This collects the thread metadata at the end of a profile. Doing it
+        # this way means that any threads that terminate before the profile ends
+        # will not have any metadata associated with it.
+        thread_metadata = {
+            str(thread.ident): {
+                "name": str(thread.name),
+            }
+            for thread in threading.enumerate()
+        }  # type: Dict[str, ProcessedThreadMetadata]
+
+        return {
+            "frames": self.frames,
+            "stacks": self.stacks,
+            "samples": self.samples,
+            "thread_metadata": thread_metadata,
+        }
 
     def to_json(self, event_opt, options, scope):
         # type: (Any, Dict[str, Any], Optional[sentry_sdk.scope.Scope]) -> Dict[str, Any]
-        assert self._start_ns is not None
-        assert self._stop_ns is not None
 
-        profile = self.scheduler.sample_buffer.slice_profile(
-            self._start_ns, self._stop_ns
-        )
+        profile = self.process()
 
         handle_in_app_impl(
             profile["frames"], options["in_app_exclude"], options["in_app_include"]
@@ -365,7 +426,7 @@ def to_json(self, event_opt, options, scope):
                     "relative_start_ns": "0",
                     # use the duration of the profile instead of the transaction
                     # because we end the transaction after the profile
-                    "relative_end_ns": str(self._stop_ns - self._start_ns),
+                    "relative_end_ns": str(self.stop_ns - self.start_ns),
                     "trace_id": self.transaction.trace_id,
                     "active_thread_id": str(
                         self.transaction._active_thread_id
@@ -377,99 +438,86 @@ def to_json(self, event_opt, options, scope):
         }
 
 
-class SampleBuffer(object):
-    """
-    A simple implementation of a ring buffer to buffer the samples taken.
+class Scheduler(object):
+    mode = "unknown"
+
+    def __init__(self, frequency):
+        # type: (int) -> None
+        self.interval = 1.0 / frequency
+
+    def __enter__(self):
+        # type: () -> Scheduler
+        self.setup()
+        return self
+
+    def __exit__(self, ty, value, tb):
+        # type: (Optional[Any], Optional[Any], Optional[Any]) -> None
+        self.teardown()
+
+    def setup(self):
+        # type: () -> None
+        raise NotImplementedError
+
+    def teardown(self):
+        # type: () -> None
+        raise NotImplementedError
 
-    At some point, the ring buffer will start overwriting old samples.
-    This is a trade off we've chosen to ensure the memory usage does not
-    grow indefinitely. But by having a sufficiently large buffer, this is
-    largely not a problem.
+    def start_profiling(self, profile):
+        # type: (Profile) -> None
+        raise NotImplementedError
+
+    def stop_profiling(self, profile):
+        # type: (Profile) -> None
+        raise NotImplementedError
+
+
+class ThreadScheduler(Scheduler):
     """
+    This abstract scheduler is based on running a daemon thread that will call
+    the sampler at a regular interval.
+    """
+
+    mode = "thread"
+    name = None  # type: Optional[str]
 
-    def __init__(self, capacity):
+    def __init__(self, frequency):
         # type: (int) -> None
+        super(ThreadScheduler, self).__init__(frequency=frequency)
 
-        self.buffer = [None] * capacity  # type: List[Optional[Tuple[int, RawSample]]]
-        self.capacity = capacity  # type: int
-        self.idx = 0  # type: int
+        self.sampler = self.make_sampler()
 
-    def write(self, ts, sample):
-        # type: (int, RawSample) -> None
-        """
-        Writing to the buffer is not thread safe. There is the possibility
-        that parallel writes will overwrite one another.
-
-        This should only be a problem if the signal handler itself is
-        interrupted by the next signal.
-        (i.e. SIGPROF is sent again before the handler finishes).
-
-        For this reason, and to keep it performant, we've chosen not to add
-        any synchronization mechanisms here like locks.
-        """
-        idx = self.idx
-
-        self.buffer[idx] = (ts, sample)
-        self.idx = (idx + 1) % self.capacity
-
-    def slice_profile(self, start_ns, stop_ns):
-        # type: (int, int) -> ProcessedProfile
-        samples = []  # type: List[ProcessedSample]
-        stacks = {}  # type: Dict[StackId, int]
-        stacks_list = []  # type: List[ProcessedStack]
-        frames = {}  # type: Dict[RawFrame, int]
-        frames_list = []  # type: List[ProcessedFrame]
-
-        for ts, sample in filter(None, self.buffer):
-            if start_ns > ts or ts > stop_ns:
-                continue
-
-            elapsed_since_start_ns = str(ts - start_ns)
-
-            for tid, (hashed_stack, stack) in sample:
-                # Check if the stack is indexed first, this lets us skip
-                # indexing frames if it's not necessary
-                if hashed_stack not in stacks:
-                    for frame in stack:
-                        if frame not in frames:
-                            frames[frame] = len(frames)
-                            frames_list.append(
-                                {
-                                    "abs_path": frame[0],
-                                    "module": frame[1],
-                                    "filename": frame[2],
-                                    "function": frame[3],
-                                    "lineno": frame[4],
-                                }
-                            )
-
-                    stacks[hashed_stack] = len(stacks)
-                    stacks_list.append(tuple(frames[frame] for frame in stack))
-
-                samples.append(
-                    {
-                        "elapsed_since_start_ns": elapsed_since_start_ns,
-                        "thread_id": tid,
-                        "stack_id": stacks[hashed_stack],
-                    }
-                )
+        # used to signal to the thread that it should stop
+        self.event = threading.Event()
 
-        # This collects the thread metadata at the end of a profile. Doing it
-        # this way means that any threads that terminate before the profile ends
-        # will not have any metadata associated with it.
-        thread_metadata = {
-            str(thread.ident): {
-                "name": str(thread.name),
-            }
-            for thread in threading.enumerate()
-        }  # type: Dict[str, ProcessedThreadMetadata]
+        # make sure the thread is a daemon here otherwise this
+        # can keep the application running after other threads
+        # have exited
+        self.thread = threading.Thread(name=self.name, target=self.run, daemon=True)
 
-        return {
-            "stacks": stacks_list,
-            "frames": frames_list,
-            "samples": samples,
-            "thread_metadata": thread_metadata,
-        }
+        self.new_profiles = deque()  # type: Deque[Profile]
+        self.active_profiles = set()  # type: Set[Profile]
+
+    def setup(self):
+        # type: () -> None
+        self.thread.start()
+
+    def teardown(self):
+        # type: () -> None
+        self.event.set()
+        self.thread.join()
+
+    def start_profiling(self, profile):
+        # type: (Profile) -> None
+        profile.active = True
+        self.new_profiles.append(profile)
+
+    def stop_profiling(self, profile):
+        # type: (Profile) -> None
+        profile.active = False
+
+    def run(self):
+        # type: () -> None
+        raise NotImplementedError
 
     def make_sampler(self):
         # type: () -> Callable[..., None]
@@ -480,7 +528,7 @@ def make_sampler(self):
         # the value in a list to allow updating this value each sample.
         last_sample = [
             {}
-        ]  # type: List[Dict[int, Tuple[StackId, RawStack, Deque[FrameType]]]]
+        ]  # type: List[Dict[int, Tuple[RawStackId, RawStack, Deque[FrameType]]]]
 
         def _sample_stack(*args, **kwargs):
             # type: (*Any, **Any) -> None
@@ -488,13 +536,32 @@ def _sample_stack(*args, **kwargs):
             Take a sample of the stack on all the threads in the process.
             This should be called at a regular interval to collect samples.
             """
+            # no profiles taking place, so we can stop early
+            if not self.new_profiles and not self.active_profiles:
+                # make sure to clear the cache if we're not profiling so we dont
+                # keep a reference to the last stack of frames around
+                last_sample[0] = {}
+                return
+
+            # This is the number of profiles we want to pop off.
+            # It's possible another thread adds a new profile to
+            # the list and we spend longer than we want inside
+            # the loop below.
+            #
+            # Also make sure to set this value before extracting
+            # frames so we do not write to any new profiles that
+            # were started after this point.
+            new_profiles = len(self.new_profiles)
 
             now = nanosecond_time()
+
             raw_sample = {
                 tid: extract_stack(frame, cwd, last_sample[0].get(tid))
                 for tid, frame in sys._current_frames().items()
             }
 
+            # make sure to update the last sample so the cache has
+            # the most recent stack for better cache hits
             last_sample[0] = raw_sample
 
             sample = [
@@ -502,99 +569,37 @@ def _sample_stack(*args, **kwargs):
                 for tid, (stack_id, stack, _) in raw_sample.items()
             ]
 
-            self.write(now, sample)
+            # Move the new profiles into the active_profiles set.
+            #
+            # We cannot directly add the to active_profiles set
+            # in `start_profiling` because it is called from other
+            # threads which can cause a RuntimeError when it the
+            # set sizes changes during iteration without a lock.
+            #
+            # We also want to avoid using a lock here so threads
+            # that are starting profiles are not blocked until it
+            # can acquire the lock.
+            for _ in range(new_profiles):
+                self.active_profiles.add(self.new_profiles.popleft())
+
+            inactive_profiles = []
+
+            for profile in self.active_profiles:
+                if profile.active:
+                    profile.write(now, sample)
+                else:
+                    # If a thread is marked inactive, we buffer it
+                    # to `inactive_profiles` so it can be removed.
+                    # We cannot remove it here as it would result
+                    # in a RuntimeError.
+                    inactive_profiles.append(profile)
+
+            for profile in inactive_profiles:
+                self.active_profiles.remove(profile)
 
         return _sample_stack
 
 
-class Scheduler(object):
-    mode = "unknown"
-
-    def __init__(self, sample_buffer, frequency):
-        # type: (SampleBuffer, int) -> None
-        self.sample_buffer = sample_buffer
-        self.sampler = sample_buffer.make_sampler()
-        self._lock = threading.Lock()
-        self._count = 0
-        self._interval = 1.0 / frequency
-
-    def setup(self):
-        # type: () -> None
-        raise NotImplementedError
-
-    def teardown(self):
-        # type: () -> None
-        raise NotImplementedError
-
-    def start_profiling(self):
-        # type: () -> bool
-        with self._lock:
-            self._count += 1
-            return self._count == 1
-
-    def stop_profiling(self):
-        # type: () -> bool
-        with self._lock:
-            self._count -= 1
-            return self._count == 0
-
-
-class ThreadScheduler(Scheduler):
-    """
-    This abstract scheduler is based on running a daemon thread that will call
-    the sampler at a regular interval.
-    """
-
-    mode = "thread"
-    name = None  # type: Optional[str]
-
-    def __init__(self, sample_buffer, frequency):
-        # type: (SampleBuffer, int) -> None
-        super(ThreadScheduler, self).__init__(
-            sample_buffer=sample_buffer, frequency=frequency
-        )
-        self.stop_events = Queue()
-
-    def setup(self):
-        # type: () -> None
-        pass
-
-    def teardown(self):
-        # type: () -> None
-        pass
-
-    def start_profiling(self):
-        # type: () -> bool
-        if super(ThreadScheduler, self).start_profiling():
-            # make sure to clear the event as we reuse the same event
-            # over the lifetime of the scheduler
-            event = threading.Event()
-            self.stop_events.put_nowait(event)
-            run = self.make_run(event)
-
-            # make sure the thread is a daemon here otherwise this
-            # can keep the application running after other threads
-            # have exited
-            thread = threading.Thread(name=self.name, target=run, daemon=True)
-            thread.start()
-            return True
-        return False
-
-    def stop_profiling(self):
-        # type: () -> bool
-        if super(ThreadScheduler, self).stop_profiling():
-            # make sure the set the event here so that the thread
-            # can check to see if it should keep running
-            event = self.stop_events.get_nowait()
-            event.set()
-            return True
-        return False
-
-    def make_run(self, event):
-        # type: (threading.Event) -> Callable[..., None]
-        raise NotImplementedError
-
-
 class SleepScheduler(ThreadScheduler):
     """
     This scheduler uses time.sleep to wait the required interval before calling
@@ -604,187 +609,30 @@ class SleepScheduler(ThreadScheduler):
     mode = "sleep"
     name = "sentry.profiler.SleepScheduler"
 
-    def make_run(self, event):
-        # type: (threading.Event) -> Callable[..., None]
-
-        def run():
-            # type: () -> None
-            self.sampler()
-
-            last = time.perf_counter()
-
-            while True:
-                # some time may have elapsed since the last time
-                # we sampled, so we need to account for that and
-                # not sleep for too long
-                now = time.perf_counter()
-                elapsed = max(now - last, 0)
-
-                if elapsed < self._interval:
-                    time.sleep(self._interval - elapsed)
-
-                last = time.perf_counter()
-
-                if event.is_set():
-                    break
-
-                self.sampler()
-
-        return run
-
-
-class EventScheduler(ThreadScheduler):
-    """
-    This scheduler uses threading.Event to wait the required interval before
-    calling the sampling function.
-    """
-
-    mode = "event"
-    name = "sentry.profiler.EventScheduler"
-
-    def make_run(self, event):
-        # type: (threading.Event) -> Callable[..., None]
-
-        def run():
-            # type: () -> None
-            self.sampler()
-
-            while True:
-                event.wait(timeout=self._interval)
-
-                if event.is_set():
-                    break
-
-                self.sampler()
-
-        return run
-
-
-class SignalScheduler(Scheduler):
-    """
-    This abstract scheduler is based on UNIX signals. It sets up a
-    signal handler for the specified signal, and the matching itimer in order
-    for the signal handler to fire at a regular interval.
-
-    See https://www.gnu.org/software/libc/manual/html_node/Alarm-Signals.html
-    """
-
-    mode = "signal"
-
-    @property
-    def signal_num(self):
-        # type: () -> signal.Signals
-        raise NotImplementedError
-
-    @property
-    def signal_timer(self):
-        # type: () -> int
-        raise NotImplementedError
-
-    def setup(self):
-        # type: () -> None
-        """
-        This method sets up the application so that it can be profiled.
-        It MUST be called from the main thread. This is a limitation of
-        python's signal library where it only allows the main thread to
-        set a signal handler.
-        """
-
-        # This setups a process wide signal handler that will be called
-        # at an interval to record samples.
-        try:
-            signal.signal(self.signal_num, self.sampler)
-        except ValueError:
-            raise ValueError(
-                "Signal based profiling can only be enabled from the main thread."
-            )
-
-        # Ensures that system calls interrupted by signals are restarted
-        # automatically. Otherwise, we may see some strage behaviours
-        # such as IOErrors caused by the system call being interrupted.
-        signal.siginterrupt(self.signal_num, False)
-
-    def teardown(self):
+    def run(self):
         # type: () -> None
+        last = time.perf_counter()
 
-        # setting the timer with 0 will stop will clear the timer
-        signal.setitimer(self.signal_timer, 0)
-
-        # put back the default signal handler
-        signal.signal(self.signal_num, signal.SIG_DFL)
-
-    def start_profiling(self):
-        # type: () -> bool
-        if super(SignalScheduler, self).start_profiling():
-            signal.setitimer(self.signal_timer, self._interval, self._interval)
-            return True
-        return False
-
-    def stop_profiling(self):
-        # type: () -> bool
-        if super(SignalScheduler, self).stop_profiling():
-            signal.setitimer(self.signal_timer, 0)
-            return True
-        return False
-
-
-class SigprofScheduler(SignalScheduler):
-    """
-    This scheduler uses SIGPROF to regularly call a signal handler where the
-    samples will be taken.
-
-    This is not based on wall time, and you may see some variances
-    in the frequency at which this handler is called.
-
-    This has some limitations:
-    - Only the main thread counts towards the time elapsed. This means that if
-      the main thread is blocking on a sleep() or select() system call, then
-      this clock will not count down. Some examples of this in practice are
-        - When using uwsgi with multiple threads in a worker, the non main
-          threads will only be profiled if the main thread is actively running
-          at the same time.
-        - When using gunicorn with threads, the main thread does not handle the
-          requests directly, so the clock counts down slower than expected since
-          its mostly idling while waiting for requests.
-    """
-
-    mode = "sigprof"
+        while True:
+            if self.event.is_set():
+                break
 
-    @property
-    def signal_num(self):
-        # type: () -> signal.Signals
-        return signal.SIGPROF
-
-    @property
-    def signal_timer(self):
-        # type: () -> int
-        return signal.ITIMER_PROF
-
-
-class SigalrmScheduler(SignalScheduler):
-    """
-    This scheduler uses SIGALRM to regularly call a signal handler where the
-    samples will be taken.
-
-    This is based on real time, so it *should* be called close to the expected
-    frequency.
-    """
-
-    mode = "sigalrm"
+            self.sampler()
 
-    @property
-    def signal_num(self):
-        # type: () -> signal.Signals
-        return signal.SIGALRM
+            # some time may have elapsed since the last time
+            # we sampled, so we need to account for that and
+            # not sleep for too long
+            elapsed = time.perf_counter() - last
+            if elapsed < self.interval:
+                time.sleep(self.interval - elapsed)
 
-    @property
-    def signal_timer(self):
-        # type: () -> int
-        return signal.ITIMER_REAL
+            # after sleeping, make sure to take the current
+            # timestamp so we can use it next iteration
+            last = time.perf_counter()
 
 
 def _should_profile(transaction, hub):
-    # type: (sentry_sdk.tracing.Transaction, Optional[sentry_sdk.Hub]) -> bool
+    # type: (sentry_sdk.tracing.Transaction, sentry_sdk.Hub) -> bool
 
     # The corresponding transaction was not sampled,
     # so don't generate a profile for it.
@@ -795,7 +643,6 @@ def _should_profile(transaction, hub):
     if _scheduler is None:
         return False
 
-    hub = hub or sentry_sdk.Hub.current
     client = hub.client
 
     # The client is None, so we can't get the sample rate.
@@ -816,11 +663,12 @@ def _should_profile(transaction, hub):
 @contextmanager
 def start_profiling(transaction, hub=None):
     # type: (sentry_sdk.tracing.Transaction, Optional[sentry_sdk.Hub]) -> Generator[None, None, None]
+    hub = hub or sentry_sdk.Hub.current
 
     # if profiling was not enabled, this should be a noop
     if _should_profile(transaction, hub):
         assert _scheduler is not None
-        with Profile(_scheduler, transaction, hub=hub):
+        with Profile(_scheduler, transaction):
             yield
     else:
         yield
diff --git a/tests/test_profiler.py b/tests/test_profiler.py
index 9ee49bb035..44474343ce 100644
--- a/tests/test_profiler.py
+++ b/tests/test_profiler.py
@@ -1,31 +1,25 @@
 import inspect
 import os
-import platform
 import sys
 import threading
-import time
 
 import pytest
 
 from sentry_sdk.profiler import (
-    EventScheduler,
-    SampleBuffer,
+    Profile,
     SleepScheduler,
     extract_frame,
     extract_stack,
     get_frame_name,
     setup_profiler,
 )
+from sentry_sdk.tracing import Transaction
 
 
 minimum_python_33 = pytest.mark.skipif(
     sys.version_info < (3, 3), reason="Profiling is only supported in Python >= 3.3"
 )
 
-unix_only = pytest.mark.skipif(
-    platform.system().lower() not in {"linux", "darwin"}, reason="UNIX only"
-)
-
 
 def process_test_sample(sample):
     return [(tid, (stack, stack)) for tid, stack in sample]
@@ -37,38 +31,7 @@ def test_profiler_invalid_mode(teardown_profiling):
         setup_profiler({"_experiments": {"profiler_mode": "magic"}})
 
 
-@unix_only
-@minimum_python_33
-@pytest.mark.parametrize("mode", ["sigprof", "sigalrm"])
-def test_profiler_signal_mode_none_main_thread(mode, teardown_profiling):
-    """
-    signal based profiling must be initialized from the main thread because
-    of how the signal library in python works
-    """
-
-    class ProfilerThread(threading.Thread):
-        def run(self):
-            self.exc = None
-            try:
-                setup_profiler({"_experiments": {"profiler_mode": mode}})
-            except Exception as e:
-                # store the exception so it can be raised in the caller
-                self.exc = e
-
-        def join(self, timeout=None):
-            ret = super(ProfilerThread, self).join(timeout=timeout)
-            if self.exc:
-                raise self.exc
-            return ret
-
-    with pytest.raises(ValueError):
-        thread = ProfilerThread()
-        thread.start()
-        thread.join()
-
-
-@unix_only
-@pytest.mark.parametrize("mode", ["sleep", "event", "sigprof", "sigalrm"])
+@pytest.mark.parametrize("mode", ["sleep"])
 def test_profiler_valid_mode(mode, teardown_profiling):
     # should not raise any exceptions
     setup_profiler({"_experiments": {"profiler_mode": mode}})
@@ -292,139 +255,25 @@ def get_scheduler_threads(scheduler):
     return [thread for thread in threading.enumerate() if thread.name == scheduler.name]
 
 
-class DummySampleBuffer(SampleBuffer):
-    def __init__(self, capacity, sample_data=None):
-        super(DummySampleBuffer, self).__init__(capacity)
-        self.sample_data = [] if sample_data is None else sample_data
-
-    def make_sampler(self):
-        def _sample_stack(*args, **kwargs):
-            ts, sample = self.sample_data.pop(0)
-            self.write(ts, process_test_sample(sample))
-
-        return _sample_stack
-
-
 @minimum_python_33
 @pytest.mark.parametrize(
     ("scheduler_class",),
-    [
-        pytest.param(SleepScheduler, id="sleep scheduler"),
-        pytest.param(EventScheduler, id="event scheduler"),
-    ],
-)
-def test_thread_scheduler_takes_first_samples(scheduler_class):
-    sample_buffer = DummySampleBuffer(
-        capacity=1,
-        sample_data=[
-            (
-                0,
-                [
-                    (
-                        0,
-                        (("/path/to/file.py", "file", "file.py", "name", 1),),
-                    )
-                ],
-            )
-        ],
-    )
-    scheduler = scheduler_class(sample_buffer=sample_buffer, frequency=1000)
-    assert scheduler.start_profiling()
-    # immediately stopping means by the time the sampling thread will exit
-    # before it samples at the end of the first iteration
-    assert scheduler.stop_profiling()
-    time.sleep(0.002)
-    assert len(get_scheduler_threads(scheduler)) == 0
-
-    # there should be exactly 1 sample because we always sample once immediately
-    profile = sample_buffer.slice_profile(0, 1)
-    assert len(profile["samples"]) == 1
-
-
-@minimum_python_33
-@pytest.mark.parametrize(
-    ("scheduler_class",),
-    [
-        pytest.param(SleepScheduler, id="sleep scheduler"),
-        pytest.param(EventScheduler, id="event scheduler"),
-    ],
-)
-def test_thread_scheduler_takes_more_samples(scheduler_class):
-    sample_buffer = DummySampleBuffer(
-        capacity=10,
-        sample_data=[
-            (
-                i,
-                [
-                    (
-                        0,
-                        (("/path/to/file.py", "file", "file.py", "name", 1),),
-                    )
-                ],
-            )
-            for i in range(3)
-        ],
-    )
-    scheduler = scheduler_class(sample_buffer=sample_buffer, frequency=1000)
-    assert scheduler.start_profiling()
-    # waiting a little before stopping the scheduler means the profiling
-    # thread will get a chance to take a few samples before exiting
-    time.sleep(0.002)
-    assert scheduler.stop_profiling()
-    time.sleep(0.002)
-    assert len(get_scheduler_threads(scheduler)) == 0
-
-    # there should be more than 1 sample because we always sample once immediately
-    # plus any samples take afterwards
-    profile = sample_buffer.slice_profile(0, 3)
-    assert len(profile["samples"]) > 1
-
-
-@minimum_python_33
-@pytest.mark.parametrize(
-    ("scheduler_class",),
-    [
-        pytest.param(SleepScheduler, id="sleep scheduler"),
-        pytest.param(EventScheduler, id="event scheduler"),
-    ],
+    [pytest.param(SleepScheduler, id="sleep scheduler")],
 )
 def test_thread_scheduler_single_background_thread(scheduler_class):
-    sample_buffer = SampleBuffer(1)
-    scheduler = scheduler_class(sample_buffer=sample_buffer, frequency=1000)
-
-    assert scheduler.start_profiling()
-
-    # the scheduler thread does not immediately exit
-    # but it should exit after the next time it samples
-    assert scheduler.stop_profiling()
+    scheduler = scheduler_class(frequency=1000)
 
-    assert scheduler.start_profiling()
+    # not yet setup, no scheduler threads yet
+    assert len(get_scheduler_threads(scheduler)) == 0
 
-    # because the scheduler thread does not immediately exit
-    # after stop_profiling is called, we have to wait a little
-    # otherwise, we'll see an extra scheduler thread in the
-    # following assertion
-    #
-    # one iteration of the scheduler takes 1.0 / frequency seconds
-    # so make sure this sleeps for longer than that to avoid flakes
-    time.sleep(0.002)
+    scheduler.setup()
 
-    # there should be 1 scheduler thread now because the first
-    # one should be stopped and a new one started
+    # the scheduler will start always 1 thread
     assert len(get_scheduler_threads(scheduler)) == 1
 
-    assert scheduler.stop_profiling()
-
-    # because the scheduler thread does not immediately exit
-    # after stop_profiling is called, we have to wait a little
-    # otherwise, we'll see an extra scheduler thread in the
-    # following assertion
-    #
-    # one iteration of the scheduler takes 1.0 / frequency seconds
-    # so make sure this sleeps for longer than that to avoid flakes
-    time.sleep(0.002)
+    scheduler.teardown()
 
-    # there should be 0 scheduler threads now because they stopped
+    # once finished, the thread should stop
     assert len(get_scheduler_threads(scheduler)) == 0
 
 
@@ -437,7 +286,7 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
 
 
 @pytest.mark.parametrize(
-    ("capacity", "start_ns", "stop_ns", "samples", "profile"),
+    ("capacity", "start_ns", "stop_ns", "samples", "expected"),
     [
         pytest.param(
             10,
@@ -454,11 +303,11 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
         ),
         pytest.param(
             10,
-            0,
             1,
+            2,
             [
                 (
-                    2,
+                    0,
                     [
                         (
                             "1",
@@ -507,7 +356,7 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                         "stack_id": 0,
                     },
                 ],
-                "stacks": [(0,)],
+                "stacks": [[0]],
                 "thread_metadata": thread_metadata,
             },
             id="single sample in range",
@@ -558,7 +407,7 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                         "stack_id": 0,
                     },
                 ],
-                "stacks": [(0,)],
+                "stacks": [[0]],
                 "thread_metadata": thread_metadata,
             },
             id="two identical stacks",
@@ -619,7 +468,7 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                         "stack_id": 1,
                     },
                 ],
-                "stacks": [(0,), (0, 1)],
+                "stacks": [[0], [0, 1]],
                 "thread_metadata": thread_metadata,
             },
             id="two identical frames",
@@ -718,72 +567,39 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
                         "stack_id": 1,
                     },
                 ],
-                "stacks": [(0, 1), (2, 3)],
+                "stacks": [[0, 1], [2, 3]],
                 "thread_metadata": thread_metadata,
             },
             id="two unique stacks",
         ),
-        pytest.param(
-            1,
-            0,
-            1,
-            [
-                (
-                    0,
-                    [
-                        (
-                            "1",
-                            (("/path/to/file.py", "file", "file.py", "name1", 1),),
-                        )
-                    ],
-                ),
-                (
-                    1,
-                    [
-                        (
-                            "1",
-                            (
-                                ("/path/to/file.py", "file", "file.py", "name2", 2),
-                                ("/path/to/file.py", "file", "file.py", "name3", 3),
-                            ),
-                        )
-                    ],
-                ),
-            ],
-            {
-                "frames": [
-                    {
-                        "abs_path": "/path/to/file.py",
-                        "function": "name2",
-                        "filename": "file.py",
-                        "lineno": 2,
-                        "module": "file",
-                    },
-                    {
-                        "abs_path": "/path/to/file.py",
-                        "function": "name3",
-                        "filename": "file.py",
-                        "lineno": 3,
-                        "module": "file",
-                    },
-                ],
-                "samples": [
-                    {
-                        "elapsed_since_start_ns": "1",
-                        "thread_id": "1",
-                        "stack_id": 0,
-                    },
-                ],
-                "stacks": [(0, 1)],
-                "thread_metadata": thread_metadata,
-            },
-            id="wraps around buffer",
-        ),
     ],
 )
-def test_sample_buffer(capacity, start_ns, stop_ns, samples, profile):
-    buffer = SampleBuffer(capacity)
-    for ts, sample in samples:
-        buffer.write(ts, process_test_sample(sample))
-    result = buffer.slice_profile(start_ns, stop_ns)
-    assert result == profile
+@pytest.mark.parametrize(
+    ("scheduler_class",),
+    [pytest.param(SleepScheduler, id="sleep scheduler")],
+)
+def test_profile_processing(
+    DictionaryContaining,  # noqa: N803
+    scheduler_class,
+    capacity,
+    start_ns,
+    stop_ns,
+    samples,
+    expected,
+):
+    with scheduler_class(frequency=1000) as scheduler:
+        transaction = Transaction()
+        profile = Profile(scheduler, transaction)
+        profile.start_ns = start_ns
+        for ts, sample in samples:
+            profile.write(ts, process_test_sample(sample))
+        profile.stop_ns = stop_ns
+
+        processed = profile.process()
+
+        assert processed["thread_metadata"] == DictionaryContaining(
+            expected["thread_metadata"]
+        )
+        assert processed["frames"] == expected["frames"]
+        assert processed["stacks"] == expected["stacks"]
+        assert processed["samples"] == expected["samples"]

From dd8bfe37d2ab369eaa481a93484d4140fd964842 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Wed, 11 Jan 2023 10:22:47 +0100
Subject: [PATCH 189/209] Update test/linting dependencies (#1801)

* build(deps): bump checkouts/data-schemas from `20ff3b9` to `0ed3357` (#1775)

Bumps [checkouts/data-schemas](https://github.com/getsentry/sentry-data-schemas) from `20ff3b9` to `0ed3357`.
- [Release notes](https://github.com/getsentry/sentry-data-schemas/releases)
- [Commits](https://github.com/getsentry/sentry-data-schemas/compare/20ff3b9f53a58efc39888c2d36b51f842e8b3f58...0ed3357a07083bf762f7878132bb3fa6645d99d1)

---
updated-dependencies:
- dependency-name: checkouts/data-schemas
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] 

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Anton Pirker 

* build(deps): bump black from 22.10.0 to 22.12.0 (#1782)

* build(deps): bump black from 22.10.0 to 22.12.0

Bumps [black](https://github.com/psf/black) from 22.10.0 to 22.12.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/22.10.0...22.12.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

* build(deps): bump sphinx from 5.2.3 to 5.3.0 (#1686)

Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 5.2.3 to 5.3.0.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v5.2.3...v5.3.0)

---
updated-dependencies:
- dependency-name: sphinx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Anton Pirker 

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Anton Pirker 

* build(deps): bump flake8-bugbear from 22.9.23 to 22.12.6 (#1781)

* build(deps): bump flake8-bugbear from 22.9.23 to 22.12.6

Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 22.9.23 to 22.12.6.
- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases)
- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/22.9.23...22.12.6)

---
updated-dependencies:
- dependency-name: flake8-bugbear
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

* build(deps): bump sphinx from 5.2.3 to 5.3.0 (#1686)

Bumps [sphinx](https://github.com/sphinx-doc/sphinx) from 5.2.3 to 5.3.0.
- [Release notes](https://github.com/sphinx-doc/sphinx/releases)
- [Changelog](https://github.com/sphinx-doc/sphinx/blob/master/CHANGES)
- [Commits](https://github.com/sphinx-doc/sphinx/compare/v5.2.3...v5.3.0)

---
updated-dependencies:
- dependency-name: sphinx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Anton Pirker 

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Anton Pirker 

* Update jsonschema form 3.2.0 to 4.17.3 (#1793)

* Cleanup

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 checkouts/data-schemas  | 2 +-
 linter-requirements.txt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/checkouts/data-schemas b/checkouts/data-schemas
index 20ff3b9f53..0ed3357a07 160000
--- a/checkouts/data-schemas
+++ b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit 20ff3b9f53a58efc39888c2d36b51f842e8b3f58
+Subproject commit 0ed3357a07083bf762f7878132bb3fa6645d99d1
diff --git a/linter-requirements.txt b/linter-requirements.txt
index 1b0829ae83..e181f00560 100644
--- a/linter-requirements.txt
+++ b/linter-requirements.txt
@@ -1,10 +1,10 @@
 mypy==0.971
-black==22.10.0
+black==22.12.0
 flake8==5.0.4
 types-certifi
 types-redis
 types-setuptools
 pymongo # There is no separate types module.
-flake8-bugbear==22.9.23
+flake8-bugbear==22.12.6
 pep8-naming==0.13.2
 pre-commit # local linting

From 23f1d07452af128b5c6d78f354edd71760849e5c Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Wed, 11 Jan 2023 11:10:39 +0100
Subject: [PATCH 190/209] Added Python 3.11 to test suite (#1795)

Run our test suite also in Python 3.11.
---
 .../workflows/test-integration-aiohttp.yml    |   2 +-
 .github/workflows/test-integration-asgi.yml   |   2 +-
 .github/workflows/test-integration-bottle.yml |   2 +-
 .github/workflows/test-integration-django.yml |   3 +-
 .github/workflows/test-integration-falcon.yml |   2 +-
 .../workflows/test-integration-fastapi.yml    |   2 +-
 .github/workflows/test-integration-flask.yml  |   2 +-
 .github/workflows/test-integration-httpx.yml  |   2 +-
 .../test-integration-opentelemetry.yml        |   2 +-
 .../workflows/test-integration-pure_eval.yml  |   2 +-
 .../workflows/test-integration-pymongo.yml    |   2 +-
 .../workflows/test-integration-pyramid.yml    |   2 +-
 .github/workflows/test-integration-quart.yml  |   2 +-
 .github/workflows/test-integration-rq.yml     |   2 +-
 .github/workflows/test-integration-sanic.yml  |   2 +-
 .../workflows/test-integration-sqlalchemy.yml |   2 +-
 .../workflows/test-integration-starlette.yml  |   2 +-
 .../workflows/test-integration-tornado.yml    |   2 +-
 .../workflows/test-integration-trytond.yml    |   2 +-
 .../split-tox-gh-actions/ci-yaml-services.txt |   2 +-
 tox.ini                                       | 441 ++++++++++--------
 21 files changed, 258 insertions(+), 224 deletions(-)

diff --git a/.github/workflows/test-integration-aiohttp.yml b/.github/workflows/test-integration-aiohttp.yml
index 5d67bc70ce..7ec01b12db 100644
--- a/.github/workflows/test-integration-aiohttp.yml
+++ b/.github/workflows/test-integration-aiohttp.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7","3.8","3.9","3.10"]
+        python-version: ["3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-asgi.yml b/.github/workflows/test-integration-asgi.yml
index a84a0cf8d1..39f63d6e89 100644
--- a/.github/workflows/test-integration-asgi.yml
+++ b/.github/workflows/test-integration-asgi.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7","3.8","3.9","3.10"]
+        python-version: ["3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-bottle.yml b/.github/workflows/test-integration-bottle.yml
index 2fee720f4d..60979bf5dd 100644
--- a/.github/workflows/test-integration-bottle.yml
+++ b/.github/workflows/test-integration-bottle.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
+        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-django.yml b/.github/workflows/test-integration-django.yml
index b309b3fec5..2e462a723a 100644
--- a/.github/workflows/test-integration-django.yml
+++ b/.github/workflows/test-integration-django.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
+        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
@@ -55,6 +55,7 @@ jobs:
       SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
       SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
       SENTRY_PYTHON_TEST_POSTGRES_NAME: ci_test
+
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
diff --git a/.github/workflows/test-integration-falcon.yml b/.github/workflows/test-integration-falcon.yml
index 6141dc2917..f69ac1d9cd 100644
--- a/.github/workflows/test-integration-falcon.yml
+++ b/.github/workflows/test-integration-falcon.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
+        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-fastapi.yml b/.github/workflows/test-integration-fastapi.yml
index 838cc43e4a..1b6e4e24b5 100644
--- a/.github/workflows/test-integration-fastapi.yml
+++ b/.github/workflows/test-integration-fastapi.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7","3.8","3.9","3.10"]
+        python-version: ["3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-flask.yml b/.github/workflows/test-integration-flask.yml
index 16e318cedc..91e50a4eac 100644
--- a/.github/workflows/test-integration-flask.yml
+++ b/.github/workflows/test-integration-flask.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
+        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-httpx.yml b/.github/workflows/test-integration-httpx.yml
index 05347aa5a4..d8ac90e7bf 100644
--- a/.github/workflows/test-integration-httpx.yml
+++ b/.github/workflows/test-integration-httpx.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9","3.10"]
+        python-version: ["3.6","3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-opentelemetry.yml b/.github/workflows/test-integration-opentelemetry.yml
index 73a16098e4..7c2caa07a5 100644
--- a/.github/workflows/test-integration-opentelemetry.yml
+++ b/.github/workflows/test-integration-opentelemetry.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7","3.8","3.9","3.10"]
+        python-version: ["3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-pure_eval.yml b/.github/workflows/test-integration-pure_eval.yml
index 4118ce7ecc..2f72e39bf4 100644
--- a/.github/workflows/test-integration-pure_eval.yml
+++ b/.github/workflows/test-integration-pure_eval.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.5","3.6","3.7","3.8","3.9","3.10"]
+        python-version: ["3.5","3.6","3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-pymongo.yml b/.github/workflows/test-integration-pymongo.yml
index a691e69d1c..b65fe7f74f 100644
--- a/.github/workflows/test-integration-pymongo.yml
+++ b/.github/workflows/test-integration-pymongo.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7","3.6","3.7","3.8","3.9","3.10"]
+        python-version: ["2.7","3.6","3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-pyramid.yml b/.github/workflows/test-integration-pyramid.yml
index 59fbaf88ee..bb8faeab84 100644
--- a/.github/workflows/test-integration-pyramid.yml
+++ b/.github/workflows/test-integration-pyramid.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
+        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-quart.yml b/.github/workflows/test-integration-quart.yml
index aae555648e..b6ca340ac6 100644
--- a/.github/workflows/test-integration-quart.yml
+++ b/.github/workflows/test-integration-quart.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7","3.8","3.9","3.10"]
+        python-version: ["3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-rq.yml b/.github/workflows/test-integration-rq.yml
index 0a1b1da443..78b0b44e29 100644
--- a/.github/workflows/test-integration-rq.yml
+++ b/.github/workflows/test-integration-rq.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
+        python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-sanic.yml b/.github/workflows/test-integration-sanic.yml
index a3966087c6..aae23aad58 100644
--- a/.github/workflows/test-integration-sanic.yml
+++ b/.github/workflows/test-integration-sanic.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.5","3.6","3.7","3.8","3.9","3.10"]
+        python-version: ["3.5","3.6","3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-sqlalchemy.yml b/.github/workflows/test-integration-sqlalchemy.yml
index a1a535089f..9bdb5064ce 100644
--- a/.github/workflows/test-integration-sqlalchemy.yml
+++ b/.github/workflows/test-integration-sqlalchemy.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7","3.7","3.8","3.9","3.10"]
+        python-version: ["2.7","3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-starlette.yml b/.github/workflows/test-integration-starlette.yml
index 0e34d851a4..8ebe2442d0 100644
--- a/.github/workflows/test-integration-starlette.yml
+++ b/.github/workflows/test-integration-starlette.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7","3.8","3.9","3.10"]
+        python-version: ["3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-tornado.yml b/.github/workflows/test-integration-tornado.yml
index cfe39f06d1..05055b1e9d 100644
--- a/.github/workflows/test-integration-tornado.yml
+++ b/.github/workflows/test-integration-tornado.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7","3.8","3.9","3.10"]
+        python-version: ["3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integration-trytond.yml b/.github/workflows/test-integration-trytond.yml
index bb5997f27d..b8d6497e6d 100644
--- a/.github/workflows/test-integration-trytond.yml
+++ b/.github/workflows/test-integration-trytond.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.5","3.6","3.7","3.8","3.9","3.10"]
+        python-version: ["3.5","3.6","3.7","3.8","3.9","3.10","3.11"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/scripts/split-tox-gh-actions/ci-yaml-services.txt b/scripts/split-tox-gh-actions/ci-yaml-services.txt
index f6a658eee8..2219e5a4da 100644
--- a/scripts/split-tox-gh-actions/ci-yaml-services.txt
+++ b/scripts/split-tox-gh-actions/ci-yaml-services.txt
@@ -15,4 +15,4 @@
     env:
       SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
       SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
-      SENTRY_PYTHON_TEST_POSTGRES_NAME: ci_test
\ No newline at end of file
+      SENTRY_PYTHON_TEST_POSTGRES_NAME: ci_test
diff --git a/tox.ini b/tox.ini
index 82d66b8d6d..50a1a7b3ec 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,3.10}
+    {py2.7,py3.4,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}
 
     # === Integrations ===
     # General format is {pythonversion}-{integrationname}-v{frameworkversion}
@@ -18,83 +18,85 @@ envlist =
     #   {py3.7}-django-v{3.2}
     #   {py3.7,py3.10}-django-v{3.2,4.0}
 
-    # Django 1.x
-    {py2.7,py3.5}-django-v{1.8,1.9,1.10}
-    {py2.7,py3.5,py3.6,py3.7}-django-v{1.11}
-    # Django 2.x
-    {py3.5,py3.6,py3.7}-django-v{2.0,2.1}
-    {py3.5,py3.6,py3.7,py3.8,py3.9}-django-v{2.2}
-    # Django 3.x
-    {py3.6,py3.7,py3.8,py3.9}-django-v{3.0,3.1}
-    {py3.6,py3.7,py3.8,py3.9,py3.10}-django-v{3.2}
-    # Django 4.x
-    {py3.8,py3.9,py3.10}-django-v{4.0,4.1}
+    # AIOHTTP
+    {py3.7}-aiohttp-v{3.5}
+    {py3.7,py3.8,py3.9,py3.10,py3.11}-aiohttp-v{3.6}
 
-    # Flask
-    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-v{0.11,0.12,1.0}
-    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-flask-v1.1
-    {py3.6,py3.8,py3.9,py3.10}-flask-v2.0
+    # Asgi
+    {py3.7,py3.8,py3.9,py3.10,py3.11}-asgi
 
-    # FastAPI
-    {py3.7,py3.8,py3.9,py3.10}-fastapi
+    # AWS Lambda
+    # The aws_lambda tests deploy to the real AWS and have their own matrix of Python versions.
+    {py3.7}-aws_lambda
 
-    # Starlette
-    {py3.7,py3.8,py3.9,py3.10}-starlette-v{0.19.1,0.20,0.21}
+    # Beam
+    {py3.7}-beam-v{2.12,2.13,2.32,2.33}
 
-    # Quart
-    {py3.7,py3.8,py3.9,py3.10}-quart
+    # Boto3
+    {py2.7,py3.6,py3.7,py3.8}-boto3-v{1.9,1.10,1.11,1.12,1.13,1.14,1.15,1.16}
 
     # Bottle
-    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-bottle-v0.12
-
-    # Falcon
-    {py2.7,py3.5,py3.6,py3.7}-falcon-v1.4
-    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-falcon-v2.0
-
-    # Sanic
-    {py3.5,py3.6,py3.7}-sanic-v{0.8,18}
-    {py3.6,py3.7}-sanic-v19
-    {py3.6,py3.7,py3.8}-sanic-v20
-    {py3.7,py3.8,py3.9,py3.10}-sanic-v21
-    {py3.7,py3.8,py3.9,py3.10}-sanic-v22
-
-    # Beam
-    py3.7-beam-v{2.12,2.13,2.32,2.33}
+    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-bottle-v{0.12}
 
     # Celery
-    {py2.7}-celery-v3
+    {py2.7}-celery-v{3}
     {py2.7,py3.5,py3.6}-celery-v{4.1,4.2}
     {py2.7,py3.5,py3.6,py3.7,py3.8}-celery-v{4.3,4.4}
     {py3.6,py3.7,py3.8}-celery-v{5.0}
     {py3.7,py3.8,py3.9,py3.10}-celery-v{5.1,5.2}
+    # TODO: enable when celery is ready {py3.7,py3.8,py3.9,py3.10,py3.11}-celery-v{5.3}
 
     # Chalice
     {py3.6,py3.7,py3.8}-chalice-v{1.16,1.17,1.18,1.19,1.20}
 
-    # Asgi
-    {py3.7,py3.8,py3.9,py3.10}-asgi
+    # Django
+    # - Django 1.x
+    {py2.7,py3.5}-django-v{1.8,1.9,1.10}
+    {py2.7,py3.5,py3.6,py3.7}-django-v{1.11}
+    # - Django 2.x
+    {py3.5,py3.6,py3.7}-django-v{2.0,2.1}
+    {py3.5,py3.6,py3.7,py3.8,py3.9}-django-v{2.2}
+    # - Django 3.x
+    {py3.6,py3.7,py3.8,py3.9}-django-v{3.0,3.1}
+    {py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-django-v{3.2}
+    # - Django 4.x
+    {py3.8,py3.9,py3.10,py3.11}-django-v{4.0,4.1}
 
-    # AWS Lambda
-    # The aws_lambda tests deploy to the real AWS and have their own matrix of Python versions.
-    py3.7-aws_lambda
+    # Falcon
+    {py2.7,py3.5,py3.6,py3.7}-falcon-v{1.4}
+    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-falcon-v{2.0}
+
+    # FastAPI
+    {py3.7,py3.8,py3.9,py3.10,py3.11}-fastapi
+
+    # Flask
+    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-flask-v{0.11,0.12,1.0}
+    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-flask-v{1.1}
+    {py3.6,py3.8,py3.9,py3.10,py3.11}-flask-v{2.0}
 
     # GCP
-    py3.7-gcp
+    {py3.7}-gcp
 
-    # Pyramid
-    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-pyramid-v{1.6,1.7,1.8,1.9,1.10}
+    # HTTPX
+    {py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-httpx-v{0.16,0.17}
 
-    # AIOHTTP
-    py3.7-aiohttp-v3.5
-    {py3.7,py3.8,py3.9,py3.10}-aiohttp-v3.6
+    # OpenTelemetry (OTel)
+    {py3.7,py3.8,py3.9,py3.10,py3.11}-opentelemetry
 
-    # Tornado
-    {py3.7,py3.8,py3.9}-tornado-v{5}
-    {py3.7,py3.8,py3.9,py3.10}-tornado-v{6}
+    # pure_eval
+    {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-pure_eval
 
-    # Trytond
-    {py3.5,py3.6,py3.7,py3.8,py3.9}-trytond-v{4.6,5.0,5.2}
-    {py3.6,py3.7,py3.8,py3.9,py3.10}-trytond-v{5.4}
+    # PyMongo (Mongo DB)
+    {py2.7,py3.6}-pymongo-v{3.1}
+    {py2.7,py3.6,py3.7,py3.8,py3.9}-pymongo-v{3.12}
+    {py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-pymongo-v{4.0}
+    {py3.7,py3.8,py3.9,py3.10,py3.11}-pymongo-v{4.1,4.2}
+
+    # Pyramid
+    {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-pyramid-v{1.6,1.7,1.8,1.9,1.10}
+
+    # Quart
+    {py3.7,py3.8,py3.9,py3.10,py3.11}-quart
 
     # Redis
     {py2.7,py3.7,py3.8,py3.9}-redis
@@ -102,34 +104,35 @@ envlist =
     # Redis Cluster
     {py2.7,py3.7,py3.8,py3.9}-rediscluster-v{1,2.1.0,2}
 
+    # Requests
+    {py2.7,py3.8,py3.9}-requests
+
     # RQ (Redis Queue)
     {py2.7,py3.5,py3.6}-rq-v{0.6,0.7,0.8,0.9,0.10,0.11}
     {py2.7,py3.5,py3.6,py3.7,py3.8,py3.9}-rq-v{0.12,0.13,1.0,1.1,1.2,1.3}
-    {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-rq-v{1.4,1.5}
-
-    # SQL Alchemy
-    {py2.7,py3.7,py3.8,py3.9,py3.10}-sqlalchemy-v{1.2,1.3}
+    {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-rq-v{1.4,1.5}
 
-    # Mongo DB
-    {py2.7,py3.6}-pymongo-v{3.1}
-    {py2.7,py3.6,py3.7,py3.8,py3.9}-pymongo-v{3.12}
-    {py3.6,py3.7,py3.8,py3.9,py3.10}-pymongo-v{4.0}
-    {py3.7,py3.8,py3.9,py3.10}-pymongo-v{4.1,4.2}
+    # Sanic
+    {py3.5,py3.6,py3.7}-sanic-v{0.8,18}
+    {py3.6,py3.7}-sanic-v{19}
+    {py3.6,py3.7,py3.8}-sanic-v{20}
+    {py3.7,py3.8,py3.9,py3.10,py3.11}-sanic-v{21}
+    {py3.7,py3.8,py3.9,py3.10,py3.11}-sanic-v{22}
 
-    # HTTPX
-    {py3.6,py3.7,py3.8,py3.9,py3.10}-httpx-v{0.16,0.17}
+    # Starlette
+    {py3.7,py3.8,py3.9,py3.10,py3.11}-starlette-v{0.19.1,0.20,0.21}
 
-    # Requests
-    {py2.7,py3.8,py3.9}-requests
+    # SQL Alchemy
+    {py2.7,py3.7,py3.8,py3.9,py3.10,py3.11}-sqlalchemy-v{1.2,1.3}
 
-    # pure_eval
-    {py3.5,py3.6,py3.7,py3.8,py3.9,py3.10}-pure_eval
+    # Tornado
+    {py3.7,py3.8,py3.9}-tornado-v{5}
+    {py3.7,py3.8,py3.9,py3.10,py3.11}-tornado-v{6}
 
-    # Boto3
-    {py2.7,py3.6,py3.7,py3.8}-boto3-v{1.9,1.10,1.11,1.12,1.13,1.14,1.15,1.16}
+    # Trytond
+    {py3.5,py3.6,py3.7,py3.8,py3.9}-trytond-v{4.6,5.0,5.2}
+    {py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-trytond-v{5.4}
 
-    # OpenTelemetry (OTel)
-    {py3.7,py3.8,py3.9,py3.10}-opentelemetry
 
 [testenv]
 deps =
@@ -141,11 +144,74 @@ deps =
     py3.4: colorama==0.4.1
     py3.4: watchdog==0.10.7
 
+    py3.8: hypothesis
+
+    linters: -r linter-requirements.txt
+
+    # AIOHTTP
+    aiohttp-v3.4: aiohttp>=3.4.0,<3.5.0
+    aiohttp-v3.5: aiohttp>=3.5.0,<3.6.0
+    aiohttp: pytest-aiohttp
+
+    # Asgi
+    asgi: pytest-asyncio
+    asgi: async-asgi-testclient
+
+    # AWS Lambda
+    aws_lambda: boto3
+
+    # Beam
+    beam-v2.12: apache-beam>=2.12.0, <2.13.0
+    beam-v2.13: apache-beam>=2.13.0, <2.14.0
+    beam-v2.32: apache-beam>=2.32.0, <2.33.0
+    beam-v2.33: apache-beam>=2.33.0, <2.34.0
+    beam-master: git+https://github.com/apache/beam#egg=apache-beam&subdirectory=sdks/python
+
+    # Boto3
+    boto3-v1.9: boto3>=1.9,<1.10
+    boto3-v1.10: boto3>=1.10,<1.11
+    boto3-v1.11: boto3>=1.11,<1.12
+    boto3-v1.12: boto3>=1.12,<1.13
+    boto3-v1.13: boto3>=1.13,<1.14
+    boto3-v1.14: boto3>=1.14,<1.15
+    boto3-v1.15: boto3>=1.15,<1.16
+    boto3-v1.16: boto3>=1.16,<1.17
+
+    # Bottle
+    bottle-v0.12: bottle>=0.12,<0.13
+
+    # Celery
+    celery: redis
+    celery-v3: Celery>=3.1,<4.0
+    celery-v4.1: Celery>=4.1,<4.2
+    celery-v4.2: Celery>=4.2,<4.3
+    celery-v4.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-v4.4: Celery>=4.4,<4.5,!=4.4.4
+    celery-v5.0: Celery>=5.0,<5.1
+    celery-v5.1: Celery>=5.1,<5.2
+    celery-v5.2: Celery>=5.2,<5.3
+
+    {py3.5}-celery: newrelic<6.0.0
+    {py3.7}-celery: importlib-metadata<5.0
+    {py2.7,py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-celery: newrelic
+
+    # Chalice
+    chalice-v1.16: chalice>=1.16.0,<1.17.0
+    chalice-v1.17: chalice>=1.17.0,<1.18.0
+    chalice-v1.18: chalice>=1.18.0,<1.19.0
+    chalice-v1.19: chalice>=1.19.0,<1.20.0
+    chalice-v1.20: chalice>=1.20.0,<1.21.0
+    chalice: pytest-chalice==0.0.5
+
+    # Django
     django-v{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-v{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: channels[daphne]>2
-    {py3.7,py3.8,py3.9,py3.10}-django-v{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-v{1.11,2.2,3.0,3.1,3.2}: psycopg2-binary
+    {py3.7,py3.8,py3.9,py3.10,py3.11}-django-v{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: channels[daphne]>2
+    {py3.7,py3.8,py3.9,py3.10,py3.11}-django-v{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,py3.11}-django-v{1.11,2.2,3.0,3.1,3.2}: psycopg2-binary
 
     django-v{1.8,1.9,1.10,1.11,2.0,2.1}: pytest-django<4.0
     django-v{2.2,3.0,3.1,3.2}: pytest-django>=4.0
@@ -170,85 +236,67 @@ deps =
     django-v4.0: Django>=4.0,<4.1
     django-v4.1: Django>=4.1,<4.2
 
-    flask: flask-login
-    flask-v0.11: Flask>=0.11,<0.12
-    flask-v0.12: Flask>=0.12,<0.13
-    flask-v1.0: Flask>=1.0,<1.1
-    flask-v1.1: Flask>=1.1,<1.2
-    flask-v2.0: Flask>=2.0,<2.1
-
-    asgi: pytest-asyncio
-    asgi: async-asgi-testclient
-
-    quart: quart>=0.16.1
-    quart: quart-auth
-    quart: pytest-asyncio
-
-    starlette: pytest-asyncio
-    starlette: python-multipart
-    starlette: requests
-    starlette-v0.21: httpx
-    starlette-v0.19.1: starlette==0.19.1
-    starlette-v0.20: starlette>=0.20.0,<0.21.0
-    starlette-v0.21: starlette>=0.21.0,<0.22.0
+    # Falcon
+    falcon-v1.4: falcon>=1.4,<1.5
+    falcon-v2.0: falcon>=2.0.0rc3,<3.0
 
+    # FastAPI
     fastapi: fastapi
     fastapi: httpx
     fastapi: pytest-asyncio
     fastapi: python-multipart
     fastapi: requests
 
-    bottle-v0.12: bottle>=0.12,<0.13
-
-    falcon-v1.4: falcon>=1.4,<1.5
-    falcon-v2.0: falcon>=2.0.0rc3,<3.0
-
-    sanic-v0.8: sanic>=0.8,<0.9
-    sanic-v18: sanic>=18.0,<19.0
-    sanic-v19: sanic>=19.0,<20.0
-    sanic-v20: sanic>=20.0,<21.0
-    sanic-v21: sanic>=21.0,<22.0
-    sanic-v22: sanic>=22.0
-
-    sanic: aiohttp
-    sanic-v21: sanic_testing<22
-    sanic-v22: sanic_testing>=22
-    {py3.5,py3.6}-sanic: aiocontextvars==0.2.1
-    py3.5-sanic: ujson<4
-
-    beam-v2.12: apache-beam>=2.12.0, <2.13.0
-    beam-v2.13: apache-beam>=2.13.0, <2.14.0
-    beam-v2.32: apache-beam>=2.32.0, <2.33.0
-    beam-v2.33: apache-beam>=2.33.0, <2.34.0
-    beam-master: git+https://github.com/apache/beam#egg=apache-beam&subdirectory=sdks/python
+    # Flask
+    flask: flask-login
+    flask-v0.11: Flask>=0.11,<0.12
+    flask-v0.12: Flask>=0.12,<0.13
+    flask-v1.0: Flask>=1.0,<1.1
+    flask-v1.1: Flask>=1.1,<1.2
+    flask-v2.0: Flask>=2.0,<2.1
 
-    celery: redis
-    celery-v3: Celery>=3.1,<4.0
-    celery-v4.1: Celery>=4.1,<4.2
-    celery-v4.2: Celery>=4.2,<4.3
-    celery-v4.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-v4.4: Celery>=4.4,<4.5,!=4.4.4
-    celery-v5.0: Celery>=5.0,<5.1
-    celery-v5.1: Celery>=5.1,<5.2
-    celery-v5.2: Celery>=5.2,<5.3
+    # HTTPX
+    httpx-v0.16: httpx>=0.16,<0.17
+    httpx-v0.17: httpx>=0.17,<0.18
 
-    py3.5-celery: newrelic<6.0.0
-    {py3.7}-celery: importlib-metadata<5.0
-    {py2.7,py3.6,py3.7,py3.8,py3.9,py3.10}-celery: newrelic
+    # OpenTelemetry (OTel)
+    opentelemetry: opentelemetry-distro
 
-    requests: requests>=2.0
+    # pure_eval
+    pure_eval: pure_eval
 
-    aws_lambda: boto3
+    # PyMongo (MongoDB)
+    pymongo: mockupdb
+    pymongo-v3.1: pymongo>=3.1,<3.2
+    pymongo-v3.12: pymongo>=3.12,<4.0
+    pymongo-v4.0: pymongo>=4.0,<4.1
+    pymongo-v4.1: pymongo>=4.1,<4.2
+    pymongo-v4.2: pymongo>=4.2,<4.3
 
+    # Pyramid
     pyramid-v1.6: pyramid>=1.6,<1.7
     pyramid-v1.7: pyramid>=1.7,<1.8
     pyramid-v1.8: pyramid>=1.8,<1.9
     pyramid-v1.9: pyramid>=1.9,<1.10
     pyramid-v1.10: pyramid>=1.10,<1.11
 
+    # Quart
+    quart: quart>=0.16.1
+    quart: quart-auth
+    quart: pytest-asyncio
+
+    # Requests
+    requests: requests>=2.0
+
+    # Redis
+    redis: fakeredis<1.7.4
+
+    # Redis Cluster
+    rediscluster-v1: redis-py-cluster>=1.0.0,<2.0.0
+    rediscluster-v2.1.0: redis-py-cluster>=2.0.0,<2.1.1
+    rediscluster-v2: redis-py-cluster>=2.1.1,<3.0.0
+
+    # RQ (Redis Queue)
     # https://github.com/jamesls/fakeredis/issues/245
     rq-v{0.6,0.7,0.8,0.9,0.10,0.11,0.12}: fakeredis<1.0
     rq-v{0.6,0.7,0.8,0.9,0.10,0.11,0.12}: redis<3.2.2
@@ -269,13 +317,38 @@ deps =
     rq-v1.4: rq>=1.4,<1.5
     rq-v1.5: rq>=1.5,<1.6
 
-    aiohttp-v3.4: aiohttp>=3.4.0,<3.5.0
-    aiohttp-v3.5: aiohttp>=3.5.0,<3.6.0
-    aiohttp: pytest-aiohttp
+    # Sanic
+    sanic-v0.8: sanic>=0.8,<0.9
+    sanic-v18: sanic>=18.0,<19.0
+    sanic-v19: sanic>=19.0,<20.0
+    sanic-v20: sanic>=20.0,<21.0
+    sanic-v21: sanic>=21.0,<22.0
+    sanic-v22: sanic>=22.0,<22.9.0
 
+    sanic: aiohttp
+    sanic-v21: sanic_testing<22
+    sanic-v22: sanic_testing<22.9.0
+    {py3.5,py3.6}-sanic: aiocontextvars==0.2.1
+    {py3.5}-sanic: ujson<4
+
+    # Starlette
+    starlette: pytest-asyncio
+    starlette: python-multipart
+    starlette: requests
+    starlette-v0.21: httpx
+    starlette-v0.19.1: starlette==0.19.1
+    starlette-v0.20: starlette>=0.20.0,<0.21.0
+    starlette-v0.21: starlette>=0.21.0,<0.22.0
+
+    # SQLAlchemy
+    sqlalchemy-v1.2: sqlalchemy>=1.2,<1.3
+    sqlalchemy-v1.3: sqlalchemy>=1.3,<1.4
+
+    # Tornado
     tornado-v5: tornado>=5,<6
     tornado-v6: tornado>=6.0a1
 
+    # Trytond
     trytond-v5.4: trytond>=5.4,<5.5
     trytond-v5.2: trytond>=5.2,<5.3
     trytond-v5.0: trytond>=5.0,<5.1
@@ -283,78 +356,37 @@ deps =
 
     trytond-v{4.6,4.8,5.0,5.2,5.4}: werkzeug<2.0
 
-    redis: fakeredis<1.7.4
-
-    rediscluster-v1: redis-py-cluster>=1.0.0,<2.0.0
-    rediscluster-v2.1.0: redis-py-cluster>=2.0.0,<2.1.1
-    rediscluster-v2: redis-py-cluster>=2.1.1,<3.0.0
-
-    sqlalchemy-v1.2: sqlalchemy>=1.2,<1.3
-    sqlalchemy-v1.3: sqlalchemy>=1.3,<1.4
-
-    linters: -r linter-requirements.txt
-
-    py3.8: hypothesis
-
-    pure_eval: pure_eval
-    chalice-v1.16: chalice>=1.16.0,<1.17.0
-    chalice-v1.17: chalice>=1.17.0,<1.18.0
-    chalice-v1.18: chalice>=1.18.0,<1.19.0
-    chalice-v1.19: chalice>=1.19.0,<1.20.0
-    chalice-v1.20: chalice>=1.20.0,<1.21.0
-    chalice: pytest-chalice==0.0.5
-
-    boto3-v1.9: boto3>=1.9,<1.10
-    boto3-v1.10: boto3>=1.10,<1.11
-    boto3-v1.11: boto3>=1.11,<1.12
-    boto3-v1.12: boto3>=1.12,<1.13
-    boto3-v1.13: boto3>=1.13,<1.14
-    boto3-v1.14: boto3>=1.14,<1.15
-    boto3-v1.15: boto3>=1.15,<1.16
-    boto3-v1.16: boto3>=1.16,<1.17
-
-    httpx-v0.16: httpx>=0.16,<0.17
-    httpx-v0.17: httpx>=0.17,<0.18
-
-    pymongo: mockupdb
-    pymongo-v3.1: pymongo>=3.1,<3.2
-    pymongo-v3.12: pymongo>=3.12,<4.0
-    pymongo-v4.0: pymongo>=4.0,<4.1
-    pymongo-v4.1: pymongo>=4.1,<4.2
-    pymongo-v4.2: pymongo>=4.2,<4.3
-
-    opentelemetry: opentelemetry-distro
-
 setenv =
     PYTHONDONTWRITEBYTECODE=1
     TESTPATH=tests
+    aiohttp: TESTPATH=tests/integrations/aiohttp
+    asgi: TESTPATH=tests/integrations/asgi
+    aws_lambda: TESTPATH=tests/integrations/aws_lambda
     beam: TESTPATH=tests/integrations/beam
-    django: TESTPATH=tests/integrations/django
-    flask: TESTPATH=tests/integrations/flask
-    quart: TESTPATH=tests/integrations/quart
+    boto3: TESTPATH=tests/integrations/boto3
     bottle: TESTPATH=tests/integrations/bottle
-    falcon: TESTPATH=tests/integrations/falcon
     celery: TESTPATH=tests/integrations/celery
-    requests: TESTPATH=tests/integrations/requests
-    aws_lambda: TESTPATH=tests/integrations/aws_lambda
+    chalice: TESTPATH=tests/integrations/chalice
+    django: TESTPATH=tests/integrations/django
+    falcon: TESTPATH=tests/integrations/falcon
+    fastapi:  TESTPATH=tests/integrations/fastapi
+    flask: TESTPATH=tests/integrations/flask
     gcp: TESTPATH=tests/integrations/gcp
-    sanic: TESTPATH=tests/integrations/sanic
+    httpx: TESTPATH=tests/integrations/httpx
+    opentelemetry: TESTPATH=tests/integrations/opentelemetry
+    pure_eval: TESTPATH=tests/integrations/pure_eval
+    pymongo: TESTPATH=tests/integrations/pymongo
     pyramid: TESTPATH=tests/integrations/pyramid
-    rq: TESTPATH=tests/integrations/rq
-    aiohttp: TESTPATH=tests/integrations/aiohttp
-    tornado: TESTPATH=tests/integrations/tornado
-    trytond: TESTPATH=tests/integrations/trytond
+    quart: TESTPATH=tests/integrations/quart
     redis: TESTPATH=tests/integrations/redis
     rediscluster: TESTPATH=tests/integrations/rediscluster
-    asgi: TESTPATH=tests/integrations/asgi
+    requests: TESTPATH=tests/integrations/requests
+    rq: TESTPATH=tests/integrations/rq
+    sanic: TESTPATH=tests/integrations/sanic
     starlette:  TESTPATH=tests/integrations/starlette
-    fastapi:  TESTPATH=tests/integrations/fastapi
     sqlalchemy: TESTPATH=tests/integrations/sqlalchemy
-    pure_eval: TESTPATH=tests/integrations/pure_eval
-    chalice: TESTPATH=tests/integrations/chalice
-    boto3: TESTPATH=tests/integrations/boto3
-    httpx: TESTPATH=tests/integrations/httpx
-    pymongo: TESTPATH=tests/integrations/pymongo
+    tornado: TESTPATH=tests/integrations/tornado
+    trytond: TESTPATH=tests/integrations/trytond
 
     COVERAGE_FILE=.coverage-{envname}
 passenv =
@@ -366,11 +398,11 @@ passenv =
     SENTRY_PYTHON_TEST_POSTGRES_NAME
 usedevelop = True
 extras =
-    flask: flask
     bottle: bottle
     falcon: falcon
-    quart: quart
+    flask: flask
     pymongo: pymongo
+    quart: quart
 
 basepython =
     py2.7: python2.7
@@ -381,6 +413,7 @@ basepython =
     py3.8: python3.8
     py3.9: python3.9
     py3.10: python3.10
+    py3.11: python3.11
 
     # Python version is pinned here because flake8 actually behaves differently
     # depending on which version is used. You can patch this out to point to
@@ -394,7 +427,7 @@ commands =
     {py3.5,py3.6,py3.7,py3.8,py3.9}-flask-v{0.11,0.12}: pip install pytest<5
     {py3.6,py3.7,py3.8,py3.9}-flask-v{0.11}: pip install Werkzeug<2
     ; https://github.com/pallets/flask/issues/4455
-    {py3.7,py3.8,py3.9,py3.10}-flask-v{0.11,0.12,1.0,1.1}: pip install "itsdangerous>=0.24,<2.0" "markupsafe<2.0.0" "jinja2<3.1.1"
+    {py3.7,py3.8,py3.9,py3.10,py3.11}-flask-v{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-v{0.11,0.12}: pip install more-itertools<8.11.0
 

From 20c25f20099f0f0c8e2c3e60ea704b36f86d6a9f Mon Sep 17 00:00:00 2001
From: Matthieu MN <10926130+gazorby@users.noreply.github.com>
Date: Wed, 11 Jan 2023 15:23:01 +0100
Subject: [PATCH 191/209] Feat: add Starlite integration (#1748)

Add Starlite support.

Co-authored-by: Na'aman Hirschfeld 
Co-authored-by: Anton Pirker 
---
 .../workflows/test-integration-starlite.yml   |  73 ++++
 .tool-versions                                |   1 +
 sentry_sdk/consts.py                          |   3 +
 sentry_sdk/integrations/starlite.py           | 271 +++++++++++++++
 sentry_sdk/utils.py                           |  96 ++++--
 setup.py                                      |   1 +
 tests/integrations/starlite/__init__.py       |   3 +
 tests/integrations/starlite/test_starlite.py  | 325 ++++++++++++++++++
 tests/utils/test_transaction.py               |  43 +++
 tox.ini                                       |  11 +
 10 files changed, 790 insertions(+), 37 deletions(-)
 create mode 100644 .github/workflows/test-integration-starlite.yml
 create mode 100644 .tool-versions
 create mode 100644 sentry_sdk/integrations/starlite.py
 create mode 100644 tests/integrations/starlite/__init__.py
 create mode 100644 tests/integrations/starlite/test_starlite.py

diff --git a/.github/workflows/test-integration-starlite.yml b/.github/workflows/test-integration-starlite.yml
new file mode 100644
index 0000000000..8a40f7d48c
--- /dev/null
+++ b/.github/workflows/test-integration-starlite.yml
@@ -0,0 +1,73 @@
+name: Test starlite
+
+on:
+  push:
+    branches:
+      - master
+      - release/**
+
+  pull_request:
+
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+env:
+  BUILD_CACHE_KEY: ${{ github.sha }}
+  CACHED_BUILD_PATHS: |
+    ${{ github.workspace }}/dist-serverless
+
+jobs:
+  test:
+    name: starlite, python ${{ matrix.python-version }}, ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 45
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.8","3.9","3.10","3.11"]
+        # python3.6 reached EOL and is no longer being supported on
+        # new versions of hosted runners on Github Actions
+        # ubuntu-20.04 is the last version that supported python3.6
+        # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
+        os: [ubuntu-20.04]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Setup Test Env
+        run: |
+          pip install codecov "tox>=3,<4"
+
+      - name: Test starlite
+        timeout-minutes: 45
+        shell: bash
+        run: |
+          set -x # print commands that are executed
+          coverage erase
+
+          ./scripts/runtox.sh "${{ matrix.python-version }}-starlite" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
+          coverage combine .coverage*
+          coverage xml -i
+          codecov --file coverage.xml
+
+  check_required_tests:
+    name: All starlite tests passed or skipped
+    needs: test
+    # Always run this, even if a dependent job failed
+    if: always()
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check for failures
+        if: contains(needs.test.result, 'failure')
+        run: |
+          echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 0000000000..d316e6d5f1
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1 @@
+python 3.7.12
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 00b2994ce1..2087202bad 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -63,6 +63,9 @@ class OP:
     MIDDLEWARE_STARLETTE = "middleware.starlette"
     MIDDLEWARE_STARLETTE_RECEIVE = "middleware.starlette.receive"
     MIDDLEWARE_STARLETTE_SEND = "middleware.starlette.send"
+    MIDDLEWARE_STARLITE = "middleware.starlite"
+    MIDDLEWARE_STARLITE_RECEIVE = "middleware.starlite.receive"
+    MIDDLEWARE_STARLITE_SEND = "middleware.starlite.send"
     QUEUE_SUBMIT_CELERY = "queue.submit.celery"
     QUEUE_TASK_CELERY = "queue.task.celery"
     QUEUE_TASK_RQ = "queue.task.rq"
diff --git a/sentry_sdk/integrations/starlite.py b/sentry_sdk/integrations/starlite.py
new file mode 100644
index 0000000000..2a5a6150bb
--- /dev/null
+++ b/sentry_sdk/integrations/starlite.py
@@ -0,0 +1,271 @@
+from typing import TYPE_CHECKING
+
+from pydantic import BaseModel  # type: ignore
+from sentry_sdk.consts import OP
+from sentry_sdk.hub import Hub, _should_send_default_pii
+from sentry_sdk.integrations import DidNotEnable, Integration
+from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
+from sentry_sdk.tracing import SOURCE_FOR_STYLE, TRANSACTION_SOURCE_ROUTE
+from sentry_sdk.utils import event_from_exception, transaction_from_function
+
+try:
+    from starlite import Request, Starlite, State  # type: ignore
+    from starlite.handlers.base import BaseRouteHandler  # type: ignore
+    from starlite.middleware import DefineMiddleware  # type: ignore
+    from starlite.plugins.base import get_plugin_for_value  # type: ignore
+    from starlite.routes.http import HTTPRoute  # type: ignore
+    from starlite.utils import ConnectionDataExtractor, is_async_callable, Ref  # type: ignore
+
+    if TYPE_CHECKING:
+        from typing import Any, Dict, List, Optional, Union
+        from starlite.types import (  # type: ignore
+            ASGIApp,
+            HTTPReceiveMessage,
+            HTTPScope,
+            Message,
+            Middleware,
+            Receive,
+            Scope,
+            Send,
+            WebSocketReceiveMessage,
+        )
+        from starlite import MiddlewareProtocol
+        from sentry_sdk._types import Event
+except ImportError:
+    raise DidNotEnable("Starlite is not installed")
+
+
+_DEFAULT_TRANSACTION_NAME = "generic Starlite request"
+
+
+class SentryStarliteASGIMiddleware(SentryAsgiMiddleware):
+    def __init__(self, app: "ASGIApp"):
+        super().__init__(
+            app=app,
+            unsafe_context_data=False,
+            transaction_style="endpoint",
+            mechanism_type="asgi",
+        )
+
+
+class StarliteIntegration(Integration):
+    identifier = "starlite"
+
+    @staticmethod
+    def setup_once() -> None:
+        patch_app_init()
+        patch_middlewares()
+        patch_http_route_handle()
+
+
+def patch_app_init() -> None:
+    """
+    Replaces the Starlite class's `__init__` function in order to inject `after_exception` handlers and set the
+    `SentryStarliteASGIMiddleware` as the outmost middleware in the stack.
+    See:
+    - https://starlite-api.github.io/starlite/usage/0-the-starlite-app/5-application-hooks/#after-exception
+    - https://starlite-api.github.io/starlite/usage/7-middleware/0-middleware-intro/
+    """
+    old__init__ = Starlite.__init__
+
+    def injection_wrapper(self: "Starlite", *args: "Any", **kwargs: "Any") -> None:
+
+        after_exception = kwargs.pop("after_exception", [])
+        kwargs.update(
+            after_exception=[
+                exception_handler,
+                *(
+                    after_exception
+                    if isinstance(after_exception, list)
+                    else [after_exception]
+                ),
+            ]
+        )
+
+        SentryStarliteASGIMiddleware.__call__ = SentryStarliteASGIMiddleware._run_asgi3
+        middleware = kwargs.pop("middleware", None) or []
+        kwargs["middleware"] = [SentryStarliteASGIMiddleware, *middleware]
+        old__init__(self, *args, **kwargs)
+
+    Starlite.__init__ = injection_wrapper
+
+
+def patch_middlewares() -> None:
+    old__resolve_middleware_stack = BaseRouteHandler.resolve_middleware
+
+    def resolve_middleware_wrapper(self: "Any") -> "List[Middleware]":
+        return [
+            enable_span_for_middleware(middleware)
+            for middleware in old__resolve_middleware_stack(self)
+        ]
+
+    BaseRouteHandler.resolve_middleware = resolve_middleware_wrapper
+
+
+def enable_span_for_middleware(middleware: "Middleware") -> "Middleware":
+    if (
+        not hasattr(middleware, "__call__")  # noqa: B004
+        or middleware is SentryStarliteASGIMiddleware
+    ):
+        return middleware
+
+    if isinstance(middleware, DefineMiddleware):
+        old_call: "ASGIApp" = middleware.middleware.__call__
+    else:
+        old_call = middleware.__call__
+
+    async def _create_span_call(
+        self: "MiddlewareProtocol", scope: "Scope", receive: "Receive", send: "Send"
+    ) -> None:
+        hub = Hub.current
+        integration = hub.get_integration(StarliteIntegration)
+        if integration is not None:
+            middleware_name = self.__class__.__name__
+            with hub.start_span(
+                op=OP.MIDDLEWARE_STARLITE, description=middleware_name
+            ) as middleware_span:
+                middleware_span.set_tag("starlite.middleware_name", middleware_name)
+
+                # Creating spans for the "receive" callback
+                async def _sentry_receive(
+                    *args: "Any", **kwargs: "Any"
+                ) -> "Union[HTTPReceiveMessage, WebSocketReceiveMessage]":
+                    hub = Hub.current
+                    with hub.start_span(
+                        op=OP.MIDDLEWARE_STARLITE_RECEIVE,
+                        description=getattr(receive, "__qualname__", str(receive)),
+                    ) as span:
+                        span.set_tag("starlite.middleware_name", middleware_name)
+                        return await receive(*args, **kwargs)
+
+                receive_name = getattr(receive, "__name__", str(receive))
+                receive_patched = receive_name == "_sentry_receive"
+                new_receive = _sentry_receive if not receive_patched else receive
+
+                # Creating spans for the "send" callback
+                async def _sentry_send(message: "Message") -> None:
+                    hub = Hub.current
+                    with hub.start_span(
+                        op=OP.MIDDLEWARE_STARLITE_SEND,
+                        description=getattr(send, "__qualname__", str(send)),
+                    ) as span:
+                        span.set_tag("starlite.middleware_name", middleware_name)
+                        return await send(message)
+
+                send_name = getattr(send, "__name__", str(send))
+                send_patched = send_name == "_sentry_send"
+                new_send = _sentry_send if not send_patched else send
+
+                return await old_call(self, scope, new_receive, new_send)
+        else:
+            return await old_call(self, scope, receive, send)
+
+    not_yet_patched = old_call.__name__ not in ["_create_span_call"]
+
+    if not_yet_patched:
+        if isinstance(middleware, DefineMiddleware):
+            middleware.middleware.__call__ = _create_span_call
+        else:
+            middleware.__call__ = _create_span_call
+
+    return middleware
+
+
+def patch_http_route_handle() -> None:
+    old_handle = HTTPRoute.handle
+
+    async def handle_wrapper(
+        self: "HTTPRoute", scope: "HTTPScope", receive: "Receive", send: "Send"
+    ) -> None:
+        hub = Hub.current
+        integration: StarliteIntegration = hub.get_integration(StarliteIntegration)
+        if integration is None:
+            return await old_handle(self, scope, receive, send)
+
+        with hub.configure_scope() as sentry_scope:
+            request: "Request[Any, Any]" = scope["app"].request_class(
+                scope=scope, receive=receive, send=send
+            )
+            extracted_request_data = ConnectionDataExtractor(
+                parse_body=True, parse_query=True
+            )(request)
+            body = extracted_request_data.pop("body")
+
+            request_data = await body
+
+            def event_processor(event: "Event", _: "Dict[str, Any]") -> "Event":
+                route_handler = scope.get("route_handler")
+
+                request_info = event.get("request", {})
+                request_info["content_length"] = len(scope.get("_body", b""))
+                if _should_send_default_pii():
+                    request_info["cookies"] = extracted_request_data["cookies"]
+                if request_data is not None:
+                    request_info["data"] = request_data
+
+                func = None
+                if route_handler.name is not None:
+                    tx_name = route_handler.name
+                elif isinstance(route_handler.fn, Ref):
+                    func = route_handler.fn.value
+                else:
+                    func = route_handler.fn
+                if func is not None:
+                    tx_name = transaction_from_function(func)
+
+                tx_info = {"source": SOURCE_FOR_STYLE["endpoint"]}
+
+                if not tx_name:
+                    tx_name = _DEFAULT_TRANSACTION_NAME
+                    tx_info = {"source": TRANSACTION_SOURCE_ROUTE}
+
+                event.update(
+                    request=request_info, transaction=tx_name, transaction_info=tx_info
+                )
+                return event
+
+            sentry_scope._name = StarliteIntegration.identifier
+            sentry_scope.add_event_processor(event_processor)
+
+            return await old_handle(self, scope, receive, send)
+
+    HTTPRoute.handle = handle_wrapper
+
+
+def retrieve_user_from_scope(scope: "Scope") -> "Optional[Dict[str, Any]]":
+    scope_user = scope.get("user", {})
+    if not scope_user:
+        return None
+    if isinstance(scope_user, dict):
+        return scope_user
+    if isinstance(scope_user, BaseModel):
+        return scope_user.dict()
+    if hasattr(scope_user, "asdict"):  # dataclasses
+        return scope_user.asdict()
+
+    plugin = get_plugin_for_value(scope_user)
+    if plugin and not is_async_callable(plugin.to_dict):
+        return plugin.to_dict(scope_user)
+
+    return None
+
+
+def exception_handler(exc: Exception, scope: "Scope", _: "State") -> None:
+    hub = Hub.current
+    if hub.get_integration(StarliteIntegration) is None:
+        return
+
+    user_info: "Optional[Dict[str, Any]]" = None
+    if _should_send_default_pii():
+        user_info = retrieve_user_from_scope(scope)
+    if user_info and isinstance(user_info, dict):
+        with hub.configure_scope() as sentry_scope:
+            sentry_scope.set_user(user_info)
+
+    event, hint = event_from_exception(
+        exc,
+        client_options=hub.client.options if hub.client else None,
+        mechanism={"type": StarliteIntegration.identifier, "handled": False},
+    )
+
+    hub.capture_event(event, hint=hint)
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index c000a3bd2c..4d6a091398 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -3,35 +3,42 @@
 import linecache
 import logging
 import os
+import re
+import subprocess
 import sys
 import threading
-import subprocess
-import re
 import time
-
 from datetime import datetime
+from functools import partial
 
-import sentry_sdk
-from sentry_sdk._compat import urlparse, text_type, implements_str, PY2, PY33, PY37
+try:
+    from functools import partialmethod
 
+    _PARTIALMETHOD_AVAILABLE = True
+except ImportError:
+    _PARTIALMETHOD_AVAILABLE = False
+
+import sentry_sdk
+from sentry_sdk._compat import PY2, PY33, PY37, implements_str, text_type, urlparse
 from sentry_sdk._types import MYPY
 
 if MYPY:
-    from types import FrameType
-    from types import TracebackType
-    from typing import Any
-    from typing import Callable
-    from typing import Dict
-    from typing import ContextManager
-    from typing import Iterator
-    from typing import List
-    from typing import Optional
-    from typing import Set
-    from typing import Tuple
-    from typing import Union
-    from typing import Type
-
-    from sentry_sdk._types import ExcInfo, EndpointType
+    from types import FrameType, TracebackType
+    from typing import (
+        Any,
+        Callable,
+        ContextManager,
+        Dict,
+        Iterator,
+        List,
+        Optional,
+        Set,
+        Tuple,
+        Type,
+        Union,
+    )
+
+    from sentry_sdk._types import EndpointType, ExcInfo
 
 
 epoch = datetime(1970, 1, 1)
@@ -968,9 +975,12 @@ def _get_contextvars():
 """
 
 
-def transaction_from_function(func):
+def qualname_from_function(func):
     # type: (Callable[..., Any]) -> Optional[str]
-    # Methods in Python 2
+    """Return the qualified name of func. Works with regular function, lambda, partial and partialmethod."""
+    func_qualname = None  # type: Optional[str]
+
+    # Python 2
     try:
         return "%s.%s.%s" % (
             func.im_class.__module__,  # type: ignore
@@ -980,26 +990,38 @@ def transaction_from_function(func):
     except Exception:
         pass
 
-    func_qualname = (
-        getattr(func, "__qualname__", None) or getattr(func, "__name__", None) or None
-    )  # type: Optional[str]
-
-    if not func_qualname:
-        # No idea what it is
-        return None
+    prefix, suffix = "", ""
 
-    # Methods in Python 3
-    # Functions
-    # Classes
-    try:
-        return "%s.%s" % (func.__module__, func_qualname)
-    except Exception:
-        pass
+    if (
+        _PARTIALMETHOD_AVAILABLE
+        and hasattr(func, "_partialmethod")
+        and isinstance(func._partialmethod, partialmethod)  # type: ignore
+    ):
+        prefix, suffix = "partialmethod()"
+        func = func._partialmethod.func  # type: ignore
+    elif isinstance(func, partial) and hasattr(func.func, "__name__"):
+        prefix, suffix = "partial()"
+        func = func.func
+
+    if hasattr(func, "__qualname__"):
+        func_qualname = func.__qualname__
+    elif hasattr(func, "__name__"):  # Python 2.7 has no __qualname__
+        func_qualname = func.__name__
+
+    # Python 3: methods, functions, classes
+    if func_qualname is not None:
+        if hasattr(func, "__module__"):
+            func_qualname = func.__module__ + "." + func_qualname
+        func_qualname = prefix + func_qualname + suffix
 
-    # Possibly a lambda
     return func_qualname
 
 
+def transaction_from_function(func):
+    # type: (Callable[..., Any]) -> Optional[str]
+    return qualname_from_function(func)
+
+
 disable_capture_event = ContextVar("disable_capture_event")
 
 
diff --git a/setup.py b/setup.py
index 86680690ce..3a52ba1961 100644
--- a/setup.py
+++ b/setup.py
@@ -61,6 +61,7 @@ def get_file_text(file_name):
         "chalice": ["chalice>=1.16.0"],
         "httpx": ["httpx>=0.16.0"],
         "starlette": ["starlette>=0.19.1"],
+        "starlite": ["starlite>=1.48"],
         "fastapi": ["fastapi>=0.79.0"],
         "pymongo": ["pymongo>=3.1"],
         "opentelemetry": ["opentelemetry-distro>=0.350b0"],
diff --git a/tests/integrations/starlite/__init__.py b/tests/integrations/starlite/__init__.py
new file mode 100644
index 0000000000..4c1037671d
--- /dev/null
+++ b/tests/integrations/starlite/__init__.py
@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("starlite")
diff --git a/tests/integrations/starlite/test_starlite.py b/tests/integrations/starlite/test_starlite.py
new file mode 100644
index 0000000000..603697ce8b
--- /dev/null
+++ b/tests/integrations/starlite/test_starlite.py
@@ -0,0 +1,325 @@
+import functools
+
+import pytest
+
+from sentry_sdk import capture_exception, capture_message, last_event_id
+from sentry_sdk.integrations.starlite import StarliteIntegration
+
+starlite = pytest.importorskip("starlite")
+
+from typing import Any, Dict
+
+from starlite import AbstractMiddleware, LoggingConfig, Starlite, get, Controller
+from starlite.middleware import LoggingMiddlewareConfig, RateLimitConfig
+from starlite.middleware.session.memory_backend import MemoryBackendConfig
+from starlite.status_codes import HTTP_500_INTERNAL_SERVER_ERROR
+from starlite.testing import TestClient
+
+
+class SampleMiddleware(AbstractMiddleware):
+    async def __call__(self, scope, receive, send) -> None:
+        async def do_stuff(message):
+            if message["type"] == "http.response.start":
+                # do something here.
+                pass
+            await send(message)
+
+        await self.app(scope, receive, do_stuff)
+
+
+class SampleReceiveSendMiddleware(AbstractMiddleware):
+    async def __call__(self, scope, receive, send):
+        message = await receive()
+        assert message
+        assert message["type"] == "http.request"
+
+        send_output = await send({"type": "something-unimportant"})
+        assert send_output is None
+
+        await self.app(scope, receive, send)
+
+
+class SamplePartialReceiveSendMiddleware(AbstractMiddleware):
+    async def __call__(self, scope, receive, send):
+        message = await receive()
+        assert message
+        assert message["type"] == "http.request"
+
+        send_output = await send({"type": "something-unimportant"})
+        assert send_output is None
+
+        async def my_receive(*args, **kwargs):
+            pass
+
+        async def my_send(*args, **kwargs):
+            pass
+
+        partial_receive = functools.partial(my_receive)
+        partial_send = functools.partial(my_send)
+
+        await self.app(scope, partial_receive, partial_send)
+
+
+def starlite_app_factory(middleware=None, debug=True, exception_handlers=None):
+    class MyController(Controller):
+        path = "/controller"
+
+        @get("/error")
+        async def controller_error(self) -> None:
+            raise Exception("Whoa")
+
+    @get("/some_url")
+    async def homepage_handler() -> Dict[str, Any]:
+        1 / 0
+        return {"status": "ok"}
+
+    @get("/custom_error", name="custom_name")
+    async def custom_error() -> Any:
+        raise Exception("Too Hot")
+
+    @get("/message")
+    async def message() -> Dict[str, Any]:
+        capture_message("hi")
+        return {"status": "ok"}
+
+    @get("/message/{message_id:str}")
+    async def message_with_id() -> Dict[str, Any]:
+        capture_message("hi")
+        return {"status": "ok"}
+
+    logging_config = LoggingConfig()
+
+    app = Starlite(
+        route_handlers=[
+            homepage_handler,
+            custom_error,
+            message,
+            message_with_id,
+            MyController,
+        ],
+        debug=debug,
+        middleware=middleware,
+        logging_config=logging_config,
+        exception_handlers=exception_handlers,
+    )
+
+    return app
+
+
+@pytest.mark.parametrize(
+    "test_url,expected_error,expected_message,expected_tx_name",
+    [
+        (
+            "/some_url",
+            ZeroDivisionError,
+            "division by zero",
+            "tests.integrations.starlite.test_starlite.starlite_app_factory..homepage_handler",
+        ),
+        (
+            "/custom_error",
+            Exception,
+            "Too Hot",
+            "custom_name",
+        ),
+        (
+            "/controller/error",
+            Exception,
+            "Whoa",
+            "partial(.MyController.controller_error>)",
+        ),
+    ],
+)
+def test_catch_exceptions(
+    sentry_init,
+    capture_exceptions,
+    capture_events,
+    test_url,
+    expected_error,
+    expected_message,
+    expected_tx_name,
+):
+    sentry_init(integrations=[StarliteIntegration()])
+    starlite_app = starlite_app_factory()
+    exceptions = capture_exceptions()
+    events = capture_events()
+
+    client = TestClient(starlite_app)
+    try:
+        client.get(test_url)
+    except Exception:
+        pass
+
+    (exc,) = exceptions
+    assert isinstance(exc, expected_error)
+    assert str(exc) == expected_message
+
+    (event,) = events
+    assert event["exception"]["values"][0]["mechanism"]["type"] == "starlite"
+    assert event["transaction"] == expected_tx_name
+
+
+def test_middleware_spans(sentry_init, capture_events):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[StarliteIntegration()],
+    )
+
+    logging_config = LoggingMiddlewareConfig()
+    session_config = MemoryBackendConfig()
+    rate_limit_config = RateLimitConfig(rate_limit=("hour", 5))
+
+    starlite_app = starlite_app_factory(
+        middleware=[
+            session_config.middleware,
+            logging_config.middleware,
+            rate_limit_config.middleware,
+        ]
+    )
+    events = capture_events()
+
+    client = TestClient(
+        starlite_app, raise_server_exceptions=False, base_url="http://testserver.local"
+    )
+    try:
+        client.get("/message")
+    except Exception:
+        pass
+
+    (_, transaction_event) = events
+
+    expected = ["SessionMiddleware", "LoggingMiddleware", "RateLimitMiddleware"]
+
+    idx = 0
+    for span in transaction_event["spans"]:
+        if span["op"] == "middleware.starlite":
+            assert span["description"] == expected[idx]
+            assert span["tags"]["starlite.middleware_name"] == expected[idx]
+            idx += 1
+
+
+def test_middleware_callback_spans(sentry_init, capture_events):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[StarliteIntegration()],
+    )
+    starlette_app = starlite_app_factory(middleware=[SampleMiddleware])
+    events = capture_events()
+
+    client = TestClient(starlette_app, raise_server_exceptions=False)
+    try:
+        client.get("/message")
+    except Exception:
+        pass
+
+    (_, transaction_event) = events
+
+    expected = [
+        {
+            "op": "middleware.starlite",
+            "description": "SampleMiddleware",
+            "tags": {"starlite.middleware_name": "SampleMiddleware"},
+        },
+        {
+            "op": "middleware.starlite.send",
+            "description": "TestClientTransport.create_send..send",
+            "tags": {"starlite.middleware_name": "SampleMiddleware"},
+        },
+        {
+            "op": "middleware.starlite.send",
+            "description": "TestClientTransport.create_send..send",
+            "tags": {"starlite.middleware_name": "SampleMiddleware"},
+        },
+    ]
+    print(transaction_event["spans"])
+    idx = 0
+    for span in transaction_event["spans"]:
+        assert span["op"] == expected[idx]["op"]
+        assert span["description"] == expected[idx]["description"]
+        assert span["tags"] == expected[idx]["tags"]
+        idx += 1
+
+
+def test_middleware_receive_send(sentry_init, capture_events):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[StarliteIntegration()],
+    )
+    starlette_app = starlite_app_factory(middleware=[SampleReceiveSendMiddleware])
+
+    client = TestClient(starlette_app, raise_server_exceptions=False)
+    try:
+        # NOTE: the assert statements checking
+        # for correct behaviour are in `SampleReceiveSendMiddleware`!
+        client.get("/message")
+    except Exception:
+        pass
+
+
+def test_middleware_partial_receive_send(sentry_init, capture_events):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[StarliteIntegration()],
+    )
+    starlette_app = starlite_app_factory(
+        middleware=[SamplePartialReceiveSendMiddleware]
+    )
+    events = capture_events()
+
+    client = TestClient(starlette_app, raise_server_exceptions=False)
+    try:
+        client.get("/message")
+    except Exception:
+        pass
+
+    (_, transaction_event) = events
+
+    expected = [
+        {
+            "op": "middleware.starlite",
+            "description": "SamplePartialReceiveSendMiddleware",
+            "tags": {"starlite.middleware_name": "SamplePartialReceiveSendMiddleware"},
+        },
+        {
+            "op": "middleware.starlite.receive",
+            "description": "TestClientTransport.create_receive..receive",
+            "tags": {"starlite.middleware_name": "SamplePartialReceiveSendMiddleware"},
+        },
+        {
+            "op": "middleware.starlite.send",
+            "description": "TestClientTransport.create_send..send",
+            "tags": {"starlite.middleware_name": "SamplePartialReceiveSendMiddleware"},
+        },
+    ]
+
+    print(transaction_event["spans"])
+    idx = 0
+    for span in transaction_event["spans"]:
+        assert span["op"] == expected[idx]["op"]
+        assert span["description"].startswith(expected[idx]["description"])
+        assert span["tags"] == expected[idx]["tags"]
+        idx += 1
+
+
+def test_last_event_id(sentry_init, capture_events):
+    sentry_init(
+        integrations=[StarliteIntegration()],
+    )
+    events = capture_events()
+
+    def handler(request, exc):
+        capture_exception(exc)
+        return starlite.response.Response(last_event_id(), status_code=500)
+
+    app = starlite_app_factory(
+        debug=False, exception_handlers={HTTP_500_INTERNAL_SERVER_ERROR: handler}
+    )
+
+    client = TestClient(app, raise_server_exceptions=False)
+    response = client.get("/custom_error")
+    assert response.status_code == 500
+    print(events)
+    event = events[-1]
+    assert response.content.strip().decode("ascii").strip('"') == event["event_id"]
+    (exception,) = event["exception"]["values"]
+    assert exception["type"] == "Exception"
+    assert exception["value"] == "Too Hot"
diff --git a/tests/utils/test_transaction.py b/tests/utils/test_transaction.py
index e1aa12308f..bfb87f4c29 100644
--- a/tests/utils/test_transaction.py
+++ b/tests/utils/test_transaction.py
@@ -1,5 +1,15 @@
+import sys
+from functools import partial
+
+import pytest
+
 from sentry_sdk.utils import transaction_from_function
 
+try:
+    from functools import partialmethod
+except ImportError:
+    pass
+
 
 class MyClass:
     def myfunc(self):
@@ -10,6 +20,16 @@ def myfunc():
     pass
 
 
+@partial
+def my_partial():
+    pass
+
+
+my_lambda = lambda: None
+
+my_partial_lambda = partial(lambda: None)
+
+
 def test_transaction_from_function():
     x = transaction_from_function
     assert x(MyClass) == "tests.utils.test_transaction.MyClass"
@@ -18,3 +38,26 @@ def test_transaction_from_function():
     assert x(None) is None
     assert x(42) is None
     assert x(lambda: None).endswith("")
+    assert x(my_lambda) == "tests.utils.test_transaction."
+    assert (
+        x(my_partial) == "partial()"
+    )
+    assert (
+        x(my_partial_lambda)
+        == "partial(>)"
+    )
+
+
+@pytest.mark.skipif(sys.version_info < (3, 4), reason="Require python 3.4 or higher")
+def test_transaction_from_function_partialmethod():
+    x = transaction_from_function
+
+    class MyPartialClass:
+        @partialmethod
+        def my_partial_method(self):
+            pass
+
+    assert (
+        x(MyPartialClass.my_partial_method)
+        == "partialmethod(.MyPartialClass.my_partial_method>)"
+    )
diff --git a/tox.ini b/tox.ini
index 50a1a7b3ec..a64e2d4987 100644
--- a/tox.ini
+++ b/tox.ini
@@ -122,6 +122,9 @@ envlist =
     # Starlette
     {py3.7,py3.8,py3.9,py3.10,py3.11}-starlette-v{0.19.1,0.20,0.21}
 
+    # Starlite
+    {py3.8,py3.9,py3.10,py3.11}-starlite
+
     # SQL Alchemy
     {py2.7,py3.7,py3.8,py3.9,py3.10,py3.11}-sqlalchemy-v{1.2,1.3}
 
@@ -340,6 +343,13 @@ deps =
     starlette-v0.20: starlette>=0.20.0,<0.21.0
     starlette-v0.21: starlette>=0.21.0,<0.22.0
 
+    # Starlite
+    starlite: starlite
+    starlite: pytest-asyncio
+    starlite: python-multipart
+    starlite: requests
+    starlite: cryptography
+
     # SQLAlchemy
     sqlalchemy-v1.2: sqlalchemy>=1.2,<1.3
     sqlalchemy-v1.3: sqlalchemy>=1.3,<1.4
@@ -384,6 +394,7 @@ setenv =
     rq: TESTPATH=tests/integrations/rq
     sanic: TESTPATH=tests/integrations/sanic
     starlette:  TESTPATH=tests/integrations/starlette
+    starlite:  TESTPATH=tests/integrations/starlite
     sqlalchemy: TESTPATH=tests/integrations/sqlalchemy
     tornado: TESTPATH=tests/integrations/tornado
     trytond: TESTPATH=tests/integrations/trytond

From c6d7b67d4d53f059965b83f388044ffdf874184c Mon Sep 17 00:00:00 2001
From: Thomas Dehghani 
Date: Thu, 12 Jan 2023 14:12:36 +0100
Subject: [PATCH 192/209] fix(serializer): Add support for `byterray` and
 `memoryview` built-in types (#1833)

Both `bytearray` and `memoryview` built-in types weren't explicitly
mentioned in the serializer logic, and as they are subtyping Sequence,
this led their instances to be enumerated upon, and to be output as a
list of bytes, byte per byte.

In the case of `memoryview`, this could also lead to a segmentation
fault if the memory referenced was already freed and unavailable to the
process by then.

By explicitly adding them as seralizable types, bytearray will be
decoded as a string just like bytes, and memoryview will use its
__repr__ method instead.

Close GH-1829

Co-authored-by: Thomas Dehghani 
---
 sentry_sdk/_compat.py    |  2 ++
 sentry_sdk/serializer.py | 15 +++++++++++----
 tests/test_serializer.py | 20 ++++++++++++++++++++
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/sentry_sdk/_compat.py b/sentry_sdk/_compat.py
index f8c579e984..e253f39372 100644
--- a/sentry_sdk/_compat.py
+++ b/sentry_sdk/_compat.py
@@ -26,6 +26,7 @@
     number_types = (int, long, float)  # noqa
     int_types = (int, long)  # noqa
     iteritems = lambda x: x.iteritems()  # noqa: B301
+    binary_sequence_types = (bytearray, memoryview)
 
     def implements_str(cls):
         # type: (T) -> T
@@ -44,6 +45,7 @@ def implements_str(cls):
     number_types = (int, float)  # type: Tuple[type, type]
     int_types = (int,)
     iteritems = lambda x: x.items()
+    binary_sequence_types = (bytes, bytearray, memoryview)
 
     def implements_str(x):
         # type: (T) -> T
diff --git a/sentry_sdk/serializer.py b/sentry_sdk/serializer.py
index e657f6b2b8..c1631e47f4 100644
--- a/sentry_sdk/serializer.py
+++ b/sentry_sdk/serializer.py
@@ -15,7 +15,14 @@
 
 import sentry_sdk.utils
 
-from sentry_sdk._compat import text_type, PY2, string_types, number_types, iteritems
+from sentry_sdk._compat import (
+    text_type,
+    PY2,
+    string_types,
+    number_types,
+    iteritems,
+    binary_sequence_types,
+)
 
 from sentry_sdk._types import MYPY
 
@@ -47,7 +54,7 @@
     # https://github.com/python/cpython/blob/master/Lib/collections/__init__.py#L49
     from collections import Mapping, Sequence, Set
 
-    serializable_str_types = string_types
+    serializable_str_types = string_types + binary_sequence_types
 
 else:
     # New in 3.3
@@ -55,7 +62,7 @@
     from collections.abc import Mapping, Sequence, Set
 
     # Bytes are technically not strings in Python 3, but we can serialize them
-    serializable_str_types = (str, bytes)
+    serializable_str_types = string_types + binary_sequence_types
 
 
 # Maximum length of JSON-serialized event payloads that can be safely sent
@@ -350,7 +357,7 @@ def _serialize_node_impl(
         if should_repr_strings:
             obj = safe_repr(obj)
         else:
-            if isinstance(obj, bytes):
+            if isinstance(obj, bytes) or isinstance(obj, bytearray):
                 obj = obj.decode("utf-8", "replace")
 
             if not isinstance(obj, string_types):
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
index f5ecc7560e..1e28daa2f1 100644
--- a/tests/test_serializer.py
+++ b/tests/test_serializer.py
@@ -1,3 +1,4 @@
+import re
 import sys
 import pytest
 
@@ -62,6 +63,25 @@ def test_bytes_serialization_repr(message_normalizer):
     assert result == r"b'abc123\x80\xf0\x9f\x8d\x95'"
 
 
+def test_bytearray_serialization_decode(message_normalizer):
+    binary = bytearray(b"abc123\x80\xf0\x9f\x8d\x95")
+    result = message_normalizer(binary, should_repr_strings=False)
+    assert result == "abc123\ufffd\U0001f355"
+
+
+@pytest.mark.xfail(sys.version_info < (3,), reason="Known safe_repr bugs in Py2.7")
+def test_bytearray_serialization_repr(message_normalizer):
+    binary = bytearray(b"abc123\x80\xf0\x9f\x8d\x95")
+    result = message_normalizer(binary, should_repr_strings=True)
+    assert result == r"bytearray(b'abc123\x80\xf0\x9f\x8d\x95')"
+
+
+def test_memoryview_serialization_repr(message_normalizer):
+    binary = memoryview(b"abc123\x80\xf0\x9f\x8d\x95")
+    result = message_normalizer(binary, should_repr_strings=False)
+    assert re.match(r"^$", result)
+
+
 def test_serialize_sets(extra_normalizer):
     result = extra_normalizer({1, 2, 3})
     assert result == [1, 2, 3]

From 4fea13fa29e1f9a6d60a1a5c9ab58a74084f52b3 Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Thu, 12 Jan 2023 15:03:16 +0000
Subject: [PATCH 193/209] release: 1.13.0

---
 CHANGELOG.md         | 19 +++++++++++++++++++
 docs/conf.py         |  2 +-
 sentry_sdk/consts.py |  2 +-
 setup.py             |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42ce1a1848..bd34254c9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## 1.13.0
+
+### Various fixes & improvements
+
+- fix(serializer): Add support for `byterray` and `memoryview` built-in types (#1833) by @Tarty
+- Feat: add Starlite integration (#1748) by @gazorby
+- Added Python 3.11 to test suite (#1795) by @antonpirker
+- Update test/linting dependencies (#1801) by @antonpirker
+- ref(profiling): Remove sample buffer from profiler (#1791) by @Zylphrex
+- Auto publish to internal pypi on release (#1823) by @asottile-sentry
+- perf(profiling): Performance tweaks to profile sampler (#1789) by @Zylphrex
+- Add span for Django SimpleTemplateResponse rendering (#1818) by @chdsbd
+- Add enqueued_at and started_at to rq job extra (#1024) by @kruvasyan
+- Remove sanic v22 pin (#1819) by @sl0thentr0py
+- Use @wraps for Django Signal receivers (#1815) by @meanmail
+- Handle `"rc"` in SQLAlchemy version. (#1812) by @peterschutt
+- doc: Use .venv (not .env) as a virtual env location in CONTRIBUTING.md (#1790) by @tonyo
+- build(deps): bump sphinx from 5.2.3 to 5.3.0 (#1686) by @dependabot
+
 ## 1.12.1
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 44180fade1..5939ad9b00 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.12.1"
+release = "1.13.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index 2087202bad..eeca4cbaf4 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -140,4 +140,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.12.1"
+VERSION = "1.13.0"
diff --git a/setup.py b/setup.py
index 3a52ba1961..62b4cead25 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.12.1",
+    version="1.13.0",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From c5d25db95968aed27de27d2a379e876946454ff5 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Thu, 12 Jan 2023 16:17:44 +0100
Subject: [PATCH 194/209] Added Starlite usage to changelog.

---
 CHANGELOG.md | 48 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd34254c9e..26739e48ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,20 +4,48 @@
 
 ### Various fixes & improvements
 
-- fix(serializer): Add support for `byterray` and `memoryview` built-in types (#1833) by @Tarty
-- Feat: add Starlite integration (#1748) by @gazorby
-- Added Python 3.11 to test suite (#1795) by @antonpirker
-- Update test/linting dependencies (#1801) by @antonpirker
-- ref(profiling): Remove sample buffer from profiler (#1791) by @Zylphrex
-- Auto publish to internal pypi on release (#1823) by @asottile-sentry
-- perf(profiling): Performance tweaks to profile sampler (#1789) by @Zylphrex
+- Add Starlite integration (#1748) by @gazorby
+
+  Adding support for the [Starlite](https://starlite-api.github.io/starlite/1.48/) framework. Unhandled errors are captured. Performance spans for Starlite middleware are also captured. Thanks @gazorby for the great work!
+
+  Usage:
+
+  ```python
+  from starlite import Starlite, get
+
+  import sentry_sdk
+  from sentry_sdk.integrations.starlite import StarliteIntegration
+
+  sentry_sdk.init(
+      dsn="...",
+      traces_sample_rate=1.0,
+      integrations=[
+          StarliteIntegration(),
+      ],
+  )
+
+  @get("/")
+  def hello_world() -> dict[str, str]:
+      """Keeping the tradition alive with hello world."""
+      bla = 1/0  # causing an error
+      return {"hello": "world"}
+
+  app = Starlite(route_handlers=[hello_world])
+  ```
+
+- Profiling: Remove sample buffer from profiler (#1791) by @Zylphrex
+- Profiling: Performance tweaks to profile sampler (#1789) by @Zylphrex
 - Add span for Django SimpleTemplateResponse rendering (#1818) by @chdsbd
+- Use @wraps for Django Signal receivers (#1815) by @meanmail
 - Add enqueued_at and started_at to rq job extra (#1024) by @kruvasyan
 - Remove sanic v22 pin (#1819) by @sl0thentr0py
-- Use @wraps for Django Signal receivers (#1815) by @meanmail
+- Add support for `byterray` and `memoryview` built-in types (#1833) by @Tarty
 - Handle `"rc"` in SQLAlchemy version. (#1812) by @peterschutt
-- doc: Use .venv (not .env) as a virtual env location in CONTRIBUTING.md (#1790) by @tonyo
-- build(deps): bump sphinx from 5.2.3 to 5.3.0 (#1686) by @dependabot
+- Doc: Use .venv (not .env) as a virtual env location in CONTRIBUTING.md (#1790) by @tonyo
+- Auto publish to internal pypi on release (#1823) by @asottile-sentry
+- Added Python 3.11 to test suite (#1795) by @antonpirker
+- Update test/linting dependencies (#1801) by @antonpirker
+- Deps: bump sphinx from 5.2.3 to 5.3.0 (#1686) by @dependabot
 
 ## 1.12.1
 

From 1445c736c584f17ffccb31607a34f9c443d3ba1c Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Tue, 17 Jan 2023 13:59:24 -0500
Subject: [PATCH 195/209] fix(otel): NoOpSpan updates scope (#1834)

When using otel as the instrumentor, the NoOpSpan needs to update the scope when
it's used as a context manager. If it does not, then this differs from the usual
behaviour of a span and the end user may start seeing an unexpected `None` on
the scope.
---
 sentry_sdk/tracing.py           |  8 --------
 tests/tracing/test_noop_span.py | 12 +++++++++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index dc65ea5fd7..b72524f734 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -859,14 +859,6 @@ def __repr__(self):
         # type: () -> str
         return self.__class__.__name__
 
-    def __enter__(self):
-        # type: () -> NoOpSpan
-        return self
-
-    def __exit__(self, ty, value, tb):
-        # type: (Optional[Any], Optional[Any], Optional[Any]) -> None
-        pass
-
     def start_child(self, instrumenter=INSTRUMENTER.SENTRY, **kwargs):
         # type: (str, **Any) -> NoOpSpan
         return NoOpSpan()
diff --git a/tests/tracing/test_noop_span.py b/tests/tracing/test_noop_span.py
index 3dc148f848..92cba75a35 100644
--- a/tests/tracing/test_noop_span.py
+++ b/tests/tracing/test_noop_span.py
@@ -11,10 +11,13 @@
 def test_noop_start_transaction(sentry_init):
     sentry_init(instrumenter="otel", debug=True)
 
-    transaction = sentry_sdk.start_transaction(op="task", name="test_transaction_name")
-    assert isinstance(transaction, NoOpSpan)
+    with sentry_sdk.start_transaction(
+        op="task", name="test_transaction_name"
+    ) as transaction:
+        assert isinstance(transaction, NoOpSpan)
+        assert sentry_sdk.Hub.current.scope.span is transaction
 
-    transaction.name = "new name"
+        transaction.name = "new name"
 
 
 def test_noop_start_span(sentry_init):
@@ -22,6 +25,7 @@ def test_noop_start_span(sentry_init):
 
     with sentry_sdk.start_span(op="http", description="GET /") as span:
         assert isinstance(span, NoOpSpan)
+        assert sentry_sdk.Hub.current.scope.span is span
 
         span.set_tag("http.status_code", "418")
         span.set_data("http.entity_type", "teapot")
@@ -35,6 +39,7 @@ def test_noop_transaction_start_child(sentry_init):
 
     with transaction.start_child(op="child_task") as child:
         assert isinstance(child, NoOpSpan)
+        assert sentry_sdk.Hub.current.scope.span is child
 
 
 def test_noop_span_start_child(sentry_init):
@@ -44,3 +49,4 @@ def test_noop_span_start_child(sentry_init):
 
     with span.start_child(op="child_task") as child:
         assert isinstance(child, NoOpSpan)
+        assert sentry_sdk.Hub.current.scope.span is child

From ffe773745120289d05b66feb3d1194757d88fc02 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Tue, 17 Jan 2023 14:11:06 -0500
Subject: [PATCH 196/209] feat(profiling): Better gevent support (#1822)

We're missing frames from gevent threads. Using `gevent.threadpool.ThreadPool`
seems to fix that. The monkey patching gevent does is causing the sampler thread
to run in a greenlet on the same thread as the all other greenlets. So when it
is taking a sample, the sampler is current greenlet thus no useful stacks can be
seen.
---
 sentry_sdk/profiler.py | 183 ++++++++++++++++++++++++++++-------------
 tests/test_profiler.py |  57 ++++++++++---
 2 files changed, 173 insertions(+), 67 deletions(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 81ba8f5753..20ac90f588 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -104,6 +104,15 @@
         },
     )
 
+try:
+    from gevent.monkey import is_module_patched  # type: ignore
+except ImportError:
+
+    def is_module_patched(*args, **kwargs):
+        # type: (*Any, **Any) -> bool
+        # unable to import from gevent means no modules have been patched
+        return False
+
 
 _scheduler = None  # type: Optional[Scheduler]
 
@@ -128,11 +137,31 @@ def setup_profiler(options):
 
     frequency = 101
 
-    profiler_mode = options["_experiments"].get("profiler_mode", SleepScheduler.mode)
-    if profiler_mode == SleepScheduler.mode:
-        _scheduler = SleepScheduler(frequency=frequency)
+    if is_module_patched("threading") or is_module_patched("_thread"):
+        # If gevent has patched the threading modules then we cannot rely on
+        # them to spawn a native thread for sampling.
+        # Instead we default to the GeventScheduler which is capable of
+        # spawning native threads within gevent.
+        default_profiler_mode = GeventScheduler.mode
+    else:
+        default_profiler_mode = ThreadScheduler.mode
+
+    profiler_mode = options["_experiments"].get("profiler_mode", default_profiler_mode)
+
+    if (
+        profiler_mode == ThreadScheduler.mode
+        # for legacy reasons, we'll keep supporting sleep mode for this scheduler
+        or profiler_mode == "sleep"
+    ):
+        _scheduler = ThreadScheduler(frequency=frequency)
+    elif profiler_mode == GeventScheduler.mode:
+        try:
+            _scheduler = GeventScheduler(frequency=frequency)
+        except ImportError:
+            raise ValueError("Profiler mode: {} is not available".format(profiler_mode))
     else:
         raise ValueError("Unknown profiler mode: {}".format(profiler_mode))
+
     _scheduler.setup()
 
     atexit.register(teardown_profiler)
@@ -445,6 +474,11 @@ def __init__(self, frequency):
         # type: (int) -> None
         self.interval = 1.0 / frequency
 
+        self.sampler = self.make_sampler()
+
+        self.new_profiles = deque()  # type: Deque[Profile]
+        self.active_profiles = set()  # type: Set[Profile]
+
     def __enter__(self):
         # type: () -> Scheduler
         self.setup()
@@ -462,50 +496,6 @@ def teardown(self):
         # type: () -> None
         raise NotImplementedError
 
-    def start_profiling(self, profile):
-        # type: (Profile) -> None
-        raise NotImplementedError
-
-    def stop_profiling(self, profile):
-        # type: (Profile) -> None
-        raise NotImplementedError
-
-
-class ThreadScheduler(Scheduler):
-    """
-    This abstract scheduler is based on running a daemon thread that will call
-    the sampler at a regular interval.
-    """
-
-    mode = "thread"
-    name = None  # type: Optional[str]
-
-    def __init__(self, frequency):
-        # type: (int) -> None
-        super(ThreadScheduler, self).__init__(frequency=frequency)
-
-        self.sampler = self.make_sampler()
-
-        # used to signal to the thread that it should stop
-        self.event = threading.Event()
-
-        # make sure the thread is a daemon here otherwise this
-        # can keep the application running after other threads
-        # have exited
-        self.thread = threading.Thread(name=self.name, target=self.run, daemon=True)
-
-        self.new_profiles = deque()  # type: Deque[Profile]
-        self.active_profiles = set()  # type: Set[Profile]
-
-    def setup(self):
-        # type: () -> None
-        self.thread.start()
-
-    def teardown(self):
-        # type: () -> None
-        self.event.set()
-        self.thread.join()
-
     def start_profiling(self, profile):
         # type: (Profile) -> None
         profile.active = True
@@ -515,10 +505,6 @@ def stop_profiling(self, profile):
         # type: (Profile) -> None
         profile.active = False
 
-    def run(self):
-        # type: () -> None
-        raise NotImplementedError
-
     def make_sampler(self):
         # type: () -> Callable[..., None]
         cwd = os.getcwd()
@@ -600,14 +586,99 @@ def _sample_stack(*args, **kwargs):
         return _sample_stack
 
 
-class SleepScheduler(ThreadScheduler):
+class ThreadScheduler(Scheduler):
     """
-    This scheduler uses time.sleep to wait the required interval before calling
-    the sampling function.
+    This scheduler is based on running a daemon thread that will call
+    the sampler at a regular interval.
     """
 
-    mode = "sleep"
-    name = "sentry.profiler.SleepScheduler"
+    mode = "thread"
+    name = "sentry.profiler.ThreadScheduler"
+
+    def __init__(self, frequency):
+        # type: (int) -> None
+        super(ThreadScheduler, self).__init__(frequency=frequency)
+
+        # used to signal to the thread that it should stop
+        self.event = threading.Event()
+
+        # make sure the thread is a daemon here otherwise this
+        # can keep the application running after other threads
+        # have exited
+        self.thread = threading.Thread(name=self.name, target=self.run, daemon=True)
+
+    def setup(self):
+        # type: () -> None
+        self.thread.start()
+
+    def teardown(self):
+        # type: () -> None
+        self.event.set()
+        self.thread.join()
+
+    def run(self):
+        # type: () -> None
+        last = time.perf_counter()
+
+        while True:
+            if self.event.is_set():
+                break
+
+            self.sampler()
+
+            # some time may have elapsed since the last time
+            # we sampled, so we need to account for that and
+            # not sleep for too long
+            elapsed = time.perf_counter() - last
+            if elapsed < self.interval:
+                time.sleep(self.interval - elapsed)
+
+            # after sleeping, make sure to take the current
+            # timestamp so we can use it next iteration
+            last = time.perf_counter()
+
+
+class GeventScheduler(Scheduler):
+    """
+    This scheduler is based on the thread scheduler but adapted to work with
+    gevent. When using gevent, it may monkey patch the threading modules
+    (`threading` and `_thread`). This results in the use of greenlets instead
+    of native threads.
+
+    This is an issue because the sampler CANNOT run in a greenlet because
+    1. Other greenlets doing sync work will prevent the sampler from running
+    2. The greenlet runs in the same thread as other greenlets so when taking
+       a sample, other greenlets will have been evicted from the thread. This
+       results in a sample containing only the sampler's code.
+    """
+
+    mode = "gevent"
+    name = "sentry.profiler.GeventScheduler"
+
+    def __init__(self, frequency):
+        # type: (int) -> None
+
+        # This can throw an ImportError that must be caught if `gevent` is
+        # not installed.
+        from gevent.threadpool import ThreadPool  # type: ignore
+
+        super(GeventScheduler, self).__init__(frequency=frequency)
+
+        # used to signal to the thread that it should stop
+        self.event = threading.Event()
+
+        # Using gevent's ThreadPool allows us to bypass greenlets and spawn
+        # native threads.
+        self.pool = ThreadPool(1)
+
+    def setup(self):
+        # type: () -> None
+        self.pool.spawn(self.run)
+
+    def teardown(self):
+        # type: () -> None
+        self.event.set()
+        self.pool.join()
 
     def run(self):
         # type: () -> None
diff --git a/tests/test_profiler.py b/tests/test_profiler.py
index 44474343ce..115e2f91ca 100644
--- a/tests/test_profiler.py
+++ b/tests/test_profiler.py
@@ -6,8 +6,9 @@
 import pytest
 
 from sentry_sdk.profiler import (
+    GeventScheduler,
     Profile,
-    SleepScheduler,
+    ThreadScheduler,
     extract_frame,
     extract_stack,
     get_frame_name,
@@ -15,23 +16,46 @@
 )
 from sentry_sdk.tracing import Transaction
 
+try:
+    import gevent
+except ImportError:
+    gevent = None
+
 
 minimum_python_33 = pytest.mark.skipif(
     sys.version_info < (3, 3), reason="Profiling is only supported in Python >= 3.3"
 )
 
+requires_gevent = pytest.mark.skipif(gevent is None, reason="gevent not enabled")
+
 
 def process_test_sample(sample):
     return [(tid, (stack, stack)) for tid, stack in sample]
 
 
-@minimum_python_33
-def test_profiler_invalid_mode(teardown_profiling):
+@pytest.mark.parametrize(
+    "mode",
+    [
+        pytest.param("foo"),
+        pytest.param(
+            "gevent",
+            marks=pytest.mark.skipif(gevent is not None, reason="gevent not enabled"),
+        ),
+    ],
+)
+def test_profiler_invalid_mode(mode, teardown_profiling):
     with pytest.raises(ValueError):
-        setup_profiler({"_experiments": {"profiler_mode": "magic"}})
+        setup_profiler({"_experiments": {"profiler_mode": mode}})
 
 
-@pytest.mark.parametrize("mode", ["sleep"])
+@pytest.mark.parametrize(
+    "mode",
+    [
+        pytest.param("thread"),
+        pytest.param("sleep"),
+        pytest.param("gevent", marks=requires_gevent),
+    ],
+)
 def test_profiler_valid_mode(mode, teardown_profiling):
     # should not raise any exceptions
     setup_profiler({"_experiments": {"profiler_mode": mode}})
@@ -56,7 +80,6 @@ def inherited_instance_method(self):
 
     def inherited_instance_method_wrapped(self):
         def wrapped():
-            self
             return inspect.currentframe()
 
         return wrapped
@@ -68,7 +91,6 @@ def inherited_class_method(cls):
     @classmethod
     def inherited_class_method_wrapped(cls):
         def wrapped():
-            cls
             return inspect.currentframe()
 
         return wrapped
@@ -84,7 +106,6 @@ def instance_method(self):
 
     def instance_method_wrapped(self):
         def wrapped():
-            self
             return inspect.currentframe()
 
         return wrapped
@@ -96,7 +117,6 @@ def class_method(cls):
     @classmethod
     def class_method_wrapped(cls):
         def wrapped():
-            cls
             return inspect.currentframe()
 
         return wrapped
@@ -258,7 +278,19 @@ def get_scheduler_threads(scheduler):
 @minimum_python_33
 @pytest.mark.parametrize(
     ("scheduler_class",),
-    [pytest.param(SleepScheduler, id="sleep scheduler")],
+    [
+        pytest.param(ThreadScheduler, id="thread scheduler"),
+        pytest.param(
+            GeventScheduler,
+            marks=[
+                requires_gevent,
+                pytest.mark.skip(
+                    reason="cannot find this thread via threading.enumerate()"
+                ),
+            ],
+            id="gevent scheduler",
+        ),
+    ],
 )
 def test_thread_scheduler_single_background_thread(scheduler_class):
     scheduler = scheduler_class(frequency=1000)
@@ -576,7 +608,10 @@ def test_thread_scheduler_single_background_thread(scheduler_class):
 )
 @pytest.mark.parametrize(
     ("scheduler_class",),
-    [pytest.param(SleepScheduler, id="sleep scheduler")],
+    [
+        pytest.param(ThreadScheduler, id="thread scheduler"),
+        pytest.param(GeventScheduler, marks=requires_gevent, id="gevent scheduler"),
+    ],
 )
 def test_profile_processing(
     DictionaryContaining,  # noqa: N803

From 43ca99169728553e6f47102da3c83d4cf302e97c Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Tue, 17 Jan 2023 15:48:59 -0500
Subject: [PATCH 197/209] feat(profiling): Enable profiling for ASGI frameworks
 (#1824)

This enables profiling for ASGI frameworks. When running in ASGI sync views, the
transaction gets started in the main thread then the request is dispatched to a
handler thread. We want to set the handler thread as the active thread id to
ensure that profiles will show it on first render.
---
 sentry_sdk/client.py                          |  4 +-
 sentry_sdk/integrations/asgi.py               |  3 +-
 sentry_sdk/integrations/django/asgi.py        | 13 +++--
 sentry_sdk/integrations/django/views.py       | 16 +++++--
 sentry_sdk/integrations/fastapi.py            | 23 +++++++++
 sentry_sdk/integrations/starlette.py          |  6 +++
 sentry_sdk/profiler.py                        | 31 ++++++++----
 sentry_sdk/scope.py                           | 30 ++++++------
 tests/integrations/django/asgi/test_asgi.py   | 37 ++++++++++++++
 tests/integrations/django/myapp/urls.py       |  6 +++
 tests/integrations/django/myapp/views.py      | 23 +++++++++
 tests/integrations/fastapi/test_fastapi.py    | 46 ++++++++++++++++++
 .../integrations/starlette/test_starlette.py  | 48 +++++++++++++++++++
 tests/integrations/wsgi/test_wsgi.py          |  2 +-
 14 files changed, 249 insertions(+), 39 deletions(-)

diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index d32d014d96..8af7003156 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -433,9 +433,7 @@ def capture_event(
 
             if is_transaction:
                 if profile is not None:
-                    envelope.add_profile(
-                        profile.to_json(event_opt, self.options, scope)
-                    )
+                    envelope.add_profile(profile.to_json(event_opt, self.options))
                 envelope.add_transaction(event_opt)
             else:
                 envelope.add_event(event_opt)
diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py
index cfeaf4d298..f34f10dc85 100644
--- a/sentry_sdk/integrations/asgi.py
+++ b/sentry_sdk/integrations/asgi.py
@@ -14,6 +14,7 @@
 from sentry_sdk.hub import Hub, _should_send_default_pii
 from sentry_sdk.integrations._wsgi_common import _filter_headers
 from sentry_sdk.integrations.modules import _get_installed_modules
+from sentry_sdk.profiler import start_profiling
 from sentry_sdk.sessions import auto_session_tracking
 from sentry_sdk.tracing import (
     SOURCE_FOR_STYLE,
@@ -175,7 +176,7 @@ async def _run_app(self, scope, callback):
 
                     with hub.start_transaction(
                         transaction, custom_sampling_context={"asgi_scope": scope}
-                    ):
+                    ), start_profiling(transaction, hub):
                         # 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/django/asgi.py b/sentry_sdk/integrations/django/asgi.py
index 5803a7e29b..955d8d19e8 100644
--- a/sentry_sdk/integrations/django/asgi.py
+++ b/sentry_sdk/integrations/django/asgi.py
@@ -7,6 +7,7 @@
 """
 
 import asyncio
+import threading
 
 from sentry_sdk import Hub, _functools
 from sentry_sdk._types import MYPY
@@ -89,10 +90,14 @@ def wrap_async_view(hub, callback):
     async def sentry_wrapped_callback(request, *args, **kwargs):
         # type: (Any, *Any, **Any) -> Any
 
-        with hub.start_span(
-            op=OP.VIEW_RENDER, description=request.resolver_match.view_name
-        ):
-            return await callback(request, *args, **kwargs)
+        with hub.configure_scope() as sentry_scope:
+            if sentry_scope.profile is not None:
+                sentry_scope.profile.active_thread_id = threading.current_thread().ident
+
+            with hub.start_span(
+                op=OP.VIEW_RENDER, 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 33ddce24d6..735822aa72 100644
--- a/sentry_sdk/integrations/django/views.py
+++ b/sentry_sdk/integrations/django/views.py
@@ -1,3 +1,5 @@
+import threading
+
 from sentry_sdk.consts import OP
 from sentry_sdk.hub import Hub
 from sentry_sdk._types import MYPY
@@ -73,9 +75,15 @@ def _wrap_sync_view(hub, callback):
     @_functools.wraps(callback)
     def sentry_wrapped_callback(request, *args, **kwargs):
         # type: (Any, *Any, **Any) -> Any
-        with hub.start_span(
-            op=OP.VIEW_RENDER, description=request.resolver_match.view_name
-        ):
-            return callback(request, *args, **kwargs)
+        with hub.configure_scope() as sentry_scope:
+            # set the active thread id to the handler thread for sync views
+            # this isn't necessary for async views since that runs on main
+            if sentry_scope.profile is not None:
+                sentry_scope.profile.active_thread_id = threading.current_thread().ident
+
+            with hub.start_span(
+                op=OP.VIEW_RENDER, description=request.resolver_match.view_name
+            ):
+                return callback(request, *args, **kwargs)
 
     return sentry_wrapped_callback
diff --git a/sentry_sdk/integrations/fastapi.py b/sentry_sdk/integrations/fastapi.py
index d38e978fbf..8bbf32eeff 100644
--- a/sentry_sdk/integrations/fastapi.py
+++ b/sentry_sdk/integrations/fastapi.py
@@ -1,3 +1,6 @@
+import asyncio
+import threading
+
 from sentry_sdk._types import MYPY
 from sentry_sdk.hub import Hub, _should_send_default_pii
 from sentry_sdk.integrations import DidNotEnable
@@ -62,6 +65,26 @@ def patch_get_request_handler():
 
     def _sentry_get_request_handler(*args, **kwargs):
         # type: (*Any, **Any) -> Any
+        dependant = kwargs.get("dependant")
+        if (
+            dependant
+            and dependant.call is not None
+            and not asyncio.iscoroutinefunction(dependant.call)
+        ):
+            old_call = dependant.call
+
+            def _sentry_call(*args, **kwargs):
+                # type: (*Any, **Any) -> Any
+                hub = Hub.current
+                with hub.configure_scope() as sentry_scope:
+                    if sentry_scope.profile is not None:
+                        sentry_scope.profile.active_thread_id = (
+                            threading.current_thread().ident
+                        )
+                    return old_call(*args, **kwargs)
+
+            dependant.call = _sentry_call
+
         old_app = old_get_request_handler(*args, **kwargs)
 
         async def _sentry_app(*args, **kwargs):
diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index 155c840461..b35e1c9fac 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -2,6 +2,7 @@
 
 import asyncio
 import functools
+import threading
 
 from sentry_sdk._compat import iteritems
 from sentry_sdk._types import MYPY
@@ -403,6 +404,11 @@ def _sentry_sync_func(*args, **kwargs):
                     return old_func(*args, **kwargs)
 
                 with hub.configure_scope() as sentry_scope:
+                    if sentry_scope.profile is not None:
+                        sentry_scope.profile.active_thread_id = (
+                            threading.current_thread().ident
+                        )
+
                     request = args[0]
 
                     _set_transaction_name_and_source(
diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 20ac90f588..66778982f5 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -46,7 +46,6 @@
     from typing import Sequence
     from typing import Tuple
     from typing_extensions import TypedDict
-    import sentry_sdk.scope
     import sentry_sdk.tracing
 
     ThreadId = str
@@ -329,10 +328,13 @@ def __init__(
         self,
         scheduler,  # type: Scheduler
         transaction,  # type: sentry_sdk.tracing.Transaction
+        hub=None,  # type: Optional[sentry_sdk.Hub]
     ):
         # type: (...) -> None
         self.scheduler = scheduler
         self.transaction = transaction
+        self.hub = hub
+        self.active_thread_id = None  # type: Optional[int]
         self.start_ns = 0  # type: int
         self.stop_ns = 0  # type: int
         self.active = False  # type: bool
@@ -347,6 +349,14 @@ def __init__(
 
     def __enter__(self):
         # type: () -> None
+        hub = self.hub or sentry_sdk.Hub.current
+
+        _, scope = hub._stack[-1]
+        old_profile = scope.profile
+        scope.profile = self
+
+        self._context_manager_state = (hub, scope, old_profile)
+
         self.start_ns = nanosecond_time()
         self.scheduler.start_profiling(self)
 
@@ -355,6 +365,11 @@ def __exit__(self, ty, value, tb):
         self.scheduler.stop_profiling(self)
         self.stop_ns = nanosecond_time()
 
+        _, scope, old_profile = self._context_manager_state
+        del self._context_manager_state
+
+        scope.profile = old_profile
+
     def write(self, ts, sample):
         # type: (int, RawSample) -> None
         if ts < self.start_ns:
@@ -414,18 +429,14 @@ def process(self):
             "thread_metadata": thread_metadata,
         }
 
-    def to_json(self, event_opt, options, scope):
-        # type: (Any, Dict[str, Any], Optional[sentry_sdk.scope.Scope]) -> Dict[str, Any]
-
+    def to_json(self, event_opt, options):
+        # type: (Any, Dict[str, Any]) -> Dict[str, Any]
         profile = self.process()
 
         handle_in_app_impl(
             profile["frames"], options["in_app_exclude"], options["in_app_include"]
         )
 
-        # the active thread id from the scope always take priorty if it exists
-        active_thread_id = None if scope is None else scope.active_thread_id
-
         return {
             "environment": event_opt.get("environment"),
             "event_id": uuid.uuid4().hex,
@@ -459,8 +470,8 @@ def to_json(self, event_opt, options, scope):
                     "trace_id": self.transaction.trace_id,
                     "active_thread_id": str(
                         self.transaction._active_thread_id
-                        if active_thread_id is None
-                        else active_thread_id
+                        if self.active_thread_id is None
+                        else self.active_thread_id
                     ),
                 }
             ],
@@ -739,7 +750,7 @@ def start_profiling(transaction, hub=None):
     # if profiling was not enabled, this should be a noop
     if _should_profile(transaction, hub):
         assert _scheduler is not None
-        with Profile(_scheduler, transaction):
+        with Profile(_scheduler, transaction, hub):
             yield
     else:
         yield
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
index f5ac270914..7d9b4f5177 100644
--- a/sentry_sdk/scope.py
+++ b/sentry_sdk/scope.py
@@ -27,6 +27,7 @@
         Type,
     )
 
+    from sentry_sdk.profiler import Profile
     from sentry_sdk.tracing import Span
     from sentry_sdk.session import Session
 
@@ -94,10 +95,7 @@ class Scope(object):
         "_session",
         "_attachments",
         "_force_auto_session_tracking",
-        # The thread that is handling the bulk of the work. This can just
-        # be the main thread, but that's not always true. For web frameworks,
-        # this would be the thread handling the request.
-        "_active_thread_id",
+        "_profile",
     )
 
     def __init__(self):
@@ -129,7 +127,7 @@ def clear(self):
         self._session = None  # type: Optional[Session]
         self._force_auto_session_tracking = None  # type: Optional[bool]
 
-        self._active_thread_id = None  # type: Optional[int]
+        self._profile = None  # type: Optional[Profile]
 
     @_attr_setter
     def level(self, value):
@@ -235,15 +233,15 @@ def span(self, span):
                 self._transaction = transaction.name
 
     @property
-    def active_thread_id(self):
-        # type: () -> Optional[int]
-        """Get/set the current active thread id."""
-        return self._active_thread_id
+    def profile(self):
+        # type: () -> Optional[Profile]
+        return self._profile
 
-    def set_active_thread_id(self, active_thread_id):
-        # type: (Optional[int]) -> None
-        """Set the current active thread id."""
-        self._active_thread_id = active_thread_id
+    @profile.setter
+    def profile(self, profile):
+        # type: (Optional[Profile]) -> None
+
+        self._profile = profile
 
     def set_tag(
         self,
@@ -464,8 +462,8 @@ def update_from_scope(self, scope):
             self._span = scope._span
         if scope._attachments:
             self._attachments.extend(scope._attachments)
-        if scope._active_thread_id is not None:
-            self._active_thread_id = scope._active_thread_id
+        if scope._profile:
+            self._profile = scope._profile
 
     def update_from_kwargs(
         self,
@@ -515,7 +513,7 @@ def __copy__(self):
         rv._force_auto_session_tracking = self._force_auto_session_tracking
         rv._attachments = list(self._attachments)
 
-        rv._active_thread_id = self._active_thread_id
+        rv._profile = self._profile
 
         return rv
 
diff --git a/tests/integrations/django/asgi/test_asgi.py b/tests/integrations/django/asgi/test_asgi.py
index 70fd416188..0652a5fdcb 100644
--- a/tests/integrations/django/asgi/test_asgi.py
+++ b/tests/integrations/django/asgi/test_asgi.py
@@ -1,3 +1,5 @@
+import json
+
 import django
 import pytest
 from channels.testing import HttpCommunicator
@@ -70,6 +72,41 @@ async def test_async_views(sentry_init, capture_events, application):
     }
 
 
+@pytest.mark.parametrize("application", APPS)
+@pytest.mark.parametrize("endpoint", ["/sync/thread_ids", "/async/thread_ids"])
+@pytest.mark.asyncio
+@pytest.mark.skipif(
+    django.VERSION < (3, 1), reason="async views have been introduced in Django 3.1"
+)
+async def test_active_thread_id(sentry_init, capture_envelopes, endpoint, application):
+    sentry_init(
+        integrations=[DjangoIntegration()],
+        traces_sample_rate=1.0,
+        _experiments={"profiles_sample_rate": 1.0},
+    )
+
+    envelopes = capture_envelopes()
+
+    comm = HttpCommunicator(application, "GET", endpoint)
+    response = await comm.get_response()
+    assert response["status"] == 200, response["body"]
+
+    await comm.wait()
+
+    data = json.loads(response["body"])
+
+    envelopes = [envelope for envelope in envelopes]
+    assert len(envelopes) == 1
+
+    profiles = [item for item in envelopes[0].items if item.type == "profile"]
+    assert len(profiles) == 1
+
+    for profile in profiles:
+        transactions = profile.payload.json["transactions"]
+        assert len(transactions) == 1
+        assert str(data["active"]) == transactions[0]["active_thread_id"]
+
+
 @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/urls.py b/tests/integrations/django/myapp/urls.py
index 376261abcf..ee357c843b 100644
--- a/tests/integrations/django/myapp/urls.py
+++ b/tests/integrations/django/myapp/urls.py
@@ -58,6 +58,7 @@ def path(path, *args, **kwargs):
         views.csrf_hello_not_exempt,
         name="csrf_hello_not_exempt",
     ),
+    path("sync/thread_ids", views.thread_ids_sync, name="thread_ids_sync"),
 ]
 
 # async views
@@ -67,6 +68,11 @@ def path(path, *args, **kwargs):
 if views.my_async_view is not None:
     urlpatterns.append(path("my_async_view", views.my_async_view, name="my_async_view"))
 
+if views.thread_ids_async is not None:
+    urlpatterns.append(
+        path("async/thread_ids", views.thread_ids_async, name="thread_ids_async")
+    )
+
 # rest framework
 try:
     urlpatterns.append(
diff --git a/tests/integrations/django/myapp/views.py b/tests/integrations/django/myapp/views.py
index bee5e656d3..dbf266e1ab 100644
--- a/tests/integrations/django/myapp/views.py
+++ b/tests/integrations/django/myapp/views.py
@@ -1,3 +1,6 @@
+import json
+import threading
+
 from django import VERSION
 from django.contrib.auth import login
 from django.contrib.auth.models import User
@@ -159,6 +162,16 @@ def csrf_hello_not_exempt(*args, **kwargs):
     return HttpResponse("ok")
 
 
+def thread_ids_sync(*args, **kwargs):
+    response = json.dumps(
+        {
+            "main": threading.main_thread().ident,
+            "active": threading.current_thread().ident,
+        }
+    )
+    return HttpResponse(response)
+
+
 if VERSION >= (3, 1):
     # Use exec to produce valid Python 2
     exec(
@@ -173,6 +186,16 @@ def csrf_hello_not_exempt(*args, **kwargs):
     await asyncio.sleep(1)
     return HttpResponse('Hello World')"""
     )
+
+    exec(
+        """async def thread_ids_async(request):
+    response = json.dumps({
+        "main": threading.main_thread().ident,
+        "active": threading.current_thread().ident,
+    })
+    return HttpResponse(response)"""
+    )
 else:
     async_message = None
     my_async_view = None
+    thread_ids_async = None
diff --git a/tests/integrations/fastapi/test_fastapi.py b/tests/integrations/fastapi/test_fastapi.py
index bc61cfc263..9c24ce2e44 100644
--- a/tests/integrations/fastapi/test_fastapi.py
+++ b/tests/integrations/fastapi/test_fastapi.py
@@ -1,3 +1,6 @@
+import json
+import threading
+
 import pytest
 from sentry_sdk.integrations.fastapi import FastApiIntegration
 
@@ -23,6 +26,20 @@ async def _message_with_id(message_id):
         capture_message("Hi")
         return {"message": "Hi"}
 
+    @app.get("/sync/thread_ids")
+    def _thread_ids_sync():
+        return {
+            "main": str(threading.main_thread().ident),
+            "active": str(threading.current_thread().ident),
+        }
+
+    @app.get("/async/thread_ids")
+    async def _thread_ids_async():
+        return {
+            "main": str(threading.main_thread().ident),
+            "active": str(threading.current_thread().ident),
+        }
+
     return app
 
 
@@ -135,3 +152,32 @@ def test_legacy_setup(
 
     (event,) = events
     assert event["transaction"] == "/message/{message_id}"
+
+
+@pytest.mark.parametrize("endpoint", ["/sync/thread_ids", "/async/thread_ids"])
+def test_active_thread_id(sentry_init, capture_envelopes, endpoint):
+    sentry_init(
+        traces_sample_rate=1.0,
+        _experiments={"profiles_sample_rate": 1.0},
+    )
+    app = fastapi_app_factory()
+    asgi_app = SentryAsgiMiddleware(app)
+
+    envelopes = capture_envelopes()
+
+    client = TestClient(asgi_app)
+    response = client.get(endpoint)
+    assert response.status_code == 200
+
+    data = json.loads(response.content)
+
+    envelopes = [envelope for envelope in envelopes]
+    assert len(envelopes) == 1
+
+    profiles = [item for item in envelopes[0].items if item.type == "profile"]
+    assert len(profiles) == 1
+
+    for profile in profiles:
+        transactions = profile.payload.json["transactions"]
+        assert len(transactions) == 1
+        assert str(data["active"]) == transactions[0]["active_thread_id"]
diff --git a/tests/integrations/starlette/test_starlette.py b/tests/integrations/starlette/test_starlette.py
index e41e6d5d19..a279142995 100644
--- a/tests/integrations/starlette/test_starlette.py
+++ b/tests/integrations/starlette/test_starlette.py
@@ -3,6 +3,7 @@
 import functools
 import json
 import os
+import threading
 
 import pytest
 
@@ -108,6 +109,22 @@ async def _message_with_id(request):
         capture_message("hi")
         return starlette.responses.JSONResponse({"status": "ok"})
 
+    def _thread_ids_sync(request):
+        return starlette.responses.JSONResponse(
+            {
+                "main": threading.main_thread().ident,
+                "active": threading.current_thread().ident,
+            }
+        )
+
+    async def _thread_ids_async(request):
+        return starlette.responses.JSONResponse(
+            {
+                "main": threading.main_thread().ident,
+                "active": threading.current_thread().ident,
+            }
+        )
+
     app = starlette.applications.Starlette(
         debug=debug,
         routes=[
@@ -115,6 +132,8 @@ async def _message_with_id(request):
             starlette.routing.Route("/custom_error", _custom_error),
             starlette.routing.Route("/message", _message),
             starlette.routing.Route("/message/{message_id}", _message_with_id),
+            starlette.routing.Route("/sync/thread_ids", _thread_ids_sync),
+            starlette.routing.Route("/async/thread_ids", _thread_ids_async),
         ],
         middleware=middleware,
     )
@@ -824,3 +843,32 @@ def test_legacy_setup(
 
     (event,) = events
     assert event["transaction"] == "/message/{message_id}"
+
+
+@pytest.mark.parametrize("endpoint", ["/sync/thread_ids", "/async/thread_ids"])
+def test_active_thread_id(sentry_init, capture_envelopes, endpoint):
+    sentry_init(
+        traces_sample_rate=1.0,
+        _experiments={"profiles_sample_rate": 1.0},
+    )
+    app = starlette_app_factory()
+    asgi_app = SentryAsgiMiddleware(app)
+
+    envelopes = capture_envelopes()
+
+    client = TestClient(asgi_app)
+    response = client.get(endpoint)
+    assert response.status_code == 200
+
+    data = json.loads(response.content)
+
+    envelopes = [envelope for envelope in envelopes]
+    assert len(envelopes) == 1
+
+    profiles = [item for item in envelopes[0].items if item.type == "profile"]
+    assert len(profiles) == 1
+
+    for profile in profiles:
+        transactions = profile.payload.json["transactions"]
+        assert len(transactions) == 1
+        assert str(data["active"]) == transactions[0]["active_thread_id"]
diff --git a/tests/integrations/wsgi/test_wsgi.py b/tests/integrations/wsgi/test_wsgi.py
index 9eba712616..3ca9c5e9e7 100644
--- a/tests/integrations/wsgi/test_wsgi.py
+++ b/tests/integrations/wsgi/test_wsgi.py
@@ -297,8 +297,8 @@ def sample_app(environ, start_response):
     ],
 )
 def test_profile_sent(
-    capture_envelopes,
     sentry_init,
+    capture_envelopes,
     teardown_profiling,
     profiles_sample_rate,
     profile_count,

From 3f38f79274685b41d7bb1d534b2a3f0dc09379fb Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Wed, 18 Jan 2023 15:29:46 +0100
Subject: [PATCH 198/209] Add `before_send_transaction` (#1840)

* Added before_send_transaction

Co-authored-by: Neel Shah 
---
 codecov.yml          |  3 ++
 sentry_sdk/_types.py |  1 +
 sentry_sdk/client.py | 13 ++++++++
 sentry_sdk/consts.py |  2 ++
 tests/test_basics.py | 74 +++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 92 insertions(+), 1 deletion(-)

diff --git a/codecov.yml b/codecov.yml
index 1989f1cd03..1811996ac4 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -7,3 +7,6 @@ coverage:
       python:
         target: 90%
 comment: false
+ignore:
+  - "tests"
+  - "sentry_sdk/_types.py"
diff --git a/sentry_sdk/_types.py b/sentry_sdk/_types.py
index 3c985f21e9..7064192977 100644
--- a/sentry_sdk/_types.py
+++ b/sentry_sdk/_types.py
@@ -30,6 +30,7 @@
     EventProcessor = Callable[[Event, Hint], Optional[Event]]
     ErrorProcessor = Callable[[Event, ExcInfo], Optional[Event]]
     BreadcrumbProcessor = Callable[[Breadcrumb, BreadcrumbHint], Optional[Breadcrumb]]
+    TransactionProcessor = Callable[[Event, Hint], Optional[Event]]
 
     TracesSampler = Callable[[SamplingContext], Union[float, int, bool]]
 
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
index 8af7003156..e5df64fbfb 100644
--- a/sentry_sdk/client.py
+++ b/sentry_sdk/client.py
@@ -248,6 +248,19 @@ def _prepare_event(
                     )
             event = new_event  # type: ignore
 
+        before_send_transaction = self.options["before_send_transaction"]
+        if before_send_transaction is not None and event.get("type") == "transaction":
+            new_event = None
+            with capture_internal_exceptions():
+                new_event = before_send_transaction(event, hint or {})
+            if new_event is None:
+                logger.info("before send transaction dropped event (%s)", event)
+                if self.transport:
+                    self.transport.record_lost_event(
+                        "before_send", data_category="transaction"
+                    )
+            event = new_event  # type: ignore
+
         return event
 
     def _is_ignored_error(self, event, hint):
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index eeca4cbaf4..db50e058f4 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -20,6 +20,7 @@
         Event,
         EventProcessor,
         TracesSampler,
+        TransactionProcessor,
     )
 
     # Experiments are feature flags to enable and disable certain unstable SDK
@@ -117,6 +118,7 @@ def __init__(
         _experiments={},  # type: Experiments  # noqa: B006
         proxy_headers=None,  # type: Optional[Dict[str, str]]
         instrumenter=INSTRUMENTER.SENTRY,  # type: Optional[str]
+        before_send_transaction=None,  # type: Optional[TransactionProcessor]
     ):
         # type: (...) -> None
         pass
diff --git a/tests/test_basics.py b/tests/test_basics.py
index 8657231fc9..0d87e049eb 100644
--- a/tests/test_basics.py
+++ b/tests/test_basics.py
@@ -91,7 +91,79 @@ def test_event_id(sentry_init, capture_events):
     assert Hub.current.last_event_id() == event_id
 
 
-def test_option_callback(sentry_init, capture_events, monkeypatch):
+def test_option_before_send(sentry_init, capture_events):
+    def before_send(event, hint):
+        event["extra"] = {"before_send_called": True}
+        return event
+
+    def do_this():
+        try:
+            raise ValueError("aha!")
+        except Exception:
+            capture_exception()
+
+    sentry_init(before_send=before_send)
+    events = capture_events()
+
+    do_this()
+
+    (event,) = events
+    assert event["extra"] == {"before_send_called": True}
+
+
+def test_option_before_send_discard(sentry_init, capture_events):
+    def before_send_discard(event, hint):
+        return None
+
+    def do_this():
+        try:
+            raise ValueError("aha!")
+        except Exception:
+            capture_exception()
+
+    sentry_init(before_send=before_send_discard)
+    events = capture_events()
+
+    do_this()
+
+    assert len(events) == 0
+
+
+def test_option_before_send_transaction(sentry_init, capture_events):
+    def before_send_transaction(event, hint):
+        assert event["type"] == "transaction"
+        event["extra"] = {"before_send_transaction_called": True}
+        return event
+
+    sentry_init(
+        before_send_transaction=before_send_transaction,
+        traces_sample_rate=1.0,
+    )
+    events = capture_events()
+    transaction = start_transaction(name="foo")
+    transaction.finish()
+
+    (event,) = events
+    assert event["transaction"] == "foo"
+    assert event["extra"] == {"before_send_transaction_called": True}
+
+
+def test_option_before_send_transaction_discard(sentry_init, capture_events):
+    def before_send_transaction_discard(event, hint):
+        return None
+
+    sentry_init(
+        before_send_transaction=before_send_transaction_discard,
+        traces_sample_rate=1.0,
+    )
+    events = capture_events()
+    transaction = start_transaction(name="foo")
+    transaction.finish()
+
+    assert len(events) == 0
+
+
+def test_option_before_breadcrumb(sentry_init, capture_events, monkeypatch):
     drop_events = False
     drop_breadcrumbs = False
     reports = []

From f6af7a091c5c0a93c00621219adb8ab2cac94df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Gu=C3=A9rin?= 
Date: Thu, 19 Jan 2023 11:58:23 +0100
Subject: [PATCH 199/209] Avoid import of pkg_resource with Starlette
 integration (#1836)

By changing the order in the condition, we can avoid the call to
`_get_installed_modules` (which imports `pkg_resources`) when the
`mechanism_type` is set to `"starlette"`.

Co-authored-by: Anton Pirker 
---
 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 f34f10dc85..c84e5ba454 100644
--- a/sentry_sdk/integrations/asgi.py
+++ b/sentry_sdk/integrations/asgi.py
@@ -109,7 +109,7 @@ def __init__(
             )
 
         asgi_middleware_while_using_starlette_or_fastapi = (
-            "starlette" in _get_installed_modules() and mechanism_type == "asgi"
+            mechanism_type == "asgi" and "starlette" in _get_installed_modules()
         )
         if asgi_middleware_while_using_starlette_or_fastapi:
             logger.warning(

From 504188c918f67c33079502efe97cc4b8fbd2776c Mon Sep 17 00:00:00 2001
From: Bernardo Torres 
Date: Thu, 19 Jan 2023 12:09:42 +0100
Subject: [PATCH 200/209] fix extra dependency (#1825)

Co-authored-by: Anton Pirker 
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 62b4cead25..c90476674e 100644
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,7 @@ def get_file_text(file_name):
         "starlite": ["starlite>=1.48"],
         "fastapi": ["fastapi>=0.79.0"],
         "pymongo": ["pymongo>=3.1"],
-        "opentelemetry": ["opentelemetry-distro>=0.350b0"],
+        "opentelemetry": ["opentelemetry-distro>=0.35b0"],
     },
     classifiers=[
         "Development Status :: 5 - Production/Stable",

From 1ac27c8582b1d99c84af69ac18bc4f3964614829 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad 
Date: Thu, 19 Jan 2023 13:38:45 +0100
Subject: [PATCH 201/209] fix(opentelemetry): Use dict for sentry-trace context
 instead of tuple (#1847)

* fix(opentelemetry): Use dict for sentry-trace context instead of tuple
---
 .../integrations/opentelemetry/span_processor.py    |  2 +-
 .../opentelemetry/test_span_processor.py            | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/sentry_sdk/integrations/opentelemetry/span_processor.py b/sentry_sdk/integrations/opentelemetry/span_processor.py
index 5b80efbca5..0dc7caaf2d 100644
--- a/sentry_sdk/integrations/opentelemetry/span_processor.py
+++ b/sentry_sdk/integrations/opentelemetry/span_processor.py
@@ -217,7 +217,7 @@ def _get_trace_data(self, otel_span, parent_context):
 
         sentry_trace_data = get_value(SENTRY_TRACE_KEY, parent_context)
         trace_data["parent_sampled"] = (
-            sentry_trace_data[2] if sentry_trace_data else None
+            sentry_trace_data["parent_sampled"] if sentry_trace_data else None
         )
 
         baggage = get_value(SENTRY_BAGGAGE_KEY, parent_context)
diff --git a/tests/integrations/opentelemetry/test_span_processor.py b/tests/integrations/opentelemetry/test_span_processor.py
index 7ba6f59e6c..d7dc6b66df 100644
--- a/tests/integrations/opentelemetry/test_span_processor.py
+++ b/tests/integrations/opentelemetry/test_span_processor.py
@@ -9,6 +9,7 @@
 from sentry_sdk.tracing import Span, Transaction
 
 from opentelemetry.trace import SpanKind, SpanContext
+from sentry_sdk.tracing_utils import extract_sentrytrace_data
 
 
 def test_is_sentry_span():
@@ -103,7 +104,9 @@ def test_get_trace_data_with_sentry_trace():
     with mock.patch(
         "sentry_sdk.integrations.opentelemetry.span_processor.get_value",
         side_effect=[
-            ("1234567890abcdef1234567890abcdef", "1234567890abcdef", True),
+            extract_sentrytrace_data(
+                "1234567890abcdef1234567890abcdef-1234567890abcdef-1"
+            ),
             None,
         ],
     ):
@@ -118,7 +121,9 @@ def test_get_trace_data_with_sentry_trace():
     with mock.patch(
         "sentry_sdk.integrations.opentelemetry.span_processor.get_value",
         side_effect=[
-            ("1234567890abcdef1234567890abcdef", "1234567890abcdef", False),
+            extract_sentrytrace_data(
+                "1234567890abcdef1234567890abcdef-1234567890abcdef-0"
+            ),
             None,
         ],
     ):
@@ -150,7 +155,9 @@ def test_get_trace_data_with_sentry_trace_and_baggage():
     with mock.patch(
         "sentry_sdk.integrations.opentelemetry.span_processor.get_value",
         side_effect=[
-            ("1234567890abcdef1234567890abcdef", "1234567890abcdef", True),
+            extract_sentrytrace_data(
+                "1234567890abcdef1234567890abcdef-1234567890abcdef-1"
+            ),
             baggage,
         ],
     ):

From 0714d9f6d38c65d87fc4523e9d9b471d535dcc8a Mon Sep 17 00:00:00 2001
From: Johnny Deuss 
Date: Thu, 19 Jan 2023 12:50:56 +0000
Subject: [PATCH 202/209] Fix middleware being patched multiple times when
 using FastAPI (#1841)

* Fix middleware being patched multiple times when using FastAPI
---
 sentry_sdk/integrations/starlette.py | 118 ++++++++++++++-------------
 1 file changed, 63 insertions(+), 55 deletions(-)

diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py
index b35e1c9fac..aec194a779 100644
--- a/sentry_sdk/integrations/starlette.py
+++ b/sentry_sdk/integrations/starlette.py
@@ -168,62 +168,66 @@ def patch_exception_middleware(middleware_class):
     """
     old_middleware_init = middleware_class.__init__
 
-    def _sentry_middleware_init(self, *args, **kwargs):
-        # type: (Any, Any, Any) -> None
-        old_middleware_init(self, *args, **kwargs)
+    not_yet_patched = "_sentry_middleware_init" not in str(old_middleware_init)
 
-        # Patch existing exception handlers
-        old_handlers = self._exception_handlers.copy()
+    if not_yet_patched:
 
-        async def _sentry_patched_exception_handler(self, *args, **kwargs):
+        def _sentry_middleware_init(self, *args, **kwargs):
             # type: (Any, Any, Any) -> None
-            exp = args[0]
-
-            is_http_server_error = (
-                hasattr(exp, "status_code") and exp.status_code >= 500
-            )
-            if is_http_server_error:
-                _capture_exception(exp, handled=True)
-
-            # Find a matching handler
-            old_handler = None
-            for cls in type(exp).__mro__:
-                if cls in old_handlers:
-                    old_handler = old_handlers[cls]
-                    break
-
-            if old_handler is None:
-                return
-
-            if _is_async_callable(old_handler):
-                return await old_handler(self, *args, **kwargs)
-            else:
-                return old_handler(self, *args, **kwargs)
+            old_middleware_init(self, *args, **kwargs)
 
-        for key in self._exception_handlers.keys():
-            self._exception_handlers[key] = _sentry_patched_exception_handler
+            # Patch existing exception handlers
+            old_handlers = self._exception_handlers.copy()
 
-    middleware_class.__init__ = _sentry_middleware_init
+            async def _sentry_patched_exception_handler(self, *args, **kwargs):
+                # type: (Any, Any, Any) -> None
+                exp = args[0]
 
-    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
+                is_http_server_error = (
+                    hasattr(exp, "status_code") and exp.status_code >= 500
+                )
+                if is_http_server_error:
+                    _capture_exception(exp, handled=True)
+
+                # Find a matching handler
+                old_handler = None
+                for cls in type(exp).__mro__:
+                    if cls in old_handlers:
+                        old_handler = old_handlers[cls]
+                        break
+
+                if old_handler is None:
+                    return
+
+                if _is_async_callable(old_handler):
+                    return await old_handler(self, *args, **kwargs)
+                else:
+                    return old_handler(self, *args, **kwargs)
+
+            for key in self._exception_handlers.keys():
+                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):
@@ -268,12 +272,16 @@ def patch_authentication_middleware(middleware_class):
     """
     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)
+    not_yet_patched = "_sentry_authenticationmiddleware_call" not in str(old_call)
+
+    if not_yet_patched:
+
+        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
+        middleware_class.__call__ = _sentry_authenticationmiddleware_call
 
 
 def patch_middlewares():

From 086e3857ac24a22debecaa99614bfc9471c5d62f Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Thu, 19 Jan 2023 10:40:23 -0500
Subject: [PATCH 203/209] feat(profiling): Use co_qualname in python 3.11
 (#1831)

The `get_frame_name` implementation works well for <3.11 but 3.11 introduced a
`co_qualname` that works like our implementation of `get_frame_name` and handles
some cases better.
---
 sentry_sdk/_compat.py  |  1 +
 sentry_sdk/profiler.py | 97 ++++++++++++++++++++++--------------------
 tests/test_profiler.py | 35 +++++++++------
 3 files changed, 75 insertions(+), 58 deletions(-)

diff --git a/sentry_sdk/_compat.py b/sentry_sdk/_compat.py
index e253f39372..62abfd1622 100644
--- a/sentry_sdk/_compat.py
+++ b/sentry_sdk/_compat.py
@@ -16,6 +16,7 @@
 PY33 = sys.version_info[0] == 3 and sys.version_info[1] >= 3
 PY37 = sys.version_info[0] == 3 and sys.version_info[1] >= 7
 PY310 = sys.version_info[0] == 3 and sys.version_info[1] >= 10
+PY311 = sys.version_info[0] == 3 and sys.version_info[1] >= 11
 
 if PY2:
     import urlparse
diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 66778982f5..884fb70af5 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -24,7 +24,7 @@
 from contextlib import contextmanager
 
 import sentry_sdk
-from sentry_sdk._compat import PY33
+from sentry_sdk._compat import PY33, PY311
 from sentry_sdk._types import MYPY
 from sentry_sdk.utils import (
     filename_for_module,
@@ -269,55 +269,60 @@ def extract_frame(frame, cwd):
     )
 
 
-def get_frame_name(frame):
-    # type: (FrameType) -> str
+if PY311:
 
-    # in 3.11+, there is a frame.f_code.co_qualname that
-    # we should consider using instead where possible
+    def get_frame_name(frame):
+        # type: (FrameType) -> str
+        return frame.f_code.co_qualname  # type: ignore
 
-    f_code = frame.f_code
-    co_varnames = f_code.co_varnames
+else:
 
-    # co_name only contains the frame name.  If the frame was a method,
-    # the class name will NOT be included.
-    name = f_code.co_name
+    def get_frame_name(frame):
+        # type: (FrameType) -> str
 
-    # if it was a method, we can get the class name by inspecting
-    # the f_locals for the `self` argument
-    try:
-        if (
-            # the co_varnames start with the frame's positional arguments
-            # and we expect the first to be `self` if its an instance method
-            co_varnames
-            and co_varnames[0] == "self"
-            and "self" in frame.f_locals
-        ):
-            for cls in frame.f_locals["self"].__class__.__mro__:
-                if name in cls.__dict__:
-                    return "{}.{}".format(cls.__name__, name)
-    except AttributeError:
-        pass
-
-    # if it was a class method, (decorated with `@classmethod`)
-    # we can get the class name by inspecting the f_locals for the `cls` argument
-    try:
-        if (
-            # the co_varnames start with the frame's positional arguments
-            # and we expect the first to be `cls` if its a class method
-            co_varnames
-            and co_varnames[0] == "cls"
-            and "cls" in frame.f_locals
-        ):
-            for cls in frame.f_locals["cls"].__mro__:
-                if name in cls.__dict__:
-                    return "{}.{}".format(cls.__name__, name)
-    except AttributeError:
-        pass
-
-    # nothing we can do if it is a staticmethod (decorated with @staticmethod)
-
-    # we've done all we can, time to give up and return what we have
-    return name
+        f_code = frame.f_code
+        co_varnames = f_code.co_varnames
+
+        # co_name only contains the frame name.  If the frame was a method,
+        # the class name will NOT be included.
+        name = f_code.co_name
+
+        # if it was a method, we can get the class name by inspecting
+        # the f_locals for the `self` argument
+        try:
+            if (
+                # the co_varnames start with the frame's positional arguments
+                # and we expect the first to be `self` if its an instance method
+                co_varnames
+                and co_varnames[0] == "self"
+                and "self" in frame.f_locals
+            ):
+                for cls in frame.f_locals["self"].__class__.__mro__:
+                    if name in cls.__dict__:
+                        return "{}.{}".format(cls.__name__, name)
+        except AttributeError:
+            pass
+
+        # if it was a class method, (decorated with `@classmethod`)
+        # we can get the class name by inspecting the f_locals for the `cls` argument
+        try:
+            if (
+                # the co_varnames start with the frame's positional arguments
+                # and we expect the first to be `cls` if its a class method
+                co_varnames
+                and co_varnames[0] == "cls"
+                and "cls" in frame.f_locals
+            ):
+                for cls in frame.f_locals["cls"].__mro__:
+                    if name in cls.__dict__:
+                        return "{}.{}".format(cls.__name__, name)
+        except AttributeError:
+            pass
+
+        # nothing we can do if it is a staticmethod (decorated with @staticmethod)
+
+        # we've done all we can, time to give up and return what we have
+        return name
 
 
 MAX_PROFILE_DURATION_NS = int(3e10)  # 30 seconds
diff --git a/tests/test_profiler.py b/tests/test_profiler.py
index 115e2f91ca..f0613c9c65 100644
--- a/tests/test_profiler.py
+++ b/tests/test_profiler.py
@@ -22,9 +22,11 @@
     gevent = None
 
 
-minimum_python_33 = pytest.mark.skipif(
-    sys.version_info < (3, 3), reason="Profiling is only supported in Python >= 3.3"
-)
+def requires_python_version(major, minor, reason=None):
+    if reason is None:
+        reason = "Requires Python {}.{}".format(major, minor)
+    return pytest.mark.skipif(sys.version_info < (major, minor), reason=reason)
+
 
 requires_gevent = pytest.mark.skipif(gevent is None, reason="gevent not enabled")
 
@@ -33,6 +35,7 @@ def process_test_sample(sample):
     return [(tid, (stack, stack)) for tid, stack in sample]
 
 
+@requires_python_version(3, 3)
 @pytest.mark.parametrize(
     "mode",
     [
@@ -146,7 +149,9 @@ def static_method():
         ),
         pytest.param(
             GetFrame().instance_method_wrapped()(),
-            "wrapped",
+            "wrapped"
+            if sys.version_info < (3, 11)
+            else "GetFrame.instance_method_wrapped..wrapped",
             id="instance_method_wrapped",
         ),
         pytest.param(
@@ -156,14 +161,15 @@ def static_method():
         ),
         pytest.param(
             GetFrame().class_method_wrapped()(),
-            "wrapped",
+            "wrapped"
+            if sys.version_info < (3, 11)
+            else "GetFrame.class_method_wrapped..wrapped",
             id="class_method_wrapped",
         ),
         pytest.param(
             GetFrame().static_method(),
-            "GetFrame.static_method",
+            "static_method" if sys.version_info < (3, 11) else "GetFrame.static_method",
             id="static_method",
-            marks=pytest.mark.skip(reason="unsupported"),
         ),
         pytest.param(
             GetFrame().inherited_instance_method(),
@@ -172,7 +178,9 @@ def static_method():
         ),
         pytest.param(
             GetFrame().inherited_instance_method_wrapped()(),
-            "wrapped",
+            "wrapped"
+            if sys.version_info < (3, 11)
+            else "GetFrameBase.inherited_instance_method_wrapped..wrapped",
             id="instance_method_wrapped",
         ),
         pytest.param(
@@ -182,14 +190,17 @@ def static_method():
         ),
         pytest.param(
             GetFrame().inherited_class_method_wrapped()(),
-            "wrapped",
+            "wrapped"
+            if sys.version_info < (3, 11)
+            else "GetFrameBase.inherited_class_method_wrapped..wrapped",
             id="inherited_class_method_wrapped",
         ),
         pytest.param(
             GetFrame().inherited_static_method(),
-            "GetFrameBase.static_method",
+            "inherited_static_method"
+            if sys.version_info < (3, 11)
+            else "GetFrameBase.inherited_static_method",
             id="inherited_static_method",
-            marks=pytest.mark.skip(reason="unsupported"),
         ),
     ],
 )
@@ -275,7 +286,7 @@ def get_scheduler_threads(scheduler):
     return [thread for thread in threading.enumerate() if thread.name == scheduler.name]
 
 
-@minimum_python_33
+@requires_python_version(3, 3)
 @pytest.mark.parametrize(
     ("scheduler_class",),
     [

From 032ea5723f6b637e919efc4c0f97373466ef3428 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Fri, 20 Jan 2023 10:06:28 +0100
Subject: [PATCH 204/209] Make sure to noop when there is no DSN (#1852)

* Make sure to noop when there is no or invalid DSN
---
 sentry_sdk/integrations/opentelemetry/span_processor.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sentry_sdk/integrations/opentelemetry/span_processor.py b/sentry_sdk/integrations/opentelemetry/span_processor.py
index 0dc7caaf2d..0017708a97 100644
--- a/sentry_sdk/integrations/opentelemetry/span_processor.py
+++ b/sentry_sdk/integrations/opentelemetry/span_processor.py
@@ -98,6 +98,14 @@ def on_start(self, otel_span, parent_context=None):
         if not hub:
             return
 
+        if not hub.client or (hub.client and not hub.client.dsn):
+            return
+
+        try:
+            _ = Dsn(hub.client.dsn or "")
+        except Exception:
+            return
+
         if hub.client and hub.client.options["instrumenter"] != INSTRUMENTER.OTEL:
             return
 

From d5152331f58d86efd3283eec928989810aa21975 Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Fri, 20 Jan 2023 11:03:15 +0100
Subject: [PATCH 205/209] Always remove Django session related cookies. (#1842)

* Always remove Django session related cookies.
---
 sentry_sdk/consts.py                          |   2 +
 sentry_sdk/integrations/django/__init__.py    |  20 +++-
 sentry_sdk/utils.py                           |  18 +++
 .../django/test_data_scrubbing.py             | 103 ++++++++++++++++++
 4 files changed, 140 insertions(+), 3 deletions(-)
 create mode 100644 tests/integrations/django/test_data_scrubbing.py

diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index db50e058f4..a5fe541dc2 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -44,6 +44,8 @@
 DEFAULT_QUEUE_SIZE = 100
 DEFAULT_MAX_BREADCRUMBS = 100
 
+SENSITIVE_DATA_SUBSTITUTE = "[Filtered]"
+
 
 class INSTRUMENTER:
     SENTRY = "sentry"
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
index 67a0bf3844..697ab484e3 100644
--- a/sentry_sdk/integrations/django/__init__.py
+++ b/sentry_sdk/integrations/django/__init__.py
@@ -6,13 +6,14 @@
 import weakref
 
 from sentry_sdk._types import MYPY
-from sentry_sdk.consts import OP
+from sentry_sdk.consts import OP, SENSITIVE_DATA_SUBSTITUTE
 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, TRANSACTION_SOURCE_URL
 from sentry_sdk.tracing_utils import record_sql_queries
 from sentry_sdk.utils import (
+    AnnotatedValue,
     HAS_REAL_CONTEXTVARS,
     CONTEXTVARS_ERROR_MESSAGE,
     logger,
@@ -28,6 +29,7 @@
 
 try:
     from django import VERSION as DJANGO_VERSION
+    from django.conf import settings as django_settings
     from django.core import signals
 
     try:
@@ -476,8 +478,20 @@ def env(self):
         return self.request.META
 
     def cookies(self):
-        # type: () -> Dict[str, str]
-        return self.request.COOKIES
+        # type: () -> Dict[str, Union[str, AnnotatedValue]]
+        privacy_cookies = [
+            django_settings.CSRF_COOKIE_NAME,
+            django_settings.SESSION_COOKIE_NAME,
+        ]
+
+        clean_cookies = {}  # type: Dict[str, Union[str, AnnotatedValue]]
+        for (key, val) in self.request.COOKIES.items():
+            if key in privacy_cookies:
+                clean_cookies[key] = SENSITIVE_DATA_SUBSTITUTE
+            else:
+                clean_cookies[key] = val
+
+        return clean_cookies
 
     def raw_data(self):
         # type: () -> bytes
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
index 4d6a091398..3f573171a6 100644
--- a/sentry_sdk/utils.py
+++ b/sentry_sdk/utils.py
@@ -370,6 +370,24 @@ def removed_because_over_size_limit(cls):
             },
         )
 
+    @classmethod
+    def substituted_because_contains_sensitive_data(cls):
+        # type: () -> AnnotatedValue
+        """The actual value was removed because it contained sensitive information."""
+        from sentry_sdk.consts import SENSITIVE_DATA_SUBSTITUTE
+
+        return AnnotatedValue(
+            value=SENSITIVE_DATA_SUBSTITUTE,
+            metadata={
+                "rem": [  # Remark
+                    [
+                        "!config",  # Because of SDK configuration (in this case the config is the hard coded removal of certain django cookies)
+                        "s",  # The fields original value was substituted
+                    ]
+                ]
+            },
+        )
+
 
 if MYPY:
     from typing import TypeVar
diff --git a/tests/integrations/django/test_data_scrubbing.py b/tests/integrations/django/test_data_scrubbing.py
new file mode 100644
index 0000000000..c0ab14ae63
--- /dev/null
+++ b/tests/integrations/django/test_data_scrubbing.py
@@ -0,0 +1,103 @@
+from functools import partial
+import pytest
+import pytest_django
+
+from werkzeug.test import Client
+
+from sentry_sdk.integrations.django import DjangoIntegration
+
+from tests.integrations.django.myapp.wsgi import application
+
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
+
+
+# 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 = 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 = partial(
+            pytest.mark.django_db, databases="__all__"
+        )
+except ValueError:
+    if "dev" in pytest_django.__version__:
+        pytest_mark_django_db_decorator = partial(
+            pytest.mark.django_db, databases="__all__"
+        )
+except AttributeError:
+    pass
+
+
+@pytest.fixture
+def client():
+    return Client(application)
+
+
+@pytest.mark.forked
+@pytest_mark_django_db_decorator()
+def test_scrub_django_session_cookies_removed(
+    sentry_init,
+    client,
+    capture_events,
+):
+    sentry_init(integrations=[DjangoIntegration()], send_default_pii=False)
+    events = capture_events()
+    client.set_cookie("localhost", "sessionid", "123")
+    client.set_cookie("localhost", "csrftoken", "456")
+    client.set_cookie("localhost", "foo", "bar")
+    client.get(reverse("view_exc"))
+
+    (event,) = events
+    assert "cookies" not in event["request"]
+
+
+@pytest.mark.forked
+@pytest_mark_django_db_decorator()
+def test_scrub_django_session_cookies_filtered(
+    sentry_init,
+    client,
+    capture_events,
+):
+    sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
+    events = capture_events()
+    client.set_cookie("localhost", "sessionid", "123")
+    client.set_cookie("localhost", "csrftoken", "456")
+    client.set_cookie("localhost", "foo", "bar")
+    client.get(reverse("view_exc"))
+
+    (event,) = events
+    assert event["request"]["cookies"] == {
+        "sessionid": "[Filtered]",
+        "csrftoken": "[Filtered]",
+        "foo": "bar",
+    }
+
+
+@pytest.mark.forked
+@pytest_mark_django_db_decorator()
+def test_scrub_django_custom_session_cookies_filtered(
+    sentry_init,
+    client,
+    capture_events,
+    settings,
+):
+    settings.SESSION_COOKIE_NAME = "my_sess"
+    settings.CSRF_COOKIE_NAME = "csrf_secret"
+
+    sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
+    events = capture_events()
+    client.set_cookie("localhost", "my_sess", "123")
+    client.set_cookie("localhost", "csrf_secret", "456")
+    client.set_cookie("localhost", "foo", "bar")
+    client.get(reverse("view_exc"))
+
+    (event,) = events
+    assert event["request"]["cookies"] == {
+        "my_sess": "[Filtered]",
+        "csrf_secret": "[Filtered]",
+        "foo": "bar",
+    }

From cd2f51b8d631c502f9f9c0186187d7b1fb405704 Mon Sep 17 00:00:00 2001
From: Tony Xiao 
Date: Fri, 20 Jan 2023 14:17:58 -0500
Subject: [PATCH 206/209] feat(profiling): Add profile context to transaction
 (#1860)

This adds the profile context to the transaction envelope.
See https://github.com/getsentry/rfcs/blob/main/text/0047-introduce-profile-context.md
---
 sentry_sdk/profiler.py               | 12 +++++++++-
 sentry_sdk/tracing.py                |  1 +
 tests/integrations/wsgi/test_wsgi.py | 33 ++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/sentry_sdk/profiler.py b/sentry_sdk/profiler.py
index 884fb70af5..94080aed89 100644
--- a/sentry_sdk/profiler.py
+++ b/sentry_sdk/profiler.py
@@ -103,6 +103,11 @@
         },
     )
 
+    ProfileContext = TypedDict(
+        "ProfileContext",
+        {"profile_id": str},
+    )
+
 try:
     from gevent.monkey import is_module_patched  # type: ignore
 except ImportError:
@@ -343,6 +348,7 @@ def __init__(
         self.start_ns = 0  # type: int
         self.stop_ns = 0  # type: int
         self.active = False  # type: bool
+        self.event_id = uuid.uuid4().hex  # type: str
 
         self.indexed_frames = {}  # type: Dict[RawFrame, int]
         self.indexed_stacks = {}  # type: Dict[RawStackId, int]
@@ -352,6 +358,10 @@ def __init__(
 
         transaction._profile = self
 
+    def get_profile_context(self):
+        # type: () -> ProfileContext
+        return {"profile_id": self.event_id}
+
     def __enter__(self):
         # type: () -> None
         hub = self.hub or sentry_sdk.Hub.current
@@ -444,7 +454,7 @@ def to_json(self, event_opt, options):
 
         return {
             "environment": event_opt.get("environment"),
-            "event_id": uuid.uuid4().hex,
+            "event_id": self.event_id,
             "platform": "python",
             "profile": profile,
             "release": event_opt.get("release", ""),
diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py
index b72524f734..61c6a7190b 100644
--- a/sentry_sdk/tracing.py
+++ b/sentry_sdk/tracing.py
@@ -709,6 +709,7 @@ def finish(self, hub=None, end_timestamp=None):
 
         if hub.client is not None and self._profile is not None:
             event["profile"] = self._profile
+            contexts.update({"profile": self._profile.get_profile_context()})
 
         if has_custom_measurements_enabled():
             event["measurements"] = self._measurements
diff --git a/tests/integrations/wsgi/test_wsgi.py b/tests/integrations/wsgi/test_wsgi.py
index 3ca9c5e9e7..dae9b26c13 100644
--- a/tests/integrations/wsgi/test_wsgi.py
+++ b/tests/integrations/wsgi/test_wsgi.py
@@ -323,3 +323,36 @@ def test_app(environ, start_response):
         for item in envelope.items:
             count_item_types[item.type] += 1
     assert count_item_types["profile"] == profile_count
+
+
+def test_profile_context_sent(sentry_init, capture_envelopes, teardown_profiling):
+    def test_app(environ, start_response):
+        start_response("200 OK", [])
+        return ["Go get the ball! Good dog!"]
+
+    sentry_init(
+        traces_sample_rate=1.0,
+        _experiments={"profiles_sample_rate": 1.0},
+    )
+    app = SentryWsgiMiddleware(test_app)
+    envelopes = capture_envelopes()
+
+    client = Client(app)
+    client.get("/")
+
+    transaction = None
+    profile = None
+    for envelope in envelopes:
+        for item in envelope.items:
+            if item.type == "profile":
+                assert profile is None  # should only have 1 profile
+                profile = item
+            elif item.type == "transaction":
+                assert transaction is None  # should only have 1 transaction
+                transaction = item
+
+    assert transaction is not None
+    assert profile is not None
+    assert transaction.payload.json["contexts"]["profile"] == {
+        "profile_id": profile.payload.json["event_id"],
+    }

From d27808f11e3c5ddb08d15a4f2e0c1e812be17b5e Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 23 Jan 2023 10:44:52 +0100
Subject: [PATCH 207/209] Removed code coverage target (#1862)

* Set target to 65% to test, but not fail
---
 codecov.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codecov.yml b/codecov.yml
index 1811996ac4..5d2dcbd0c7 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -5,7 +5,7 @@ coverage:
     patch:
       default: false
       python:
-        target: 90%
+        target: 65%
 comment: false
 ignore:
   - "tests"

From f095df7565a5fe6757cb741f4290e15cfdb6c716 Mon Sep 17 00:00:00 2001
From: getsentry-bot 
Date: Mon, 23 Jan 2023 09:59:55 +0000
Subject: [PATCH 208/209] release: 1.14.0

---
 CHANGELOG.md         | 18 ++++++++++++++++++
 docs/conf.py         |  2 +-
 sentry_sdk/consts.py |  2 +-
 setup.py             |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26739e48ce..dbb2f05033 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## 1.14.0
+
+### Various fixes & improvements
+
+- Removed code coverage target (#1862) by @antonpirker
+- feat(profiling): Add profile context to transaction (#1860) by @Zylphrex
+- Always remove Django session related cookies. (#1842) by @antonpirker
+- Make sure to noop when there is no DSN (#1852) by @antonpirker
+- feat(profiling): Use co_qualname in python 3.11 (#1831) by @Zylphrex
+- Fix middleware being patched multiple times when using FastAPI (#1841) by @JohnnyDeuss
+- fix(opentelemetry): Use dict for sentry-trace context instead of tuple (#1847) by @AbhiPrasad
+- fix extra dependency (#1825) by @bernardotorres
+- Avoid import of pkg_resource with Starlette integration (#1836) by @mgu
+- Add `before_send_transaction` (#1840) by @antonpirker
+- feat(profiling): Enable profiling for ASGI frameworks (#1824) by @Zylphrex
+- feat(profiling): Better gevent support (#1822) by @Zylphrex
+- fix(otel): NoOpSpan updates scope (#1834) by @Zylphrex
+
 ## 1.13.0
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
index 5939ad9b00..0bb09bffa0 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.13.0"
+release = "1.14.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
index a5fe541dc2..1e309837a3 100644
--- a/sentry_sdk/consts.py
+++ b/sentry_sdk/consts.py
@@ -144,4 +144,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.13.0"
+VERSION = "1.14.0"
diff --git a/setup.py b/setup.py
index c90476674e..34810fba4b 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.13.0",
+    version="1.14.0",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

From 8c4a19a4391a721b4b7e27d6a2b17902963ce62e Mon Sep 17 00:00:00 2001
From: Anton Pirker 
Date: Mon, 23 Jan 2023 11:08:46 +0100
Subject: [PATCH 209/209] Updated changelog

---
 CHANGELOG.md | 44 ++++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbb2f05033..8dfde55540 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,19 +4,39 @@
 
 ### Various fixes & improvements
 
-- Removed code coverage target (#1862) by @antonpirker
-- feat(profiling): Add profile context to transaction (#1860) by @Zylphrex
-- Always remove Django session related cookies. (#1842) by @antonpirker
-- Make sure to noop when there is no DSN (#1852) by @antonpirker
-- feat(profiling): Use co_qualname in python 3.11 (#1831) by @Zylphrex
-- Fix middleware being patched multiple times when using FastAPI (#1841) by @JohnnyDeuss
-- fix(opentelemetry): Use dict for sentry-trace context instead of tuple (#1847) by @AbhiPrasad
-- fix extra dependency (#1825) by @bernardotorres
-- Avoid import of pkg_resource with Starlette integration (#1836) by @mgu
 - Add `before_send_transaction` (#1840) by @antonpirker
-- feat(profiling): Enable profiling for ASGI frameworks (#1824) by @Zylphrex
-- feat(profiling): Better gevent support (#1822) by @Zylphrex
-- fix(otel): NoOpSpan updates scope (#1834) by @Zylphrex
+
+  Adds a hook (similar to `before_send`) that is called for all transaction events (performance releated data).
+
+  Usage:
+
+  ```python
+    import sentry_sdk
+
+    def strip_sensitive_data(event, hint):
+        # modify event here (or return `None` if you want to drop the event entirely)
+        return event
+
+    sentry_sdk.init(
+        # ...
+        before_send_transaction=strip_sensitive_data,
+    )
+  ```
+
+  See also: https://docs.sentry.io/platforms/python/configuration/filtering/#using-platformidentifier-namebefore-send-transaction-
+
+- Django: Always remove values of Django session related cookies. (#1842) by @antonpirker
+- Profiling: Enable profiling for ASGI frameworks (#1824) by @Zylphrex
+- Profiling: Better gevent support (#1822) by @Zylphrex
+- Profiling: Add profile context to transaction (#1860) by @Zylphrex
+- Profiling: Use co_qualname in python 3.11 (#1831) by @Zylphrex
+- OpenTelemetry: fix Use dict for sentry-trace context instead of tuple (#1847) by @AbhiPrasad
+- OpenTelemetry: fix extra dependency (#1825) by @bernardotorres
+- OpenTelemetry: fix NoOpSpan updates scope (#1834) by @Zylphrex
+- OpenTelemetry: Make sure to noop when there is no DSN (#1852) by @antonpirker
+- FastAPI: Fix middleware being patched multiple times (#1841) by @JohnnyDeuss
+- Starlette: Avoid import of pkg_resource with Starlette integration (#1836) by @mgu
+- Removed code coverage target (#1862) by @antonpirker
 
 ## 1.13.0