Merge pull request #22 from allenisalai/fix-datadog-tracer-reset

Remove manual rate limiting  and fix GlobalTracer reset

src/Profiler/DatadogProfiler.php

@@ -22,17 +22,9 @@ class DatadogProfiler implements ProfilerInterface
 
     private LoggerInterface $logger;
 
-    private float $sampleRate = 1.0;
-
     public function __construct(LoggerInterface $logger)
     {
         $this->logger = $logger;
-
-        $sampleRateString = getenv('DD_TRACE_SAMPLE_RATE');
-        if (is_numeric($sampleRateString)) {
-            $sampleRate = (float) $sampleRateString;
-            $this->sampleRate = $sampleRate;
-        }
     }
 
     public function start(string $name, ?string $kind = null): void
@@ -41,10 +33,6 @@ public function start(string $name, ?string $kind = null): void
             return;
         }
 
-        if ($this->rateLimited()) {
-            return;
-        }
-
         if (dd_trace_env_config('DD_TRACE_GENERATE_ROOT_SPAN')) {
             $this->logger->error(
                 sprintf('You should set DD_TRACE_GENERATE_ROOT_SPAN=0 when using %s.', self::class)
@@ -98,14 +86,13 @@ public function stopAndIgnore(): void
             return;
         }
 
-        GlobalTracer::set(new Tracer());
-    }
+        $this->scope = null;
 
-    private function rateLimited(): bool
-    {
-        $randomFloat = mt_rand() / mt_getrandmax(); // between 0 and 1
+        // https://github.com/DataDog/dd-trace-php/issues/1533#issuecomment-1059211743
+        ini_set('datadog.trace.enabled', '0');
+        ini_set('datadog.trace.enabled', '1');
 
-        return $randomFloat > $this->sampleRate;
+        GlobalTracer::set(new Tracer());
     }
 
     private function isEnabled(): bool