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

[3.10] 3.10.1 backports 2 #40634

Merged
merged 17 commits into from
May 15, 2024
Merged

[3.10] 3.10.1 backports 2 #40634

merged 17 commits into from
May 15, 2024

Conversation

gsmet
Copy link
Member

@gsmet gsmet commented May 14, 2024

Please don't merge, I will merge it myself.

cknoblauch and others added 17 commits May 14, 2024 17:53
(cherry picked from commit c17d757)
…ealth checks per channel

(cherry picked from commit e3fc54a)
(cherry picked from commit caa2fad)
(cherry picked from commit fd03b00)
(cherry picked from commit 77de608)
Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.12.4 to 1.12.5.
- [Release notes](https://github.com/micrometer-metrics/micrometer/releases)
- [Commits](micrometer-metrics/micrometer@v1.12.4...v1.12.5)

---
updated-dependencies:
- dependency-name: io.micrometer:micrometer-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit a48726a)
(cherry picked from commit ed09ff3)
The plan is to remove this property in 3.11 but we need to provide a way
for people to update to latest security fixes without having to
significantly adjust their applications.

In 3.11, we need to document this breaking change properly and also
provide guidance on how to fix the most common issues that could be
encountered due to this breaking change.

(cherry picked from commit aa7d2ee)
This to make sure we have a consistent experience between JVM and native
modes.

(cherry picked from commit 4f372d0)
…ces` into `quarkus.transaction-manager.unsafe-multiple-last-resources`

* The property is now named `quarkus.transaction-manager.unsafe-multiple-last-resources`
* It has three possible values:
   * `allow`: allow unsafe multiple last resources, no warning per offending transaction
   * `warn`: allow unsafe multiple last resources, one warning log per offending transaction
   * `fail`: fail on unsafe multiple last resources
* It will log a warning on startup if *explicitly* set to `allow` or `warn`.
* It defaults to `fail` in this commit.
* The plan is to make it default to `warn` in 3.8, which means no log on startup,
  but one per offending transaction.
  People will be able to set it to `allow` explicitly to suppress the warning per
  offending transaction,
  but will get a warning on startup (since they set the property explicitly).

(cherry picked from commit 2595498)
The log level we get in beforeAnalysis may be null, in which case we
still want to reset it after analysis.

From the javadoc of Logger#getLevel:

> Get the log Level that has been specified for this Logger.
> The result may be null, which means that this logger's effective level will be inherited from its parent.

(cherry picked from commit d5c2ed5)
…o accept `warn-first` and `warn-each`

(cherry picked from commit 3b008a8)
Fixes quarkusio#40369

(cherry picked from commit a80a37e)
@gsmet gsmet added the area/infra internal and infrastructure related issues label May 14, 2024
@gsmet gsmet self-assigned this May 14, 2024
@quarkus-bot quarkus-bot bot added area/dependencies Pull requests that update a dependency file area/docstyle issues related for manual docstyle review area/documentation area/graphql area/kubernetes area/narayana Transactions / Narayana area/reactive-messaging area/smallrye labels May 14, 2024
@quarkus-bot quarkus-bot bot changed the title 3.10.1 backports 2 [3.10] 3.10.1 backports 2 May 14, 2024

This comment has been minimized.

Copy link

github-actions bot commented May 14, 2024

🙈 The PR is closed and the preview is expired.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

@gsmet
Copy link
Member Author

gsmet commented May 15, 2024

@radcortez I tried to backport #40516 to 3.10 and it doesn't fly (see the minimized bot report above). I think I have merged all the other config patches on top of 3.10 so that's odd. Any chance you could have a look?

For now, I dropped this commit so that I can release 3.10.1.

@gsmet gsmet merged commit 0275783 into quarkusio:3.10 May 15, 2024
31 of 59 checks passed
@radcortez
Copy link
Member

Yes, I'll have a look.

@radcortez
Copy link
Member

I did git am -3 https://github.com/quarkusio/quarkus/pull/40516 and it applied cleanly. New PR: #40660

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/config area/core area/dependencies Pull requests that update a dependency file area/docstyle issues related for manual docstyle review area/documentation area/graphql area/infra internal and infrastructure related issues area/kubernetes area/narayana Transactions / Narayana area/reactive-messaging area/smallrye triage/flaky-test
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants