Update to latest spec PR

Author: trask

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

@@ -113,26 +113,32 @@ static Value<Empty> empty() {
   T getValue();
 
   /**
-   * Returns a JSON encoding of this {@link Value}.
+   * Returns a string representation of this {@link Value}.
    *
-   * <p>The output follows the <a href="https://protobuf.dev/programming-guides/json/">ProtoJSON</a>
-   * specification:
+   * <p>The output follows the <a
+   * href="https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/common/README.md#anyvalue-representation-for-non-otlp-protocols">
+   * string representation guidance</a> for complex attribute value types:
    *
    * <ul>
-   *   <li>{@link ValueType#STRING} JSON string (including escaping and surrounding quotes)
-   *   <li>{@link ValueType#BOOLEAN} JSON boolean ({@code true} or {@code false})
-   *   <li>{@link ValueType#LONG} JSON number
+   *   <li>{@link ValueType#STRING} String as-is without surrounding quotes. Examples: {@code hello
+   *       world}, (empty string)
+   *   <li>{@link ValueType#BOOLEAN} JSON boolean. Examples: {@code true}, {@code false}
+   *   <li>{@link ValueType#LONG} JSON number. Examples: {@code 42}, {@code -123}
    *   <li>{@link ValueType#DOUBLE} JSON number, or {@code "NaN"}, {@code "Infinity"}, {@code
-   *       "-Infinity"} for special values
-   *   <li>{@link ValueType#ARRAY} JSON array (e.g. {@code [1,"two",true]})
-   *   <li>{@link ValueType#KEY_VALUE_LIST} JSON object (e.g. {@code {"key1":"value1","key2":2}})
-   *   <li>{@link ValueType#BYTES} JSON string (including surrounding double quotes) containing
-   *       base64 encoded bytes
-   *   <li>{@link ValueType#EMPTY} JSON {@code null} (the string {@code "null"} without the
-   *       surrounding quotes)
+   *       "-Infinity"} for special values. Examples: {@code 3.14159}, {@code 1.23e10}, {@code
+   *       "NaN"}, {@code "-Infinity"}
+   *   <li>{@link ValueType#ARRAY} JSON array. Nested strings and byte arrays are encoded as JSON
+   *       strings (with surrounding quotes). Nested empty values are encoded as JSON {@code null}.
+   *       Examples: {@code []}, {@code [1, "a", true, {"nested": "aGVsbG8gd29ybGQ="}]}
+   *   <li>{@link ValueType#KEY_VALUE_LIST} JSON object. Nested strings and byte arrays are encoded
+   *       as JSON strings (with surrounding quotes). Nested empty values are encoded as JSON {@code
+   *       null}. Examples: {@code {}}, {@code {"a": "1", "b": 2, "c": [3, null]}}
+   *   <li>{@link ValueType#BYTES} Base64-encoded bytes without surrounding quotes. Example: {@code
+   *       aGVsbG8gd29ybGQ=}
+   *   <li>{@link ValueType#EMPTY} The empty string.
    * </ul>
    *
-   * @return a JSON encoding of this value
+   * @return a string representation of this value
    */
   String asString();
 }

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

