Defaults for name and resource on SpanData#923
Merged
Conversation
e56e379 to
3f29692
Compare
3f29692 to
ce30c04
Compare
Comment on lines
+310
to
+314
| zval prop_resource_as_string; | ||
| if (Z_TYPE_P(prop_resource) != IS_NULL) { | ||
| ddtrace_convert_to_string(&prop_resource_as_string, prop_resource); | ||
| _add_assoc_zval_copy(el, "resource", &prop_resource_as_string); | ||
| zval_dtor(&prop_resource_as_string); |
Collaborator
There was a problem hiding this comment.
Let's extract a static function that basically does:
ddtrace_convert_to_string(&prop_resource_as_string, prop_resource);
_add_assoc_zval_copy(el, "resource", &prop_resource_as_string);
zval_dtor(&prop_resource_as_string);
This way we can replace 4 lines with 1 for resource, service, and type.
morrisonlevi
approved these changes
Jun 18, 2020
Collaborator
morrisonlevi
left a comment
There was a problem hiding this comment.
Looks good, Sammy, let's 🚢!
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR adds default values to
DDTrace\SpanData::$nameandDDTrace\SpanData::$resourcewhen they are not explicitly set from a tracing closure.SpanData::$namedefaults to the fully qualified name of the instrumented call in the form ofClassName.methodNameorfunctionNameSpanData::$resourcedefaults to the value ofSpanData::$nameIn a future PR
SpanData::$servicewill default to the value of the parent span'sSpanData::$service, orDD_SERVICEfor top-level spans.Readiness checklist
Reviewer checklist