Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: proper error when parsing telemetry configuration (backport #12981) #12999

Merged
merged 2 commits into from
Aug 23, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 23, 2022

This is an automatic backport of pull request #12981 done by Mergify.
Cherry-pick of c24c439 has failed:

On branch mergify/bp/release/v0.45.x/pr-12981
Your branch is up to date with 'origin/release/v0.45.x'.

You are currently cherry-picking commit c24c43972.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   server/config/config.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   server/start.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

When parsing `telemetry.global-labels` config the code assumes that the type will be an array.  I saw an issue where someone edited the configuration in the wrong way and got the following error:
![photo_2022-08-21_08-02-21](https://user-images.githubusercontent.com/22855163/185793842-c5759a54-1860-4dd1-bdb4-b94f4dab3c16.jpg)
Instead, I suggest here to print a proper error log to indicate what the issue is.

(cherry picked from commit c24c439)

# Conflicts:
#	server/start.go
@mergify mergify bot requested review from aaronc and alexanderbez as code owners August 23, 2022 00:21
@mergify mergify bot added the conflicts label Aug 23, 2022
@alexanderbez alexanderbez merged commit a80bf98 into release/v0.45.x Aug 23, 2022
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.45.x/pr-12981 branch August 23, 2022 14:24
p0mvn pushed a commit to osmosis-labs/cosmos-sdk that referenced this pull request Oct 12, 2022
p0mvn added a commit to osmosis-labs/cosmos-sdk that referenced this pull request Oct 13, 2022
…os#12981) (cosmos#12999) (#348)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
mergify bot pushed a commit to osmosis-labs/cosmos-sdk that referenced this pull request Oct 13, 2022
…os#12981) (cosmos#12999) (#348)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 9fed068)
mattverse pushed a commit to osmosis-labs/cosmos-sdk that referenced this pull request Oct 13, 2022
…os#12981) (cosmos#12999) (#348) (#349)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 9fed068)

Co-authored-by: Roman <roman@osmosis.team>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants