merge master

Author: alexander-alderman-webb

.github/release.yml

@@ -11,16 +11,29 @@ changelog:
         - Feature
         - Improvement
         - New Integration
+      commit_patterns:
+        - "^feat(\([a-zA-Z0-9_-]+\))?:"
     - title: Bug Fixes 🐛
       labels:
         - "Changelog: Bugfix"
         - Bug
+      commit_patterns:
+        - "^(fix|bugfix)(\([a-zA-Z0-9_-]+\))?:"
+    - title: Deprecations 🏗️
+      labels:
+        - "Changelog: Deprecation"
+      commit_patterns:
+        - "deprecat"  # deprecation, deprecated
     - title: Documentation 📚
       labels:
         - "Changelog: Docs"
         - Docs
         - "Component: Docs"
+      commit_patterns:
+        - "^docs(\([a-zA-Z0-9_-]+\))?:"
     - title: Internal Changes 🔧
       labels:
         - "Changelog: Internal"
         - Quality Improvement
+      commit_patterns:
+        - "^(build|ref|chore|ci|tests|test)(\([a-zA-Z0-9_-]+\))?:"

.github/workflows/test-integrations-tasks.yml

@@ -45,7 +45,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
       - name: Start Redis
-        uses: supercharge/redis-github-action@1.8.1
+        uses: supercharge/redis-github-action@v2
       - name: Install Java
         uses: actions/setup-java@v5
         with:

.github/workflows/update-tox.yml

@@ -54,7 +54,7 @@ jobs:
           echo "date=$DATE" >> $GITHUB_OUTPUT
 
       - name: Create pull request
-        uses: actions/github-script@v8.0.0
+        uses: actions/github-script@v8
         with:
           script: |
             const branchName = '${{ steps.create-branch.outputs.branch_name }}';

scripts/populate_tox/config.py

@@ -235,7 +235,13 @@
     "litestar": {
         "package": "litestar",
         "deps": {
-            "*": ["pytest-asyncio", "python-multipart", "requests", "cryptography"],
+            "*": [
+                "pytest-asyncio",
+                "python-multipart",
+                "requests",
+                "cryptography",
+                "sniffio",
+            ],
             "<2.7": ["httpx<0.28"],
         },
     },

scripts/populate_tox/package_dependencies.jsonl

@@ -56,7 +56,7 @@
 
       {% if needs_redis %}
       - name: Start Redis
-        uses: supercharge/redis-github-action@1.8.1
+        uses: supercharge/redis-github-action@2
       {% endif %}
 
       {% if needs_java %}

scripts/populate_tox/releases.jsonl

@@ -83,9 +83,21 @@ def add(
 
         with self._lock:
             if len(self._log_buffer) >= self.MAX_LOGS_BEFORE_DROP:
+                # Construct log envelope item without sending it to report lost bytes
+                log_item = Item(
+                    type="log",
+                    content_type="application/vnd.sentry.items.log+json",
+                    headers={
+                        "item_count": 1,
+                    },
+                    payload=PayloadRef(
+                        json={"items": [LogBatcher._log_to_transport_format(log)]}
+                    ),
+                )
                 self._record_lost_func(
                     reason="queue_overflow",
                     data_category="log_item",
+                    item=log_item,
                     quantity=1,
                 )
                 return None

scripts/split_tox_gh_actions/templates/test_group.jinja

@@ -294,6 +294,7 @@ class SDKInfo(TypedDict):
         "monitor",
         "span",
         "log_item",
+        "log_byte",
         "trace_metric",
     ]
     SessionStatus = Literal["ok", "exited", "crashed", "abnormal"]

sentry_sdk/_log_batcher.py

@@ -67,9 +67,10 @@
     from sentry_sdk.scope import Scope
     from sentry_sdk.session import Session
     from sentry_sdk.spotlight import SpotlightClient
-    from sentry_sdk.transport import Transport
+    from sentry_sdk.transport import Transport, Item
     from sentry_sdk._log_batcher import LogBatcher
     from sentry_sdk._metrics_batcher import MetricsBatcher
+    from sentry_sdk.utils import Dsn
 
     I = TypeVar("I", bound=Integration)  # noqa: E741
 
@@ -201,6 +202,11 @@ def dsn(self):
         # type: () -> Optional[str]
         return None
 
+    @property
+    def parsed_dsn(self):
+        # type: () -> Optional[Dsn]
+        return None
+
     def should_send_default_pii(self):
         # type: () -> bool
         return False
@@ -354,19 +360,23 @@ def _init_impl(self):
 
         def _capture_envelope(envelope):
             # type: (Envelope) -> None
+            if self.spotlight is not None:
+                self.spotlight.capture_envelope(envelope)
             if self.transport is not None:
                 self.transport.capture_envelope(envelope)
 
         def _record_lost_event(
             reason,  # type: str
             data_category,  # type: EventDataCategory
+            item=None,  # type: Optional[Item]
             quantity=1,  # type: int
         ):
             # type: (...) -> None
             if self.transport is not None:
                 self.transport.record_lost_event(
                     reason=reason,
                     data_category=data_category,
+                    item=item,
                     quantity=quantity,
                 )
 
@@ -379,6 +389,18 @@ def _record_lost_event(
                 if self.options["enable_backpressure_handling"]:
                     self.monitor = Monitor(self.transport)
 
+            # Setup Spotlight before creating batchers so _capture_envelope can use it.
+            # setup_spotlight handles all config/env var resolution per the SDK spec.
+            from sentry_sdk.spotlight import setup_spotlight
+
+            self.spotlight = setup_spotlight(self.options)
+            if self.spotlight is not None and not self.options["dsn"]:
+                sample_all = lambda *_args, **_kwargs: 1.0
+                self.options["send_default_pii"] = True
+                self.options["error_sampler"] = sample_all
+                self.options["traces_sampler"] = sample_all
+                self.options["profiles_sampler"] = sample_all
+
             self.session_flusher = SessionFlusher(capture_func=_capture_envelope)
 
             self.log_batcher = None
@@ -429,29 +451,6 @@ def _record_lost_event(
                 options=self.options,
             )
 
-            spotlight_config = self.options.get("spotlight")
-            if spotlight_config is None and "SENTRY_SPOTLIGHT" in os.environ:
-                spotlight_env_value = os.environ["SENTRY_SPOTLIGHT"]
-                spotlight_config = env_to_bool(spotlight_env_value, strict=True)
-                self.options["spotlight"] = (
-                    spotlight_config
-                    if spotlight_config is not None
-                    else spotlight_env_value
-                )
-
-            if self.options.get("spotlight"):
-                # This is intentionally here to prevent setting up spotlight
-                # stuff we don't need unless spotlight is explicitly enabled
-                from sentry_sdk.spotlight import setup_spotlight
-
-                self.spotlight = setup_spotlight(self.options)
-                if not self.options["dsn"]:
-                    sample_all = lambda *_args, **_kwargs: 1.0
-                    self.options["send_default_pii"] = True
-                    self.options["error_sampler"] = sample_all
-                    self.options["traces_sampler"] = sample_all
-                    self.options["profiles_sampler"] = sample_all
-
             sdk_name = get_sdk_name(list(self.integrations.keys()))
             SDK_INFO["name"] = sdk_name
             logger.debug("Setting SDK name to '%s'", sdk_name)
@@ -510,6 +509,12 @@ def dsn(self):
         """Returns the configured DSN as string."""
         return self.options["dsn"]
 
+    @property
+    def parsed_dsn(self):
+        # type: () -> Optional[Dsn]
+        """Returns the configured parsed DSN object."""
+        return self.transport.parsed_dsn if self.transport else None
+
     def _prepare_event(
         self,
         event,  # type: Event