Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Baggage Header Propagation Support #3102

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Baggage Header Propagation Support #3102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0e1466
Initial extracing and injecting simple baggage string
link04 Feb 10, 2025
ef9f82e
Merge branch 'master' into maximo/datadog-baggage
link04 Feb 18, 2025
ac782dd
Finally switching string to hashtable
link04 Feb 20, 2025
b4e33d9
Adding simple tests and adding baggage to default config
link04 Feb 21, 2025
028caa6
Adding incorrectly deleted code
link04 Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ext/configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ enum ddtrace_sampling_rules_format {
CONFIG(BOOL, DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED, "false") \
CONFIG(BOOL, DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED, "false") \
CONFIG(BOOL, DD_TRACE_PROPAGATE_SERVICE, "false") \
CONFIG(SET_LOWERCASE, DD_TRACE_PROPAGATION_STYLE_EXTRACT, "datadog,tracecontext,B3,B3 single header") \
CONFIG(SET_LOWERCASE, DD_TRACE_PROPAGATION_STYLE_INJECT, "datadog,tracecontext") \
CONFIG(SET_LOWERCASE, DD_TRACE_PROPAGATION_STYLE, "datadog,tracecontext", \
CONFIG(SET_LOWERCASE, DD_TRACE_PROPAGATION_STYLE_EXTRACT, "datadog,tracecontext,B3,B3 single header,baggage") \
CONFIG(SET_LOWERCASE, DD_TRACE_PROPAGATION_STYLE_INJECT, "datadog,tracecontext,baggage") \
CONFIG(SET_LOWERCASE, DD_TRACE_PROPAGATION_STYLE, "datadog,tracecontext,baggage", \
.env_config_fallback = ddtrace_conf_otel_propagators) \
CONFIG(SET, DD_TRACE_TRACED_INTERNAL_FUNCTIONS, "") \
CONFIG(INT, DD_TRACE_AGENT_TIMEOUT, DD_CFG_EXPSTR(DD_TRACE_AGENT_TIMEOUT_VAL), \
Expand Down
3 changes: 3 additions & 0 deletions ext/ddtrace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,6 +881,8 @@ ZEND_METHOD(DDTrace_SpanLink, fromHeaders) {
zend_hash_destroy(&result.meta_tags);
zend_hash_destroy(&result.propagated_tags);
zend_hash_destroy(&result.tracestate_unknown_dd_keys);
zend_hash_destroy(&result.baggage);

if (result.origin) {
zend_string_release(result.origin);
}
Expand Down Expand Up @@ -1646,6 +1648,7 @@ static void dd_clean_globals(void) {
zend_hash_destroy(&DDTRACE_G(root_span_tags_preset));
zend_hash_destroy(&DDTRACE_G(tracestate_unknown_dd_keys));
zend_hash_destroy(&DDTRACE_G(propagated_root_span_tags));
zend_hash_destroy(&DDTRACE_G(baggage));

if (DDTRACE_G(curl_multi_injecting_spans)) {
if (GC_DELREF(DDTRACE_G(curl_multi_injecting_spans)) == 0) {
Expand Down
1 change: 1 addition & 0 deletions ext/ddtrace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ ZEND_BEGIN_MODULE_GLOBALS(ddtrace)
zend_array tracestate_unknown_dd_keys;
zend_bool backtrace_handler_already_run;
ddtrace_error_data active_error;
HashTable baggage;
#ifndef _WIN32
dogstatsd_client dogstatsd_client;
#endif
Expand Down
6 changes: 6 additions & 0 deletions ext/ddtrace.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,12 @@ class RootSpanData extends SpanData {
* @var GitMetadata|null The git metadata of the span
*/
public GitMetadata|null $gitMetadata = null;

/**
* @var array In OpenTelemetry, Baggage is contextual information that resides next to context.
* Baggage is a key-value store, which means it lets you propagate any data you like alongside context regardless of trace ids existence.
*/
public array $baggage = [];
}

/**
Expand Down
24 changes: 19 additions & 5 deletions ext/ddtrace_arginfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: 5edec61a2b1ae22c8473ffbd3c509df6196abbae */
* Stub hash: 3e5816ef45654bc111875f74d66de5e7d478437f */

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)
Expand Down Expand Up @@ -520,7 +520,9 @@ static zend_class_entry *register_class_DDTrace_SpanEvent(zend_class_entry *clas

zval property_name_default_value;
ZVAL_UNDEF(&property_name_default_value);
zend_declare_typed_property(class_entry, ZSTR_KNOWN(ZEND_STR_NAME), &property_name_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING));
zend_string *property_name_name = zend_string_init("name", sizeof("name") - 1, 1);
zend_declare_typed_property(class_entry, property_name_name, &property_name_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING));
zend_string_release(property_name_name);

zval property_attributes_default_value;
ZVAL_UNDEF(&property_attributes_default_value);
Expand Down Expand Up @@ -626,11 +628,15 @@ static zend_class_entry *register_class_DDTrace_SpanData(void)

zval property_name_default_value;
ZVAL_EMPTY_STRING(&property_name_default_value);
zend_declare_typed_property(class_entry, ZSTR_KNOWN(ZEND_STR_NAME), &property_name_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING|MAY_BE_NULL));
zend_string *property_name_name = zend_string_init("name", sizeof("name") - 1, 1);
zend_declare_typed_property(class_entry, property_name_name, &property_name_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING|MAY_BE_NULL));
zend_string_release(property_name_name);

zval property_resource_default_value;
ZVAL_EMPTY_STRING(&property_resource_default_value);
zend_declare_typed_property(class_entry, ZSTR_KNOWN(ZEND_STR_RESOURCE), &property_resource_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING|MAY_BE_NULL));
zend_string *property_resource_name = zend_string_init("resource", sizeof("resource") - 1, 1);
zend_declare_typed_property(class_entry, property_resource_name, &property_resource_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING|MAY_BE_NULL));
zend_string_release(property_resource_name);

zval property_service_default_value;
ZVAL_EMPTY_STRING(&property_service_default_value);
Expand Down Expand Up @@ -658,7 +664,9 @@ static zend_class_entry *register_class_DDTrace_SpanData(void)

zval property_type_default_value;
ZVAL_EMPTY_STRING(&property_type_default_value);
zend_declare_typed_property(class_entry, ZSTR_KNOWN(ZEND_STR_TYPE), &property_type_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING|MAY_BE_NULL));
zend_string *property_type_name = zend_string_init("type", sizeof("type") - 1, 1);
zend_declare_typed_property(class_entry, property_type_name, &property_type_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING|MAY_BE_NULL));
zend_string_release(property_type_name);

