test: Add sample failing test

Author: PROFeNoM

ext/ddtrace.stub.php

@@ -121,9 +121,9 @@ class SpanData {
         public array $peerServiceSources = [];
 
         /**
-         * @var \Closure|null $endCallback A callback to be called when the span is finished, if any.
+         * @var \Closure|string|null $endCallback A callback to be called when the span is finished, if any.
          */
-        public \Closure|null $endCallback = null;
+        public \Closure|string|null $endCallback = null;
 
         /**
          * @var SpanData|null The parent span, or 'null' if there is none

ext/ddtrace_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 55972d231789add1cf24ac96d74b532cd7f112f5 */
+ * Stub hash: e001e68def98ce39cf3f6a11337dc109cca4868f */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_DDTrace_trace_method, 0, 3, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, className, IS_STRING, 0)
@@ -573,7 +573,7 @@ static zend_class_entry *register_class_DDTrace_SpanData(void)
 	ZVAL_NULL(&property_endCallback_default_value);
 	zend_string *property_endCallback_name = zend_string_init("endCallback", sizeof("endCallback") - 1, 1);
 	zend_string *property_endCallback_class_Closure = zend_string_init("Closure", sizeof("Closure")-1, 1);
-	zend_declare_typed_property(class_entry, property_endCallback_name, &property_endCallback_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_CLASS(property_endCallback_class_Closure, 0, MAY_BE_NULL));
+	zend_declare_typed_property(class_entry, property_endCallback_name, &property_endCallback_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_CLASS(property_endCallback_class_Closure, 0, MAY_BE_STRING|MAY_BE_NULL));
 	zend_string_release(property_endCallback_name);
 
 	zval property_parent_default_value;

ext/span.c

@@ -410,29 +410,47 @@ bool ddtrace_span_alter_root_span_config(zval *old_value, zval *new_value) {
     }
 }
 
-void dd_trace_stop_span_time(ddtrace_span_data *span) {
+bool execute_span_end_callback(ddtrace_span_data *span) {
     zval *end_closure_zv = &span->property_end_closure;
 
-    if (end_closure_zv
-        && Z_TYPE_P(end_closure_zv) == IS_OBJECT
-        && Z_OBJCE_P(end_closure_zv) == zend_ce_closure) {
-        zval rv;
-        zval span_zv;
-        ZVAL_OBJ(&span_zv, &span->std);
-        bool success = zai_symbol_call(
-                ZAI_SYMBOL_SCOPE_GLOBAL,
-                NULL,
-                ZAI_SYMBOL_FUNCTION_CLOSURE,
-                end_closure_zv,
-                &rv,
-                1,
-                &span_zv
-        );
+    if (end_closure_zv && !ZVAL_IS_NULL(end_closure_zv)) {
+        uint8_t type = Z_TYPE_P(end_closure_zv);
+        bool success = false;
+
+        if (type == IS_OBJECT && Z_OBJCE_P(end_closure_zv) == zend_ce_closure) {
+            zval rv;
+            zval span_zv;
+            ZVAL_OBJ(&span_zv, &span->std);
+
+            success = zai_symbol_call(
+                    ZAI_SYMBOL_SCOPE_GLOBAL,
+                    NULL,
+                    ZAI_SYMBOL_FUNCTION_CLOSURE,
+                    end_closure_zv,
+                    &rv,
+                    1,
+                    &span_zv
+            );
+
+            zval_ptr_dtor(&rv);
+        } // TODO: string, etc? TBD, else refactor
+
         if (!success) {
-            LOG(Warn, "Unable to call end closure");
+            zend_string *hex_trace_id = ddtrace_trace_id_as_hex_string(span->root->trace_id);
+            zend_string *hex_span_id = ddtrace_span_id_as_hex_string(span->span_id);
+            LOG(Warn, "Error while calling end closure on span %s [dd.trace_id=%s dd.span_id=%s]", Z_STRVAL_P(&span->property_name), ZSTR_VAL(hex_trace_id), ZSTR_VAL(hex_span_id));
+            zend_string_release(hex_trace_id);
+            zend_string_release(hex_span_id);
         }
+
+        return success;
+    } else {
+        return true;
     }
+}
 
+void dd_trace_stop_span_time(ddtrace_span_data *span) {
+    execute_span_end_callback(span);
     span->duration = _get_nanoseconds(USE_MONOTONIC_CLOCK) - span->duration_start;
 }
 

tests/ext/span_callback_static.phpt

@@ -0,0 +1,28 @@
+--TEST--
+End callback using a static method
+--ENV--
+DD_TRACE_DEBUG=1
+--FILE--
+<?php
+
+$counter = 0;
+
+class MyCounter
+{
+    public static function increment()
+    {
+        global $counter;
+        $counter++;
+    }
+}
+
+$closure = Closure::fromCallable('MyCounter::increment');
+
+$span = \DDTrace\start_span();
+$span->endCallback = $closure;
+\DDTrace\close_span();
+
+var_dump($counter);
+
+?>
+--EXPECT--