Minor formatting fixes and code simplification

Signed-off-by: Andriy Redko <drreta@gmail.com>
openzipkin · Apr 12, 2024 · 4369ade · 4369ade
1 parent 9705256
commit 4369ade
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/core/src/main/java/zipkin2/reporter/internal/CountBoundedQueue.java b/core/src/main/java/zipkin2/reporter/internal/CountBoundedQueue.java
@@ -117,18 +117,14 @@ int doDrain(SpanWithSizeConsumer<S> consumer) {
       metrics.incrementSpanBytes(nextSizeInBytes);
 
       if (messageSizeOfNextSpan > messageMaxBytes) {
-          drainedCount++;
-          metrics.incrementSpansDropped(1);
-          elements[readPos] = null; // should have been dropped before
-          if (++readPos == elements.length) readPos = 0; // circle back to the front of the array
-      } else if (consumer.offer(next, nextSizeInBytes)) {
-        drainedCount++;
-
-        elements[readPos] = null;
-        if (++readPos == elements.length) readPos = 0; // circle back to the front of the array
-      } else {
+        metrics.incrementSpansDropped(1);
+      } else if (!consumer.offer(next, nextSizeInBytes)) {
         break;
       }
+
+      drainedCount++;
+      elements[readPos] = null;
+      if (++readPos == elements.length) readPos = 0; // circle back to the front of the array
     }
     count -= drainedCount;
     return drainedCount;