@@ -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