Merge branch 'master' into constantinius/feat/integrations/implement-context-management-for-invoke_agent-spans

constantinius · web-flow · commit d45dcea25689 · 2025-11-13T09:48:48.000+01:00
diff --git a/.github/workflows/test-integrations-dbs.yml b/.github/workflows/test-integrations-dbs.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
+        python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
diff --git a/.github/workflows/test-integrations-misc.yml b/.github/workflows/test-integrations-misc.yml
@@ -58,6 +58,10 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-opentelemetry"
+      - name: Test otlp
+        run: |
+          set -x # print commands that are executed
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-otlp"
       - name: Test potel
         run: |
           set -x # print commands that are executed
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Changelog
 
+## 2.44.0
+
+### Various fixes & improvements
+
+- fix(openai): Check response text is present to avoid AttributeError (#5081) by @alexander-alderman-webb
+- fix(pydantic-ai): Do not fail on new `ToolManager._call_tool()` parameters (#5084) by @alexander-alderman-webb
+- tests(huggingface): Avoid `None` version (#5083) by @alexander-alderman-webb
+- ci: Pin `coverage` version for 3.14 Django tests (#5088) by @alexander-alderman-webb
+- chore: X handle update (#5078) by @cleptric
+- fix(openai-agents): add input messages to errored spans as well (#5077) by @shellmayr
+- fix: Add hard limit to log batcher (#5069) by @alexander-alderman-webb
+- fix: Add hard limit to metrics batcher (#5068) by @alexander-alderman-webb
+- fix(integrations): properly handle exceptions in tool calls (#5065) by @constantinius
+- feat: non-experimental `before_send_metric` option (#5064) by @alexander-alderman-webb
+- feat: non-experimental `enable_metrics` option (#5056) by @alexander-alderman-webb
+- fix(integrations): properly distinguish between network.transport and mcp.transport (#5063) by @constantinius
+- feat(integrations): add ability to auto-deactivate lower-level integrations based on map (#5052) by @shellmayr
+- Fix NOT_GIVEN check in anthropic (#5058) by @sl0thentr0py
+- ci: 🤖 Update test matrix with new releases (11/03) (#5054) by @github-actions
+- Add external_propagation_context support (#5051) by @sl0thentr0py
+- chore: Remove `enable_metrics` option (#5046) by @alexander-alderman-webb
+- Allow new integration setup on the instance with config options (#5047) by @sl0thentr0py
+- ci: Run integration tests on Python 3.14t (#4995) by @alexander-alderman-webb
+- docs: Elaborate on Strawberry autodetection in changelog (#5039) by @sentrivana
+
 ## 2.43.0
 
 ### Various fixes & improvements
diff --git a/docs/conf.py b/docs/conf.py
@@ -31,7 +31,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "2.43.0"
+release = "2.44.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/requirements-linting.txt b/requirements-linting.txt
@@ -7,7 +7,7 @@ types-greenlet
 types-redis
 types-setuptools
 types-webob
-opentelemetry-distro
+opentelemetry-distro[otlp]
 pymongo # There is no separate types module.
 loguru # There is no separate types module.
 pre-commit # local linting
diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py
@@ -103,6 +103,7 @@
                 "Werkzeug<2.1.0",
             ],
             "<3.1": ["pytest-django<4.0"],
+            "py3.14,py3.14t": ["coverage==7.11.0"],
         },
     },
     "dramatiq": {
diff --git a/scripts/populate_tox/package_dependencies.jsonl b/scripts/populate_tox/package_dependencies.jsonl
diff --git a/scripts/populate_tox/populate_tox.py b/scripts/populate_tox/populate_tox.py
@@ -68,6 +68,7 @@
     "gcp",
     "gevent",
     "opentelemetry",
+    "otlp",
     "potel",
 }
 
diff --git a/scripts/populate_tox/releases.jsonl b/scripts/populate_tox/releases.jsonl
diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja
@@ -43,6 +43,9 @@ envlist =
     # OpenTelemetry (OTel)
     {py3.7,py3.9,py3.12,py3.13,py3.14,py3.14t}-opentelemetry
 
+    # OpenTelemetry with OTLP
+    {py3.7,py3.9,py3.12,py3.13,py3.14}-otlp
+
     # OpenTelemetry Experimental (POTel)
     {py3.8,py3.9,py3.10,py3.11,py3.12,py3.13}-potel
 
@@ -113,6 +116,9 @@ deps =
     # OpenTelemetry (OTel)
     opentelemetry: opentelemetry-distro
 
+    # OpenTelemetry with OTLP
+    otlp: opentelemetry-distro[otlp]
+
     # OpenTelemetry Experimental (POTel)
     potel: -e .[opentelemetry-experimental]
 
@@ -158,6 +164,7 @@ setenv =
     cloud_resource_context: TESTPATH=tests/integrations/cloud_resource_context
     gcp: TESTPATH=tests/integrations/gcp
     opentelemetry: TESTPATH=tests/integrations/opentelemetry
+    otlp: TESTPATH=tests/integrations/otlp
     potel: TESTPATH=tests/integrations/opentelemetry
     socket: TESTPATH=tests/integrations/socket
 
diff --git a/scripts/split_tox_gh_actions/split_tox_gh_actions.py b/scripts/split_tox_gh_actions/split_tox_gh_actions.py
@@ -150,6 +150,7 @@
     "Misc": [
         "loguru",
         "opentelemetry",
+        "otlp",
         "potel",
         "pure_eval",
         "trytond",
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
@@ -21,6 +21,7 @@ class EndpointType(Enum):
     """
 
     ENVELOPE = "envelope"
+    OTLP_TRACES = "integration/otlp/v1/traces"
 
 
 class CompressionAlgo(Enum):
@@ -1441,4 +1442,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "2.43.0"
+VERSION = "2.44.0"
diff --git a/sentry_sdk/integrations/openai.py b/sentry_sdk/integrations/openai.py
@@ -243,7 +243,11 @@ def _set_output_data(span, response, kwargs, integration, finish_span=True):
 
     if hasattr(response, "choices"):
         if should_send_default_pii() and integration.include_prompts:
-            response_text = [choice.message.model_dump() for choice in response.choices]
+            response_text = [
+                choice.message.model_dump()
+                for choice in response.choices
+                if choice.message is not None
+            ]
             if len(response_text) > 0:
                 set_data_normalized(span, SPANDATA.GEN_AI_RESPONSE_TEXT, response_text)
 
diff --git a/sentry_sdk/integrations/otlp.py b/sentry_sdk/integrations/otlp.py
@@ -0,0 +1,82 @@
+from sentry_sdk.integrations import Integration, DidNotEnable
+from sentry_sdk.scope import register_external_propagation_context
+from sentry_sdk.utils import logger, Dsn
+from sentry_sdk.consts import VERSION, EndpointType
+
+try:
+    from opentelemetry import trace
+    from opentelemetry.propagate import set_global_textmap
+    from opentelemetry.sdk.trace import TracerProvider
+    from opentelemetry.sdk.trace.export import BatchSpanProcessor
+    from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
+
+    from sentry_sdk.integrations.opentelemetry.propagator import SentryPropagator
+except ImportError:
+    raise DidNotEnable("opentelemetry-distro[otlp] is not installed")
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from typing import Optional, Dict, Any, Tuple
+
+
+def otel_propagation_context():
+    # type: () -> Optional[Tuple[str, str]]
+    """
+    Get the (trace_id, span_id) from opentelemetry if exists.
+    """
+    ctx = trace.get_current_span().get_span_context()
+
+    if ctx.trace_id == trace.INVALID_TRACE_ID or ctx.span_id == trace.INVALID_SPAN_ID:
+        return None
+
+    return (trace.format_trace_id(ctx.trace_id), trace.format_span_id(ctx.span_id))
+
+
+def setup_otlp_exporter(dsn=None):
+    # type: (Optional[str]) -> None
+    tracer_provider = trace.get_tracer_provider()
+
+    if not isinstance(tracer_provider, TracerProvider):
+        logger.debug("[OTLP] No TracerProvider configured by user, creating a new one")
+        tracer_provider = TracerProvider()
+        trace.set_tracer_provider(tracer_provider)
+
+    endpoint = None
+    headers = None
+    if dsn:
+        auth = Dsn(dsn).to_auth(f"sentry.python/{VERSION}")
+        endpoint = auth.get_api_url(EndpointType.OTLP_TRACES)
+        headers = {"X-Sentry-Auth": auth.to_header()}
+        logger.debug(f"[OTLP] Sending traces to {endpoint}")
+
+    otlp_exporter = OTLPSpanExporter(endpoint=endpoint, headers=headers)
+    span_processor = BatchSpanProcessor(otlp_exporter)
+    tracer_provider.add_span_processor(span_processor)
+
+
+class OTLPIntegration(Integration):
+    identifier = "otlp"
+
+    def __init__(self, setup_otlp_exporter=True, setup_propagator=True):
+        # type: (bool, bool) -> None
+        self.setup_otlp_exporter = setup_otlp_exporter
+        self.setup_propagator = setup_propagator
+
+    @staticmethod
+    def setup_once():
+        # type: () -> None
+        logger.debug("[OTLP] Setting up trace linking for all events")
+        register_external_propagation_context(otel_propagation_context)
+
+    def setup_once_with_options(self, options=None):
+        # type: (Optional[Dict[str, Any]]) -> None
+        if self.setup_otlp_exporter:
+            logger.debug("[OTLP] Setting up OTLP exporter")
+            dsn = options.get("dsn") if options else None  # type: Optional[str]
+            setup_otlp_exporter(dsn)
+
+        if self.setup_propagator:
+            logger.debug("[OTLP] Setting up propagator for distributed tracing")
+            # TODO-neel better propagator support, chain with existing ones if possible instead of replacing
+            set_global_textmap(SentryPropagator())
diff --git a/sentry_sdk/integrations/pydantic_ai/patches/tools.py b/sentry_sdk/integrations/pydantic_ai/patches/tools.py
@@ -40,8 +40,8 @@ def _patch_tool_execution():
     original_call_tool = ToolManager._call_tool
 
     @wraps(original_call_tool)
-    async def wrapped_call_tool(self, call, allow_partial, wrap_validation_errors):
-        # type: (Any, Any, bool, bool) -> Any
+    async def wrapped_call_tool(self, call, *args, **kwargs):
+        # type: (Any, Any, *Any, **Any) -> Any
 
         # Extract tool info before calling original
         name = call.tool_name
@@ -72,7 +72,7 @@ async def wrapped_call_tool(self, call, allow_partial, wrap_validation_errors):
                 ) as span:
                     try:
                         result = await original_call_tool(
-                            self, call, allow_partial, wrap_validation_errors
+                            self, call, wrap_validation_errors
                         )
                         update_execute_tool_span(span, result)
                         return result
@@ -81,8 +81,6 @@ async def wrapped_call_tool(self, call, allow_partial, wrap_validation_errors):
                         raise exc from None
 
         # No span context - just call original
-        return await original_call_tool(
-            self, call, allow_partial, wrap_validation_errors
-        )
+        return await original_call_tool(self, call, *args, **kwargs)
 
     ToolManager._call_tool = wrapped_call_tool
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
@@ -1760,6 +1760,12 @@ def _normalize_module_name(name):
     return name.lower()
 
 
+def _replace_hyphens_dots_and_underscores_with_dashes(name):
+    # type: (str) -> str
+    # https://peps.python.org/pep-0503/#normalized-names
+    return re.sub(r"[-_.]+", "-", name)
+
+
 def _get_installed_modules():
     # type: () -> Dict[str, str]
     global _installed_modules
@@ -1770,8 +1776,15 @@ def _get_installed_modules():
 
 def package_version(package):
     # type: (str) -> Optional[Tuple[int, ...]]
-    installed_packages = _get_installed_modules()
-    version = installed_packages.get(package)
+    normalized_package = _normalize_module_name(
+        _replace_hyphens_dots_and_underscores_with_dashes(package)
+    )
+
+    installed_packages = {
+        _replace_hyphens_dots_and_underscores_with_dashes(module): v
+        for module, v in _get_installed_modules().items()
+    }
+    version = installed_packages.get(normalized_package)
     if version is None:
         return None
 
diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="2.43.0",
+    version="2.44.0",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",
@@ -73,6 +73,7 @@ def get_file_text(file_name):
         "openfeature": ["openfeature-sdk>=0.7.1"],
         "opentelemetry": ["opentelemetry-distro>=0.35b0"],
         "opentelemetry-experimental": ["opentelemetry-distro"],
+        "opentelemetry-otlp": ["opentelemetry-distro[otlp]>=0.35b0"],
         "pure-eval": ["pure_eval", "executing", "asttokens"],
         "pydantic_ai": ["pydantic-ai>=1.0.0"],
         "pymongo": ["pymongo>=3.1"],
diff --git a/tests/integrations/otlp/__init__.py b/tests/integrations/otlp/__init__.py
@@ -0,0 +1,3 @@
+import pytest
+
+pytest.importorskip("opentelemetry")
diff --git a/tests/integrations/otlp/test_otlp.py b/tests/integrations/otlp/test_otlp.py
diff --git a/tests/profiler/test_transaction_profiler.py b/tests/profiler/test_transaction_profiler.py
diff --git a/tests/tracing/test_decorator.py b/tests/tracing/test_decorator.py
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@`
`68`	`68`	`"gcp",`
`69`	`69`	`"gevent",`
`70`	`70`	`"opentelemetry",`
	`71`	`+ "otlp",`
`71`	`72`	`"potel",`
`72`	`73`	`}`
`73`	`74`