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

By @gomoripeti: Streams: two additional Prometheus metrics for connections (backport #12765) #12771

Closed
wants to merge 4 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 20, 2024

This is #10275 by @gomoripeti re-submitted so that Actions have access to all the GH secrets.


This is an automatic backport of pull request #12765 done by Mergify.

gomoripeti and others added 4 commits November 20, 2024 15:28
So that they can be used from multiple test suites.

(cherry picked from commit cf8a00c)
(cherry picked from commit 9bb7530)

# Conflicts:
#	deps/rabbitmq_ct_helpers/Makefile
#	deps/rabbitmq_stream/test/protocol_interop_SUITE.erl
Supports both per stream (detailed) and aggregated (metrics) values.

(cherry picked from commit e82058e)
(cherry picked from commit 085ec75)
(cherry picked from commit 0c76054)
(cherry picked from commit bbc902e)
The application is not always recompiled which causes tests to fail
because they cannot call `serial_number:usort/1`.

(cherry picked from commit 05a3733)
(cherry picked from commit 4eb5b82)
Copy link
Author

mergify bot commented Nov 20, 2024

Cherry-pick of 9bb7530 has failed:

On branch mergify/bp/v4.0.x/pr-12765
Your branch is up to date with 'origin/v4.0.x'.

You are currently cherry-picking commit 9bb7530d04.
  (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:
	new file:   deps/rabbitmq_ct_helpers/src/stream_test_utils.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_ct_helpers/Makefile
	both modified:   deps/rabbitmq_stream/test/protocol_interop_SUITE.erl

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

@mergify mergify bot added the make label Nov 20, 2024
@michaelklishin michaelklishin added this to the 4.0.4 milestone Nov 20, 2024
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-12765 branch November 20, 2024 17:29
@michaelklishin michaelklishin removed this from the 4.0.4 milestone Nov 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants