Fix fibers with tracer disabled

bwoebi · bwoebi · commit 87effa0bd0c2 · 2024-03-19T12:51:07.000+01:00
Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;
diff --git a/ext/ddtrace.c b/ext/ddtrace.c
@@ -1042,9 +1042,6 @@ static PHP_MINIT_FUNCTION(ddtrace) {
 #if ZAI_JIT_BLACKLIST_ACTIVE
     zai_jit_minit();
 #endif
-#if PHP_VERSION_ID >= 80100
-    ddtrace_setup_fiber_observers();
-#endif
 
 #if PHP_VERSION_ID < 70300 || (defined(_WIN32) && PHP_VERSION_ID >= 80300 && PHP_VERSION_ID < 80400)
     ddtrace_startup_hrtime();
@@ -1096,6 +1093,10 @@ static PHP_MINIT_FUNCTION(ddtrace) {
         return SUCCESS;
     }
 
+#if PHP_VERSION_ID >= 80100
+    ddtrace_setup_fiber_observers();
+#endif
+
 #ifndef _WIN32
     ddtrace_set_coredumpfilter();
 #endif
diff --git a/tests/ext/fibers/fiber_switch_tracer_disabled.phpt b/tests/ext/fibers/fiber_switch_tracer_disabled.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Test executing fibers with tracer fully disabled
+--INI--
+ddtrace.disable=1
+--FILE--
+<?php
+
+function fiber() {
+    Fiber::suspend(1);
+    return 2;
+}
+
+$fiber = new Fiber(fiber(...));
+var_dump($fiber->start());
+$fiber->resume();
+var_dump($fiber->getReturn());
+
+?>
+--EXPECT--
+int(1)
+int(2)
