Make production of quarkus.uuid lazy

This is done because bootstrapping the plumbing needed by the JDK to produce a UUID value is expensive, it thus doesn't make sense to pay this cost when the property isn't actually needed
geoand · Jan 8, 2025 · aef3a1f · aef3a1f
1 parent 9289bab
commit aef3a1f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 10 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java
@@ -332,7 +332,6 @@ void generateConfigClass(
     public void suppressNonRuntimeConfigChanged(
             BuildProducer<SuppressNonRuntimeConfigChangedWarningBuildItem> suppressNonRuntimeConfigChanged) {
         suppressNonRuntimeConfigChanged.produce(new SuppressNonRuntimeConfigChangedWarningBuildItem("quarkus.profile"));
-        suppressNonRuntimeConfigChanged.produce(new SuppressNonRuntimeConfigChangedWarningBuildItem("quarkus.uuid"));
         suppressNonRuntimeConfigChanged.produce(new SuppressNonRuntimeConfigChangedWarningBuildItem("quarkus.default-locale"));
         suppressNonRuntimeConfigChanged.produce(new SuppressNonRuntimeConfigChangedWarningBuildItem("quarkus.locales"));
         suppressNonRuntimeConfigChanged.produce(new SuppressNonRuntimeConfigChangedWarningBuildItem("quarkus.test.arg-line"));

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ConfigConfig.java b/core/runtime/src/main/java/io/quarkus/runtime/ConfigConfig.java
@@ -74,14 +74,6 @@ public interface ConfigConfig {
     @WithDefault("warn")
     BuildTimeMismatchAtRuntime buildTimeMismatchAtRuntime();
 
-    /**
-     * A property that allows accessing a generated UUID.
-     * It generates that UUID at startup time. So it changes between two starts including in dev mode.
-     * <br>
-     * Access this generated UUID using expressions: `${quarkus.uuid}`.
-     */
-    Optional<String> uuid();
-
     enum BuildTimeMismatchAtRuntime {
         warn,
         fail

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/RuntimeConfigBuilder.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/RuntimeConfigBuilder.java
@@ -1,7 +1,10 @@
 package io.quarkus.runtime.configuration;
 
+import java.util.Set;
 import java.util.UUID;
 
+import org.eclipse.microprofile.config.spi.ConfigSource;
+
 import io.smallrye.config.SmallRyeConfigBuilder;
 import io.smallrye.config.SmallRyeConfigBuilderCustomizer;
 
@@ -12,7 +15,38 @@ public class RuntimeConfigBuilder implements SmallRyeConfigBuilderCustomizer {
     @Override
     public void configBuilder(final SmallRyeConfigBuilder builder) {
         new QuarkusConfigBuilderCustomizer().configBuilder(builder);
-        builder.withDefaultValue("quarkus.uuid", UUID.randomUUID().toString());
+        builder.withSources(new ConfigSource() {
+
+            private static final String QUARKUS_UUID = "quarkus.uuid";
+
+            @Override
+            public Set<String> getPropertyNames() {
+                return Set.of(QUARKUS_UUID);
+            }
+
+            @Override
+            public String getValue(String propertyName) {
+                if (propertyName.equals(QUARKUS_UUID)) {
+                    return Holder.UUID_VALUE;
+                }
+                return null;
+            }
+
+            @Override
+            public String getName() {
+                return "QuarkusUUIDConfigSource";
+            }
+
+            @Override
+            public int getOrdinal() {
+                return Integer.MIN_VALUE;
+            }
+
+            // acts as a lazy value supplier
+            private static class Holder {
+                private static final String UUID_VALUE = UUID.randomUUID().toString();
+            }
+        });
 
         builder.forClassLoader(Thread.currentThread().getContextClassLoader())
                 .addDefaultInterceptors()