zval property_meta_default_value;
ZVAL_EMPTY_ARRAY(&property_meta_default_value);
Expand Down Expand Up @@ -782,6 +790,12 @@ static zend_class_entry *register_class_DDTrace_RootSpanData(zend_class_entry *c
zend_declare_typed_property(class_entry, property_gitMetadata_name, &property_gitMetadata_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_CLASS(property_gitMetadata_class_DDTrace_GitMetadata, 0, MAY_BE_NULL));
zend_string_release(property_gitMetadata_name);

zval property_baggage_default_value;
ZVAL_EMPTY_ARRAY(&property_baggage_default_value);
zend_string *property_baggage_name = zend_string_init("baggage", sizeof("baggage") - 1, 1);
zend_declare_typed_property(class_entry, property_baggage_name, &property_baggage_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_ARRAY));
zend_string_release(property_baggage_name);

return class_entry;
}

Expand Down
90 changes: 90 additions & 0 deletions ext/distributed_tracing_headers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ static ddtrace_distributed_tracing_result dd_init_empty_result(void) {
zend_hash_init(&result.tracestate_unknown_dd_keys, 8, unused, ZVAL_PTR_DTOR, 0);
zend_hash_init(&result.propagated_tags, 8, unused, ZVAL_PTR_DTOR, 0);
zend_hash_init(&result.meta_tags, 8, unused, ZVAL_PTR_DTOR, 0);
zend_hash_init(&result.baggage, 8, unused, ZVAL_PTR_DTOR, 0);
return result;
}

