Deprecation

Author: trask

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

@@ -94,7 +94,14 @@ static ExtendedAttributeKey<List<Double>> doubleArrayKey(String key) {
     return fromAttributeKey(AttributeKey.doubleArrayKey(key));
   }
 
-  /** Returns a new ExtendedAttributeKey for Map valued attributes. */
+  /**
+   * Returns a new ExtendedAttributeKey for {@link ExtendedAttributes} valued attributes.
+   *
+   * @deprecated Use {@link #valueKey(String)} in combination with {@link Value#of(java.util.Map)}
+   *     instead.
+   */
+  @Deprecated
+  @SuppressWarnings("deprecation")
   static ExtendedAttributeKey<ExtendedAttributes> extendedAttributesKey(String key) {
     return InternalExtendedAttributeKeyImpl.create(key, ExtendedAttributeType.EXTENDED_ATTRIBUTES);
   }

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

@@ -22,6 +22,11 @@ public enum ExtendedAttributeType {
   LONG_ARRAY,
   DOUBLE_ARRAY,
   // Extended types unique to ExtendedAttributes
+  /**
+   * @deprecated Use {@link #VALUE} with {@link io.opentelemetry.api.common.Value}-based maps
+   *     instead.
+   */
+  @Deprecated
   EXTENDED_ATTRIBUTES,
   VALUE;
 }

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

@@ -18,9 +18,10 @@
  *
  * <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#VALUE}, allowing attributes backed by {@link
+ * io.opentelemetry.api.common.Value}, and the deprecated {@link
  * ExtendedAttributeType#EXTENDED_ATTRIBUTES}, allowing nested {@link ExtendedAttributes} of
- * arbitrary depth, and {@link ExtendedAttributeType#VALUE}, allowing attributes backed by {@link
- * io.opentelemetry.api.common.Value}.
+ * 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

@@ -93,8 +93,11 @@ 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(String, Value)} with {@link Value#of(java.util.Map)} instead.
    * @return this Builder
    */
+  @Deprecated
+  @SuppressWarnings("deprecation")
   default <T> ExtendedAttributesBuilder put(String key, ExtendedAttributes value) {
     return put(ExtendedAttributeKey.extendedAttributesKey(key), value);
   }

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

@@ -115,6 +115,7 @@ private static int buildHashCode(ExtendedAttributeType type, String key) {
    * io.opentelemetry.api.common.AttributeType}.
    */
   @Nullable
+  @SuppressWarnings("deprecation") // Supporting deprecated EXTENDED_ATTRIBUTES until removed
   public static <T> AttributeKey<T> toAttributeKey(ExtendedAttributeKey<T> extendedAttributeKey) {
     switch (extendedAttributeKey.getType()) {
       case STRING:

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

@@ -14,6 +14,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+@SuppressWarnings("deprecation") // Testing deprecated EXTENDED_ATTRIBUTES until removed
 public class ExtendedAttributeKeyTest {
 
   @ParameterizedTest

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

@@ -21,6 +21,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+@SuppressWarnings("deprecation") // Testing deprecated EXTENDED_ATTRIBUTES until removed
 class ExtendedAttributesTest {
 
   @ParameterizedTest

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

@@ -104,6 +104,7 @@ private static String flipCoin() {
   AttributeKey<List<Double>> doubleArrKey = AttributeKey.doubleArrayKey("acme.double_array");
 
   // Extended keys
+  @SuppressWarnings("deprecation") // Supporting deprecated EXTENDED_ATTRIBUTES until removed
   ExtendedAttributeKey<ExtendedAttributes> mapKey =
       ExtendedAttributeKey.extendedAttributesKey("acme.map");
 

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

@@ -141,7 +141,8 @@ private static class ValueStatelessMarshaler
       implements StatelessMarshaler2<ExtendedAttributeKey<?>, Object> {
     static final ValueStatelessMarshaler INSTANCE = new ValueStatelessMarshaler();
 
-    @SuppressWarnings("unchecked")
+    // Supporting deprecated EXTENDED_ATTRIBUTES type until removed
+    @SuppressWarnings({"unchecked", "deprecation"})
     @Override
     public int getBinarySerializedSize(
         ExtendedAttributeKey<?> attributeKey, Object value, MarshalerContext context) {
@@ -184,7 +185,8 @@ public int getBinarySerializedSize(
       throw new IllegalArgumentException("Unsupported attribute type.");
     }
 
-    @SuppressWarnings("unchecked")
+    // Supporting deprecated EXTENDED_ATTRIBUTES type until removed
+    @SuppressWarnings({"unchecked", "deprecation"})
     @Override
     public void writeTo(
         Serializer output,

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

@@ -81,7 +81,8 @@ public void accept(ExtendedAttributeKey<?> attributeKey, Object o) {
   }
 
   // TODO(jack-berg): move to KeyValueMarshaler when ExtendedAttributes is stable
-  @SuppressWarnings("unchecked")
+  // Supporting deprecated EXTENDED_ATTRIBUTES type until removed
+  @SuppressWarnings({"unchecked", "deprecation"})
   private static KeyValueMarshaler create(ExtendedAttributeKey<?> attributeKey, Object value) {
     byte[] keyUtf8;
     if (attributeKey.getKey().isEmpty()) {