merge

alexander-alderman-webb · alexander-alderman-webb · commit d845ee38953d · 2025-10-21T11:16:47.000+02:00
diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13","3.14t"]
+        python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
         # 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-integrations-misc.yml b/.github/workflows/test-integrations-misc.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
+        python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
         # 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-integrations-web-2.yml b/.github/workflows/test-integrations-web-2.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
+        python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
         # 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/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## 2.42.1
+
+### Various fixes & improvements
+
+- fix(gcp): Inject scopes in TimeoutThread exception with GCP (#4959) by @alexander-alderman-webb
+- fix(aws): Inject scopes in TimeoutThread exception with AWS lambda (#4914) by @alexander-alderman-webb
+- fix(ai): add message trunction to anthropic (#4953) by @shellmayr
+- fix(ai): add message truncation to langgraph (#4954) by @shellmayr
+- fix: Default breadcrumbs value for events without breadcrumbs (#4952) by @alexander-alderman-webb
+- fix(ai): add message truncation in langchain (#4950) by @shellmayr
+- fix(ai): correct size calculation, rename internal property for message truncation & add test (#4949) by @shellmayr
+- fix(ai): introduce message truncation for openai (#4946) by @shellmayr
+- fix(openai): Use non-deprecated Pydantic method to extract response text  (#4942) by @JasonLovesDoggo
+- ci: 🤖 Update test matrix with new releases (10/16) (#4945) by @github-actions
+- Handle ValueError in scope resets (#4928) by @sl0thentr0py
+- fix(litellm): Classify embeddings correctly (#4918) by @alexander-alderman-webb
+- Generalize NOT_GIVEN check with omit for openai (#4926) by @sl0thentr0py
+- ⚡️ Speed up function `_get_db_span_description` (#4924) by @misrasaurabh1
+
 ## 2.42.0
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
@@ -31,7 +31,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "2.42.0"
+release = "2.42.1"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py
@@ -48,6 +48,9 @@
         "package": "apache-beam",
         "python": ">=3.7",
         "num_versions": 2,
+        "deps": {
+            "*": ["dill"],
+        },
     },
     "boto3": {
         "package": "boto3",
diff --git a/scripts/populate_tox/releases.jsonl b/scripts/populate_tox/releases.jsonl
diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja
@@ -18,15 +18,15 @@ requires =
     virtualenv<20.26.3
 envlist =
     # === Common ===
-    {py3.6,py3.7,py3.8,py3.9,py3.10,py3.11,py3.12,py3.13,py3.14t}-common
+    {py3.6,py3.7,py3.8,py3.9,py3.10,py3.11,py3.12,py3.13,py3.14,py3.14t}-common
 
     # === Gevent ===
     {py3.6,py3.8,py3.10,py3.11,py3.12}-gevent
 
     # === Integrations ===
 
     # Asgi
-    {py3.7,py3.12,py3.13}-asgi
+    {py3.7,py3.12,py3.13,py3.14,py3.14t}-asgi
 
     # AWS Lambda
     {py3.8,py3.9,py3.11,py3.13}-aws_lambda
@@ -38,7 +38,7 @@ envlist =
     {py3.7}-gcp
 
     # OpenTelemetry (OTel)
-    {py3.7,py3.9,py3.12,py3.13}-opentelemetry
+    {py3.7,py3.9,py3.12,py3.13,py3.14,py3.14t}-opentelemetry
 
     # OpenTelemetry Experimental (POTel)
     {py3.8,py3.9,py3.10,py3.11,py3.12,py3.13}-potel
@@ -74,7 +74,7 @@ deps =
     # and https://github.com/pytest-dev/pytest-forked/issues/67
     # for justification of the upper bound on pytest
     {py3.6,py3.7}-common: pytest<7.0.0
-    {py3.8,py3.9,py3.10,py3.11,py3.12,py3.13}-common: pytest
+    {py3.8,py3.9,py3.10,py3.11,py3.12,py3.13,py3.14,py3.14t}-common: pytest
 
     # === Gevent ===
     {py3.6,py3.7,py3.8,py3.9,py3.10,py3.11}-gevent: gevent>=22.10.0, <22.11.0
@@ -177,6 +177,8 @@ basepython =
     py3.11: python3.11
     py3.12: python3.12
     py3.13: python3.13
+    py3.14: python3.14
+    py3.14t: python3.14t
 
     # Python version is pinned here for consistency across environments.
     # Tools like ruff and mypy have options that pin the target Python
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
@@ -909,7 +909,7 @@ def __init__(
         error_sampler=None,  # type: Optional[Callable[[Event, Hint], Union[float, bool]]]
         enable_db_query_source=True,  # type: bool
         db_query_source_threshold_ms=100,  # type: int
-        enable_http_request_source=False,  # type: bool
+        enable_http_request_source=True,  # type: bool
         http_request_source_threshold_ms=100,  # type: int
         spotlight=None,  # type: Optional[Union[bool, str]]
         cert_file=None,  # type: Optional[str]
@@ -1348,4 +1348,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "2.42.0"
+VERSION = "2.42.1"
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
@@ -330,7 +330,7 @@ def add_http_request_source(span):
     if span.timestamp is None or span.start_timestamp is None:
         return
 
-    should_add_request_source = client.options.get("enable_http_request_source", False)
+    should_add_request_source = client.options.get("enable_http_request_source", True)
     if not should_add_request_source:
         return
 
diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="2.42.0",
+    version="2.42.1",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -57,17 +57,6 @@
     with open(SENTRY_EVENT_SCHEMA) as f:
         SENTRY_EVENT_SCHEMA = json.load(f)
 
-try:
-    import pytest_benchmark
-except ImportError:
-
-    @pytest.fixture
-    def benchmark():
-        return lambda x: x()
-
-else:
-    del pytest_benchmark
-
 
 from sentry_sdk import scope
 
diff --git a/tests/integrations/aiohttp/test_aiohttp.py b/tests/integrations/aiohttp/test_aiohttp.py
@@ -637,23 +637,19 @@ async def handler(request):
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize("enable_http_request_source", [None, False])
 async def test_request_source_disabled(
     sentry_init,
     aiohttp_raw_server,
     aiohttp_client,
     capture_events,
-    enable_http_request_source,
 ):
     sentry_options = {
         "integrations": [AioHttpIntegration()],
         "traces_sample_rate": 1.0,
+        "enable_http_request_source": False,
         "http_request_source_threshold_ms": 0,
     }
 
-    if enable_http_request_source is not None:
-        sentry_options["enable_http_request_source"] = enable_http_request_source
-
     sentry_init(**sentry_options)
 
     # server for making span request
@@ -689,18 +685,21 @@ async def hello(request):
 
 
 @pytest.mark.asyncio
+@pytest.mark.parametrize("enable_http_request_source", [None, True])
 async def test_request_source_enabled(
     sentry_init,
     aiohttp_raw_server,
     aiohttp_client,
     capture_events,
+    enable_http_request_source,
 ):
     sentry_options = {
         "integrations": [AioHttpIntegration()],
         "traces_sample_rate": 1.0,
-        "enable_http_request_source": True,
         "http_request_source_threshold_ms": 0,
     }
+    if enable_http_request_source is not None:
+        sentry_options["enable_http_request_source"] = enable_http_request_source
 
     sentry_init(**sentry_options)
 
diff --git a/tests/integrations/httpx/test_httpx.py b/tests/integrations/httpx/test_httpx.py
@@ -396,22 +396,18 @@ def test_omit_url_data_if_parsing_fails(sentry_init, capture_events, httpx_mock)
     assert SPANDATA.HTTP_QUERY not in event["breadcrumbs"]["values"][0]["data"]
 
 
-@pytest.mark.parametrize("enable_http_request_source", [None, False])
 @pytest.mark.parametrize(
     "httpx_client",
     (httpx.Client(), httpx.AsyncClient()),
 )
-def test_request_source_disabled(
-    sentry_init, capture_events, enable_http_request_source, httpx_client, httpx_mock
-):
+def test_request_source_disabled(sentry_init, capture_events, httpx_client, httpx_mock):
     httpx_mock.add_response()
     sentry_options = {
         "integrations": [HttpxIntegration()],
         "traces_sample_rate": 1.0,
+        "enable_http_request_source": False,
         "http_request_source_threshold_ms": 0,
     }
-    if enable_http_request_source is not None:
-        sentry_options["enable_http_request_source"] = enable_http_request_source
 
     sentry_init(**sentry_options)
 
@@ -438,18 +434,23 @@ def test_request_source_disabled(
     assert SPANDATA.CODE_FUNCTION not in data
 
 
+@pytest.mark.parametrize("enable_http_request_source", [None, True])
 @pytest.mark.parametrize(
     "httpx_client",
     (httpx.Client(), httpx.AsyncClient()),
 )
-def test_request_source_enabled(sentry_init, capture_events, httpx_client, httpx_mock):
+def test_request_source_enabled(
+    sentry_init, capture_events, enable_http_request_source, httpx_client, httpx_mock
+):
     httpx_mock.add_response()
     sentry_options = {
         "integrations": [HttpxIntegration()],
         "traces_sample_rate": 1.0,
-        "enable_http_request_source": True,
         "http_request_source_threshold_ms": 0,
     }
+    if enable_http_request_source is not None:
+        sentry_options["enable_http_request_source"] = enable_http_request_source
+
     sentry_init(**sentry_options)
 
     events = capture_events()
diff --git a/tests/integrations/stdlib/test_httplib.py b/tests/integrations/stdlib/test_httplib.py
@@ -376,16 +376,12 @@ def test_option_trace_propagation_targets(
             assert "baggage" not in request_headers
 
 
-@pytest.mark.parametrize("enable_http_request_source", [None, False])
-def test_request_source_disabled(
-    sentry_init, capture_events, enable_http_request_source
-):
+def test_request_source_disabled(sentry_init, capture_events):
     sentry_options = {
         "traces_sample_rate": 1.0,
+        "enable_http_request_source": False,
         "http_request_source_threshold_ms": 0,
     }
-    if enable_http_request_source is not None:
-        sentry_options["enable_http_request_source"] = enable_http_request_source
 
     sentry_init(**sentry_options)
 
@@ -409,12 +405,17 @@ def test_request_source_disabled(
     assert SPANDATA.CODE_FUNCTION not in data
 
 
-def test_request_source_enabled(sentry_init, capture_events):
+@pytest.mark.parametrize("enable_http_request_source", [None, True])
+def test_request_source_enabled(
+    sentry_init, capture_events, enable_http_request_source
+):
     sentry_options = {
         "traces_sample_rate": 1.0,
-        "enable_http_request_source": True,
         "http_request_source_threshold_ms": 0,
     }
+    if enable_http_request_source is not None:
+        sentry_options["enable_http_request_source"] = enable_http_request_source
+
     sentry_init(**sentry_options)
 
     events = capture_events()
diff --git a/tests/test_client.py b/tests/test_client.py
diff --git a/tox.ini b/tox.ini
