Implement ArrayAttribute

open-telemetry · Mar 16, 2020 · a9ff82c · a9ff82c
1 parent cecf833
commit a9ff82c
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 19 deletions.
diff --git a/api/src/main/java/io/opentelemetry/common/AttributeValue.java b/api/src/main/java/io/opentelemetry/common/AttributeValue.java
@@ -112,7 +112,7 @@ public static AttributeValue arrayAttributeValue(String... stringValues) {
    * @return an {@code AttributeValue} with a boolean array value.
    * @since 0.3.0
    */
-  public static AttributeValue arrayAttributeValue(boolean... booleanValues) {
+  public static AttributeValue arrayAttributeValue(Boolean... booleanValues) {
     return AttributeValueBooleanArray.create(booleanValues);
   }
 
@@ -123,7 +123,7 @@ public static AttributeValue arrayAttributeValue(boolean... booleanValues) {
    * @return an {@code AttributeValue} with a long array value.
    * @since 0.3.0
    */
-  public static AttributeValue arrayAttributeValue(long... longValues) {
+  public static AttributeValue arrayAttributeValue(Long... longValues) {
     return AttributeValueLongArray.create(longValues);
   }
 
@@ -134,7 +134,7 @@ public static AttributeValue arrayAttributeValue(long... longValues) {
    * @return an {@code AttributeValue} with a double array value.
    * @since 0.3.0
    */
-  public static AttributeValue arrayAttributeValue(double... doubleValues) {
+  public static AttributeValue arrayAttributeValue(Double... doubleValues) {
     return AttributeValueDoubleArray.create(doubleValues);
   }
 
@@ -351,13 +351,13 @@ abstract static class AttributeValueBooleanArray extends AttributeValue {
 
     AttributeValueBooleanArray() {}
 
-    static AttributeValue create(boolean... booleanValues) {
+    static AttributeValue create(Boolean... booleanValues) {
       if (booleanValues == null) {
         return new AutoValue_AttributeValue_AttributeValueBooleanArray(
             Collections.<Boolean>emptyList());
       }
       List<Boolean> values = new ArrayList<>(booleanValues.length);
-      for (boolean value : booleanValues) {
+      for (Boolean value : booleanValues) {
         values.add(value);
       }
       return new AutoValue_AttributeValue_AttributeValueBooleanArray(
@@ -379,12 +379,12 @@ abstract static class AttributeValueLongArray extends AttributeValue {
 
     AttributeValueLongArray() {}
 
-    static AttributeValue create(long... longValues) {
+    static AttributeValue create(Long... longValues) {
       if (longValues == null) {
         return new AutoValue_AttributeValue_AttributeValueLongArray(Collections.<Long>emptyList());
       }
       List<Long> values = new ArrayList<>(longValues.length);
-      for (long value : longValues) {
+      for (Long value : longValues) {
         values.add(value);
       }
       return new AutoValue_AttributeValue_AttributeValueLongArray(
@@ -406,13 +406,13 @@ abstract static class AttributeValueDoubleArray extends AttributeValue {
 
     AttributeValueDoubleArray() {}
 
-    static AttributeValue create(double... doubleValues) {
+    static AttributeValue create(Double... doubleValues) {
       if (doubleValues == null) {
         return new AutoValue_AttributeValue_AttributeValueDoubleArray(
             Collections.<Double>emptyList());
       }
       List<Double> values = new ArrayList<>(doubleValues.length);
-      for (double value : doubleValues) {
+      for (Double value : doubleValues) {
         values.add(value);
       }
       return new AutoValue_AttributeValue_AttributeValueDoubleArray(

diff --git a/api/src/test/java/io/opentelemetry/common/AttributeValueTest.java b/api/src/test/java/io/opentelemetry/common/AttributeValueTest.java
@@ -68,9 +68,9 @@ public void attributeValue_EqualsAndHashCode() {
   public void doNotCrashOnNull() {
     AttributeValue.stringAttributeValue(null);
     AttributeValue.arrayAttributeValue((String[]) null);
-    AttributeValue.arrayAttributeValue((boolean[]) null);
-    AttributeValue.arrayAttributeValue((long[]) null);
-    AttributeValue.arrayAttributeValue((double[]) null);
+    AttributeValue.arrayAttributeValue((Boolean[]) null);
+    AttributeValue.arrayAttributeValue((Long[]) null);
+    AttributeValue.arrayAttributeValue((Double[]) null);
   }
 
   @Test
@@ -98,4 +98,21 @@ public void attributeValue_ToString() {
     assertThat(attribute.toString()).contains("1.2345");
     assertThat(attribute.toString()).contains("6.789");
   }
+
+  @Test
+  public void arrayAttributeValue_nullValuesWithinArray() {
+    AttributeValue attribute;
+
+    attribute = AttributeValue.arrayAttributeValue("string", null, "", "string");
+    assertThat(attribute.getStringArrayValue().size()).isEqualTo(4);
+
+    attribute = AttributeValue.arrayAttributeValue(10L, null, 20L);
+    assertThat(attribute.getLongArrayValue().size()).isEqualTo(3);
+
+    attribute = AttributeValue.arrayAttributeValue(true, null, false);
+    assertThat(attribute.getBooleanArrayValue().size()).isEqualTo(3);
+
+    attribute = AttributeValue.arrayAttributeValue(1.2, null, 3.4);
+    assertThat(attribute.getDoubleArrayValue().size()).isEqualTo(3);
+  }
 }
diff --git a/api/src/test/java/io/opentelemetry/trace/DefaultSpanTest.java b/api/src/test/java/io/opentelemetry/trace/DefaultSpanTest.java
@@ -57,9 +57,9 @@ public void doNotCrash() {
     span.setAttribute("NullString", (String) null);
     span.setAttribute("EmptyString", "");
     span.setAttribute("NullArrayString", AttributeValue.arrayAttributeValue((String[]) null));
-    span.setAttribute("NullArrayBoolean", AttributeValue.arrayAttributeValue((boolean[]) null));
-    span.setAttribute("NullArrayLong", AttributeValue.arrayAttributeValue((long[]) null));
-    span.setAttribute("NullArrayDouble", AttributeValue.arrayAttributeValue((double[]) null));
+    span.setAttribute("NullArrayBoolean", AttributeValue.arrayAttributeValue((Boolean[]) null));
+    span.setAttribute("NullArrayLong", AttributeValue.arrayAttributeValue((Long[]) null));
+    span.setAttribute("NullArrayDouble", AttributeValue.arrayAttributeValue((Double[]) null));
     span.addEvent("event");
     span.addEvent("event", 0);
     span.addEvent(

diff --git a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/CommonAdapter.java b/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/CommonAdapter.java
@@ -43,6 +43,11 @@ static AttributeKeyValue toProtoAttribute(String key, AttributeValue attributeVa
             .setType(ValueType.DOUBLE)
             .setDoubleValue(attributeValue.getDoubleValue())
             .build();
+      case BOOLEAN_ARRAY:
+      case LONG_ARRAY:
+      case DOUBLE_ARRAY:
+      case STRING_ARRAY:
+        return builder.setType(ValueType.UNRECOGNIZED).build();
     }
     return builder.setType(ValueType.UNRECOGNIZED).build();
   }

diff --git a/sdk/src/main/java/io/opentelemetry/sdk/trace/RecordEventsReadableSpan.java b/sdk/src/main/java/io/opentelemetry/sdk/trace/RecordEventsReadableSpan.java
@@ -19,7 +19,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.EvictingQueue;
 import io.opentelemetry.common.AttributeValue;
-import io.opentelemetry.common.AttributeValue.Type;
 import io.opentelemetry.internal.StringUtils;
 import io.opentelemetry.sdk.common.Clock;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;

diff --git a/sdk/src/test/java/io/opentelemetry/sdk/trace/RecordEventsReadableSpanTest.java b/sdk/src/test/java/io/opentelemetry/sdk/trace/RecordEventsReadableSpanTest.java
@@ -303,10 +303,10 @@ public void setAttribute() {
       span.setAttribute(
           "ArrayBooleanKey", AttributeValue.arrayAttributeValue(true, false, false, true));
       span.setAttribute("NullArrayStringKey", AttributeValue.arrayAttributeValue((String[]) null));
-      span.setAttribute("NullArrayLongKey", AttributeValue.arrayAttributeValue((long[]) null));
-      span.setAttribute("NullArrayDoubleKey", AttributeValue.arrayAttributeValue((double[]) null));
+      span.setAttribute("NullArrayLongKey", AttributeValue.arrayAttributeValue((Long[]) null));
+      span.setAttribute("NullArrayDoubleKey", AttributeValue.arrayAttributeValue((Double[]) null));
       span.setAttribute(
-          "NullArrayBooleanKey", AttributeValue.arrayAttributeValue((boolean[]) null));
+          "NullArrayBooleanKey", AttributeValue.arrayAttributeValue((Boolean[]) null));
     } finally {
       span.end();
     }