LINE -> LINES. SAMPLE -> SAMPLES. remove temporality.

Author: breedx-splk

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

@@ -64,7 +64,7 @@ private LocationMarshaler(
   protected void writeTo(Serializer output) throws IOException {
     output.serializeInt32(Location.MAPPING_INDEX, mappingIndex);
     output.serializeUInt64(Location.ADDRESS, address);
-    output.serializeRepeatedMessage(Location.LINE, lineMarshalers);
+    output.serializeRepeatedMessage(Location.LINES, lineMarshalers);
     output.serializeRepeatedInt32(Location.ATTRIBUTE_INDICES, attributeIndices);
   }
 
@@ -76,7 +76,7 @@ private static int calculateSize(
     int size = 0;
     size += MarshalerUtil.sizeInt32(Location.MAPPING_INDEX, mappingIndex);
     size += MarshalerUtil.sizeUInt64(Location.ADDRESS, address);
-    size += MarshalerUtil.sizeRepeatedMessage(Location.LINE, lineMarshalers);
+    size += MarshalerUtil.sizeRepeatedMessage(Location.LINES, lineMarshalers);
     size += MarshalerUtil.sizeRepeatedInt32(Location.ATTRIBUTE_INDICES, attributeIndices);
     return size;
   }

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

@@ -96,7 +96,7 @@ private ProfileMarshaler(
   @Override
   protected void writeTo(Serializer output) throws IOException {
     output.serializeMessage(Profile.SAMPLE_TYPE, sampleTypeMarshaler);
-    output.serializeRepeatedMessage(Profile.SAMPLE, sampleMarshalers);
+    output.serializeRepeatedMessage(Profile.SAMPLES, sampleMarshalers);
     output.serializeFixed64(Profile.TIME_UNIX_NANO, timeNanos);
     output.serializeInt64(Profile.DURATION_NANO, durationNanos);
     output.serializeMessage(Profile.PERIOD_TYPE, periodTypeMarshaler);
@@ -126,7 +126,7 @@ private static int calculateSize(
     int size;
     size = 0;
     size += MarshalerUtil.sizeMessage(Profile.SAMPLE_TYPE, sampleTypeMarshaler);
-    size += MarshalerUtil.sizeRepeatedMessage(Profile.SAMPLE, sampleMarshalers);
+    size += MarshalerUtil.sizeRepeatedMessage(Profile.SAMPLES, sampleMarshalers);
     size += MarshalerUtil.sizeFixed64(Profile.TIME_UNIX_NANO, timeNanos);
     size += MarshalerUtil.sizeInt64(Profile.DURATION_NANO, durationNanos);
     size += MarshalerUtil.sizeMessage(Profile.PERIOD_TYPE, periodTypeMarshaler);

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

@@ -9,7 +9,7 @@
 import javax.annotation.concurrent.Immutable;
 
 /**
- * ValueType describes the type and units of a value, with an optional aggregation temporality.
+ * ValueType describes the type and units of a value.
  *
  * @see "profiles.proto::ValueType"
  */
@@ -21,7 +21,4 @@ public interface ValueTypeData {
 
   /** Index into string table. */
   int getUnitStringIndex();
-
-  @Nullable
-  AggregationTemporality getAggregationTemporality();
 }

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

@@ -9,7 +9,6 @@
 import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize;
 import io.opentelemetry.exporter.internal.marshal.ProtoEnumInfo;
 import io.opentelemetry.exporter.internal.marshal.Serializer;
-import io.opentelemetry.proto.profiles.v1development.internal.AggregationTemporality;
 import io.opentelemetry.proto.profiles.v1development.internal.ValueType;
 import java.io.IOException;
 import java.util.List;
@@ -21,25 +20,11 @@ final class ValueTypeMarshaler extends MarshalerWithSize {
 
   private final int typeStringIndex;
   private final int unitStringIndex;
-  private final ProtoEnumInfo aggregationTemporality;
 
   static ValueTypeMarshaler create(ValueTypeData valueTypeData) {
-    ProtoEnumInfo aggregationTemporality =
-        AggregationTemporality.AGGREGATION_TEMPORALITY_UNSPECIFIED;
-    if (valueTypeData.getAggregationTemporality() != null) {
-      switch (valueTypeData.getAggregationTemporality()) {
-        case DELTA:
-          aggregationTemporality = AggregationTemporality.AGGREGATION_TEMPORALITY_DELTA;
-          break;
-        case CUMULATIVE:
-          aggregationTemporality = AggregationTemporality.AGGREGATION_TEMPORALITY_CUMULATIVE;
-          break;
-      }
-    }
     return new ValueTypeMarshaler(
         valueTypeData.getTypeStringIndex(),
-        valueTypeData.getUnitStringIndex(),
-        aggregationTemporality);
+        valueTypeData.getUnitStringIndex());
   }
 
   static ValueTypeMarshaler[] createRepeated(List<ValueTypeData> items) {
@@ -60,28 +45,23 @@ public void accept(ValueTypeData valueTypeData) {
     return valueTypeMarshalers;
   }
 
-  private ValueTypeMarshaler(
-      int typeStringIndex, int unitStringIndex, ProtoEnumInfo aggregationTemporality) {
-    super(calculateSize(typeStringIndex, unitStringIndex, aggregationTemporality));
+  private ValueTypeMarshaler(int typeStringIndex, int unitStringIndex) {
+    super(calculateSize(typeStringIndex, unitStringIndex));
     this.typeStringIndex = typeStringIndex;
     this.unitStringIndex = unitStringIndex;
-    this.aggregationTemporality = aggregationTemporality;
   }
 
   @Override
   protected void writeTo(Serializer output) throws IOException {
     output.serializeInt64(ValueType.TYPE_STRINDEX, typeStringIndex);
     output.serializeInt64(ValueType.UNIT_STRINDEX, unitStringIndex);
-    output.serializeEnum(ValueType.AGGREGATION_TEMPORALITY, aggregationTemporality);
   }
 
-  private static int calculateSize(
-      int typeStringIndex, int unitStringIndex, ProtoEnumInfo aggregationTemporality) {
+  private static int calculateSize(int typeStringIndex, int unitStringIndex) {
     int size;
     size = 0;
     size += MarshalerUtil.sizeInt32(ValueType.TYPE_STRINDEX, typeStringIndex);
     size += MarshalerUtil.sizeInt32(ValueType.UNIT_STRINDEX, unitStringIndex);
-    size += MarshalerUtil.sizeEnum(ValueType.AGGREGATION_TEMPORALITY, aggregationTemporality);
     return size;
   }
 }