Fault in SdkSpan.events (open-telemetry#6244)

Co-authored-by: John Watson <jkwatson@gmail.com>
qixiaogang · Feb 24, 2024 · 96fe54f · 96fe54f
1 parent 4eb05c7
commit 96fe54f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java
@@ -71,7 +71,8 @@ final class SdkSpan implements ReadWriteSpan, ExtendedSpan {
 
   // List of recorded events.
   @GuardedBy("lock")
-  private final List<EventData> events;
+  @Nullable
+  private List<EventData> events;
 
   // Number of events recorded.
   @GuardedBy("lock")
@@ -126,7 +127,6 @@ private SdkSpan(
     this.clock = clock;
     this.startEpochNanos = startEpochNanos;
     this.attributes = attributes;
-    this.events = new ArrayList<>();
     this.spanLimits = spanLimits;
   }
 
@@ -378,6 +378,9 @@ private void addTimedEvent(EventData timedEvent) {
         logger.log(Level.FINE, "Calling addEvent() on an ended Span.");
         return;
       }
+      if (events == null) {
+        events = new ArrayList<>();
+      }
       if (events.size() < spanLimits.getMaxNumberOfEvents()) {
         events.add(timedEvent);
       }
@@ -518,7 +521,7 @@ long getStartEpochNanos() {
 
   @GuardedBy("lock")
   private List<EventData> getImmutableTimedEvents() {
-    if (events.isEmpty()) {
+    if (events == null) {
       return Collections.emptyList();
     }