updates

Author: trask

api/all/src/main/java/io/opentelemetry/api/common/ArrayBackedAttributes.java

@@ -7,6 +7,7 @@
 
 import io.opentelemetry.api.internal.ImmutableKeyValuePairs;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -46,12 +47,55 @@ public AttributesBuilder toBuilder() {
   @Override
   @Nullable
   public <T> T get(AttributeKey<T> key) {
-    if (key != null && key.getType() == AttributeType.VALUE) {
+    if (key == null) {
+      return null;
+    }
+    if (key.getType() == AttributeType.VALUE) {
       return (T) getAsValue(key.getKey());
     }
+    // Check if we're looking for an array type but have a VALUE with empty array
+    if (isArrayType(key.getType())) {
+      T value = (T) super.get(key);
+      if (value == null) {
+        // Check if there's a VALUE with the same key that contains an empty array
+        Value<?> valueAttr = getValueAttribute(key.getKey());
+        if (valueAttr != null && isEmptyArray(valueAttr)) {
+          return (T) Collections.emptyList();
+        }
+      }
+      return value;
+    }
     return (T) super.get(key);
   }
 
+  private static boolean isArrayType(AttributeType type) {
+    return type == AttributeType.STRING_ARRAY
+        || type == AttributeType.LONG_ARRAY
+        || type == AttributeType.DOUBLE_ARRAY
+        || type == AttributeType.BOOLEAN_ARRAY;
+  }
+
+  @Nullable
+  private Value<?> getValueAttribute(String keyName) {
+    List<Object> data = data();
+    for (int i = 0; i < data.size(); i += 2) {
+      AttributeKey<?> currentKey = (AttributeKey<?>) data.get(i);
+      if (currentKey.getKey().equals(keyName) && currentKey.getType() == AttributeType.VALUE) {
+        return (Value<?>) data.get(i + 1);
+      }
+    }
+    return null;
+  }
+
+  private static boolean isEmptyArray(Value<?> value) {
+    if (value.getType() != ValueType.ARRAY) {
+      return false;
+    }
+    @SuppressWarnings("unchecked")
+    List<Value<?>> arrayValues = (List<Value<?>>) value.getValue();
+    return arrayValues.isEmpty();
+  }
+
   @Nullable
   private Value<?> getAsValue(String keyName) {
     // Find any attribute with the same key name and convert it to Value

api/all/src/test/java/io/opentelemetry/api/common/AttributesTest.java

@@ -808,4 +808,29 @@ void simpleAttributeRetrievedAsComplexValue() {
     assertThat(attributes.get(doubleKey("double"))).isEqualTo(3.14);
     assertThat(attributes.get(booleanKey("boolean"))).isEqualTo(true);
   }
+
+  @Test
+  void emptyValueArrayRetrievedAsAnyArrayType() {
+    // When putting an empty VALUE array, it should be retrievable as any array type
+    Attributes attributes =
+        Attributes.builder().put(valueKey("key"), Value.of(Collections.emptyList())).build();
+
+    // Should be able to retrieve as any array type and get an empty list
+    assertThat(attributes.get(stringArrayKey("key"))).isEqualTo(Collections.emptyList());
+    assertThat(attributes.get(longArrayKey("key"))).isEqualTo(Collections.emptyList());
+    assertThat(attributes.get(doubleArrayKey("key"))).isEqualTo(Collections.emptyList());
+    assertThat(attributes.get(booleanArrayKey("key"))).isEqualTo(Collections.emptyList());
+
+    // Should also be retrievable as VALUE
+    assertThat(attributes.get(valueKey("key"))).isEqualTo(Value.of(Collections.emptyList()));
+
+    // forEach should show VALUE type (since empty arrays are stored as VALUE)
+    Map<AttributeKey<?>, Object> entriesSeen = new LinkedHashMap<>();
+    attributes.forEach(entriesSeen::put);
+    assertThat(entriesSeen).containsExactly(entry(valueKey("key"), Value.of(Collections.emptyList())));
+
+    // asMap should show VALUE type
+    assertThat(attributes.asMap())
+        .containsExactly(entry(valueKey("key"), Value.of(Collections.emptyList())));
+  }
 }

api/incubator/src/main/java/io/opentelemetry/api/incubator/common/ExtendedAttributesBuilder.java

@@ -14,7 +14,6 @@
 import static io.opentelemetry.api.incubator.common.ExtendedAttributeKey.longKey;
 import static io.opentelemetry.api.incubator.common.ExtendedAttributeKey.stringArrayKey;
 import static io.opentelemetry.api.incubator.common.ExtendedAttributeKey.stringKey;
-import static io.opentelemetry.api.incubator.common.ExtendedAttributeKey.valueKey;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
@@ -93,7 +92,7 @@ default ExtendedAttributesBuilder put(String key, boolean value) {
    * <p>Note: It is strongly recommended to use {@link #put(ExtendedAttributeKey, Object)}, and
    * pre-allocate your keys, if possible.
    *
-   * @deprecated Use {@link #put(AttributeKey, Value)} with {@link Value#of(java.util.Map)} instead.
+   * @deprecated Use {@link #put(ExtendedAttributeKey, Object)} with {@link Value#of(java.util.Map)} instead.
    * @return this Builder
    */
   @Deprecated

sdk/testing/src/main/java/io/opentelemetry/sdk/testing/assertj/AttributeAssertion.java

@@ -58,6 +58,8 @@ static AttributeAssertion create(
       case LONG_ARRAY:
       case DOUBLE_ARRAY:
         return assertThat((List<?>) value);
+      case VALUE:
+        return assertThat(value);
     }
     throw new IllegalArgumentException("Unknown type for key " + key);
   }

sdk/testing/src/main/java/io/opentelemetry/sdk/testing/assertj/LogRecordDataAssert.java

@@ -344,8 +344,10 @@ public <T> LogRecordDataAssert hasBodyField(AttributeKey<T> key, T value) {
         return hasBodyField(
             key.getKey(),
             Value.of(((List<Double>) value).stream().map(Value::of).collect(toList())));
+      case VALUE:
+        return hasBodyField(key.getKey(), (Value<?>) value);
     }
-    return this;
+    throw new IllegalArgumentException("Unknown type for key " + key);
   }
 
   /** Asserts the log has the given attributes. */