Use @ConfigMapping in SmallRye extensions #45757

gsmet · 2025-01-21T16:28:15Z

Created as draft to do a last review with the diff and check the whole CI.

Probably better reviewed commit per commit.

quarkus-bot · 2025-01-21T16:29:09Z

/cc @ebullient (metrics), @jmartisk (metrics)

gsmet · 2025-01-21T16:30:18Z

...yment/src/main/java/io/quarkus/smallrye/health/deployment/SmallRyeHealthBuildTimeConfig.java

-    public Optional<Boolean> openapiIncluded;
+    @WithName("openapi.included")
+    @WithDefault("false")
+    boolean openapiIncluded();


For a weird reason, the config was split in two classes. I centralized everything in one class.

gsmet · 2025-01-21T16:34:00Z

.../java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/RabbitMQBuildTimeConfig.java

+@ConfigRoot(phase = ConfigPhase.BUILD_TIME)
+@ConfigMapping(prefix = "quarkus.rabbitmq")


@ozangunalp @cescoffier the config for the Messaging extensions is rather inconsistent. Some of them have quarkus.messaging.whatever and some of them quarkus.whatever. I would have expected the consistent quarkus.messaging prefix.

It's out of the scope of this PR though and I will let you handle it once this is in if you want to adjust.

github-actions · 2025-01-21T17:29:29Z

🎊 PR Preview 7bf5b30 has been successfully built and deployed to https://quarkus-pr-main-45757-preview.surge.sh/version/main/guides/

Images of blog posts older than 3 months are not available.
Newsletters older than 3 months are not available.

radcortez

I've seen a few places using @ConfigGroup which shouldn't be required anymore.

gastaldi · 2025-01-21T19:18:38Z

...graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLConfig.java


    /**
     * Abort a query if the total depth of the query exceeds the defined limit. Default to no limit
     */
-    @ConfigItem
-    public Optional<Integer> instrumentationQueryDepth;
+    Optional<Integer> instrumentationQueryDepth();


Suggested change

Optional<Integer> instrumentationQueryDepth();

OptionalInt instrumentationQueryDepth();

I addressed all of them.

gastaldi · 2025-01-21T19:18:53Z

...graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLConfig.java


    /**
     * Abort a query if the total number of data fields queried exceeds the defined limit. Default to no limit
     */
-    @ConfigItem
-    public Optional<Integer> instrumentationQueryComplexity;
+    Optional<Integer> instrumentationQueryComplexity();


Suggested change

Optional<Integer> instrumentationQueryComplexity();

OptionalInt instrumentationQueryComplexity();

gastaldi · 2025-01-21T19:19:03Z

...graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLConfig.java


    /**
     * The maximum number of raw whitespace tokens the parser will accept, after which an exception will be thrown. Default to
     * 200000
     */
-    @ConfigItem
-    public Optional<Integer> parserMaxWhitespaceTokens;
+    Optional<Integer> parserMaxWhitespaceTokens();


Suggested change

Optional<Integer> parserMaxWhitespaceTokens();

OptionalInt parserMaxWhitespaceTokens();

gastaldi · 2025-01-21T19:19:14Z

...graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLConfig.java


    /**
     * The maximum number of raw tokens the parser will accept, after which an exception will be thrown. Default to 15000
     */
-    @ConfigItem
-    public Optional<Integer> parserMaxTokens;
+    Optional<Integer> parserMaxTokens();


Suggested change

Optional<Integer> parserMaxTokens();

OptionalInt parserMaxTokens();

gsmet · 2025-01-22T08:50:00Z

I've seen a few places using @ConfigGroup which shouldn't be required anymore.

@radcortez yeah I know we have a disagreement on it :). I personally prefer being explicit, both for documentation sake (you know it's a config group when you see it and because I'm not a big fan of magic - I have been hit by the bus too many times later).

Also drop the deprecated configuration (it's present in at least one LTS as it has been deprecated in 3.14) and rationalize the config classes (we had two config classes with the exact same scope).

Also extract the config to a proper file.

gsmet · 2025-01-22T09:06:10Z

This is now ready for review.

quarkus-bot · 2025-01-22T09:40:00Z

Status for workflow `Quarkus Documentation CI`

This is the status report for running Quarkus Documentation CI on commit b329543.

✅ The latest workflow run for the pull request has completed successfully.

It should be safe to merge provided you have a look at the other checks in the summary.

Warning

There are other workflow runs running, you probably need to wait for their status before merging.

radcortez · 2025-01-22T10:37:40Z

@radcortez yeah I know we have a disagreement on it :). I personally prefer being explicit, both for documentation sake (you know it's a config group when you see it and because I'm not a big fan of magic - I have been hit by the bus too many times later).

Ok :)

quarkus-bot · 2025-01-22T13:32:58Z

Status for workflow `Quarkus CI`

This is the status report for running Quarkus CI on commit b329543.

✅ The latest workflow run for the pull request has completed successfully.

It should be safe to merge provided you have a look at the other checks in the summary.

You can consult the Develocity build scans.

Flaky tests - Develocity

⚙️ JVM Tests - JDK 21

📦 extensions/infinispan-cache/deployment

✖ io.quarkus.cache.infinispan.InfinispanCacheTest.testGetAsyncWithParallelCalls - History

expected: "thread1" but was: "thread2" - org.opentest4j.AssertionFailedError

org.opentest4j.AssertionFailedError: 

expected: "thread1"
 but was: "thread2"
	at io.quarkus.cache.infinispan.InfinispanCacheTest.testGetAsyncWithParallelCalls(InfinispanCacheTest.java:283)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at io.quarkus.test.QuarkusUnitTest.runExtensionMethod(QuarkusUnitTest.java:513)
	at io.quarkus.test.QuarkusUnitTest.interceptTestMethod(QuarkusUnitTest.java:427)

📦 integration-tests/observability-lgtm

✖ io.quarkus.observability.test.LgtmLifecycleTest.testTracing - History

java.lang.RuntimeException: java.lang.reflect.InvocationTargetException - java.lang.RuntimeException

java.lang.RuntimeException: java.lang.RuntimeException: java.lang.reflect.InvocationTargetException
	at io.quarkus.test.junit.QuarkusTestExtension.throwBootFailureException(QuarkusTestExtension.java:611)
	at io.quarkus.test.junit.QuarkusTestExtension.interceptTestClassConstructor(QuarkusTestExtension.java:695)
	at java.base/java.util.Optional.orElseGet(Optional.java:364)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
Caused by: java.lang.RuntimeException: java.lang.reflect.InvocationTargetException
	at io.quarkus.test.junit.TestResourceUtil$TestResourceManagerReflections.startReflectively(TestResourceUtil.java:214)

quarkus-bot bot added area/graphql area/health area/metrics area/openapi area/reactive-messaging area/smallrye area/swagger-ui labels Jan 21, 2025

gsmet commented Jan 21, 2025

View reviewed changes

gsmet mentioned this pull request Jan 21, 2025

WIP: ConfigMapping of GraphQL Client config #45608

Draft

gsmet requested a review from radcortez January 21, 2025 16:39

gsmet force-pushed the smallrye-config-mapping branch from 58316ea to dccdf78 Compare January 21, 2025 16:54

radcortez reviewed Jan 21, 2025

View reviewed changes

gastaldi reviewed Jan 21, 2025

View reviewed changes

Use @ConfigMapping in SmallRye GraphQL server

ce6b944

gsmet force-pushed the smallrye-config-mapping branch from dccdf78 to b64aef0 Compare January 22, 2025 08:54

gsmet added 4 commits January 22, 2025 10:03

Use @ConfigMapping in SmallRye Health

f90a67d

Also drop the deprecated configuration (it's present in at least one LTS as it has been deprecated in 3.14) and rationalize the config classes (we had two config classes with the exact same scope).

Use @ConfigMapping in SmallRye Metrics

952c33e

Also extract the config to a proper file.

Use @ConfigMapping in SmallRye OpenAPI

1e454df

Use @ConfigMapping in SmallRye Reactive Messaging extensions

b329543

gsmet force-pushed the smallrye-config-mapping branch from b64aef0 to b329543 Compare January 22, 2025 09:05

gsmet marked this pull request as ready for review January 22, 2025 09:05

radcortez approved these changes Jan 22, 2025

View reviewed changes

quarkus-bot bot added the triage/flaky-test label Jan 22, 2025

gsmet merged commit 3f6f477 into quarkusio:main Jan 22, 2025
62 of 64 checks passed

quarkus-bot bot added this to the 3.19 - main milestone Jan 22, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use @ConfigMapping in SmallRye extensions #45757

Use @ConfigMapping in SmallRye extensions #45757

gsmet commented Jan 21, 2025 •

edited

Loading

quarkus-bot bot commented Jan 21, 2025

gsmet Jan 21, 2025

gsmet Jan 21, 2025

github-actions bot commented Jan 21, 2025 •

edited

Loading

radcortez left a comment

gastaldi Jan 21, 2025

gsmet Jan 22, 2025

gastaldi Jan 21, 2025

gastaldi Jan 21, 2025

gastaldi Jan 21, 2025

gsmet commented Jan 22, 2025

gsmet commented Jan 22, 2025

quarkus-bot bot commented Jan 22, 2025

radcortez commented Jan 22, 2025

quarkus-bot bot commented Jan 22, 2025 •

edited by github-actions bot

Loading

		@ConfigRoot(phase = ConfigPhase.BUILD_TIME)
		@ConfigMapping(prefix = "quarkus.rabbitmq")

	Optional<Integer> instrumentationQueryDepth();
	OptionalInt instrumentationQueryDepth();

	Optional<Integer> instrumentationQueryComplexity();
	OptionalInt instrumentationQueryComplexity();

	Optional<Integer> parserMaxWhitespaceTokens();
	OptionalInt parserMaxWhitespaceTokens();

	Optional<Integer> parserMaxTokens();
	OptionalInt parserMaxTokens();

Use @ConfigMapping in SmallRye extensions #45757

Use @ConfigMapping in SmallRye extensions #45757

Conversation

gsmet commented Jan 21, 2025 • edited Loading

quarkus-bot bot commented Jan 21, 2025

gsmet Jan 21, 2025

Choose a reason for hiding this comment

gsmet Jan 21, 2025

Choose a reason for hiding this comment

github-actions bot commented Jan 21, 2025 • edited Loading

radcortez left a comment

Choose a reason for hiding this comment

gastaldi Jan 21, 2025

Choose a reason for hiding this comment

gsmet Jan 22, 2025

Choose a reason for hiding this comment

gastaldi Jan 21, 2025

Choose a reason for hiding this comment

gastaldi Jan 21, 2025

Choose a reason for hiding this comment

gastaldi Jan 21, 2025

Choose a reason for hiding this comment

gsmet commented Jan 22, 2025

gsmet commented Jan 22, 2025

quarkus-bot bot commented Jan 22, 2025

Status for workflow Quarkus Documentation CI

radcortez commented Jan 22, 2025

quarkus-bot bot commented Jan 22, 2025 • edited by github-actions bot Loading

Status for workflow Quarkus CI

Flaky tests - Develocity

⚙️ JVM Tests - JDK 21

📦 extensions/infinispan-cache/deployment

📦 integration-tests/observability-lgtm

gsmet commented Jan 21, 2025 •

edited

Loading

github-actions bot commented Jan 21, 2025 •

edited

Loading

Status for workflow `Quarkus Documentation CI`

quarkus-bot bot commented Jan 22, 2025 •

edited by github-actions bot

Loading

Status for workflow `Quarkus CI`