feat(spans): Retain empty attributes #4174
Merged
Conversation
This file contains 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
Lms24
approved these changes
Oct 28, 2024
Dav1dde
approved these changes
Oct 28, 2024
| @@ -135,7 +135,7 @@ pub struct TraceContext { | |||
| pub sampled: Annotated<bool>, | |||
|
|
|||
| /// Data of the trace's root span. | |||
| #[metastructure(pii = "maybe", skip_serialization = "empty")] | |||
| #[metastructure(pii = "maybe", skip_serialization = "null")] | |||
There was a problem hiding this comment.
Should we ever skip here? I assume the Python SDK setting data to None would be serialized as null which we then skip incorrectly.
There was a problem hiding this comment.
Skipping null would be correct IMO, but a side effect of this change is that data: {} is not be skipped anymore. I will add some more tests.
jjbayer
commented
Oct 28, 2024
Comment on lines
+960
to
+967
| #[test] | ||
| fn test_span_data_completely_empty() { | ||
| let span = r#"{ | ||
| "data": {} | ||
| }"#; | ||
| let span: Annotated<Span> = Annotated::from_json(span).unwrap(); | ||
| assert_eq!(span.to_json().unwrap(), r#"{"data":{}}"#); | ||
| } |
There was a problem hiding this comment.
I verified that this test has the same result on master. skip_serialization applies to child elements, not the element itself.
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.
Currently well-known span attributes may be set to
"", but custom attributes (which end up in theotherfield) are removed if their value is empty.To be consistent in itself and with open telemetry, we should allow empty non-null values.
Apply this change also to
event.contexts.trace.databecause it is supposed to be consistent withspan.data.