Merge branch 'potel-base' into antonpirker/potel/pymongo

Author: antonpirker

sentry_sdk/integrations/opentelemetry/integration.py

@@ -5,6 +5,7 @@
 """
 
 from sentry_sdk.integrations import DidNotEnable, Integration
+from sentry_sdk.integrations.opentelemetry.scope import setup_initial_scopes
 from sentry_sdk.integrations.opentelemetry.propagator import SentryPropagator
 from sentry_sdk.integrations.opentelemetry.span_processor import (
     SentrySpanProcessor,
@@ -74,6 +75,7 @@ def _setup_scope_context_management():
     import opentelemetry.context
 
     opentelemetry.context._RUNTIME_CONTEXT = SentryContextVarsRuntimeContext()
+    setup_initial_scopes()
 
 
 def _setup_sentry_tracing():

sentry_sdk/integrations/opentelemetry/propagator.py

@@ -99,7 +99,7 @@ def inject(self, carrier, context=None, setter=default_setter):
 
             # TODO-neel-potel check trace_propagation_targets
             # TODO-neel-potel test propagator works with twp
-            for (key, value) in current_scope.iter_trace_propagation_headers():
+            for key, value in current_scope.iter_trace_propagation_headers():
                 setter.set(carrier, key, value)
 
     @property

sentry_sdk/integrations/opentelemetry/sampler.py

@@ -17,7 +17,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Optional, Sequence, Union
+    from typing import Any, Optional, Sequence, Union
     from opentelemetry.context import Context
     from opentelemetry.trace import Link, SpanKind
     from opentelemetry.trace.span import SpanContext
@@ -152,15 +152,9 @@ def should_sample(
         has_traces_sampler = callable(client.options.get("traces_sampler"))
 
         if is_root_span and has_traces_sampler:
-            sampling_context = {
-                "transaction_context": {
-                    "name": name,
-                    "op": attributes.get(SentrySpanAttribute.OP),
-                    "source": attributes.get(SentrySpanAttribute.SOURCE),
-                },
-                "parent_sampled": get_parent_sampled(parent_span_context, trace_id),
-            }
-            sampling_context.update(attributes)
+            sampling_context = create_sampling_context(
+                name, attributes, parent_span_context, trace_id
+            )
             sample_rate = client.options["traces_sampler"](sampling_context)
         else:
             # Check if there is a parent with a sampling decision
@@ -193,3 +187,19 @@ def should_sample(
 
     def get_description(self) -> str:
         return self.__class__.__name__
+
+
+def create_sampling_context(name, attributes, parent_span_context, trace_id):
+    # type: (str, Attributes, SpanContext, str) -> dict[str, Any]
+    sampling_context = {
+        "transaction_context": {
+            "name": name,
+            "op": attributes.get(SentrySpanAttribute.OP),
+            "source": attributes.get(SentrySpanAttribute.SOURCE),
+        },
+        "parent_sampled": get_parent_sampled(parent_span_context, trace_id),
+    }
+
+    sampling_context.update(attributes)
+
+    return sampling_context

sentry_sdk/integrations/opentelemetry/scope.py

@@ -1,7 +1,14 @@
 from typing import cast
 from contextlib import contextmanager
 
-from opentelemetry.context import get_value, set_value, attach, detach, get_current
+from opentelemetry.context import (
+    Context,
+    get_value,
+    set_value,
+    attach,
+    detach,
+    get_current,
+)
 from opentelemetry.trace import (
     SpanContext,
     NonRecordingSpan,
@@ -136,13 +143,13 @@ def start_span(self, **kwargs):
 _INITIAL_ISOLATION_SCOPE = None
 
 
-def _setup_initial_scopes():
+def setup_initial_scopes():
     global _INITIAL_CURRENT_SCOPE, _INITIAL_ISOLATION_SCOPE
     _INITIAL_CURRENT_SCOPE = PotelScope(ty=ScopeType.CURRENT)
     _INITIAL_ISOLATION_SCOPE = PotelScope(ty=ScopeType.ISOLATION)
 
-
-_setup_initial_scopes()
+    scopes = (_INITIAL_CURRENT_SCOPE, _INITIAL_ISOLATION_SCOPE)
+    attach(set_value(SENTRY_SCOPES_KEY, scopes))
 
 
 @contextmanager

sentry_sdk/integrations/opentelemetry/span_processor.py

@@ -20,6 +20,7 @@
     get_profiler_id,
 )
 from sentry_sdk.profiler.transaction_profiler import Profile
+from sentry_sdk.integrations.opentelemetry.sampler import create_sampling_context
 from sentry_sdk.integrations.opentelemetry.utils import (
     is_sentry_span,
     convert_from_otel_timestamp,
@@ -126,8 +127,10 @@ def _start_profile(self, span):
             # unix timestamp that is on span.start_time
             # setting it to 0 means the profiler will internally measure time on start
             profile = Profile(sampled, 0)
-            # TODO-neel-potel sampling context??
-            profile._set_initial_sampling_decision(sampling_context={})
+            sampling_context = create_sampling_context(
+                span.name, span.attributes, span.parent, span.context.trace_id
+            )
+            profile._set_initial_sampling_decision(sampling_context)
             profile.__enter__()
             set_sentry_meta(span, "profile", profile)
 

sentry_sdk/tracing_utils.py

@@ -33,7 +33,6 @@
     from typing import Generator
     from typing import Optional
     from typing import Union
-
     from types import FrameType
 
 
@@ -731,6 +730,3 @@ def get_current_span(scope=None):
     LOW_QUALITY_TRANSACTION_SOURCES,
     SENTRY_TRACE_HEADER_NAME,
 )
-
-if TYPE_CHECKING:
-    from sentry_sdk.tracing import Span

tests/conftest.py

@@ -74,7 +74,7 @@ def clean_scopes():
     scope._isolation_scope.set(None)
     scope._current_scope.set(None)
 
-    potel_scope._setup_initial_scopes()
+    potel_scope.setup_initial_scopes()
 
 
 @pytest.fixture(autouse=True)

tests/integrations/clickhouse_driver/test_clickhouse_driver.py

@@ -1,7 +1,7 @@
 """
 Tests need a local clickhouse instance running, this can best be done using
 ```sh
-docker run -d -p 18123:8123 -p9000:9000 --name clickhouse-test --ulimit nofile=262144:262144 --rm clickhouse/clickhouse-server
+docker run -d -p 18123:8123 -p9000:9000 --name clickhouse-test --ulimit nofile=262144:262144 --rm clickhouse
 ```
 """
 

tests/integrations/stdlib/test_subprocess.py

@@ -7,7 +7,7 @@
 
 import pytest
 
-from sentry_sdk import capture_exception, capture_message, start_transaction
+from sentry_sdk import capture_exception, capture_message, start_span
 from sentry_sdk.integrations.stdlib import StdlibIntegration
 from tests.conftest import ApproxDict
 
@@ -59,7 +59,7 @@ def test_subprocess_basic(
     sentry_init(integrations=[StdlibIntegration()], traces_sample_rate=1.0)
     events = capture_events()
 
-    with start_transaction(name="foo") as transaction:
+    with start_span(name="foo") as span:
         args = [
             sys.executable,
             "-c",
@@ -110,7 +110,7 @@ def test_subprocess_basic(
 
     assert os.environ == old_environ
 
-    assert transaction.trace_id in str(output)
+    assert span.trace_id in str(output)
 
     capture_message("hi")
 
@@ -178,7 +178,7 @@ def test_subprocess_basic(
 def test_subprocess_empty_env(sentry_init, monkeypatch):
     monkeypatch.setenv("TEST_MARKER", "should_not_be_seen")
     sentry_init(integrations=[StdlibIntegration()], traces_sample_rate=1.0)
-    with start_transaction(name="foo"):
+    with start_span(name="foo"):
         args = [
             sys.executable,
             "-c",
@@ -201,7 +201,7 @@ def test_subprocess_span_origin(sentry_init, capture_events):
     sentry_init(integrations=[StdlibIntegration()], traces_sample_rate=1.0)
     events = capture_events()
 
-    with start_transaction(name="foo"):
+    with start_span(name="foo"):
         args = [
             sys.executable,
             "-c",

tests/tracing/test_sampling.py

@@ -307,3 +307,24 @@ def test_records_lost_event_only_if_traces_sampler_enabled(
 
     # Use Counter because order of calls does not matter
     assert Counter(record_lost_event_calls) == Counter(expected_record_lost_event_calls)
+
+
+@pytest.mark.parametrize("parent_sampling_decision", [True, False])
+def test_profiles_sampler_gets_sampling_context(sentry_init, parent_sampling_decision):
+    def dummy_profiles_sampler(sampling_context):
+        assert sampling_context["transaction_context"] == {
+            "name": "dogpark",
+            "op": "op",
+            "source": "custom",
+        }
+        assert sampling_context["parent_sampled"] == parent_sampling_decision
+        return 1.0
+
+    sentry_init(traces_sample_rate=1.0, profiles_sampler=dummy_profiles_sampler)
+
+    sentry_trace = "12312012123120121231201212312012-1121201211212012-{}".format(
+        int(parent_sampling_decision)
+    )
+    with sentry_sdk.continue_trace({"sentry-trace": sentry_trace}):
+        with sentry_sdk.start_span(name="dogpark", op="op"):
+            pass