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

feat(telemetry): enable statsd and dogstatsd telemetry sinks (backport #18646) #18673

Merged
merged 1 commit into from
Dec 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 9, 2023

This is an automatic backport of pull request #18646 done by Mergify.
Cherry-pick of 3ba1c5b has failed:

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

You are currently cherry-picking commit 3ba1c5bf2.
  (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:   client/v2/go.sum
	modified:   go.sum
	modified:   server/config/toml.go
	modified:   simapp/go.sum
	modified:   telemetry/metrics.go
	modified:   telemetry/metrics_test.go
	modified:   tests/go.sum
	modified:   tools/confix/data/v0.50-app.toml
	modified:   x/circuit/go.sum
	modified:   x/evidence/go.sum
	modified:   x/feegrant/go.sum
	modified:   x/nft/go.sum
	modified:   x/upgrade/go.sum

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   client/v2/go.mod
	both modified:   go.mod
	both modified:   simapp/go.mod
	deleted by us:   simapp/gomod2nix.toml
	both modified:   tests/go.mod
	deleted by us:   tests/starship/tests/go.mod
	deleted by us:   tests/starship/tests/go.sum
	deleted by us:   tools/confix/data/v0.51-app.toml
	deleted by us:   x/accounts/go.mod
	deleted by us:   x/accounts/go.sum
	deleted by us:   x/auth/go.mod
	deleted by us:   x/auth/go.sum
	deleted by us:   x/authz/go.mod
	deleted by us:   x/authz/go.sum
	deleted by us:   x/bank/go.mod
	deleted by us:   x/bank/go.sum
	both modified:   x/circuit/go.mod
	deleted by us:   x/distribution/go.mod
	deleted by us:   x/distribution/go.sum
	both modified:   x/evidence/go.mod
	both modified:   x/feegrant/go.mod
	deleted by us:   x/gov/go.mod
	deleted by us:   x/gov/go.sum
	deleted by us:   x/group/go.mod
	deleted by us:   x/group/go.sum
	deleted by us:   x/mint/go.mod
	deleted by us:   x/mint/go.sum
	both modified:   x/nft/go.mod
	deleted by us:   x/params/go.mod
	deleted by us:   x/params/go.sum
	deleted by us:   x/protocolpool/go.mod
	deleted by us:   x/protocolpool/go.sum
	deleted by us:   x/slashing/go.mod
	deleted by us:   x/slashing/go.sum
	deleted by us:   x/staking/go.mod
	deleted by us:   x/staking/go.sum
	both modified:   x/upgrade/go.mod

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

@mergify mergify bot requested a review from a team as a code owner December 9, 2023 22:03
@mergify mergify bot added the conflicts label Dec 9, 2023
Copy link
Contributor

coderabbitai bot commented Dec 9, 2023

Important

Auto Review Skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on X ?


Tips

Chat with CodeRabbit Bot (@coderabbitai)

  • If you reply to a review comment from CodeRabbit, the bot will automatically respond.
  • To engage with CodeRabbit bot directly around the specific lines of code in the PR, mention @coderabbitai in your review comment
  • Note: Review comments are made on code diffs or files, not on the PR overview.
  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Note: For conversation with the bot, please use the review comments on code diffs or files.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything outside server, telemetry and Confix 0.50 config should be reverted. Then we should run the script

@julienrbrt julienrbrt force-pushed the mergify/bp/release/v0.50.x/pr-18646 branch from 467badd to ab1d38d Compare December 10, 2023 19:04
@julienrbrt julienrbrt enabled auto-merge (squash) December 10, 2023 19:11
@julienrbrt julienrbrt merged commit cddc197 into release/v0.50.x Dec 10, 2023
44 of 46 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-18646 branch December 10, 2023 19:30
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
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.

2 participants