Merge pull request #30470 from zakkak/2023-01-19-drop-enable-monitori…

…ng-no-args Revert --enable-monitoring with no arguments support
quarkusio · Jan 19, 2023 · 0eaa252 · 0eaa252
2 parents 44d3402 + db6f091
commit 0eaa252
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
@@ -466,7 +466,6 @@ public enum MonitoringOption {
         HEAPDUMP,
         JVMSTAT,
         JFR,
-        ALL,
-        TRUE // only needed to support -Dquarkus.native.monitoring
+        ALL
     }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
@@ -22,7 +22,6 @@
 import java.util.stream.Stream;
 
 import org.apache.commons.lang3.SystemUtils;
-import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.logging.Logger;
 
 import io.quarkus.bootstrap.util.IoUtils;
@@ -830,17 +829,10 @@ public NativeImageInvokerInfo build() {
 
                 if (nativeConfig.monitoring.isPresent()) {
                     List<NativeConfig.MonitoringOption> monitoringOptions = nativeConfig.monitoring.get();
-                    if (monitoringOptions.stream().anyMatch(o -> o == NativeConfig.MonitoringOption.TRUE
-                            || o == NativeConfig.MonitoringOption.ALL)) {
-                        nativeImageArgs.add("--enable-monitoring");
+                    if (!monitoringOptions.isEmpty()) {
+                        nativeImageArgs.add("--enable-monitoring=" + monitoringOptions.stream()
+                                .map(o -> o.name().toLowerCase(Locale.ROOT)).collect(Collectors.joining(",")));
                     }
-                    nativeImageArgs
-                            .add("--enable-monitoring=" + monitoringOptions.stream().map(o -> o.name().toLowerCase(
-                                    Locale.ROOT)).collect(Collectors.joining(",")));
-                } else if (ConfigProvider.getConfig().getConfigValue("quarkus.native.monitoring").getValue() != null) {
-                    // this only happens when a user has configured 'quarkus.native.monitoring='
-                    // we want to support this use case as GraalVM allows the use of '--enable-monitoring' without an argument
-                    nativeImageArgs.add("--enable-monitoring");
                 }
                 if (nativeConfig.autoServiceLoaderRegistration) {
                     nativeImageArgs.add("-H:+UseServiceLoaderFeature");