Implement UST Consistency #2896
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #2896 +/- ##
============================================
- Coverage 78.24% 72.39% -5.85%
Complexity 2526 2526
============================================
Files 135 135
Lines 14400 14400
Branches 989 989
============================================
- Hits 11267 10425 -842
- Misses 2591 3433 +842
Partials 542 542
Flags with carried forward coverage won't be shown. Click here to find out more. see 8 files with indirect coverage changes Continue to review full report in Codecov by Sentry.
|
Benchmarks [ tracer ]Benchmark execution time: 2024-11-01 23:41:55 Comparing candidate commit 2c8c58f in PR branch Found 2 performance improvements and 1 performance regressions! Performance is the same for 175 metrics, 0 unstable metrics. scenario:PDOBench/benchPDOBaseline
scenario:PDOBench/benchPDOBaseline-opcache
scenario:TraceFlushBench/benchFlushTrace
|
ext/ddtrace.c
Outdated
| @@ -1096,6 +1096,10 @@ static zval *ddtrace_root_span_data_write(zend_object *object, zend_string *memb | |||
| } else if (zend_string_equals_literal(prop_name, "service")) { | |||
| if (ddtrace_span_is_entrypoint_root(&span->span) && !zend_is_identical(&span->property_service, value)) { | |||
| root_span_data_changed = true; | |||
| // As per unified service tagging spec if a span is created with a service name different from the global | |||
There was a problem hiding this comment.
Nearly, it needs to be changed when the span is not the root span.
And misses zval_ptr_dtor(&span->property_version); to first free to old value.
ext/ddtrace.c
Outdated
| @@ -1096,6 +1096,10 @@ static zval *ddtrace_root_span_data_write(zend_object *object, zend_string *memb | |||
| } else if (zend_string_equals_literal(prop_name, "service")) { | |||
| if (ddtrace_span_is_entrypoint_root(&span->span) && !zend_is_identical(&span->property_service, value)) { | |||
| root_span_data_changed = true; | |||
| // As per unified service tagging spec if a span is created with a service name different from the global | |||
| // service name it will not inherit the global version value | |||
| ZVAL_NULL(&span->property_version); | |||
There was a problem hiding this comment.
This cannot be null, use ZVAL_EMPTY_STRING instead. (see definition of SpanData class in ddtrace.stup.php)
khanayan123
force-pushed
the
khanayan123/implement-config-consistency-2
branch
from
7c66d29 to
0f2e7dc
Compare
This reverts commit 352d3ba.
Description
Make changes such that iff a span has service name set by DD_SERVICE, it also gets the version specified in DD_VERSION. This is done to better align with the UST spec https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging/?tab=kubernetes