Merge branch 'master' into ivana/toxgen/httpx

Author: sentrivana

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 2.38.0
+
+### Various fixes & improvements
+
+- Feat(huggingface_hub): Update HuggingFace Hub integration (#4746) by @antonpirker
+- Feat(Anthropic): Add proper tool calling data to Anthropic integration (#4769) by @antonpirker
+- Feat(openai-agents): Add input and output to `invoke_agent` span. (#4785) by @antonpirker
+- Feat(AI): Create transaction in AI agents framworks, when no transaction is running. (#4758) by @constantinius
+- Feat(GraphQL): Support gql 4.0-style execute (#4779) by @sentrivana
+- Fix(logs): Expect `log_item` as rate limit category (#4798) by @sentrivana
+- Fix: CI for mypy, gevent (#4790) by @sentrivana
+- Fix: Correctly check for a running transaction (#4791) by @antonpirker
+- Fix: Use float for sample rand (#4677) by @sentrivana
+- Fix: Avoid reporting false-positive StopAsyncIteration in the asyncio integration (#4741) by @vmarkovtsev
+- Fix: Add log message when `DedupeIntegration` is dropping an error. (#4788) by @antonpirker
+- Fix(profiling): Re-init continuous profiler (#4772) by @Zylphrex
+- Chore: Reexport module `profiler` (#4535) by @zen-xu
+- Tests: Update tox.ini (#4799) by @sentrivana
+- Build(deps): bump actions/create-github-app-token from 2.1.1 to 2.1.4 (#4795) by @dependabot
+- Build(deps): bump actions/setup-python from 5 to 6 (#4774) by @dependabot
+- Build(deps): bump codecov/codecov-action from 5.5.0 to 5.5.1 (#4773) by @dependabot
+
 ## 2.37.1
 
 ### Various fixes & improvements

docs/conf.py

@@ -31,7 +31,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "2.37.1"
+release = "2.38.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

sentry_sdk/_types.py

@@ -269,7 +269,7 @@ class SDKInfo(TypedDict):
         "metric_bucket",
         "monitor",
         "span",
-        "log",
+        "log_item",
     ]
     SessionStatus = Literal["ok", "exited", "crashed", "abnormal"]
 

sentry_sdk/consts.py

@@ -1331,4 +1331,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "2.37.1"
+VERSION = "2.38.0"

sentry_sdk/envelope.py

@@ -273,7 +273,7 @@ def data_category(self):
         elif ty == "event":
             return "error"
         elif ty == "log":
-            return "log"
+            return "log_item"
         elif ty == "client_report":
             return "internal"
         elif ty == "profile":

setup.py

@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="2.37.1",
+    version="2.38.0",
     author="Sentry Team and Contributors",
     author_email="[email protected]",
     url="https://github.com/getsentry/sentry-python",

tests/test_envelope.py

@@ -1,4 +1,4 @@
-from sentry_sdk.envelope import Envelope
+from sentry_sdk.envelope import Envelope, Item, PayloadRef
 from sentry_sdk.session import Session
 from sentry_sdk import capture_event
 import sentry_sdk.client
@@ -239,3 +239,24 @@ def test_envelope_without_headers():
 
     assert len(items) == 1
     assert items[0].payload.get_bytes() == b'{"started": "2020-02-07T14:16:00Z"}'
+
+
+def test_envelope_item_data_category_mapping():
+    """Test that envelope items map to correct data categories for rate limiting."""
+    test_cases = [
+        ("event", "error"),
+        ("transaction", "transaction"),
+        ("log", "log_item"),
+        ("session", "session"),
+        ("attachment", "attachment"),
+        ("client_report", "internal"),
+        ("profile", "profile"),
+        ("profile_chunk", "profile_chunk"),
+        ("statsd", "metric_bucket"),
+        ("check_in", "monitor"),
+        ("unknown_type", "default"),
+    ]
+
+    for item_type, expected_category in test_cases:
+        item = Item(payload=PayloadRef(json={"test": "data"}), type=item_type)
+        assert item.data_category == expected_category

tests/test_transport.py

@@ -611,7 +611,7 @@ def test_metric_bucket_limits(capturing_server, response_code, make_client):
     assert capturing_server.captured[0].path == "/api/132/envelope/"
     capturing_server.clear_captured()
 
-    assert set(client.transport._disabled_until) == set(["metric_bucket"])
+    assert set(client.transport._disabled_until) == {"metric_bucket"}
 
     client.transport.capture_envelope(envelope)
     client.capture_event({"type": "transaction"})
@@ -629,6 +629,43 @@ def test_metric_bucket_limits(capturing_server, response_code, make_client):
     ]
 
 
+@pytest.mark.parametrize("response_code", [200, 429])
+def test_log_item_limits(capturing_server, response_code, make_client):
+    client = make_client()
+    capturing_server.respond_with(
+        code=response_code,
+        headers={
+            "X-Sentry-Rate-Limits": "4711:log_item:organization:quota_exceeded:custom"
+        },
+    )
+
+    envelope = Envelope()
+    envelope.add_item(Item(payload=b"{}", type="log"))
+    client.transport.capture_envelope(envelope)
+    client.flush()
+
+    assert len(capturing_server.captured) == 1
+    assert capturing_server.captured[0].path == "/api/132/envelope/"
+    capturing_server.clear_captured()
+
+    assert set(client.transport._disabled_until) == {"log_item"}
+
+    client.transport.capture_envelope(envelope)
+    client.capture_event({"type": "transaction"})
+    client.flush()
+
+    assert len(capturing_server.captured) == 2
+
+    envelope = capturing_server.captured[0].envelope
+    assert envelope.items[0].type == "transaction"
+    envelope = capturing_server.captured[1].envelope
+    assert envelope.items[0].type == "client_report"
+    report = parse_json(envelope.items[0].get_bytes())
+    assert report["discarded_events"] == [
+        {"category": "log_item", "reason": "ratelimit_backoff", "quantity": 1},
+    ]
+
+
 @pytest.mark.parametrize("response_code", [200, 429])
 def test_metric_bucket_limits_with_namespace(
     capturing_server, response_code, make_client

tox.ini

@@ -10,7 +10,7 @@
 # The file (and all resulting CI YAMLs) then need to be regenerated via
 # "scripts/generate-test-files.sh".
 #
-# Last generated: 2025-09-15T15:03:26.855602+00:00
+# Last generated: 2025-09-15T15:06:00.206204+00:00
 
 [tox]
 requires =