Use WeakMap for frankenphp closure

bwoebi · bwoebi · commit 4aac38fa0324 · 2024-03-29T15:35:34.000+01:00
Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;
diff --git a/ext/integrations/integrations.c b/ext/integrations/integrations.c
@@ -192,8 +192,10 @@ void ddtrace_integrations_minit(void) {
     DD_SET_UP_DEFERRED_LOADING_BY_METHOD(DDTRACE_INTEGRATION_ELOQUENT, "Illuminate\\Database\\Eloquent\\Model", "destroy",
                                          "DDTrace\\Integrations\\Eloquent\\EloquentIntegration");
 
+#if PHP_VERSION_ID >= 80200
     DD_SET_UP_DEFERRED_LOADING_BY_FUNCTION(DDTRACE_INTEGRATION_FRANKENPHP, "frankenphp_handle_request",
                                           "DDTrace\\Integrations\\Frankenphp\\FrankenphpIntegration");
+#endif
 
     DD_SET_UP_DEFERRED_LOADING_BY_METHOD(DDTRACE_INTEGRATION_GUZZLE, "GuzzleHttp\\Client", "__construct",
                                          "DDTrace\\Integrations\\Guzzle\\GuzzleIntegration");
diff --git a/src/Integrations/Integrations/Frankenphp/FrankenphpIntegration.php b/src/Integrations/Integrations/Frankenphp/FrankenphpIntegration.php
@@ -34,9 +34,16 @@ public function init()
         ini_set("datadog.trace.auto_flush_enabled", 1);
         ini_set("datadog.trace.generate_root_span", 0);
 
-        \DDTrace\install_hook('frankenphp_handle_request', function (HookData $hook) use ($integration) {
-            $hook->data = \DDTrace\install_hook(
-                $hook->args[0],
+        $is_hooked = new \WeakMap();
+        \DDTrace\install_hook('frankenphp_handle_request', function (HookData $hook) use ($integration, $is_hooked) {
+            $handler = $hook->args[0];
+            if (isset($is_hooked[$handler])) {
+                return;
+            }
+            $is_hooked[$handler] = true;
+
+            \DDTrace\install_hook(
+                $handler,
                 function (HookData $hook) use ($integration) {
                     $rootSpan = $hook->span(new SpanStack());
                     $rootSpan->name = "web.request";
@@ -48,10 +55,10 @@ function (HookData $hook) use ($integration) {
                     $integration->addTraceAnalyticsIfEnabled($rootSpan);
 
                     consume_distributed_tracing_headers(null);
-                }
+                },
+                null,
+                \DDTrace\HOOK_INSTANCE
             );
-        }, function (HookData $hook) {
-            \DDTrace\remove_hook($hook->data);
         });
 
         return Integration::LOADED;
