update profiles exporters for changes in proto v1.8.0-alpha

Author: jhalliday

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/internal/data/ImmutableKeyValueAndUnitData.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.exporter.otlp.internal.data;
+
+import com.google.auto.value.AutoValue;
+import io.opentelemetry.api.common.Value;
+import io.opentelemetry.exporter.otlp.profiles.KeyValueAndUnitData;
+import javax.annotation.concurrent.Immutable;
+
+/**
+ * Auto value implementation of {@link KeyValueAndUnitData}, which describes a Key Value pair with
+ * optional unit for the value.
+ *
+ * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
+ * at any time.
+ */
+@Immutable
+@AutoValue
+public abstract class ImmutableKeyValueAndUnitData implements KeyValueAndUnitData {
+
+  /** Returns a {@link KeyValueAndUnitData} for the given parameters. */
+  public static ImmutableKeyValueAndUnitData create(
+      int keyStringIndex, Value<?> value, int unitStringIndex) {
+    return new AutoValue_ImmutableKeyValueAndUnitData(keyStringIndex, value, unitStringIndex);
+  }
+
+  ImmutableKeyValueAndUnitData() {}
+}

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/internal/data/ImmutableProfileDictionaryData.java

@@ -39,7 +39,7 @@ public static ProfileDictionaryData create(
       List<FunctionData> functionTable,
       List<LinkData> linkTable,
       List<String> stringTable,
-      List<KeyValueAndUnitData<?>> attributeTable,
+      List<KeyValueAndUnitData> attributeTable,
       List<StackData> stackTable) {
     return new AutoValue_ImmutableProfileDictionaryData(
         mappingTable,

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/KeyValueAndUnitData.java

@@ -5,22 +5,22 @@
 
 package io.opentelemetry.exporter.otlp.profiles;
 
-import io.opentelemetry.exporter.internal.otlp.AttributeKeyValue;
+import io.opentelemetry.api.common.Value;
 
 /**
- * Describes a KeyValue pair with optional unit description for the value.
+ * Describes a KeyValue pair with optional unit description for the value. Similar to
+ * io.opentelemetry.api.common.KeyValue, but dictionary-centric.
  *
  * @see "common.proto::KeyValue"
  * @see "profiles.proto::KeyValueAndUnit"
  */
-public interface KeyValueAndUnitData<T> extends AttributeKeyValue<T> {
+public interface KeyValueAndUnitData {
 
   /** Index into string table. */
-  String getKeyStringIndex();
+  int getKeyStringIndex();
 
-  // T getValue();
+  Value<?> getValue();
 
   /** Index into string table. 0 indicates implicit (via semconv) or undefined. */
-  String getUnitStringIndex();
+  int getUnitStringIndex();
 }
-// TODO JH finish me, then add Marshaler, tests

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/KeyValueAndUnitMarshaler.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.exporter.otlp.profiles;
+
+import io.opentelemetry.exporter.internal.marshal.Marshaler;
+import io.opentelemetry.exporter.internal.marshal.MarshalerUtil;
+import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize;
+import io.opentelemetry.exporter.internal.marshal.Serializer;
+import io.opentelemetry.exporter.internal.otlp.AnyValueMarshaler;
+import io.opentelemetry.proto.profiles.v1development.internal.KeyValueAndUnit;
+import java.io.IOException;
+import java.util.List;
+import java.util.function.Consumer;
+
+final class KeyValueAndUnitMarshaler extends MarshalerWithSize {
+
+  private static final KeyValueAndUnitMarshaler[] EMPTY_REPEATED = new KeyValueAndUnitMarshaler[0];
+
+  private final int keyStringIndex;
+  private final Marshaler valueMarshaler;
+  private final int unitStringIndex;
+
+  static KeyValueAndUnitMarshaler create(KeyValueAndUnitData keyValueAndUnitData) {
+    Marshaler valueMarshaler = AnyValueMarshaler.create(keyValueAndUnitData.getValue());
+    return new KeyValueAndUnitMarshaler(
+        keyValueAndUnitData.getKeyStringIndex(),
+        valueMarshaler,
+        keyValueAndUnitData.getUnitStringIndex());
+  }
+
+  static KeyValueAndUnitMarshaler[] createRepeated(List<KeyValueAndUnitData> items) {
+    if (items.isEmpty()) {
+      return EMPTY_REPEATED;
+    }
+
+    KeyValueAndUnitMarshaler[] keyValueAndUnitMarshalers =
+        new KeyValueAndUnitMarshaler[items.size()];
+    items.forEach(
+        new Consumer<KeyValueAndUnitData>() {
+          int index = 0;
+
+          @Override
+          public void accept(KeyValueAndUnitData keyValueAndUnitData) {
+            keyValueAndUnitMarshalers[index++] =
+                KeyValueAndUnitMarshaler.create(keyValueAndUnitData);
+          }
+        });
+    return keyValueAndUnitMarshalers;
+  }
+
+  private KeyValueAndUnitMarshaler(
+      int keyStringIndex, Marshaler valueMarshaler, int unitStringIndex) {
+    super(calculateSize(keyStringIndex, valueMarshaler, unitStringIndex));
+    this.keyStringIndex = keyStringIndex;
+    this.valueMarshaler = valueMarshaler;
+    this.unitStringIndex = unitStringIndex;
+  }
+
+  @Override
+  protected void writeTo(Serializer output) throws IOException {
+    output.serializeInt32(KeyValueAndUnit.KEY_STRINDEX, keyStringIndex);
+    output.serializeMessage(KeyValueAndUnit.VALUE, valueMarshaler);
+    output.serializeInt64(KeyValueAndUnit.UNIT_STRINDEX, unitStringIndex);
+  }
+
+  private static int calculateSize(
+      int keyStringIndex, Marshaler valueMarshaler, int unitStringIndex) {
+    int size = 0;
+    size += MarshalerUtil.sizeInt32(KeyValueAndUnit.KEY_STRINDEX, keyStringIndex);
+    size += MarshalerUtil.sizeMessage(KeyValueAndUnit.VALUE, valueMarshaler);
+    size += MarshalerUtil.sizeInt32(KeyValueAndUnit.UNIT_STRINDEX, unitStringIndex);
+    return size;
+  }
+}

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/ProfileDictionaryData.java

@@ -37,7 +37,7 @@ public interface ProfileDictionaryData {
   List<String> getStringTable();
 
   /** Lookup table for attributes. */
-  List<KeyValueAndUnitData<?>> getAttributeTable();
+  List<KeyValueAndUnitData> getAttributeTable();
 
   /** Lookup table for stacks. */
   List<StackData> getStackTable();

exporters/otlp/profiles/src/main/java/io/opentelemetry/exporter/otlp/profiles/ProfileDictionaryMarshaler.java

@@ -8,11 +8,9 @@
 import io.opentelemetry.exporter.internal.marshal.MarshalerUtil;
 import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize;
 import io.opentelemetry.exporter.internal.marshal.Serializer;
-import io.opentelemetry.exporter.internal.otlp.KeyValueMarshaler;
 import io.opentelemetry.proto.profiles.v1development.internal.ProfilesDictionary;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.Collections;
 
 final class ProfileDictionaryMarshaler extends MarshalerWithSize {
 
@@ -21,7 +19,7 @@ final class ProfileDictionaryMarshaler extends MarshalerWithSize {
   private final FunctionMarshaler[] functionTableMarshalers;
   private final LinkMarshaler[] linkTableMarshalers;
   private final byte[][] stringTable;
-  private final KeyValueMarshaler[] attributeTableMarshalers; // TODO
+  private final KeyValueAndUnitMarshaler[] attributeTableMarshalers;
   private final StackMarshaler[] stackTableMarshalers;
 
   static ProfileDictionaryMarshaler create(ProfileDictionaryData profileDictionaryData) {
@@ -41,9 +39,8 @@ static ProfileDictionaryMarshaler create(ProfileDictionaryData profileDictionary
           profileDictionaryData.getStringTable().get(i).getBytes(StandardCharsets.UTF_8);
     }
 
-    KeyValueMarshaler[] attributeTableMarshalers =
-        KeyValueMarshaler.createRepeated(Collections.emptyList());
-    // TODO JH profileDictionaryData.getAttributeTable()
+    KeyValueAndUnitMarshaler[] attributeTableMarshalers =
+        KeyValueAndUnitMarshaler.createRepeated(profileDictionaryData.getAttributeTable());
     StackMarshaler[] stackTableMarshalers =
         StackMarshaler.createRepeated(profileDictionaryData.getStackTable());
 
@@ -63,7 +60,7 @@ private ProfileDictionaryMarshaler(
       FunctionMarshaler[] functionTableMarshalers,
       LinkMarshaler[] linkTableMarshalers,
       byte[][] stringTableUtf8,
-      KeyValueMarshaler[] attributeTableMarshalers,
+      KeyValueAndUnitMarshaler[] attributeTableMarshalers,
       StackMarshaler[] stackTableMarshalers) {
     super(
         calculateSize(
@@ -100,7 +97,7 @@ private static int calculateSize(
       FunctionMarshaler[] functionMarshalers,
       LinkMarshaler[] linkMarshalers,
       byte[][] stringTable,
-      KeyValueMarshaler[] attributeTableMarshalers,
+      KeyValueAndUnitMarshaler[] attributeTableMarshalers,
       StackMarshaler[] stackTableMarshalers) {
     int size;
     size = 0;

exporters/otlp/profiles/src/test/java/io/opentelemetry/exporter/otlp/profiles/ProfilesRequestMarshalerTest.java

@@ -12,8 +12,10 @@
 import com.google.protobuf.Message;
 import com.google.protobuf.util.JsonFormat;
 import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.common.Value;
 import io.opentelemetry.exporter.internal.marshal.Marshaler;
 import io.opentelemetry.exporter.otlp.internal.data.ImmutableFunctionData;
+import io.opentelemetry.exporter.otlp.internal.data.ImmutableKeyValueAndUnitData;
 import io.opentelemetry.exporter.otlp.internal.data.ImmutableLineData;
 import io.opentelemetry.exporter.otlp.internal.data.ImmutableLinkData;
 import io.opentelemetry.exporter.otlp.internal.data.ImmutableLocationData;
@@ -23,8 +25,10 @@
 import io.opentelemetry.exporter.otlp.internal.data.ImmutableSampleData;
 import io.opentelemetry.exporter.otlp.internal.data.ImmutableStackData;
 import io.opentelemetry.exporter.otlp.internal.data.ImmutableValueTypeData;
+import io.opentelemetry.proto.common.v1.AnyValue;
 import io.opentelemetry.proto.common.v1.InstrumentationScope;
 import io.opentelemetry.proto.profiles.v1development.Function;
+import io.opentelemetry.proto.profiles.v1development.KeyValueAndUnit;
 import io.opentelemetry.proto.profiles.v1development.Line;
 import io.opentelemetry.proto.profiles.v1development.Link;
 import io.opentelemetry.proto.profiles.v1development.Location;
@@ -123,6 +127,49 @@ void compareRepeatedLineMarshaling() {
     }
   }
 
+  @Test
+  void compareKeyValueAndUnitMarshaling() {
+    KeyValueAndUnitData input = ImmutableKeyValueAndUnitData.create(1, Value.of("foo"), 3);
+    KeyValueAndUnit builderResult =
+        KeyValueAndUnit.newBuilder()
+            .setKeyStrindex(1)
+            .setValue(AnyValue.newBuilder().setStringValue("foo").build())
+            .setUnitStrindex(3)
+            .build();
+
+    KeyValueAndUnit roundTripResult =
+        parse(KeyValueAndUnit.getDefaultInstance(), KeyValueAndUnitMarshaler.create(input));
+    assertThat(roundTripResult).isEqualTo(builderResult);
+  }
+
+  @Test
+  void compareRepeatedKeyValueAndUnitMarshaling() {
+    List<KeyValueAndUnitData> inputs = new ArrayList<>();
+    inputs.add(ImmutableKeyValueAndUnitData.create(1, Value.of("foo"), 3));
+    inputs.add(ImmutableKeyValueAndUnitData.create(4, Value.of("bar"), 6));
+
+    List<KeyValueAndUnit> builderResults = new ArrayList<>();
+    builderResults.add(
+        KeyValueAndUnit.newBuilder()
+            .setKeyStrindex(1)
+            .setValue(AnyValue.newBuilder().setStringValue("foo").build())
+            .setUnitStrindex(3)
+            .build());
+    builderResults.add(
+        KeyValueAndUnit.newBuilder()
+            .setKeyStrindex(4)
+            .setValue(AnyValue.newBuilder().setStringValue("bar").build())
+            .setUnitStrindex(6)
+            .build());
+
+    KeyValueAndUnitMarshaler[] marshalers = KeyValueAndUnitMarshaler.createRepeated(inputs);
+
+    for (int i = 0; i < marshalers.length; i++) {
+      KeyValueAndUnit roundTripResult = parse(KeyValueAndUnit.getDefaultInstance(), marshalers[i]);
+      assertThat(roundTripResult).isEqualTo(builderResults.get(i));
+    }
+  }
+
   @Test
   void compareLinkMarshaling() {
     String traceId = "0123456789abcdef0123456789abcdef";