Expand All @@ -42,6 +43,54 @@ static void dd_check_tid(ddtrace_distributed_tracing_result *result) {
}
}

static void ddtrace_deserialize_baggage(char *baggage_ptr, char *baggage_end, HashTable *baggage) {
while (baggage_ptr < baggage_end) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
while (baggage_ptr < baggage_end) {
for (;;) {

redundant loop condition, we eventually check anyway in the first loop below here.

char *key_start = baggage_ptr;
while (baggage_ptr < baggage_end && *baggage_ptr != '=') {
++baggage_ptr;
}
if (baggage_ptr >= baggage_end || *baggage_ptr != '=') break;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (baggage_ptr >= baggage_end || *baggage_ptr != '=') break;
if (baggage_ptr >= baggage_end) break;

This will never be != '=' at this place


size_t key_len = baggage_ptr - key_start;
++baggage_ptr; // skip '='

char *value_start = baggage_ptr;
while (baggage_ptr < baggage_end && *baggage_ptr != ',') {
++baggage_ptr;
}

size_t value_len = baggage_ptr - value_start;
if (key_len > 0 && value_len > 0) {
zend_string *key = zend_string_init(key_start, key_len, 0);
zval value;
ZVAL_STRINGL(&value, value_start, value_len);
zend_hash_update(baggage, key, &value);
zend_string_release(key);
Comment on lines +64 to +68
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
zend_string *key = zend_string_init(key_start, key_len, 0);
zval value;
ZVAL_STRINGL(&value, value_start, value_len);
zend_hash_update(baggage, key, &value);
zend_string_release(key);
zval value;
ZVAL_STRINGL(&value, value_start, value_len);
zend_hash_str_update(baggage, key_start, key_len, &value);

}

if (baggage_ptr < baggage_end && *baggage_ptr == ',') {
++baggage_ptr; // skip ','
}
Comment on lines +71 to +73
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (baggage_ptr < baggage_end && *baggage_ptr == ',') {
++baggage_ptr; // skip ','
}
++baggage_ptr; // skip ','

We can skip this unconditionally (the offset is going to be checked at the start of the loop)

}
}

static ddtrace_distributed_tracing_result ddtrace_read_distributed_baggage(ddtrace_read_header *read_header, void *data) {
zend_string *baggage_header;
ddtrace_distributed_tracing_result result = dd_init_empty_result();

if (!read_header((zai_str)ZAI_STRL("BAGGAGE"), "baggage", &baggage_header, data)) {
return result;
}

char *baggage_ptr = ZSTR_VAL(baggage_header);
char *baggage_end = baggage_ptr + ZSTR_LEN(baggage_header);

ddtrace_deserialize_baggage(baggage_ptr, baggage_end, &result.baggage);

zend_string_release(baggage_header);
return result;
}

static ddtrace_distributed_tracing_result ddtrace_read_distributed_tracing_ids_datadog(ddtrace_read_header *read_header, void *data) {
zend_string *trace_id_str, *parent_id_str, *priority_str, *propagated_tags;
ddtrace_distributed_tracing_result result = dd_init_empty_result();
Expand Down Expand Up @@ -359,12 +408,16 @@ ddtrace_distributed_tracing_result ddtrace_read_distributed_tracing_ids(ddtrace_
func = ddtrace_read_distributed_tracing_ids_b3;
} else if (!has_trace && zend_string_equals_literal(extraction_style, "b3 single header")) {
func = ddtrace_read_distributed_tracing_ids_b3_single_header;
} else if (zend_string_equals_literal(extraction_style, "baggage")) {
func = ddtrace_read_distributed_baggage;
} else {
continue;
}

if (!has_trace) {
zend_string *existing_origin = result.origin;
zend_array existing_baggage = result.baggage;

if (result.meta_tags.arData) {
zend_hash_destroy(&result.meta_tags);
}
Expand All @@ -388,8 +441,24 @@ ddtrace_distributed_tracing_result ddtrace_read_distributed_tracing_ids(ddtrace_
result.origin = existing_origin;
}
}

if (existing_baggage.arData) {
zend_string *key;
zval *value;
ZEND_HASH_FOREACH_STR_KEY_VAL(&existing_baggage, key, value) {
zend_string *new_key = zend_string_dup(key, 0);
zval new_value;
ZVAL_DUP(&new_value, value);

zend_hash_update(&result.baggage, new_key, &new_value);
zend_string_release(new_key);
} ZEND_HASH_FOREACH_END();

zend_hash_destroy(&existing_baggage);
Comment on lines +446 to +457
Copy link
Collaborator

@bwoebi bwoebi Feb 25, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
zend_string *key;
zval *value;
ZEND_HASH_FOREACH_STR_KEY_VAL(&existing_baggage, key, value) {
zend_string *new_key = zend_string_dup(key, 0);
zval new_value;
ZVAL_DUP(&new_value, value);
zend_hash_update(&result.baggage, new_key, &new_value);
zend_string_release(new_key);
} ZEND_HASH_FOREACH_END();
zend_hash_destroy(&existing_baggage);
result.baggage = existing_baggage;

... this whole stuff is a bit weird. There's no reason for baggage being in this loop. Let's talk about it.

}
} else {
ddtrace_distributed_tracing_result new_result = func(read_header, data);

if (result.trace_id.low == new_result.trace_id.low && result.trace_id.high == new_result.trace_id.high) {
if (!result.tracestate && new_result.tracestate) {
result.tracestate = new_result.tracestate;
Expand All @@ -415,12 +484,27 @@ ddtrace_distributed_tracing_result ddtrace_read_distributed_tracing_ids(ddtrace_
}
}

if (new_result.baggage.arData) {
zend_string *key;
zval *value;
ZEND_HASH_FOREACH_STR_KEY_VAL(&new_result.baggage, key, value) {
zend_string *new_key = zend_string_dup(key, 0);
zval new_value;
ZVAL_DUP(&new_value, value);

zend_hash_update(&result.baggage, new_key, &new_value);
zend_string_release(new_key);
} ZEND_HASH_FOREACH_END();
}

if (new_result.tracestate) {
zend_string_release(new_result.tracestate);
}
if (new_result.origin) {
zend_string_release(new_result.origin);
}

zend_hash_destroy(&new_result.baggage);
zend_hash_destroy(&new_result.meta_tags);
zend_hash_destroy(&new_result.propagated_tags);
zend_hash_destroy(&new_result.tracestate_unknown_dd_keys);
Expand Down Expand Up @@ -448,6 +532,10 @@ void ddtrace_apply_distributed_tracing_result(ddtrace_distributed_tracing_result
*Z_ARR(zv) = result->propagated_tags;
ddtrace_assign_variable(&span->property_propagated_tags, &zv);

ZVAL_ARR(&zv, emalloc(sizeof(HashTable)));
*Z_ARR(zv) = result->baggage;
ddtrace_assign_variable(&span->property_baggage, &zv);

zend_hash_copy(root_meta, &result->meta_tags, NULL);

if (result->origin) {
Expand All @@ -474,6 +562,8 @@ void ddtrace_apply_distributed_tracing_result(ddtrace_distributed_tracing_result
DDTRACE_G(propagated_root_span_tags) = result->propagated_tags;
zend_hash_destroy(&DDTRACE_G(tracestate_unknown_dd_keys));
DDTRACE_G(tracestate_unknown_dd_keys) = result->tracestate_unknown_dd_keys;
zend_hash_destroy(&DDTRACE_G(baggage));
DDTRACE_G(baggage) = result->baggage;
zend_hash_copy(&DDTRACE_G(root_span_tags_preset), &result->meta_tags, NULL);
if (DDTRACE_G(dd_origin)) {
zend_string_release(DDTRACE_G(dd_origin));
Expand Down
1 change: 1 addition & 0 deletions ext/distributed_tracing_headers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ typedef struct {
uint64_t parent_id;
zend_string *origin;
zend_string *tracestate;
HashTable baggage;
HashTable tracestate_unknown_dd_keys;
HashTable propagated_tags;
HashTable meta_tags;
Expand Down
44 changes: 44 additions & 0 deletions ext/handlers_http.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,44 @@ static inline zend_string *ddtrace_format_tracestate(zend_string *tracestate, ui
return NULL;
}

static inline zend_string *ddtrace_serialize_baggage(HashTable *baggage) {
smart_str serialized_baggage = {0};
zend_string *key;
zval *value;
bool first_entry = true;

ZEND_HASH_FOREACH_STR_KEY_VAL(baggage, key, value) {
if (!key || Z_TYPE_P(value) != IS_STRING) {
continue; // Skip invalid entries
}

if (!first_entry) {
smart_str_appendc(&serialized_baggage, ','); // Add comma separator
} else {
first_entry = false;
}

// Append key=value
smart_str_appendl(&serialized_baggage, ZSTR_VAL(key), ZSTR_LEN(key));
smart_str_appendc(&serialized_baggage, '=');
smart_str_appendl(&serialized_baggage, Z_STRVAL_P(value), Z_STRLEN_P(value));
} ZEND_HASH_FOREACH_END();

if (!serialized_baggage.s) {
smart_str_free(&serialized_baggage);
} else {
smart_str_0(&serialized_baggage); // Null-terminate
}

return serialized_baggage.s;
}

static inline void ddtrace_inject_distributed_headers_config(zend_array *array, bool key_value_pairs, zend_array *inject) {
ddtrace_root_span_data *root = DDTRACE_G(active_stack) && DDTRACE_G(active_stack)->active ? SPANDATA(DDTRACE_G(active_stack)->active)->root : NULL;
zend_string *origin = DDTRACE_G(dd_origin);
zend_array *tracestate_unknown_dd_keys = &DDTRACE_G(tracestate_unknown_dd_keys);
zend_string *tracestate = DDTRACE_G(tracestate);
zend_array *baggage = &DDTRACE_G(baggage);
if (root) {
if (Z_TYPE(root->property_origin) == IS_STRING && Z_STRLEN(root->property_origin)) {
origin = Z_STR(root->property_origin);
Expand All @@ -118,6 +151,7 @@ static inline void ddtrace_inject_distributed_headers_config(zend_array *array,
tracestate = NULL;
}
tracestate_unknown_dd_keys = ddtrace_property_array(&root->property_tracestate_tags);
baggage = ddtrace_property_array(&root->property_baggage);
}

zval headers;
Expand All @@ -134,6 +168,7 @@ static inline void ddtrace_inject_distributed_headers_config(zend_array *array,
bool send_tracestate = zend_hash_str_exists(inject, ZEND_STRL("tracecontext"));
bool send_b3 = zend_hash_str_exists(inject, ZEND_STRL("b3")) || zend_hash_str_exists(inject, ZEND_STRL("b3multi"));
bool send_b3single = zend_hash_str_exists(inject, ZEND_STRL("b3 single header"));
bool send_baggage = zend_hash_str_exists(inject, ZEND_STRL("baggage"));

zend_long sampling_priority = ddtrace_fetch_priority_sampling_from_root();
if (get_DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED() && DDTRACE_G(asm_event_emitted) == true) {
Expand Down Expand Up @@ -239,6 +274,15 @@ static inline void ddtrace_inject_distributed_headers_config(zend_array *array,
}
}

if (send_baggage) {
zend_string *full_baggage = ddtrace_serialize_baggage(baggage);

if (full_baggage) {
ADD_HEADER("baggage", "%.*s", (int)ZSTR_LEN(full_baggage), ZSTR_VAL(full_baggage));
zend_string_release(full_baggage);
}
}

if (propagated_tags) {
zend_string_release(propagated_tags);
}
Expand Down
4 changes: 4 additions & 0 deletions ext/serializer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,7 @@ void ddtrace_set_root_span_properties(ddtrace_root_span_data *span) {
if (parent_root) {
ddtrace_inherit_span_properties(&span->span, &parent_root->span);
ZVAL_COPY(&span->property_origin, &parent_root->property_origin);
ZVAL_COPY(&span->property_baggage, &parent_root->property_baggage);
} else {
zval *prop_type = &span->property_type;
zval *prop_name = &span->property_name;
Expand Down Expand Up @@ -840,6 +841,9 @@ void ddtrace_set_root_span_properties(ddtrace_root_span_data *span) {
zend_hash_copy(Z_ARR(span->property_propagated_tags), &DDTRACE_G(propagated_root_span_tags), zval_add_ref);
SEPARATE_ARRAY(&span->property_tracestate_tags);
zend_hash_copy(Z_ARR(span->property_tracestate_tags), &DDTRACE_G(tracestate_unknown_dd_keys), zval_add_ref);
SEPARATE_ARRAY(&span->property_baggage);
zend_hash_copy(Z_ARR(span->property_baggage), &DDTRACE_G(baggage), zval_add_ref);
Copy link
Collaborator

@bwoebi bwoebi Feb 25, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some tests fail with:

==305==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000000 (pc 0x7f3fdc8a7ddd bp 0x7ffd0bae01f0 sp 0x7ffd0bae01d0 T0)
==305==The signal is caused by a READ memory access.
==305==Hint: address points to the zero page.
    #0 0x7f3fdc8a7ddd in zend_gc_refcount /opt/php/debug-zts-asan/include/php/Zend/zend_types.h:1025:12
    #1 0x7f3fdc8a4fb7 in ddtrace_set_root_span_properties /home/circleci/datadog/tmp/build_extension/ext/serializer.c:844:9
    #2 0x7f3fdc8cc915 in ddtrace_open_span /home/circleci/datadog/tmp/build_extension/ext/span.c:206:9
    #3 0x7f3fdc8d1961 in ddtrace_push_root_span /home/circleci/datadog/tmp/build_extension/ext/span.c:372:31
    #4 0x7f3fdc7cbdbd in dd_initialize_request /home/circleci/datadog/tmp/build_extension/ext/ddtrace.c:1618:9
    #5 0x7f3fdc7ea07c in zm_activate_ddtrace /home/circleci/datadog/tmp/build_extension/ext/ddtrace.c:1640:9
    #6 0x559c53442bab in zend_activate_modules /usr/local/src/php/Zend/zend_API.c:2605:7
    #7 0x559c531b27dc in php_request_startup /usr/local/src/php/main/main.c:1881:3
    #8 0x559c537cab41 in do_cli /usr/local/src/php/sapi/cli/php_cli.c:929:7
    #9 0x559c537c880b in main /usr/local/src/php/sapi/cli/php_cli.c:1360:18

Have a look at ddtrace_root_span_data_create.


if (DDTRACE_G(propagated_priority_sampling) != DDTRACE_PRIORITY_SAMPLING_UNSET) {
ZVAL_LONG(&span->property_propagated_sampling_priority, DDTRACE_G(propagated_priority_sampling));
}
Expand Down
1 change: 1 addition & 0 deletions ext/span.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ struct ddtrace_root_span_data {
zval property_parent_id;
zval property_trace_id;
zval property_git_metadata;
zval property_baggage;
};

static inline ddtrace_root_span_data *ROOTSPANDATA(zend_object *obj) {
Expand Down
Loading
Loading