Merge branch 'master' into dependabot/github_actions/actions/checkout-4.2.1

Author: sentrivana

requirements-linting.txt

@@ -14,3 +14,4 @@ loguru # There is no separate types module.
 flake8-bugbear
 pep8-naming
 pre-commit # local linting
+httpcore

sentry_sdk/integrations/__init__.py

@@ -14,6 +14,7 @@
     from typing import Optional
     from typing import Set
     from typing import Type
+    from typing import Union
 
 
 _DEFAULT_FAILED_REQUEST_STATUS_CODES = frozenset(range(500, 600))
@@ -124,7 +125,7 @@ def setup_integrations(
     with_auto_enabling_integrations=False,
     disabled_integrations=None,
 ):
-    # type: (Sequence[Integration], bool, bool, Optional[Sequence[Integration]]) -> Dict[str, Integration]
+    # type: (Sequence[Integration], bool, bool, Optional[Sequence[Union[type[Integration], Integration]]]) -> Dict[str, Integration]
     """
     Given a list of integration instances, this installs them all.
 

sentry_sdk/integrations/langchain.py

@@ -138,7 +138,7 @@ def _create_span(self, run_id, parent_id, **kwargs):
 
         watched_span = None  # type: Optional[WatchedSpan]
         if parent_id:
-            parent_span = self.span_map[parent_id]  # type: Optional[WatchedSpan]
+            parent_span = self.span_map.get(parent_id)  # type: Optional[WatchedSpan]
             if parent_span:
                 watched_span = WatchedSpan(parent_span.span.start_child(**kwargs))
                 parent_span.children.append(watched_span)