wip

Author: sl0thentr0py

sentry_sdk/integrations/opentelemetry/potel_span_exporter.py

@@ -1,4 +1,4 @@
-from opentelemetry.trace import Span  # type: ignore
+from opentelemetry.sdk.trace import ReadableSpan  # type: ignore
 
 
 class PotelSentrySpanExporter:
@@ -11,7 +11,7 @@ def __init__(self):
         pass
 
     def export(self, span):
-        # type: (Span) -> None
+        # type: (ReadableSpan) -> None
         pass
 
     def flush(self, timeout_millis):

sentry_sdk/integrations/opentelemetry/potel_span_processor.py

@@ -1,10 +1,12 @@
-from opentelemetry.sdk.trace import SpanProcessor  # type: ignore
+from opentelemetry.trace import INVALID_SPAN, get_current_span  # type: ignore
 from opentelemetry.context import Context  # type: ignore
-from opentelemetry.trace import Span  # type: ignore
+from opentelemetry.sdk.trace import Span, ReadableSpan, SpanProcessor  # type: ignore
 
+from sentry_sdk.integrations.opentelemetry.utils import is_sentry_span
 from sentry_sdk.integrations.opentelemetry.potel_span_exporter import (
     PotelSentrySpanExporter,
 )
+
 from sentry_sdk._types import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -30,9 +32,19 @@ def __init__(self):
     def on_start(self, span, parent_context=None):
         # type: (Span, Optional[Context]) -> None
         pass
+        # if is_sentry_span(span):
+        #     return
+
+        # parent_span = get_current_span(parent_context)
+
+        # # TODO-neel-potel check remote logic with propagation and incoming trace later
+        # if parent_span != INVALID_SPAN:
+        #     # TODO-neel once we add our apis, we might need to store references on the span
+        #     # directly, see if we need to do this like JS
+        #     pass
 
     def on_end(self, span):
-        # type: (Span) -> None
+        # type: (ReadableSpan) -> None
         self._exporter.export(span)
 
     # TODO-neel-potel not sure we need a clear like JS

sentry_sdk/integrations/opentelemetry/span_processor.py

@@ -22,9 +22,9 @@
     SENTRY_BAGGAGE_KEY,
     SENTRY_TRACE_KEY,
 )
+from sentry_sdk.integrations.opentelemetry.utils import is_sentry_span
 from sentry_sdk.scope import add_global_event_processor
 from sentry_sdk.tracing import Transaction, Span as SentrySpan
-from sentry_sdk.utils import Dsn
 from sentry_sdk._types import TYPE_CHECKING
 
 from urllib3.util import parse_url as urlparse
@@ -125,7 +125,7 @@ def on_start(self, otel_span, parent_context=None):
         if not otel_span.get_span_context().is_valid:
             return
 
-        if self._is_sentry_span(otel_span):
+        if is_sentry_span(otel_span):
             return
 
         trace_data = self._get_trace_data(otel_span, parent_context)
@@ -208,28 +208,6 @@ def on_end(self, otel_span):
         self.open_spans.setdefault(span_start_in_minutes, set()).discard(span_id)
         self._prune_old_spans()
 
-    def _is_sentry_span(self, otel_span):
-        # type: (OTelSpan) -> bool
-        """
-        Break infinite loop:
-        HTTP requests to Sentry are caught by OTel and send again to Sentry.
-        """
-        otel_span_url = otel_span.attributes.get(SpanAttributes.HTTP_URL, None)
-
-        dsn_url = None
-        client = get_client()
-
-        if client.dsn:
-            try:
-                dsn_url = Dsn(client.dsn).netloc
-            except Exception:
-                pass
-
-        if otel_span_url and dsn_url in otel_span_url:
-            return True
-
-        return False
-
     def _get_otel_context(self, otel_span):
         # type: (OTelSpan) -> Dict[str, Any]
         """

sentry_sdk/integrations/opentelemetry/utils.py

@@ -0,0 +1,33 @@
+from opentelemetry.semconv.trace import SpanAttributes  # type: ignore
+from opentelemetry.trace import Span  # type: ignore
+
+from sentry_sdk import get_client, start_transaction
+from sentry_sdk.utils import Dsn
+
+def is_sentry_span(span):
+    # type: (Span) -> bool
+    """
+    Break infinite loop:
+    HTTP requests to Sentry are caught by OTel and send again to Sentry.
+    """
+    span_url = span.attributes.get(SpanAttributes.HTTP_URL, None)
+
+    if not span_url:
+        return False
+
+    dsn_url = None
+    client = get_client()
+
+    if client.dsn:
+        try:
+            dsn_url = Dsn(client.dsn).netloc
+        except Exception:
+            pass
+
+    if not dsn_url:
+        return False
+
+    if dsn_url in span_url:
+        return True
+
+    return False