Update opentelementry-proto to 1.4 #6906
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #6906 +/- ##
============================================
- Coverage 90.23% 90.10% -0.14%
Complexity 6594 6594
============================================
Files 729 729
Lines 19800 19828 +28
Branches 1947 1950 +3
============================================
- Hits 17867 17866 -1
- Misses 1341 1369 +28
- Partials 592 593 +1 ☔ View full report in Codecov by Sentry. |
jack-berg
reviewed
Nov 25, 2024
exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/MarshalerUtil.java
Outdated
Show resolved
Hide resolved
exporters/common/src/main/java/io/opentelemetry/exporter/internal/marshal/MarshalerUtil.java
Show resolved
Hide resolved
...s/src/main/java/io/opentelemetry/exporter/otlp/internal/data/ImmutableAttributeUnitData.java
Outdated
Show resolved
Hide resolved
|
Looks like some merge conflicts need resolution. |
jhalliday
force-pushed
the
jh-profiling-f
branch
from
03b8c2d
to
7f0700f
Compare
jsuereth
approved these changes
Nov 27, 2024
| public void serializeInt32(ProtoFieldInfo field, int value) throws IOException { | ||
| if (value == 0) { | ||
| return; | ||
| } | ||
| writeint32(field, value); | ||
| } | ||
|
|
||
| /** Serializes a protobuf {@code int32} field. */ |
There was a problem hiding this comment.
Nit: I'd explicitly call this out as serialization a {@code optional int32} field.
Yes, it's in the name of the method.
| @@ -122,14 +122,27 @@ public void serializeSInt32(ProtoFieldInfo field, int value) throws IOException | |||
|
|
|||
| protected abstract void writeSInt32(ProtoFieldInfo info, int value) throws IOException; | |||
|
|
|||
| /** Serializes a protobuf {@code uint32} field. */ | |||
| /** Serializes a protobuf {@code int32} field. */ | |||
There was a problem hiding this comment.
So - IIRC - this is actually how we serialize both uint32 and int32 in Java.
| @@ -340,6 +353,25 @@ protected abstract void writeStartRepeatedVarint(ProtoFieldInfo field, int paylo | |||
|
|
|||
| protected abstract void writeEndRepeatedVarint() throws IOException; | |||
|
|
|||
| /** Serializes a {@code repeated int32} field. */ | |||
| public void serializeRepeatedInt32(ProtoFieldInfo field, List<Integer> values) | |||
There was a problem hiding this comment.
Nit: Maybe take Collection instead of List for more flexibility here.
|
|
||
| final class LocationMarshaler extends MarshalerWithSize { | ||
|
|
||
| private static final LocationMarshaler[] EMPTY_REPEATED = new LocationMarshaler[0]; | ||
|
|
||
| private final long mappingIndex; | ||
| @Nullable private final Integer mappingIndex; |
There was a problem hiding this comment.
Nit: Does it make sense to use java.util.Optional or does that just add headache here?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mostly changes to the experimental profiling protocol, with some additions to the serialization framework it uses.