Move process tags assign

Signed-off-by: Bob Weinand <[email protected]>

Author: bwoebi

ext/serializer.c

@@ -22,6 +22,8 @@
 #include <SAPI.h>
 #include <exceptions/exceptions.h>
 #include <json/json.h>
+
+#include "process_tags.h"
 #ifndef _WIN32
 #include <stdatomic.h>
 #else
@@ -1544,6 +1546,7 @@ void transfer_metrics_data(ddog_SpanBytes *source, ddog_SpanBytes *destination,
 }
 
 ddog_SpanBytes *ddtrace_serialize_span_to_rust_span(ddtrace_span_data *span, ddog_TraceBytes *trace) {
+    bool is_first_span = ddog_get_trace_size(trace) == 0;
     ddog_SpanBytes *rust_span = ddog_trace_new_span(trace);
 
     bool is_root_span = span->std.ce == ddtrace_ce_root_span_data;
@@ -1608,6 +1611,13 @@ ddog_SpanBytes *ddtrace_serialize_span_to_rust_span(ddtrace_span_data *span, ddo
         zend_hash_str_del(metrics, ZEND_STRL("http.status_code"));
     }
 
+    if (is_first_span) {
+        zend_string *process_tags = ddtrace_process_tags_get_serialized();
+        if (process_tags) {
+            ddog_add_str_span_meta_zstr(rust_span, "_dd.process_tags", process_tags);
+        }
+    }
+
     // SpanData::$name defaults to fully qualified called name (set at span close)
     zval *operation_name = zend_hash_str_find(meta, ZEND_STRL("operation.name"));
     zval *prop_name = &span->property_name;

ext/span.c

@@ -25,7 +25,6 @@
 #include "standalone_limiter.h"
 #include "code_origins.h"
 #include "endpoint_guessing.h"
-#include "process_tags.h"
 
 #define USE_REALTIME_CLOCK 0
 #define USE_MONOTONIC_CLOCK 1
@@ -1114,14 +1113,7 @@ void ddtrace_serialize_closed_spans(ddog_TracesBytes *traces, bool fast_shutdown
                 do {
                     ddtrace_span_data *tmp = span;
                     span = tmp->next;
-                    bool is_first_span = (ddog_get_trace_size(trace) == 0);
-                    ddog_SpanBytes *rust_span = ddtrace_serialize_span_to_rust_span(tmp, trace);
-                    if (is_first_span) {
-                        zend_string *process_tags = ddtrace_process_tags_get_serialized();
-                        if (process_tags) {
-                            ddog_add_str_span_meta_zstr(rust_span, "_dd.process_tags", process_tags);
-                        }
-                    }
+                    ddtrace_serialize_span_to_rust_span(tmp, trace);
 #if PHP_VERSION_ID < 70400
                     // remove the artificially increased RC while closing again
                     GC_SET_REFCOUNT(&tmp->std, GC_REFCOUNT(&tmp->std) - DD_RC_CLOSED_MARKER);