.

Author: alexander-alderman-webb

.github/workflows/flaky-test-detector.yml

@@ -47,6 +47,8 @@ jobs:
     name: Detect flaky tests and open summary issue
     runs-on: ubuntu-latest
     timeout-minutes: 30
+    # ANTHROPIC_API_KEY is not a repo-level secret; it lives in this environment
+    environment: AI Integrations Tests
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/update-tox.yml

@@ -11,7 +11,7 @@ jobs:
     name: Update test matrix
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 20
 
     permissions:
       contents: write

sentry_sdk/api.py

@@ -8,7 +8,8 @@
 from sentry_sdk.consts import INSTRUMENTER
 from sentry_sdk.crons import monitor
 from sentry_sdk.scope import Scope, _ScopeManager, isolation_scope, new_scope
-from sentry_sdk.traces import StreamedSpan, _get_current_streamed_span
+from sentry_sdk.traces import StreamedSpan
+from sentry_sdk.traces import get_current_span as _get_current_streamed_span
 from sentry_sdk.tracing import NoOpSpan, Transaction, trace
 
 if TYPE_CHECKING:

sentry_sdk/feature_flags.py

@@ -65,7 +65,7 @@ def add_feature_flag(flag: str, result: bool) -> None:
     flags.set(flag, result)
 
     if has_span_streaming_enabled(client.options):
-        span = sentry_sdk.traces._get_current_streamed_span()
+        span = sentry_sdk.traces.get_current_span()
         if span and isinstance(span, sentry_sdk.traces.StreamedSpan):
             span.set_attribute(f"flag.evaluation.{flag}", result)
 

sentry_sdk/integrations/celery/__init__.py

@@ -16,7 +16,7 @@
 from sentry_sdk.integrations.celery.utils import _now_seconds_since_epoch
 from sentry_sdk.integrations.logging import ignore_logger
 from sentry_sdk.scope import Scope, should_send_default_pii
