Merge branch 'ivana/potel/port-sample-rate-update' of github.com:getsentry/sentry-python into ivana/potel/port-sample-rate-update

Author: antonpirker

.github/workflows/release-comment-issues.yml

@@ -17,7 +17,10 @@ jobs:
     steps:
       - name: Get version
         id: get_version
-        run: echo "version=${{ github.event.inputs.version || github.event.release.tag_name }}" >> $GITHUB_OUTPUT
+        env:
+          INPUTS_VERSION: ${{ github.event.inputs.version }}
+          RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
+        run: echo "version=${$INPUTS_VERSION:-$RELEASE_TAG_NAME}" >> "$GITHUB_OUTPUT"
 
       - name: Comment on linked issues that are mentioned in release
         if: |
@@ -28,4 +31,4 @@ jobs:
         uses: getsentry/release-comment-issues-gh-action@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          version: ${{ steps.get_version.outputs.version }}
+          version: ${{ steps.get_version.outputs.version }}

sentry_sdk/integrations/aiohttp.py

@@ -27,6 +27,7 @@
     capture_internal_exceptions,
     ensure_integration_enabled,
     event_from_exception,
+    http_client_status_to_breadcrumb_level,
     logger,
     parse_url,
     parse_version,
@@ -277,13 +278,15 @@ async def on_request_end(session, trace_config_ctx, params):
             return
 
         span_data = trace_config_ctx.span_data or {}
-        span_data[SPANDATA.HTTP_STATUS_CODE] = int(params.response.status)
+        status_code = int(params.response.status)
+        span_data[SPANDATA.HTTP_STATUS_CODE] = status_code
         span_data["reason"] = params.response.reason
 
         sentry_sdk.add_breadcrumb(
             type="http",
             category="httplib",
             data=span_data,
+            level=http_client_status_to_breadcrumb_level(status_code),
         )
 
         span = trace_config_ctx.span

sentry_sdk/integrations/asgi.py

@@ -255,12 +255,12 @@ def event_processor(self, event, hint, asgi_scope):
         event["request"] = deepcopy(request_data)
 
         # Only set transaction name if not already set by Starlette or FastAPI (or other frameworks)
+        transaction = event.get("transaction")
+        transaction_source = (event.get("transaction_info") or {}).get("source")
         already_set = (
-            "transaction" in event
-            and event["transaction"] != _DEFAULT_TRANSACTION_NAME
-            and "transaction_info" in event
-            and "source" in event["transaction_info"]
-            and event["transaction_info"]["source"]
+            transaction is not None
+            and transaction != _DEFAULT_TRANSACTION_NAME
+            and transaction_source
             in [
                 TransactionSource.COMPONENT,
                 TransactionSource.ROUTE,

sentry_sdk/integrations/httpx.py

@@ -7,6 +7,7 @@
     SENSITIVE_DATA_SUBSTITUTE,
     capture_internal_exceptions,
     ensure_integration_enabled,
+    http_client_status_to_breadcrumb_level,
     logger,
     parse_url,
 )
@@ -101,6 +102,7 @@ def send(self, request, **kwargs):
                 type="http",
                 category="httplib",
                 data=data,
+                level=http_client_status_to_breadcrumb_level(rv.status_code),
             )
 
             return rv

sentry_sdk/integrations/opentelemetry/span_processor.py

@@ -261,9 +261,6 @@ def _span_to_json(self, span):
             }
         )
 
-        if status:
-            span_json.setdefault("tags", {})["status"] = status
-
         if parent_span_id:
             span_json["parent_span_id"] = parent_span_id
 

sentry_sdk/integrations/stdlib.py

@@ -14,6 +14,7 @@
     capture_internal_exceptions,
     ensure_integration_enabled,
     get_current_thread_meta,
+    http_client_status_to_breadcrumb_level,
     is_sentry_url,
     logger,
     safe_repr,
@@ -144,14 +145,16 @@ def getresponse(self, *args, **kwargs):
             span_data[SPANDATA.HTTP_STATUS_CODE] = int(rv.status)
             span_data["reason"] = rv.reason
 
+            status_code = int(rv.status)
+            span.set_http_status(status_code)
+            span.set_data("reason", rv.reason)
+
             sentry_sdk.add_breadcrumb(
                 type="http",
                 category="httplib",
                 data=span_data,
+                level=http_client_status_to_breadcrumb_level(status_code),
             )
-
-            span.set_http_status(int(rv.status))
-            span.set_data("reason", rv.reason)
         finally:
             span.__exit__(None, None, None)
 

sentry_sdk/tracing.py

@@ -20,6 +20,7 @@
     _serialize_span_attribute,
     get_current_thread_meta,
     logger,
+    should_be_treated_as_error,
 )
 
 from typing import TYPE_CHECKING, cast
@@ -424,7 +425,7 @@ def __enter__(self):
 
     def __exit__(self, ty, value, tb):
         # type: (Optional[Any], Optional[Any], Optional[Any]) -> None
-        if value is not None:
+        if value is not None and should_be_treated_as_error(ty, value):
             self.set_status(SPANSTATUS.INTERNAL_ERROR)
         else:
             status_unset = (

sentry_sdk/utils.py

@@ -1879,11 +1879,21 @@ def datetime_from_isoformat(value):
     return result.astimezone(timezone.utc)
 
 
-# TODO-neel-potel use in span status
 def should_be_treated_as_error(ty, value):
     # type: (Any, Any) -> bool
     if ty == SystemExit and hasattr(value, "code") and value.code in (0, None):
         # https://docs.python.org/3/library/exceptions.html#SystemExit
         return False
 
     return True
+
+
+def http_client_status_to_breadcrumb_level(status_code):
+    # type: (Optional[int]) -> str
+    if status_code is not None:
+        if 500 <= status_code <= 599:
+            return "error"
+        elif 400 <= status_code <= 499:
+            return "warning"
+
+    return "info"

tests/integrations/aiohttp/test_aiohttp.py

@@ -534,8 +534,8 @@ async def handler(request):
 @pytest.mark.parametrize(
     "status_code,level",
     [
-        (200, None),
-        (301, None),
+        (200, "info"),
+        (301, "info"),
         (403, "warning"),
         (405, "warning"),
         (500, "error"),
@@ -570,10 +570,7 @@ async def handler(request):
 
         crumb = event["breadcrumbs"]["values"][0]
         assert crumb["type"] == "http"
-        if level is None:
-            assert "level" not in crumb
-        else:
-            assert crumb["level"] == level
+        assert crumb["level"] == level
         assert crumb["category"] == "httplib"
         assert crumb["data"] == ApproxDict(
             {

tests/integrations/httpx/test_httpx.py

@@ -64,8 +64,8 @@ def before_breadcrumb(crumb, hint):
 @pytest.mark.parametrize(
     "status_code,level",
     [
-        (200, None),
-        (301, None),
+        (200, "info"),
+        (301, "info"),
         (403, "warning"),
         (405, "warning"),
         (500, "error"),
@@ -98,12 +98,7 @@ def test_crumb_capture_client_error(
         crumb = event["breadcrumbs"]["values"][0]
         assert crumb["type"] == "http"
         assert crumb["category"] == "httplib"
-
-        if level is None:
-            assert "level" not in crumb
-        else:
-            assert crumb["level"] == level
-
+        assert crumb["level"] == level
         assert crumb["data"] == ApproxDict(
             {
                 "url": url,