Fix bug preventing accurate reporting of dropped attribute count

Author: jack-berg

sdk/common/src/main/java/io/opentelemetry/sdk/internal/AttributesMap.java

@@ -21,10 +21,9 @@
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.
  */
-public final class AttributesMap extends HashMap<AttributeKey<?>, Object> implements Attributes {
-
-  private static final long serialVersionUID = -5072696312123632376L;
+public final class AttributesMap implements Attributes {
 
+  private final HashMap<AttributeKey<?>, Object> delegate = new HashMap<>();
   private final long capacity;
   private final int lengthLimit;
   private int totalAddedValues = 0;
@@ -47,10 +46,10 @@ public static AttributesMap create(long capacity, int lengthLimit) {
   /** Add the attribute key value pair, applying capacity and length limits. */
   public <T> void put(AttributeKey<T> key, T value) {
     totalAddedValues++;
-    if (size() >= capacity && !containsKey(key)) {
+    if (size() >= capacity && !delegate.containsKey(key)) {
       return;
     }
-    super.put(key, AttributeUtil.applyAttributeLengthLimit(value, lengthLimit));
+    delegate.put(key, AttributeUtil.applyAttributeLengthLimit(value, lengthLimit));
   }
 
   /** Get the total number of attributes added, including those dropped for capcity limits. */
@@ -62,7 +61,7 @@ public int getTotalAddedValues() {
   @Override
   @Nullable
   public <T> T get(AttributeKey<T> key) {
-    return (T) super.get(key);
+    return (T) delegate.get(key);
   }
 
   @Override
@@ -72,7 +71,7 @@ public Map<AttributeKey<?>, Object> asMap() {
     // anyways. We implement the immutable Attributes for this class to support the
     // Attributes.builder().putAll usage - it is tricky but an implementation detail of this private
     // class.
-    return Collections.unmodifiableMap(this);
+    return Collections.unmodifiableMap(delegate);
   }
 
   @Override
@@ -85,14 +84,24 @@ public void forEach(BiConsumer<? super AttributeKey<?>, ? super Object> action)
     // https://github.com/open-telemetry/opentelemetry-java/issues/4161
     // Help out android desugaring by having an explicit call to HashMap.forEach, when forEach is
     // just called through Attributes.forEach desugaring is unable to correctly handle it.
-    super.forEach(action);
+    delegate.forEach(action);
+  }
+
+  @Override
+  public int size() {
+    return delegate.size();
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return delegate.isEmpty();
   }
 
   @Override
   public String toString() {
     return "AttributesMap{"
         + "data="
-        + super.toString()
+        + delegate
         + ", capacity="
         + capacity
         + ", totalAddedValues="

sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java

@@ -466,6 +466,7 @@ public ReadWriteSpan recordException(Throwable exception) {
   }
 
   @Override
+  @SuppressWarnings("unchecked")
   public ReadWriteSpan recordException(Throwable exception, Attributes additionalAttributes) {
     if (exception == null) {
       return this;
@@ -495,7 +496,10 @@ public ReadWriteSpan recordException(Throwable exception, Attributes additionalA
       attributes.put(EXCEPTION_STACKTRACE, stackTrace);
     }
 
-    additionalAttributes.forEach(attributes::put);
+    additionalAttributes.forEach(
+        (attributeKey, object) -> {
+          attributes.put((AttributeKey<Object>) attributeKey, object);
+        });
 
     addTimedEvent(
         ExceptionEventData.create(

sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java

@@ -1277,6 +1277,21 @@ void recordException_additionalAttributes() {
             });
   }
 
+  @Test
+  void recordException_SpanLimits() {
+    SdkSpan span = createTestSpan(SpanLimits.builder().setMaxNumberOfAttributes(2).build());
+    span.recordException(
+        new IllegalStateException("error"),
+        Attributes.builder().put("key1", "value").put("key2", "value").build());
+
+    List<EventData> events = span.toSpanData().getEvents();
+    assertThat(events.size()).isEqualTo(1);
+    EventData event = events.get(0);
+    assertThat(event.getAttributes().size()).isEqualTo(2);
+    assertThat(event.getTotalAttributeCount()).isEqualTo(5);
+    assertThat(event.getTotalAttributeCount() - event.getAttributes().size()).isPositive();
+  }
+
   @Test
   void badArgsIgnored() {
     SdkSpan span = createTestRootSpan();
@@ -1519,7 +1534,9 @@ void testAsSpanData() {
     Resource resource = this.resource;
     Attributes attributes = TestUtils.generateRandomAttributes();
     AttributesMap attributesWithCapacity = AttributesMap.create(32, Integer.MAX_VALUE);
-    attributes.forEach(attributesWithCapacity::put);
+    attributes.forEach(
+        (attributeKey, object) ->
+            attributesWithCapacity.put((AttributeKey<Object>) attributeKey, object));
     Attributes event1Attributes = TestUtils.generateRandomAttributes();
     Attributes event2Attributes = TestUtils.generateRandomAttributes();
     SpanContext context =