[chore] updating google.golang.org/genproto #3968
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
requested review from
dashpole,
hanyuancheung and
Aneurysm9
as code owners
MadVikingGod
approved these changes
Jun 9, 2023
MrAlias
reviewed
Jun 9, 2023
codeboten
force-pushed
the
codeboten/update-genproto
branch
from
b038920 to
5f61afc
Compare
MrAlias
approved these changes
Jun 9, 2023
pellared
approved these changes
Jun 12, 2023
pellared
reviewed
Jun 12, 2023
|
Can you please resolve the conflicts after #3976 is merged? |
added 3 commits
June 12, 2023 08:51
This is to avoid issues caused by googleapis/go-genproto#1015 Signed-off-by: Alex Boten <aboten@lightstep.com>
Signed-off-by: Alex Boten <aboten@lightstep.com>
Signed-off-by: Alex Boten <aboten@lightstep.com>
codeboten
force-pushed
the
codeboten/update-genproto
branch
from
5f61afc to
5acab36
Compare
|
@pellared i've rebased it |
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #3968 +/- ##
=======================================
- Coverage 79.1% 79.1% -0.1%
=======================================
Files 165 165
Lines 10293 10293
=======================================
- Hits 8151 8148 -3
- Misses 2006 2008 +2
- Partials 136 137 +1 |
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.
This is to avoid issues caused by googleapis/go-genproto#1015. I ran into the ambiguous import in this PR: open-telemetry/opentelemetry-collector#7863