Merge branch 'ivana/span-first-9-start-end' into ivana/span-first-10-random-improvements

Author: sentrivana

.github/workflows/ci.yml

@@ -5,7 +5,6 @@ on:
     branches:
       - master
       - release/**
-      - potel-base
 
   pull_request:
 

.github/workflows/codeql-analysis.yml

@@ -15,7 +15,6 @@ on:
   push:
     branches:
       - master
-      - potel-base
   pull_request:
   schedule:
     - cron: '18 18 * * 3'

.github/workflows/enforce-license-compliance.yml

@@ -6,7 +6,6 @@ on:
       - master
       - main
       - release/*
-      - potel-base
   pull_request:
 
 # Cancel in progress workflows on pull_requests.

sentry_sdk/traces.py

@@ -303,7 +303,7 @@ def finish(self, end_timestamp: "Optional[Union[float, datetime]]" = None) -> No
     def _start(self) -> None:
         if self._active:
             old_span = self._scope.span
-            self._scope.span = self
+            self._scope.span = self  # type: ignore
             self._previous_span_on_scope = old_span
 
     def _end(self, end_timestamp: "Optional[Union[float, datetime]]" = None) -> None:
@@ -453,7 +453,7 @@ def _start(self) -> None:
             return
 
         old_span = self._scope.span
-        self._scope.span = self
+        self._scope.span = self  # type: ignore
         self._previous_span_on_scope = old_span
 
     def _end(self, end_timestamp: "Optional[Union[float, datetime]]" = None) -> None: