add transition from instrumentationlibrary -> scope #5085
Merged
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
codeboten
force-pushed
the
codeboten/transition-scope
branch
from
599671c to
9f21939
Compare
bogdandrutu
reviewed
Mar 25, 2022
cbandy
reviewed
Mar 25, 2022
cbandy
reviewed
Mar 25, 2022
This is the last piece of upgrading to v0.15.0. This PR adds the tests and code to ensure the transition plan is implemented in the collector. Fixes open-telemetry#5074
codeboten
force-pushed
the
codeboten/transition-scope
branch
from
9f21939 to
0e8ed3a
Compare
Codecov Report
@@ Coverage Diff @@
## main #5085 +/- ##
==========================================
- Coverage 90.04% 89.94% -0.10%
==========================================
Files 183 183
Lines 11035 11103 +68
==========================================
+ Hits 9936 9987 +51
- Misses 877 891 +14
- Partials 222 225 +3
Continue to review full report at Codecov.
|
| @@ -133,7 +138,11 @@ func (lr LogsRequest) MarshalJSON() ([]byte, error) { | |||
|
|
|||
| // UnmarshalJSON unmarshalls LogsRequest from JSON bytes. | |||
| func (lr LogsRequest) UnmarshalJSON(data []byte) error { | |||
There was a problem hiding this comment.
Unrelated to your change: looks like for some reason we now have 2 places in the codebase to unmarshal OTLP JSON. I am not sure if this duplication is intentional.
There was a problem hiding this comment.
It is intentional because we have logically 2 "encodings":
- For Request/Response for grpc/http
- For persistent storage like Kafka/File etc. See proto Request message vs TracesData.
tigrannajaryan
approved these changes
Mar 28, 2022
Co-authored-by: Tigran Najaryan <[email protected]>
codeboten
force-pushed
the
codeboten/transition-scope
branch
from
7085979 to
7a61880
Compare
bogdandrutu
approved these changes
Mar 29, 2022
| @@ -133,7 +138,11 @@ func (lr LogsRequest) MarshalJSON() ([]byte, error) { | |||
|
|
|||
| // UnmarshalJSON unmarshalls LogsRequest from JSON bytes. | |||
| func (lr LogsRequest) UnmarshalJSON(data []byte) error { | |||
There was a problem hiding this comment.
It is intentional because we have logically 2 "encodings":
- For Request/Response for grpc/http
- For persistent storage like Kafka/File etc. See proto Request message vs TracesData.
Nicholaswang
pushed a commit
to Nicholaswang/opentelemetry-collector
that referenced
this pull request
Jun 7, 2022
) * add transition from instrumentationlibrary -> scope This is the last piece of upgrading to v0.15.0. This PR adds the tests and code to ensure the transition plan is implemented in the collector. Fixes open-telemetry#5074 * fix spacing, add link * update unmarshaler, adding tests * update grpc tests * update changelog * Update model/otlpgrpc/logs.go Co-authored-by: Tigran Najaryan <[email protected]> Co-authored-by: Tigran Najaryan <[email protected]>
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.
Follow up to #5076.
This is the last piece of upgrading to v0.15.0. This PR adds the tests and code to ensure the transition plan is implemented in the collector.
Fixes #5074