-from sentry_sdk.traces import StreamedSpan, _get_current_streamed_span
+from sentry_sdk.traces import StreamedSpan, get_current_span
 from sentry_sdk.tracing import BAGGAGE_HEADER_NAME, Span, TransactionSource
 from sentry_sdk.tracing_utils import Baggage, has_span_streaming_enabled
 from sentry_sdk.utils import (
@@ -286,7 +286,7 @@ def apply_async(*args: "Any", **kwargs: "Any") -> "Any":
 
         span_mgr: "Union[StreamedSpan, Span, NoOpMgr]" = NoOpMgr()
         if span_streaming:
-            if not task_started_from_beat and _get_current_streamed_span() is not None:
+            if not task_started_from_beat and get_current_span() is not None:
                 span_mgr = sentry_sdk.traces.start_span(
                     name=task_name,
                     attributes={
@@ -567,7 +567,7 @@ def sentry_publish(self: "Producer", *args: "Any", **kwargs: "Any") -> "Any":
 
         span: "Union[StreamedSpan, Span, None]" = None
         if span_streaming:
-            if _get_current_streamed_span() is not None:
+            if get_current_span() is not None:
                 span = sentry_sdk.traces.start_span(
                     name=task_name,
                     attributes={

sentry_sdk/integrations/opentelemetry/integration.py

@@ -4,11 +4,18 @@
 removed at any time without prior notice.
 """
 
+import warnings
+from typing import TYPE_CHECKING
+
 from sentry_sdk.integrations import DidNotEnable, Integration
 from sentry_sdk.integrations.opentelemetry.propagator import SentryPropagator
 from sentry_sdk.integrations.opentelemetry.span_processor import SentrySpanProcessor
+from sentry_sdk.tracing_utils import has_span_streaming_enabled
 from sentry_sdk.utils import logger
 
+if TYPE_CHECKING:
+    from typing import Any, Dict, Optional
+
 try:
     from opentelemetry import trace
     from opentelemetry.propagate import set_global_textmap
@@ -34,9 +41,24 @@ class OpenTelemetryIntegration(Integration):
 
     @staticmethod
     def setup_once() -> None:
-        logger.warning(
-            "[OTel] Initializing highly experimental OpenTelemetry support. "
-            "Use at your own risk."
+        pass
+
+    def setup_once_with_options(
+        self, options: "Optional[Dict[str, Any]]" = None
+    ) -> None:
+        if has_span_streaming_enabled(options):
+            logger.warning(
+                "[OTel] OpenTelemetryIntegration is not compatible with span streaming "
+                "(trace_lifecycle='stream') and will be disabled."
+            )
+            return
+
+        warnings.warn(
+            "OpenTelemetryIntegration is deprecated. "
+            "Please use OTLPIntegration instead: "
+            "https://docs.sentry.io/platforms/python/integrations/otlp/",
+            DeprecationWarning,
+            stacklevel=2,
         )
 
         _setup_sentry_tracing()

sentry_sdk/integrations/starlette.py

@@ -22,7 +22,7 @@
 )
 from sentry_sdk.integrations.asgi import SentryAsgiMiddleware
 from sentry_sdk.scope import should_send_default_pii
-from sentry_sdk.traces import StreamedSpan, _get_current_streamed_span
+from sentry_sdk.traces import StreamedSpan, get_current_span
 from sentry_sdk.tracing import (
     SOURCE_FOR_STYLE,
     TransactionSource,
@@ -254,7 +254,7 @@ def _default(value: "Any") -> "Any":
 def _set_request_body_data_on_streaming_segment(
     info: "Optional[Dict[str, Any]]",
 ) -> None:
-    current_span = _get_current_streamed_span()
+    current_span = get_current_span()
     if info and "data" in info and type(current_span) is StreamedSpan:
         with capture_internal_exceptions():
             current_span._segment.set_attribute(

sentry_sdk/traces.py

@@ -827,7 +827,7 @@ def make_db_query(sql):
         return decorator
 
 
-def _get_current_streamed_span(
+def get_current_span(
     scope: "Optional[sentry_sdk.Scope]" = None,
 ) -> "Optional[StreamedSpan]":
     """

tests/integrations/celery/test_celery.py

@@ -8,13 +8,13 @@
 from celery.bin import worker
 
 import sentry_sdk
+import sentry_sdk.traces
 from sentry_sdk import get_current_span, start_transaction
 from sentry_sdk.integrations.celery import (
     CeleryIntegration,
     _wrap_task_run,
 )
 from sentry_sdk.integrations.celery.beat import _get_headers
-from sentry_sdk.traces import _get_current_streamed_span
 from sentry_sdk.utils import SENSITIVE_DATA_SUBSTITUTE
 from tests.conftest import ApproxDict
 
@@ -667,7 +667,7 @@ def test_sentry_propagate_traces_override(span_streaming, init_celery):
     @celery.task(name="dummy_task", bind=True)
     def dummy_task(self, message):
         trace_id = (
-            _get_current_streamed_span().trace_id
+            sentry_sdk.traces.get_current_span().trace_id
             if span_streaming
             else get_current_span().trace_id
         )

tests/integrations/opentelemetry/test_experimental.py

@@ -2,46 +2,56 @@
 
 import pytest
 
+from sentry_sdk.integrations.opentelemetry.integration import OpenTelemetryIntegration
+
 
 @pytest.mark.forked
 def test_integration_enabled_if_option_is_on(sentry_init, reset_integrations):
-    mocked_setup_once = MagicMock()
+    mocked_setup_sentry_tracing = MagicMock()
 
     with patch(
-        "sentry_sdk.integrations.opentelemetry.integration.OpenTelemetryIntegration.setup_once",
-        mocked_setup_once,
+        "sentry_sdk.integrations.opentelemetry.integration._setup_sentry_tracing",
+        mocked_setup_sentry_tracing,
     ):
-        sentry_init(
-            _experiments={
-                "otel_powered_performance": True,
-            },
-        )
-        mocked_setup_once.assert_called_once()
+        with pytest.warns(DeprecationWarning):
+            sentry_init(_experiments={"otel_powered_performance": True})
+        mocked_setup_sentry_tracing.assert_called_once()
 
 
 @pytest.mark.forked
 def test_integration_not_enabled_if_option_is_off(sentry_init, reset_integrations):
-    mocked_setup_once = MagicMock()
+    mocked_setup_sentry_tracing = MagicMock()
 
     with patch(
-        "sentry_sdk.integrations.opentelemetry.integration.OpenTelemetryIntegration.setup_once",
-        mocked_setup_once,
+        "sentry_sdk.integrations.opentelemetry.integration._setup_sentry_tracing",
+        mocked_setup_sentry_tracing,
     ):
-        sentry_init(
-            _experiments={
-                "otel_powered_performance": False,
-            },
-        )
-        mocked_setup_once.assert_not_called()
+        sentry_init(_experiments={"otel_powered_performance": False})
+        mocked_setup_sentry_tracing.assert_not_called()
 
 
 @pytest.mark.forked
 def test_integration_not_enabled_if_option_is_missing(sentry_init, reset_integrations):
-    mocked_setup_once = MagicMock()
+    mocked_setup_sentry_tracing = MagicMock()
 
     with patch(
-        "sentry_sdk.integrations.opentelemetry.integration.OpenTelemetryIntegration.setup_once",
-        mocked_setup_once,
+        "sentry_sdk.integrations.opentelemetry.integration._setup_sentry_tracing",
+        mocked_setup_sentry_tracing,
     ):
         sentry_init()
-        mocked_setup_once.assert_not_called()
+        mocked_setup_sentry_tracing.assert_not_called()
+
+
+@pytest.mark.forked
+def test_integration_disabled_with_span_streaming(sentry_init, reset_integrations):
+    mocked_setup_sentry_tracing = MagicMock()
+
+    with patch(
+        "sentry_sdk.integrations.opentelemetry.integration._setup_sentry_tracing",
+        mocked_setup_sentry_tracing,
+    ):
+        sentry_init(
+            integrations=[OpenTelemetryIntegration()],
+            _experiments={"trace_lifecycle": "stream"},
+        )
+        mocked_setup_sentry_tracing.assert_not_called()