fix: return empty PAnnotationValue for NullAnnotation to prevent NPE - #14135
Open
waterWang wants to merge 1 commit into
Open
fix: return empty PAnnotationValue for NullAnnotation to prevent NPE#14135waterWang wants to merge 1 commit into
waterWang wants to merge 1 commit into
Conversation
|
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.



Fixes #14127
Problem
AnnotationValueMapper.map(Annotation<?>)returnsnullwhen the annotation is aNullAnnotation. The caller (SpanMessageMapper.map(Annotation<?>)→PAnnotation.Builder.setValue(...)) does not guard against a null return value, causing aNullPointerException:This causes span data loss, for example when ES version information cannot be collected.
Root cause
The
NullAnnotationclass was designed to represent annotations with a null value, but the mapper'sNullAnnotationbranch returnsnullinstead of a valid emptyPAnnotationValue. The calling code inSpanMessageMapperunconditionally callspAnnotation.setValue(annotationValueMapper.map(annotation))without a null check.Fix
Return an empty
PAnnotationValue(viagetAnnotationBuilder().build()) instead ofnullwhen the annotation is aNullAnnotation. This preserves the semantics of "no annotation value" while preventing the NPE in the caller.default PAnnotationValue map(Annotation<?> annotation) { if (annotation instanceof NullAnnotation) { - return null; + return getAnnotationBuilder().build(); } return mapNonNull(annotation); }Impact
The NPE has a high impact — it causes span data loss. The fix is minimal and safe: returning an empty
PAnnotationValueis equivalent to the previous behavior of returningnullfrom the caller's perspective (the builder accepts an empty value), but avoids the crash.