Rename EXTENDED_ATTRIBUTES to MAP

Author: trask

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

@@ -93,8 +93,8 @@ static ExtendedAttributeKey<List<Double>> doubleArrayKey(String key) {
     return fromAttributeKey(AttributeKey.doubleArrayKey(key));
   }
 
-  /** Returns a new ExtendedAttributeKey for Map valued attributes. */
-  static ExtendedAttributeKey<ExtendedAttributes> extendedAttributesKey(String key) {
-    return InternalExtendedAttributeKeyImpl.create(key, ExtendedAttributeType.EXTENDED_ATTRIBUTES);
+  /** Returns a new ExtendedAttributeKey for map valued attributes. */
+  static ExtendedAttributeKey<ExtendedAttributes> mapKey(String key) {
+    return InternalExtendedAttributeKeyImpl.create(key, ExtendedAttributeType.MAP);
   }
 }

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

@@ -22,5 +22,5 @@ public enum ExtendedAttributeType {
   LONG_ARRAY,
   DOUBLE_ARRAY,
   // Extended types unique to ExtendedAttributes
-  EXTENDED_ATTRIBUTES;
+  MAP;
 }

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

@@ -18,8 +18,7 @@
  *
  * <p>"extended" refers an extended set of allowed value types compared to standard {@link
  * Attributes}. Notably, {@link ExtendedAttributes} values can be of type {@link
- * ExtendedAttributeType#EXTENDED_ATTRIBUTES}, allowing nested {@link ExtendedAttributes} of
- * arbitrary depth.
+ * ExtendedAttributeType#MAP}, allowing nested {@link ExtendedAttributes} of arbitrary depth.
  *
  * <p>Where standard {@link Attributes} are accepted everyone that OpenTelemetry represents key /
  * value pairs, {@link ExtendedAttributes} are only accepted in select places, such as log records

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

@@ -94,7 +94,7 @@ default ExtendedAttributesBuilder put(String key, boolean value) {
    * @return this Builder
    */
   default <T> ExtendedAttributesBuilder put(String key, ExtendedAttributes value) {
-    return put(ExtendedAttributeKey.extendedAttributesKey(key), value);
+    return put(ExtendedAttributeKey.mapKey(key), value);
   }
 
   /**

api/incubator/src/main/java/io/opentelemetry/api/incubator/internal/InternalExtendedAttributeKeyImpl.java

@@ -138,7 +138,7 @@ public static <T> AttributeKey<T> toAttributeKey(ExtendedAttributeKey<T> extende
       case DOUBLE_ARRAY:
         return InternalAttributeKeyImpl.create(
             extendedAttributeKey.getKey(), AttributeType.DOUBLE_ARRAY);
-      case EXTENDED_ATTRIBUTES:
+      case MAP:
         return null;
     }
     throw new IllegalArgumentException(

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

@@ -76,10 +76,6 @@ private static Stream<Arguments> attributeKeyArgs() {
             "key",
             ExtendedAttributeType.DOUBLE_ARRAY,
             AttributeKey.doubleArrayKey("key")),
-        Arguments.of(
-            ExtendedAttributeKey.extendedAttributesKey("key"),
-            "key",
-            ExtendedAttributeType.EXTENDED_ATTRIBUTES,
-            null));
+        Arguments.of(ExtendedAttributeKey.mapKey("key"), "key", ExtendedAttributeType.MAP, null));
   }
 }

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

@@ -95,7 +95,7 @@ private static void assertEquals(
     assertThat(actual.size()).isEqualTo(expected.size());
     actual.forEach(
         (key, value) -> {
-          if (key.getType() == ExtendedAttributeType.EXTENDED_ATTRIBUTES) {
+          if (key.getType() == ExtendedAttributeType.MAP) {
             assertEquals(
                 ((ExtendedAttributes) value).asMap(),
                 (Map<String, Object>) expected.get(key.getKey()));
@@ -161,7 +161,7 @@ private static ExtendedAttributes fromMap(Map<String, Object> map) {
     map.forEach(
         (key, value) -> {
           ExtendedAttributeKey<?> extendedAttributeKey = getKey(key, value);
-          if (extendedAttributeKey.getType() == ExtendedAttributeType.EXTENDED_ATTRIBUTES) {
+          if (extendedAttributeKey.getType() == ExtendedAttributeType.MAP) {
             builder.put(
                 (ExtendedAttributeKey<ExtendedAttributes>) extendedAttributeKey,
                 fromMap((Map<String, Object>) value));
@@ -249,7 +249,7 @@ private static Stream<Arguments> attributesArgs() {
         Arguments.of(
             ExtendedAttributes.builder()
                 .put(
-                    ExtendedAttributeKey.extendedAttributesKey("key"),
+                    ExtendedAttributeKey.mapKey("key"),
                     ExtendedAttributes.builder().put("child", "value").build())
                 .build(),
             ImmutableMap.builder()
@@ -287,7 +287,7 @@ private static Map<String, Object> toMap(ExtendedAttributes extendedAttributes)
     Map<String, Object> map = new HashMap<>();
     extendedAttributes.forEach(
         (key, value) -> {
-          if (key.getType() == ExtendedAttributeType.EXTENDED_ATTRIBUTES) {
+          if (key.getType() == ExtendedAttributeType.MAP) {
             map.put(key.getKey(), toMap((ExtendedAttributes) value));
             return;
           }
@@ -314,8 +314,8 @@ private static ExtendedAttributeKey<?> getKey(String key, Object value) {
         return ExtendedAttributeKey.longArrayKey(key);
       case DOUBLE_ARRAY:
         return ExtendedAttributeKey.doubleArrayKey(key);
-      case EXTENDED_ATTRIBUTES:
-        return ExtendedAttributeKey.extendedAttributesKey(key);
+      case MAP:
+        return ExtendedAttributeKey.mapKey(key);
     }
     throw new IllegalArgumentException();
   }
@@ -353,7 +353,7 @@ private static ExtendedAttributeType getType(Object value) {
       }
     }
     if ((value instanceof Map)) {
-      return ExtendedAttributeType.EXTENDED_ATTRIBUTES;
+      return ExtendedAttributeType.MAP;
     }
     throw new IllegalArgumentException("Unrecognized value type: " + value);
   }

api/incubator/src/test/java/io/opentelemetry/api/incubator/logs/ExtendedLogsBridgeApiUsageTest.java

@@ -104,8 +104,7 @@ private static String flipCoin() {
   AttributeKey<List<Double>> doubleArrKey = AttributeKey.doubleArrayKey("acme.double_array");
 
   // Extended keys
-  ExtendedAttributeKey<ExtendedAttributes> mapKey =
-      ExtendedAttributeKey.extendedAttributesKey("acme.map");
+  ExtendedAttributeKey<ExtendedAttributes> mapKey = ExtendedAttributeKey.mapKey("acme.map");
 
   @Test
   @SuppressLogger(ExtendedLogsBridgeApiUsageTest.class)
@@ -148,7 +147,7 @@ void extendedAttributesUsage() {
     // acme.double_array(DOUBLE_ARRAY): [1.1, 2.2]
     // acme.long(LONG): 1
     // acme.long_array(LONG_ARRAY): [1, 2]
-    // acme.map(EXTENDED_ATTRIBUTES): {childLong=1, childStr="value"}
+    // acme.map(MAP): {childLong=1, childStr="value"}
     // acme.string(STRING): value
     // acme.string_array(STRING_ARRAY): [value1, value2]
     extendedAttributes.forEach(

exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/ExtendedAttributeKeyValueStatelessMarshaler.java

@@ -168,7 +168,7 @@ public int getBinarySerializedSize(
               (List<Object>) value,
               AttributeArrayAnyValueStatelessMarshaler.INSTANCE,
               context);
-        case EXTENDED_ATTRIBUTES:
+        case MAP:
           return StatelessMarshalerUtil.sizeMessageWithContext(
               AnyValue.KVLIST_VALUE,
               (ExtendedAttributes) value,
@@ -213,7 +213,7 @@ public void writeTo(
               AttributeArrayAnyValueStatelessMarshaler.INSTANCE,
               context);
           return;
-        case EXTENDED_ATTRIBUTES:
+        case MAP:
           output.serializeMessageWithContext(
               AnyValue.KVLIST_VALUE,
               (ExtendedAttributes) value,

exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/IncubatingUtil.java

@@ -110,7 +110,7 @@ private static KeyValueMarshaler create(ExtendedAttributeKey<?> attributeKey, Ob
       case DOUBLE_ARRAY:
         return new KeyValueMarshaler(
             keyUtf8, ArrayAnyValueMarshaler.createDouble((List<Double>) value));
-      case EXTENDED_ATTRIBUTES:
+      case MAP:
         return new KeyValueMarshaler(
             keyUtf8,
             new KeyValueListAnyValueMarshaler(