gitcommit90
diff --git a/‎sentry_sdk/client.py‎
Lines changed: 8 additions & 0 deletions b/‎sentry_sdk/client.py‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎sentry_sdk/consts.py‎
Lines changed: 1 addition & 1 deletion b/‎sentry_sdk/consts.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎sentry_sdk/integrations/profiling.py‎
Lines changed: 0 additions & 14 deletions b/‎sentry_sdk/integrations/profiling.py‎
Lines changed: 0 additions & 14 deletions
diff --git a/‎sentry_sdk/profiler.py‎
Lines changed: 28 additions & 9 deletions b/‎sentry_sdk/profiler.py‎
Lines changed: 28 additions & 9 deletions
diff --git a/‎tests/integrations/wsgi/test_wsgi.py‎
Lines changed: 18 additions & 30 deletions b/‎tests/integrations/wsgi/test_wsgi.py‎
Lines changed: 18 additions & 30 deletions
@@ -22,6 +22,7 @@
 from sentry_sdk.utils import ContextVar
 from sentry_sdk.sessions import SessionFlusher
 from sentry_sdk.envelope import Envelope
+from sentry_sdk.profiler import setup_profiler
 from sentry_sdk.tracing_utils import has_tracestate_enabled, reinflate_tracestate
 
 from sentry_sdk._types import MYPY
@@ -130,6 +131,13 @@ def _capture_envelope(envelope):
         finally:
             _client_init_debug.set(old_debug)
 
+        profiles_sample_rate = self.options["_experiments"].get("profiles_sample_rate")
+        if profiles_sample_rate is not None and profiles_sample_rate > 0:
+            try:
+                setup_profiler()
+            except ValueError:
+                logger.debug("Profiling can only be enabled from the main thread.")
+
     @property
     def dsn(self):
         # type: () -> Optional[str]
 
@@ -34,7 +34,7 @@
             "smart_transaction_trimming": Optional[bool],
             "propagate_tracestate": Optional[bool],
             "custom_measurements": Optional[bool],
-            "enable_profiling": Optional[bool],
+            "profiles_sample_rate": Optional[float],
         },
         total=False,
     )
 
@@ -14,6 +14,7 @@
 
 import atexit
 import platform
+import random
 import signal
 import threading
 import time
@@ -63,7 +64,7 @@ def nanosecond_time():
 _scheduler = None  # type: Optional[_Scheduler]
 
 
-def _setup_profiler(buffer_secs=60, frequency=101):
+def setup_profiler(buffer_secs=60, frequency=101):
     # type: (int, int) -> None
 
     """
@@ -90,17 +91,15 @@ def _setup_profiler(buffer_secs=60, frequency=101):
     # This setups a process wide signal handler that will be called
     # at an interval to record samples.
     signal.signal(signal.SIGPROF, _sample_stack)
-    atexit.register(_teardown_profiler)
+    atexit.register(teardown_profiler)
 
 
-def _teardown_profiler():
+def teardown_profiler():
     # type: () -> None
 
     global _sample_buffer
     global _scheduler
 
-    assert _sample_buffer is not None and _scheduler is not None
-
     _sample_buffer = None
     _scheduler = None
 
@@ -328,17 +327,37 @@ def stop_profiling(self):
         return should_stop_timer
 
 
-def _has_profiling_enabled():
-    # type: () -> bool
-    return _sample_buffer is not None and _scheduler is not None
+def _should_profile(hub):
+    # type: (Optional[sentry_sdk.Hub]) -> bool
+
+    # The profiler hasn't been properly initialized.
+    if _sample_buffer is None or _scheduler is None:
+        return False
+
+    hub = hub or sentry_sdk.Hub.current
+    client = hub.client
+
+    # The client is None, so we can't get the sample rate.
+    if client is None:
+        return False
+
+    options = client.options
+    profiles_sample_rate = options["_experiments"].get("profiles_sample_rate")
+
+    # The profiles_sample_rate option was not set, so profiling
+    # was never enabled.
+    if profiles_sample_rate is None:
+        return False
+
+    return random.random() < float(profiles_sample_rate)
 
 
 @contextmanager
 def start_profiling(transaction, hub=None):
     # type: (sentry_sdk.tracing.Transaction, Optional[sentry_sdk.Hub]) -> Generator[None, None, None]
 
     # if profiling was not enabled, this should be a noop
-    if _has_profiling_enabled():
+    if _should_profile(hub):
         with Profile(transaction, hub=hub):
             yield
     else:
 
@@ -1,10 +1,10 @@
 from werkzeug.test import Client
+
 import pytest
 
 import sentry_sdk
-from sentry_sdk.integrations.profiling import ProfilingIntegration
 from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
-from sentry_sdk.profiler import _teardown_profiler
+from sentry_sdk.profiler import teardown_profiler
 from collections import Counter
 
 try:
@@ -22,9 +22,9 @@ def app(environ, start_response):
 
 
 @pytest.fixture
-def profiling_integration():
-    yield ProfilingIntegration()
-    _teardown_profiler()
+def profiling():
+    yield
+    teardown_profiler()
 
 
 class IterableApp(object):
@@ -289,43 +289,31 @@ def sample_app(environ, start_response):
     assert len(session_aggregates) == 1
 
 
+@pytest.mark.parametrize(
+    "profiles_sample_rate,should_send",
+    [(1.0, True), (0.75, True), (0.25, False), (None, False)],
+)
 def test_profile_sent_when_profiling_enabled(
-    capture_envelopes, sentry_init, profiling_integration
+    capture_envelopes, sentry_init, profiling, profiles_sample_rate, should_send
 ):
     def test_app(environ, start_response):
         start_response("200 OK", [])
         return ["Go get the ball! Good dog!"]
 
-    sentry_init(traces_sample_rate=1.0, integrations=[profiling_integration])
-    app = SentryWsgiMiddleware(test_app)
-    envelopes = capture_envelopes()
-
-    client = Client(app)
-    client.get("/")
-
-    profile_sent = False
-    for item in envelopes[0].items:
-        if item.headers["type"] == "profile":
-            profile_sent = True
-            break
-    assert profile_sent
-
-
-def test_profile_not_sent_when_profiling_disabled(capture_envelopes, sentry_init):
-    def test_app(environ, start_response):
-        start_response("200 OK", [])
-        return ["Go get the ball! Good dog!"]
-
-    sentry_init(traces_sample_rate=1.0)
+    sentry_init(
+        traces_sample_rate=1.0,
+        _experiments={"profiles_sample_rate": profiles_sample_rate},
+    )
     app = SentryWsgiMiddleware(test_app)
     envelopes = capture_envelopes()
 
-    client = Client(app)
-    client.get("/")
+    with mock.patch("sentry_sdk.profiler.random.random", return_value=0.5):
+        client = Client(app)
+        client.get("/")
 
     profile_sent = False
     for item in envelopes[0].items:
         if item.headers["type"] == "profile":
             profile_sent = True
             break
-    assert not profile_sent
+    assert profile_sent == should_send
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`"smart_transaction_trimming": Optional[bool],`
`35`	`35`	`"propagate_tracestate": Optional[bool],`
`36`	`36`	`"custom_measurements": Optional[bool],`
`37`		`- "enable_profiling": Optional[bool],`
	`37`	`+ "profiles_sample_rate": Optional[float],`
`38`	`38`	`},`
`39`	`39`	`total=False,`
`40`	`40`	`)`