updates

Author: trask

api/all/src/main/java/io/opentelemetry/api/internal/ImmutableKeyValuePairs.java

@@ -243,6 +243,7 @@ public boolean equals(@Nullable Object o) {
       return false;
     }
     ImmutableKeyValuePairs<?, ?> that = (ImmutableKeyValuePairs<?, ?>) o;
+    // deepEquals is needed to support byte[] attribute values
     return Arrays.deepEquals(this.data, that.data);
   }
 
@@ -252,6 +253,7 @@ public int hashCode() {
     if (result == 0) {
       result = 1;
       result *= 1000003;
+      // deepHashCode is needed to support byte[] attribute values
       result ^= Arrays.deepHashCode(data);
       hashcode = result;
     }

api/incubator/src/test/java/io/opentelemetry/api/incubator/common/ExtendedAttributesTest.java

@@ -37,23 +37,6 @@ void get_ExtendedAttributeKey(
             actualValue = mapValue;
           }
 
-          if (extendedAttributeKey.getType() == ExtendedAttributeType.BYTE_ARRAY) {
-            assertThat((byte[]) actualValue)
-                .describedAs(key + "(" + extendedAttributeKey.getType() + ")")
-                .containsExactly((byte[]) value);
-            return;
-          }
-          if (extendedAttributeKey.getType() == ExtendedAttributeType.VALUE_ARRAY) {
-            @SuppressWarnings("unchecked")
-            List<Value<?>> actualList = (List<Value<?>>) actualValue;
-            @SuppressWarnings("unchecked")
-            List<Value<?>> expectedList = (List<Value<?>>) value;
-            assertThat(actualList)
-                .describedAs(key + "(" + extendedAttributeKey.getType() + ")")
-                .isEqualTo(expectedList);
-            return;
-          }
-
           assertThat(actualValue)
               .describedAs(key + "(" + extendedAttributeKey.getType() + ")")
               .isEqualTo(value);
@@ -90,6 +73,20 @@ void forEach(ExtendedAttributes extendedAttributes, Map<String, Object> expected
     assertMapEquals(seenEntries, expectedMap);
   }
 
+  @SuppressWarnings("unchecked")
+  private static void assertMapEquals(Map<String, Object> actual, Map<String, Object> expected) {
+    assertThat(actual.keySet()).isEqualTo(expected.keySet());
+    actual.forEach(
+        (key, value) -> {
+          Object expectedValue = expected.get(key);
+          if (value instanceof Map && expectedValue instanceof Map) {
+            assertMapEquals((Map<String, Object>) value, (Map<String, Object>) expectedValue);
+            return;
+          }
+          assertThat(value).isEqualTo(expectedValue);
+        });
+  }
+
   @ParameterizedTest
   @MethodSource("attributesArgs")
   void size(ExtendedAttributes extendedAttributes, Map<String, Object> expectedMap) {
@@ -114,55 +111,16 @@ private static void assertEquals(
     assertThat(actual.size()).isEqualTo(expected.size());
     actual.forEach(
         (key, value) -> {
-          if (key.getType() == ExtendedAttributeType.BYTE_ARRAY) {
-            assertThat((byte[]) value).containsExactly((byte[]) expected.get(key.getKey()));
-            return;
-          }
-          if (key.getType() == ExtendedAttributeType.VALUE_ARRAY) {
-            assertThat((List<Value<?>>) value)
-                .isEqualTo((List<Value<?>>) expected.get(key.getKey()));
-            return;
-          }
           if (key.getType() == ExtendedAttributeType.MAP) {
             assertEquals(
                 ((ExtendedAttributes) value).asMap(),
                 (Map<String, Object>) expected.get(key.getKey()));
             return;
           }
-          assertThat(expected.get(key.getKey())).isEqualTo(value);
+          assertThat(value).isEqualTo(expected.get(key.getKey()));
         });
   }
 
-  @SuppressWarnings("unchecked")
-  private static void assertMapEquals(Map<String, Object> actual, Map<String, Object> expected) {
-    assertThat(actual.keySet()).isEqualTo(expected.keySet());
-    actual.forEach(
-        (key, value) -> {
-          Object expectedValue = expected.get(key);
-          if (value instanceof byte[] && expectedValue instanceof byte[]) {
-            assertThat((byte[]) value).containsExactly((byte[]) expectedValue);
-            return;
-          }
-          if (isValueArray(value) && isValueArray(expectedValue)) {
-            assertThat((List<Value<?>>) value).isEqualTo((List<Value<?>>) expectedValue);
-            return;
-          }
-          if (value instanceof Map && expectedValue instanceof Map) {
-            assertMapEquals((Map<String, Object>) value, (Map<String, Object>) expectedValue);
-            return;
-          }
-          assertThat(expectedValue).isEqualTo(value);
-        });
-  }
-
-  private static boolean isValueArray(Object value) {
-    if (!(value instanceof List)) {
-      return false;
-    }
-    List<?> list = (List<?>) value;
-    return !list.isEmpty() && list.get(0) instanceof Value;
-  }
-
   @ParameterizedTest
   @MethodSource("attributesArgs")
   void asAttributes(ExtendedAttributes extendedAttributes, Map<String, Object> expectedMap) {
@@ -182,6 +140,14 @@ void asAttributes(ExtendedAttributes extendedAttributes, Map<String, Object> exp
     assertThat(attributes.size()).isEqualTo(expectedSize);
   }
 
+  private static boolean isValueArray(Object value) {
+    if (!(value instanceof List)) {
+      return false;
+    }
+    List<?> list = (List<?>) value;
+    return !list.isEmpty() && list.get(0) instanceof Value;
+  }
+
   @ParameterizedTest
   @MethodSource("attributesArgs")
   void toBuilder(ExtendedAttributes extendedAttributes, Map<String, Object> expectedMap) {