Skip to content

Commit b9f98a8

Browse files
renovate[bot]breedx-splk
renovate[bot]
and
breedx-splk
authored
fix(deps): update dependency io.opentelemetry.proto:opentelemetry-proto to v1.9.0-alpha (#7847)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jason Plumb <[email protected]>
1 parent 04642a0 commit b9f98a8

File tree

8 files changed

+24
-97
lines changed

8 files changed

+24
-97
lines changed

‎dependencyManagement/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ val DEPENDENCIES = listOf(
8282
"io.jaegertracing:jaeger-client:1.8.1",
8383
"io.opentelemetry.contrib:opentelemetry-aws-xray-propagator:1.52.0-alpha",
8484
"io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.37.0-alpha",
85-
"io.opentelemetry.proto:opentelemetry-proto:1.8.0-alpha",
85+
"io.opentelemetry.proto:opentelemetry-proto:1.9.0-alpha",
8686
"io.opentracing:opentracing-api:0.33.0",
8787
"io.opentracing:opentracing-noop:0.33.0",
8888
"junit:junit:4.13.2",

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.opentelemetry.exporter.otlp.internal.data;
77

88
import com.google.auto.value.AutoValue;
9-
import io.opentelemetry.exporter.otlp.profiles.AggregationTemporality;
109
import io.opentelemetry.exporter.otlp.profiles.ValueTypeData;
1110
import javax.annotation.concurrent.Immutable;
1211

@@ -26,10 +25,8 @@ public abstract class ImmutableValueTypeData implements ValueTypeData {
2625
*
2726
* @return a new ValueTypeData describing the given type and unit characteristics.
2827
*/
29-
public static ValueTypeData create(
30-
int typeStringIndex, int unitStringIndex, AggregationTemporality aggregationTemporality) {
31-
return new AutoValue_ImmutableValueTypeData(
32-
typeStringIndex, unitStringIndex, aggregationTemporality);
28+
public static ValueTypeData create(int typeStringIndex, int unitStringIndex) {
29+
return new AutoValue_ImmutableValueTypeData(typeStringIndex, unitStringIndex);
3330
}
3431

3532
ImmutableValueTypeData() {}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private LocationMarshaler(
6464
protected void writeTo(Serializer output) throws IOException {
6565
output.serializeInt32(Location.MAPPING_INDEX, mappingIndex);
6666
output.serializeUInt64(Location.ADDRESS, address);
67-
output.serializeRepeatedMessage(Location.LINE, lineMarshalers);
67+
output.serializeRepeatedMessage(Location.LINES, lineMarshalers);
6868
output.serializeRepeatedInt32(Location.ATTRIBUTE_INDICES, attributeIndices);
6969
}
7070

@@ -76,7 +76,7 @@ private static int calculateSize(
7676
int size = 0;
7777
size += MarshalerUtil.sizeInt32(Location.MAPPING_INDEX, mappingIndex);
7878
size += MarshalerUtil.sizeUInt64(Location.ADDRESS, address);
79-
size += MarshalerUtil.sizeRepeatedMessage(Location.LINE, lineMarshalers);
79+
size += MarshalerUtil.sizeRepeatedMessage(Location.LINES, lineMarshalers);
8080
size += MarshalerUtil.sizeRepeatedInt32(Location.ATTRIBUTE_INDICES, attributeIndices);
8181
return size;
8282
}

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ final class ProfileMarshaler extends MarshalerWithSize {
2121
private final long durationNanos;
2222
private final ValueTypeMarshaler periodTypeMarshaler;
2323
private final long period;
24-
private final List<Integer> comment;
2524
private final byte[] profileId;
2625
private final List<Integer> attributeIndices;
2726
private final int droppedAttributesCount;
@@ -44,7 +43,6 @@ static ProfileMarshaler create(ProfileData profileData) {
4443
profileData.getDurationNanos(),
4544
periodTypeMarshaler,
4645
profileData.getPeriod(),
47-
profileData.getCommentStrIndices(),
4846
profileData.getProfileIdBytes(),
4947
profileData.getAttributeIndices(),
5048
droppedAttributesCount,
@@ -59,7 +57,6 @@ private ProfileMarshaler(
5957
long durationNanos,
6058
ValueTypeMarshaler periodTypeMarshaler,
6159
long period,
62-
List<Integer> comment,
6360
byte[] profileId,
6461
List<Integer> attributeIndices,
6562
int droppedAttributesCount,
@@ -73,7 +70,6 @@ private ProfileMarshaler(
7370
durationNanos,
7471
periodTypeMarshaler,
7572
period,
76-
comment,
7773
profileId,
7874
attributeIndices,
7975
droppedAttributesCount,
@@ -85,7 +81,6 @@ private ProfileMarshaler(
8581
this.durationNanos = durationNanos;
8682
this.periodTypeMarshaler = periodTypeMarshaler;
8783
this.period = period;
88-
this.comment = comment;
8984
this.profileId = profileId;
9085
this.attributeIndices = attributeIndices;
9186
this.droppedAttributesCount = droppedAttributesCount;
@@ -96,12 +91,11 @@ private ProfileMarshaler(
9691
@Override
9792
protected void writeTo(Serializer output) throws IOException {
9893
output.serializeMessage(Profile.SAMPLE_TYPE, sampleTypeMarshaler);
99-
output.serializeRepeatedMessage(Profile.SAMPLE, sampleMarshalers);
94+
output.serializeRepeatedMessage(Profile.SAMPLES, sampleMarshalers);
10095
output.serializeFixed64(Profile.TIME_UNIX_NANO, timeNanos);
10196
output.serializeInt64(Profile.DURATION_NANO, durationNanos);
10297
output.serializeMessage(Profile.PERIOD_TYPE, periodTypeMarshaler);
10398
output.serializeInt64(Profile.PERIOD, period);
104-
output.serializeRepeatedInt32(Profile.COMMENT_STRINDICES, comment);
10599

106100
output.serializeBytes(Profile.PROFILE_ID, profileId);
107101
output.serializeRepeatedInt32(Profile.ATTRIBUTE_INDICES, attributeIndices);
@@ -117,7 +111,6 @@ private static int calculateSize(
117111
long durationNanos,
118112
ValueTypeMarshaler periodTypeMarshaler,
119113
long period,
120-
List<Integer> comment,
121114
byte[] profileId,
122115
List<Integer> attributeIndices,
123116
int droppedAttributesCount,
@@ -126,12 +119,11 @@ private static int calculateSize(
126119
int size;
127120
size = 0;
128121
size += MarshalerUtil.sizeMessage(Profile.SAMPLE_TYPE, sampleTypeMarshaler);
129-
size += MarshalerUtil.sizeRepeatedMessage(Profile.SAMPLE, sampleMarshalers);
122+
size += MarshalerUtil.sizeRepeatedMessage(Profile.SAMPLES, sampleMarshalers);
130123
size += MarshalerUtil.sizeFixed64(Profile.TIME_UNIX_NANO, timeNanos);
131124
size += MarshalerUtil.sizeInt64(Profile.DURATION_NANO, durationNanos);
132125
size += MarshalerUtil.sizeMessage(Profile.PERIOD_TYPE, periodTypeMarshaler);
133126
size += MarshalerUtil.sizeInt64(Profile.PERIOD, period);
134-
size += MarshalerUtil.sizeRepeatedInt32(Profile.COMMENT_STRINDICES, comment);
135127

136128
size += MarshalerUtil.sizeBytes(Profile.PROFILE_ID, profileId);
137129
size += MarshalerUtil.sizeRepeatedInt32(Profile.ATTRIBUTE_INDICES, attributeIndices);

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55

66
package io.opentelemetry.exporter.otlp.profiles;
77

8-
import javax.annotation.Nullable;
98
import javax.annotation.concurrent.Immutable;
109

1110
/**
12-
* ValueType describes the type and units of a value, with an optional aggregation temporality.
11+
* ValueType describes the type and units of a value.
1312
*
1413
* @see "profiles.proto::ValueType"
1514
*/
@@ -21,7 +20,4 @@ public interface ValueTypeData {
2120

2221
/** Index into string table. */
2322
int getUnitStringIndex();
24-
25-
@Nullable
26-
AggregationTemporality getAggregationTemporality();
2723
}

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

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77

88
import io.opentelemetry.exporter.internal.marshal.MarshalerUtil;
99
import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize;
10-
import io.opentelemetry.exporter.internal.marshal.ProtoEnumInfo;
1110
import io.opentelemetry.exporter.internal.marshal.Serializer;
12-
import io.opentelemetry.proto.profiles.v1development.internal.AggregationTemporality;
1311
import io.opentelemetry.proto.profiles.v1development.internal.ValueType;
1412
import java.io.IOException;
1513
import java.util.List;
@@ -21,25 +19,10 @@ final class ValueTypeMarshaler extends MarshalerWithSize {
2119

2220
private final int typeStringIndex;
2321
private final int unitStringIndex;
24-
private final ProtoEnumInfo aggregationTemporality;
2522

2623
static ValueTypeMarshaler create(ValueTypeData valueTypeData) {
27-
ProtoEnumInfo aggregationTemporality =
28-
AggregationTemporality.AGGREGATION_TEMPORALITY_UNSPECIFIED;
29-
if (valueTypeData.getAggregationTemporality() != null) {
30-
switch (valueTypeData.getAggregationTemporality()) {
31-
case DELTA:
32-
aggregationTemporality = AggregationTemporality.AGGREGATION_TEMPORALITY_DELTA;
33-
break;
34-
case CUMULATIVE:
35-
aggregationTemporality = AggregationTemporality.AGGREGATION_TEMPORALITY_CUMULATIVE;
36-
break;
37-
}
38-
}
3924
return new ValueTypeMarshaler(
40-
valueTypeData.getTypeStringIndex(),
41-
valueTypeData.getUnitStringIndex(),
42-
aggregationTemporality);
25+
valueTypeData.getTypeStringIndex(), valueTypeData.getUnitStringIndex());
4326
}
4427

4528
static ValueTypeMarshaler[] createRepeated(List<ValueTypeData> items) {
@@ -60,28 +43,23 @@ public void accept(ValueTypeData valueTypeData) {
6043
return valueTypeMarshalers;
6144
}
6245

63-
private ValueTypeMarshaler(
64-
int typeStringIndex, int unitStringIndex, ProtoEnumInfo aggregationTemporality) {
65-
super(calculateSize(typeStringIndex, unitStringIndex, aggregationTemporality));
46+
private ValueTypeMarshaler(int typeStringIndex, int unitStringIndex) {
47+
super(calculateSize(typeStringIndex, unitStringIndex));
6648
this.typeStringIndex = typeStringIndex;
6749
this.unitStringIndex = unitStringIndex;
68-
this.aggregationTemporality = aggregationTemporality;
6950
}
7051

7152
@Override
7253
protected void writeTo(Serializer output) throws IOException {
7354
output.serializeInt64(ValueType.TYPE_STRINDEX, typeStringIndex);
7455
output.serializeInt64(ValueType.UNIT_STRINDEX, unitStringIndex);
75-
output.serializeEnum(ValueType.AGGREGATION_TEMPORALITY, aggregationTemporality);
7656
}
7757

78-
private static int calculateSize(
79-
int typeStringIndex, int unitStringIndex, ProtoEnumInfo aggregationTemporality) {
58+
private static int calculateSize(int typeStringIndex, int unitStringIndex) {
8059
int size;
8160
size = 0;
8261
size += MarshalerUtil.sizeInt32(ValueType.TYPE_STRINDEX, typeStringIndex);
8362
size += MarshalerUtil.sizeInt32(ValueType.UNIT_STRINDEX, unitStringIndex);
84-
size += MarshalerUtil.sizeEnum(ValueType.AGGREGATION_TEMPORALITY, aggregationTemporality);
8563
return size;
8664
}
8765
}

‎exporters/otlp/profiles/src/test/java/io/opentelemetry/exporter/otlp/profiles/FakeTelemetryUtil.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ static ProfileData generateFakeProfileData() {
4242
Resource.create(Attributes.empty()),
4343
SCOPE_INFO,
4444
EMPTY_PROFILE_DICTIONARY_DATA,
45-
ImmutableValueTypeData.create(1, 2, AggregationTemporality.CUMULATIVE),
45+
ImmutableValueTypeData.create(1, 2),
4646
Collections.emptyList(),
4747
5L,
4848
6L,
49-
ImmutableValueTypeData.create(1, 2, AggregationTemporality.CUMULATIVE),
49+
ImmutableValueTypeData.create(1, 2),
5050
7L,
5151
Collections.emptyList(),
5252
profileId,

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

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -345,11 +345,11 @@ void compareResourceProfilesMarshaling() {
345345
Collections.emptyList(),
346346
Collections.emptyList(),
347347
Collections.emptyList()),
348-
ImmutableValueTypeData.create(1, 2, AggregationTemporality.CUMULATIVE),
348+
ImmutableValueTypeData.create(1, 2),
349349
Collections.emptyList(),
350350
5L,
351351
6L,
352-
ImmutableValueTypeData.create(1, 2, AggregationTemporality.CUMULATIVE),
352+
ImmutableValueTypeData.create(1, 2),
353353
7L,
354354
listOf(8, 9),
355355
profileId,
@@ -363,30 +363,15 @@ void compareResourceProfilesMarshaling() {
363363

364364
Profile profileContainer =
365365
Profile.newBuilder()
366-
.setSampleType(
367-
ValueType.newBuilder()
368-
.setTypeStrindex(1)
369-
.setUnitStrindex(2)
370-
.setAggregationTemporality(
371-
io.opentelemetry.proto.profiles.v1development.AggregationTemporality
372-
.AGGREGATION_TEMPORALITY_CUMULATIVE)
373-
.build())
366+
.setSampleType(ValueType.newBuilder().setTypeStrindex(1).setUnitStrindex(2).build())
374367
.setProfileId(ByteString.fromHex(profileId))
375368
.setDroppedAttributesCount(3)
376369
.setOriginalPayloadFormat("format")
377370
.setOriginalPayload(ByteString.copyFrom(new byte[] {4, 5}))
378371
.setTimeUnixNano(5)
379372
.setDurationNano(6)
380373
.setPeriod(7)
381-
.setPeriodType(
382-
ValueType.newBuilder()
383-
.setTypeStrindex(1)
384-
.setUnitStrindex(2)
385-
.setAggregationTemporality(
386-
io.opentelemetry.proto.profiles.v1development.AggregationTemporality
387-
.AGGREGATION_TEMPORALITY_CUMULATIVE)
388-
.build())
389-
.addAllCommentStrindices(listOf(8, 9))
374+
.setPeriodType(ValueType.newBuilder().setTypeStrindex(1).setUnitStrindex(2).build())
390375
.build();
391376

392377
ResourceProfiles builderResult =
@@ -457,15 +442,8 @@ void compareRepeatedSampleMarshaling() {
457442

458443
@Test
459444
void compareValueTypeMarshaling() {
460-
ValueTypeData input = ImmutableValueTypeData.create(1, 2, AggregationTemporality.CUMULATIVE);
461-
ValueType builderResult =
462-
ValueType.newBuilder()
463-
.setTypeStrindex(1)
464-
.setUnitStrindex(2)
465-
.setAggregationTemporality(
466-
io.opentelemetry.proto.profiles.v1development.AggregationTemporality
467-
.AGGREGATION_TEMPORALITY_CUMULATIVE)
468-
.build();
445+
ValueTypeData input = ImmutableValueTypeData.create(1, 2);
446+
ValueType builderResult = ValueType.newBuilder().setTypeStrindex(1).setUnitStrindex(2).build();
469447

470448
ValueType roundTripResult =
471449
parse(ValueType.getDefaultInstance(), ValueTypeMarshaler.create(input));
@@ -475,26 +453,12 @@ void compareValueTypeMarshaling() {
475453
@Test
476454
void compareRepeatedValueTypeMarshaling() {
477455
List<ValueTypeData> inputs = new ArrayList<>();
478-
inputs.add(ImmutableValueTypeData.create(1, 2, AggregationTemporality.CUMULATIVE));
479-
inputs.add(ImmutableValueTypeData.create(3, 4, AggregationTemporality.CUMULATIVE));
456+
inputs.add(ImmutableValueTypeData.create(1, 2));
457+
inputs.add(ImmutableValueTypeData.create(3, 4));
480458

481459
List<ValueType> builderResults = new ArrayList<>();
482-
builderResults.add(
483-
ValueType.newBuilder()
484-
.setTypeStrindex(1)
485-
.setUnitStrindex(2)
486-
.setAggregationTemporality(
487-
io.opentelemetry.proto.profiles.v1development.AggregationTemporality
488-
.AGGREGATION_TEMPORALITY_CUMULATIVE)
489-
.build());
490-
builderResults.add(
491-
ValueType.newBuilder()
492-
.setTypeStrindex(3)
493-
.setUnitStrindex(4)
494-
.setAggregationTemporality(
495-
io.opentelemetry.proto.profiles.v1development.AggregationTemporality
496-
.AGGREGATION_TEMPORALITY_CUMULATIVE)
497-
.build());
460+
builderResults.add(ValueType.newBuilder().setTypeStrindex(1).setUnitStrindex(2).build());
461+
builderResults.add(ValueType.newBuilder().setTypeStrindex(3).setUnitStrindex(4).build());
498462

499463
ValueTypeMarshaler[] marshalers = ValueTypeMarshaler.createRepeated(inputs);
500464

0 commit comments

Comments
 (0)