Skip to content
New issue

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

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

Already on GitHub? # to your account

Prometheus: some per-exchange/per-queue metrics aggregated per-channel (rebased) (backport #11755) #11759

Merged
merged 7 commits into from
Jul 19, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 19, 2024

This is #11726 rebased. Submitting to see if CI passes with Bazel and GCP-based Bazel caching.


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

LoisSotoLopez and others added 6 commits July 19, 2024 12:37
Add copies of some per-object metrics that are labeled per-channel
aggregated to reduce cardinality. These metrics are valuable and
easier to process if exposed on per-exchange and per-queue basis.

(cherry picked from commit bb93e71)
(cherry picked from commit c66e5ea)

# Conflicts:
#	release-notes/4.0.0.md
(cherry picked from commit a931cec)

# Conflicts:
#	release-notes/4.0.0.md
Configuring the mock authentication backend blocks
and generates an error in the test process when the
broker goes down. The error report makes the test fail
in some environments.

The process where the setup takes place must stay up
otherwise the ETS table used will go away.

This commit makes sure the broker-side authentication backend
setup returns at the end of the test. This way the calling
process terminates in a normal way.

(cherry picked from commit 834bed7)
Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.3.1...v3.3.2)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-starter-parent
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit b807942)
Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v3.3.1...v3.3.2)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-starter-parent
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 2cb27b2)
Copy link
Author

mergify bot commented Jul 19, 2024

Cherry-pick of c66e5ea has failed:

On branch mergify/bp/v4.0.x/pr-11755
Your branch is ahead of 'origin/v4.0.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c66e5ea058.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   release-notes/4.0.0.md

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of a931cec has failed:

On branch mergify/bp/v4.0.x/pr-11755
Your branch is ahead of 'origin/v4.0.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a931cec76e.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   release-notes/4.0.0.md

no changes added to commit (use "git add" and/or "git commit -a")

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

@michaelklishin michaelklishin merged commit 6e97731 into v4.0.x Jul 19, 2024
191 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-11755 branch July 19, 2024 14:45
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants