wip

Author: cleptric

src/State/Hub.php

@@ -323,16 +323,7 @@ public function startTransaction(TransactionContext $context, array $customSampl
 
         $transaction->initSpanRecorder();
 
-        $profilesSampleRate = $options->getProfilesSampleRate();
-        if ($profilesSampleRate === null) {
-            $logger->info(\sprintf('Transaction [%s] is not profiling because `profiles_sample_rate` option is not set.', (string) $transaction->getTraceId()));
-        } elseif ($this->sample($profilesSampleRate)) {
-            $logger->info(\sprintf('Transaction [%s] started profiling because it was sampled.', (string) $transaction->getTraceId()));
-
-            $transaction->initProfiler()->start();
-        } else {
-            $logger->info(\sprintf('Transaction [%s] is not profiling because it was not sampled.', (string) $transaction->getTraceId()));
-        }
+        $this->initProfiler($transaction, $options, $logger);
 
         return $transaction;
     }
@@ -423,4 +414,34 @@ private function isValidSampleRate($sampleRate): bool
 
         return true;
     }
+
+    private function initProfiler(Transaction $transaction, $options, $logger): void
+    {
+        $profileSessionSampleRate = $options->getProfilesSessionSampleRate();
+        $profilesLifecycle = $options->getProfilesLifecycle();
+
+        // profileSessionSampleRate takes priority
+        if ($profilesLifecycle === 'trace' && $profileSessionSampleRate !== null) {
+            if ($this->sample($profileSessionSampleRate)) {
+                $logger->info(\sprintf('Transaction [%s] started profiling because it was sampled by profiles_session_sample_rate.', (string) $transaction->getTraceId()));
+                $transaction->initProfiler()->start();
+            } else {
+                $logger->info(\sprintf('Transaction [%s] is not profiling because it was not sampled by profiles_session_sample_rate.', (string) $transaction->getTraceId()));
+            }
+
+            return;
+        }
+
+        // Fall back to profilesSampleRate
+        $profilesSampleRate = $options->getProfilesSampleRate();
+
+        if ($profilesSampleRate === null) {
+            $logger->info(\sprintf('Transaction [%s] is not profiling because `profiles_sample_rate` option is not set.', (string) $transaction->getTraceId()));
+        } elseif ($this->sample($profilesSampleRate)) {
+            $logger->info(\sprintf('Transaction [%s] started profiling because it was sampled.', (string) $transaction->getTraceId()));
+            $transaction->initProfiler()->start();
+        } else {
+            $logger->info(\sprintf('Transaction [%s] is not profiling because it was not sampled.', (string) $transaction->getTraceId()));
+        }
+    }
 }

src/Tracing/Transaction.php

@@ -7,7 +7,7 @@
 use Sentry\Event;
 use Sentry\EventId;
 use Sentry\Profiles\ProfileChunk;
-use Sentry\Profiles\Profiles;
+use Sentry\Profiles\Profiler as ContinuousProfiler;
 use Sentry\Profiling\Profiler;
 use Sentry\SentrySdk;
 use Sentry\State\HubInterface;
@@ -38,7 +38,7 @@ final class Transaction extends Span
     protected $metadata;
 
     /**
-     * @var Profiler|null Reference instance to the {@see Profiler}
+     * @var Profiler|ContinuousProfiler|null Reference instance to the {@see Profiler or @see ContinuousProfiler}
      */
     protected $profiler;
 
@@ -121,19 +121,31 @@ public function initSpanRecorder(int $maxSpans = 1000): self
         return $this;
     }
 
-    public function initProfiler(): Profiler
+    /**
+     * @return Profiler|ContinuousProfiler|null
+     */
+    public function initProfiler()
     {
         if ($this->profiler === null) {
             $client = $this->hub->getClient();
             $options = $client !== null ? $client->getOptions() : null;
 
-            $this->profiler = new Profiler($options);
+            if ($options !== null) {
+                if ($options->getProfilesLifecycle() === 'trace' && $options->getProfilesSessionSampleRate() !== null) {
+                    $this->profiler = new ContinuousProfiler($options);
+                } else {
+                    $this->profiler = new Profiler($options);
+                }
+            }
         }
 
         return $this->profiler;
     }
 
-    public function getProfiler(): ?Profiler
+    /**
+     * @return Profiler|ContinuousProfiler|null
+     */
+    public function getProfiler()
     {
         return $this->profiler;
     }
@@ -185,16 +197,18 @@ public function finish(?float $endTimestamp = null): ?EventId
         $event->setSdkMetadata('dynamic_sampling_context', $this->getDynamicSamplingContext());
         $event->setSdkMetadata('transaction_metadata', $this->getMetadata());
 
-        if ($this->profiler !== null) {
+        // Legacy Profiler
+        if ($this->profiler !== null && $this->profiler instanceof Profiler) {
             $profile = $this->profiler->getProfile();
             if ($profile !== null) {
                 $event->setSdkMetadata('profile', $profile);
             }
         }
 
-        if (Profiles::getInstance()->getProfiler()->getProfilerId() !== null) {
+        // Continuous Profiler
+        if ($this->profiler !== null && $this->profiler instanceof ContinuousProfiler) {
             $event->setContext('profile', [
-                'profiler_id' => Profiles::getInstance()->getProfiler()->getProfilerId(),
+                'profiler_id' => $this->profiler->getProfilerId(),
             ]);
 
             $traceContext = $this->getTraceContext();