Fixed empty exemplar data and fixed reservoir cells sizing (#752)

Author: bryce-b

Sources/OpenTelemetrySdk/Metrics/Stable/Exemplar/ExemplarReservoir.swift

@@ -51,7 +51,7 @@ public class FixedSizedExemplarReservoir: ExemplarReservoir {
     self.reservoirCellSelector = reservoirCellSelector
     self.mapAndResetCell = mapAndResetCell
 
-    for _ in 0 ... size {
+    for _ in 0 ..< size {
       storage.append(ReservoirCell(clock: clock))
     }
   }

Sources/OpenTelemetrySdk/Metrics/Stable/Exemplar/ReservoirCell.swift

@@ -37,13 +37,19 @@ public class ReservoirCell {
     }
   }
 
-  func getAndResetLong(pointAttributes: [String: AttributeValue]) -> LongExemplarData {
+  func getAndResetLong(pointAttributes: [String: AttributeValue]) -> LongExemplarData? {
+    if attributes.isEmpty {
+      return nil
+    }
     let result = LongExemplarData(value: longValue, epochNanos: recordTime, filteredAttributes: filtered(attributes, pointAttributes), spanContext: spanContext)
     reset()
     return result
   }
 
-  func getAndResetDouble(pointAttributes: [String: AttributeValue]) -> DoubleExemplarData {
+  func getAndResetDouble(pointAttributes: [String: AttributeValue]) -> DoubleExemplarData? {
+    if attributes.isEmpty {
+      return nil
+    }
     let result = DoubleExemplarData(value: doubleValue, epochNanos: recordTime, filteredAttributes: filtered(attributes, pointAttributes), spanContext: spanContext)
     reset()
     return result

Tests/OpenTelemetrySdkTests/Metrics/StableMetrics/Exemplar/ExemplarReservoirTests.swift

@@ -32,7 +32,8 @@ class FixedSizedExemplarReservoirTests: XCTestCase {
 
   override func setUp() {
     super.setUp()
-    reservoir = FixedSizedExemplarReservoir(clock: clock, size: 3, reservoirCellSelector: selector, mapAndResetCell: { _, _ in nil })
+    reservoir = FixedSizedExemplarReservoir(clock: clock, size: 4, reservoirCellSelector: selector, mapAndResetCell: { cell,attributes in cell.getAndResetDouble(pointAttributes: attributes)
+ })
   }
 
   func testOfferLongMeasurement() {
@@ -59,15 +60,26 @@ class FixedSizedExemplarReservoirTests: XCTestCase {
     XCTAssertTrue(reservoir.storage.contains { $0.doubleValue == 4.4 })
   }
 
+
+  func testPartiallyFullReservoir(){
+    reservoir.offerDoubleMeasurement(value: 1.1, attributes: attributes)
+    let result = reservoir.collectAndReset(attribute: attributes)
+    XCTAssertEqual(result.count, 1)
+    XCTAssertTrue(result.contains(where: { exemplarData in
+      (exemplarData as! DoubleExemplarData).value == 1.1
+    }))
+    XCTAssertFalse(reservoir.storage.contains { $0.doubleValue == 1.1 })
+  }
+
   func testCollectAndReset() {
     let clock = TestClock()
-    let reservoirSize = 5
+    let reservoirSize = 6
     let reservoirCellSelector = ReservoirCellSelectorMock()
 
     // Create the reservoir
     let reservoir = FixedSizedExemplarReservoir(clock: clock, size: reservoirSize, reservoirCellSelector: reservoirCellSelector, mapAndResetCell: { cell, attributes in
       let exemplar = cell.getAndResetLong(pointAttributes: attributes)
-      return exemplar.value > 0 ? exemplar : nil
+      return exemplar?.value ?? 0 > 0 ? exemplar : nil
     })
 
     // Offer measurements

Tests/OpenTelemetrySdkTests/Metrics/StableMetrics/Exemplar/ReservoirCellTests.swift

@@ -41,10 +41,10 @@ class ReservoirCellTests: XCTestCase {
     reservoirCell.recordLongValue(value: 10, attributes: attributes)
 
     let result = reservoirCell.getAndResetLong(pointAttributes: pointAttributes)
-    XCTAssertEqual(result.value, 10)
-    XCTAssertEqual(result.epochNanos, mockClock.nanoTime)
-    XCTAssertEqual(result.filteredAttributes, attributes)
-    XCTAssertEqual(result.spanContext, nil)
+    XCTAssertEqual(result?.value, 10)
+    XCTAssertEqual(result?.epochNanos, mockClock.nanoTime)
+    XCTAssertEqual(result?.filteredAttributes, attributes)
+    XCTAssertEqual(result?.spanContext, nil)
 
     XCTAssertEqual(reservoirCell.attributes, [:])
     XCTAssertEqual(reservoirCell.longValue, 0)
@@ -58,10 +58,10 @@ class ReservoirCellTests: XCTestCase {
     reservoirCell.recordDoubleValue(value: 3.14, attributes: attributes)
 
     let result = reservoirCell.getAndResetDouble(pointAttributes: pointAttributes)
-    XCTAssertEqual(result.value, 3.14)
-    XCTAssertEqual(result.epochNanos, mockClock.nanoTime)
-    XCTAssertEqual(result.filteredAttributes, attributes)
-    XCTAssertEqual(result.spanContext, nil)
+    XCTAssertEqual(result?.value, 3.14)
+    XCTAssertEqual(result?.epochNanos, mockClock.nanoTime)
+    XCTAssertEqual(result?.filteredAttributes, attributes)
+    XCTAssertEqual(result?.spanContext, nil)
 
     XCTAssertEqual(reservoirCell.attributes, [:])
     XCTAssertEqual(reservoirCell.doubleValue, 0)