Upgrade proto to 1.7.0 #13075
Merged
Upgrade proto to 1.7.0 #13075
+2,070
−1,221
Conversation
This file contains hidden or 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 #13075 +/- ##
==========================================
- Coverage 91.60% 91.48% -0.13%
==========================================
Files 505 506 +1
Lines 28526 28557 +31
==========================================
- Hits 26132 26125 -7
- Misses 1880 1917 +37
- Partials 514 515 +1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
atoulme
pushed a commit
to open-telemetry/opentelemetry-collector-contrib
that referenced
this pull request
May 27, 2025
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Access to these lookup tables isn't really useful, as they only provide a slice of values, and we can't check which one is being used by the current profile. Also, with open-telemetry/opentelemetry-collector#13075, the lookup tables are moving out of the profile and into a new dictionary object. So as a first step to the proto migration, this removes access to the lookup tables for a profile. The replacement for this is #39681, which will give acces to the profile attributes, as we do with other signals and abstract away the lookup tables. --------- Co-authored-by: Edmo Vamerlatti Costa <11836452+edmocosta@users.noreply.github.com>
mx-psi
reviewed
May 28, 2025
| @@ -33,6 +34,8 @@ func TestMergeProfilesInvalidInput(t *testing.T) { | |||
| } | |||
|
|
|||
| func TestMergeSplitProfiles(t *testing.T) { | |||
| t.Skip("merging of profiles has been temporarily disabled") | |||
There was a problem hiding this comment.
Should we return an error explicitly stating that, and add a test to check that we indeed return such an error?
Also, can we link to the issue tracking this (I guess the same as in my previous comment would suffice)
There was a problem hiding this comment.
The behavior is not to return an error, but not to perform any merging. We return the same slice of requests as we get.
There was a problem hiding this comment.
Is there any component on contrib using this merging functionality?
There was a problem hiding this comment.
There is no occurence of MergeSplit( on contrib.
mx-psi
reviewed
May 28, 2025
mx-psi
approved these changes
May 29, 2025
andrzej-stencel
approved these changes
May 29, 2025
Merged
via the queue into
open-telemetry:main
with commit Jun 2, 2025
8568c97
50 of 56 checks passed
mx-psi
pushed a commit
to open-telemetry/opentelemetry-collector-contrib
that referenced
this pull request
Jun 2, 2025
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description This PR goes in sync with open-telemetry/opentelemetry-collector#13075, and upgrades pdata to 1.7.0. This is currently based after #40227. It can either come together or separately from that other PR. This has been tested locally. CI can't pass now because it relies on the changes in the core PR, which haven't been merged yet.
bogdandrutu
pushed a commit
to bogdandrutu/opentelemetry-collector
that referenced
this pull request
Jun 2, 2025
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description This upgrades protobuf/pdata to [v1.7.0](https://github.com/open-telemetry/opentelemetry-proto/releases/tag/v1.7.0). Note: due to the move of the lookup tables, merging profiles required more non-trivial work. In order to facilitate this review, merging is therefore currently disabled for profiles. We will bring it back in a separate PR. Note: this needs its contrib counterpart before it can be moved out of draft.
malus2077
pushed a commit
to malus2077/opentelemetry-collector
that referenced
this pull request
Jun 3, 2025
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description This upgrades protobuf/pdata to [v1.7.0](https://github.com/open-telemetry/opentelemetry-proto/releases/tag/v1.7.0). Note: due to the move of the lookup tables, merging profiles required more non-trivial work. In order to facilitate this review, merging is therefore currently disabled for profiles. We will bring it back in a separate PR. Note: this needs its contrib counterpart before it can be moved out of draft.
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.
Description
This upgrades protobuf/pdata to v1.7.0.
Note: due to the move of the lookup tables, merging profiles required more non-trivial work.
In order to facilitate this review, merging is therefore currently disabled for profiles. We will bring it back in a separate PR.
Note: this needs its contrib counterpart before it can be moved out of draft.