@@ -7,6 +7,7 @@
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Objects;
 
 final class ValueBytes implements Value<ByteBuffer> {
@@ -34,9 +35,8 @@ public ByteBuffer getValue() {
 
   @Override
   public String asString() {
-    StringBuilder sb = new StringBuilder();
-    ProtoJson.append(sb, this);
-    return sb.toString();
+    byte[] bytes = raw;
+    return Base64.getEncoder().encodeToString(bytes);
   }
 
   @Override

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

@@ -27,7 +27,7 @@ public Empty getValue() {
 
   @Override
   public String asString() {
-    return "null";
+    return "";
   }
 
   @Override

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

@@ -32,9 +32,7 @@ public String getValue() {
 
   @Override
   public String asString() {
-    StringBuilder sb = new StringBuilder();
-    ProtoJson.append(sb, this);
-    return sb.toString();
+    return value;
   }
 
   @Override

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

@@ -26,13 +26,13 @@ void valueString(String input, String expectedJson) {
 
   private static Stream<Arguments> stringValueProvider() {
     return Stream.of(
-        Arguments.of("hello", "\"hello\""),
-        Arguments.of("", "\"\""),
-        Arguments.of("line1\nline2\ttab", "\"line1\\nline2\\ttab\""),
-        Arguments.of("say \"hello\"", "\"say \\\"hello\\\"\""),
-        Arguments.of("path\\to\\file", "\"path\\\\to\\\\file\""),
-        Arguments.of("\u0000\u0001\u001F", "\"\\u0000\\u0001\\u001f\""),
-        Arguments.of("Hello 世界 🌍", "\"Hello 世界 🌍\""));
+        Arguments.of("hello", "hello"),
+        Arguments.of("", ""),
+        Arguments.of("line1\nline2\ttab", "line1\nline2\ttab"),
+        Arguments.of("say \"hello\"", "say \"hello\""),
+        Arguments.of("path\\to\\file", "path\\to\\file"),
+        Arguments.of("\u0000\u0001\u001F", "\u0000\u0001\u001F"),
+        Arguments.of("Hello 世界 🌍", "Hello 世界 🌍"));
   }
 
   @ParameterizedTest
@@ -88,13 +88,13 @@ void valueBytes(byte[] input, String expectedJson) {
   private static Stream<Arguments> bytesValueProvider() {
     byte[] regularBytes = new byte[] {0, 1, 2, Byte.MAX_VALUE, Byte.MIN_VALUE};
     return Stream.of(
-        Arguments.of(new byte[] {}, "\"\""),
-        Arguments.of(regularBytes, '"' + Base64.getEncoder().encodeToString(regularBytes) + '"'));
+        Arguments.of(new byte[] {}, ""),
+        Arguments.of(regularBytes, Base64.getEncoder().encodeToString(regularBytes)));
   }
 
   @Test
   void valueEmpty() {
-    assertThat(Value.empty().asString()).isEqualTo("null");
+    assertThat(Value.empty().asString()).isEqualTo("");
   }
 
   @ParameterizedTest

api/all/src/test/java/io/opentelemetry/api/logs/ValueTest.java

@@ -172,7 +172,7 @@ void asString(Value<?> value, String expectedAsString) {
   private static Stream<Arguments> asStringArgs() {
     return Stream.of(
         // primitives
-        arguments(Value.of("str"), "\"str\""),
+        arguments(Value.of("str"), "str"),
         arguments(Value.of(true), "true"),
         arguments(Value.of(1), "1"),
         arguments(Value.of(1.1), "1.1"),
@@ -201,18 +201,15 @@ private static Stream<Arguments> asStringArgs() {
                     "child", Value.of(Collections.singletonMap("grandchild", Value.of("str"))))),
             "{\"child\":{\"grandchild\":\"str\"}}"),
         // bytes
-        arguments(
-            Value.of("hello world".getBytes(StandardCharsets.UTF_8)), "\"aGVsbG8gd29ybGQ=\""));
+        arguments(Value.of("hello world".getBytes(StandardCharsets.UTF_8)), "aGVsbG8gd29ybGQ="));
   }
 
   @Test
   void valueByteAsString() {
     // TODO: add more test cases
     String str = "hello world";
     String base64Encoded = Value.of(str.getBytes(StandardCharsets.UTF_8)).asString();
-    // Remove surrounding quotes from JSON string
-    String base64Value = base64Encoded.substring(1, base64Encoded.length() - 1);
-    byte[] decodedBytes = Base64.getDecoder().decode(base64Value);
+    byte[] decodedBytes = Base64.getDecoder().decode(base64Encoded);
     assertThat(new String(decodedBytes, StandardCharsets.UTF_8)).isEqualTo(str);
   }
 }

exporters/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingSpanExporterTest.java

@@ -115,7 +115,7 @@ void export() {
         .isEqualTo(
             "'testSpan1' : 12345678876543211234567887654321 8765432112345678 "
                 + "INTERNAL [tracer: tracer1:] "
-                + "{animal=\"cat\", bytes=ValueBytes{\"AQID\"}, empty=ValueEmpty{}, "
+                + "{animal=\"cat\", bytes=ValueBytes{AQID}, empty=ValueEmpty{}, "
                 + "heterogeneousArray=ValueArray{[\"string\",123]}, lives=9, "
                 + "map=KeyValueList{{\"nested\":\"value\"}}}");
     assertThat(logs.getEvents().get(1).getMessage())

exporters/logging/src/test/java/io/opentelemetry/exporter/logging/SystemOutLogRecordExporterTest.java

@@ -47,8 +47,8 @@ void format() {
     SystemOutLogRecordExporter.formatLog(output, log);
     assertThat(output.toString())
         .isEqualTo(
-            "1970-08-07T10:00:00Z ERROR3 '\"message\"' : 00000000000000010000000000000002 0000000000000003 "
-                + "[scopeInfo: logTest:1.0] {amount=1, bytes=ValueBytes{\"AQID\"}, cheese=\"cheddar\", "
+            "1970-08-07T10:00:00Z ERROR3 'message' : 00000000000000010000000000000002 0000000000000003 "
+                + "[scopeInfo: logTest:1.0] {amount=1, bytes=ValueBytes{AQID}, cheese=\"cheddar\", "
                 + "empty=ValueEmpty{}, heterogeneousArray=ValueArray{[\"string\",123]}, "
                 + "map=KeyValueList{{\"nested\":\"value\"}}}");
   }

exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverterTest.java

@@ -352,14 +352,14 @@ private static Stream<Arguments> labelValueSerializationArgs() {
         Arguments.of(
             Attributes.of(doubleArrayKey("key"), Arrays.asList(Double.MIN_VALUE, Double.MAX_VALUE)),
             "[4.9E-324,1.7976931348623157E308]"),
-        Arguments.of(Attributes.of(valueKey("key"), Value.of(new byte[] {1, 2, 3})), "\"AQID\""),
+        Arguments.of(Attributes.of(valueKey("key"), Value.of(new byte[] {1, 2, 3})), "AQID"),
         Arguments.of(
             Attributes.of(valueKey("key"), Value.of(KeyValue.of("nested", Value.of("value")))),
             "{\"nested\":\"value\"}"),
         Arguments.of(
             Attributes.of(valueKey("key"), Value.of(Value.of("string"), Value.of(123L))),
             "[\"string\",123]"),
-        Arguments.of(Attributes.of(valueKey("key"), Value.empty()), "null"));
+        Arguments.of(Attributes.of(valueKey("key"), Value.empty()), ""));
   }
 
   static MetricData createSampleMetricData(

exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/EventDataToAnnotation.java

@@ -9,6 +9,7 @@
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.Value;
+import io.opentelemetry.api.common.ValueType;
 import io.opentelemetry.sdk.trace.data.EventData;
 import java.util.List;
 
@@ -45,8 +46,31 @@ private static String toValue(Object o) {
           .stream().map(EventDataToAnnotation::toValue).collect(joining(",", "[", "]"));
     }
     if (o instanceof Value) {
-      return ((Value<?>) o).asString();
+      return toJsonValue((Value<?>) o);
     }
     return String.valueOf(o);
   }
+
+  // note: simple types (STRING, BOOLEAN, LONG, DOUBLE) won't actually come here
+  // but handling here for completeness
+  private static String toJsonValue(Value<?> value) {
+    ValueType type = value.getType();
+    switch (type) {
+      case STRING:
+      case BYTES:
+        // For JSON encoding, strings and bytes need to be quoted
+        return "\"" + value.asString() + "\"";
+      case EMPTY:
+        // For JSON encoding, empty values should be null
+        return "null";
+      case ARRAY:
+      case KEY_VALUE_LIST:
+      case BOOLEAN:
+      case LONG:
+      case DOUBLE:
+        // Arrays, maps, and primitives are already valid JSON from asString()
+        return value.asString();
+    }
+    throw new IllegalStateException("Unknown value type: " + type);
+  }
 }