tweaking hints on actuators

Author: aclement

spring-graalvm-native-configuration/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/reactive/WebFluxEndpointManagementContextConfigurationHints.java

@@ -16,44 +16,37 @@
 package org.springframework.boot.actuate.autoconfigure.endpoint.web.reactive;
 
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.servlet.CommonWebActuatorTypes;
-import org.springframework.boot.actuate.autoconfigure.web.reactive.ReactiveManagementChildContextConfiguration;
-import org.springframework.boot.actuate.endpoint.web.reactive.AbstractWebFluxEndpointHandlerMapping;
-import org.springframework.boot.actuate.endpoint.web.reactive.ControllerEndpointHandlerMapping;
-import org.springframework.boot.actuate.endpoint.web.reactive.WebFluxEndpointHandlerMapping;
-import org.springframework.boot.actuate.metrics.web.reactive.client.DefaultWebClientExchangeTagsProvider;
-import org.springframework.boot.actuate.metrics.web.reactive.client.MetricsWebClientCustomizer;
-import org.springframework.boot.actuate.metrics.web.reactive.client.WebClientExchangeTagsProvider;
-import org.springframework.boot.actuate.metrics.web.reactive.server.DefaultWebFluxTagsProvider;
-import org.springframework.boot.actuate.metrics.web.reactive.server.MetricsWebFilter;
-import org.springframework.boot.actuate.metrics.web.reactive.server.WebFluxTagsProvider;
 import org.springframework.graalvm.extension.NativeImageConfiguration;
 import org.springframework.graalvm.extension.NativeImageHint;
 import org.springframework.graalvm.extension.TypeInfo;
+import org.springframework.graalvm.type.AccessBits;
 import org.springframework.graalvm.type.TypeSystem;
 
 
 @NativeImageHint(trigger=WebFluxEndpointManagementContextConfiguration.class,
 	importInfos = { CommonWebActuatorTypes.class},
 	typeInfos = {
-	@TypeInfo(types = {
-		AbstractWebFluxEndpointHandlerMapping.class,
-		ControllerEndpointHandlerMapping.class,
-		DefaultWebClientExchangeTagsProvider.class,
-		WebClientExchangeTagsProvider.class,
-		MetricsWebFilter.class,
-		DefaultWebFluxTagsProvider.class,
-		WebFluxTagsProvider.class,
-		MetricsWebClientCustomizer.class
-	}, typeNames = {
-		"org.springframework.boot.actuate.endpoint.web.reactive.ControllerEndpointHandlerMapping",
-		"org.springframework.boot.actuate.endpoint.web.reactive.AbstractWebFluxEndpointHandlerMapping",
+	@TypeInfo(
+//			types = {
+//		AbstractWebFluxEndpointHandlerMapping.class,
+//		ControllerEndpointHandlerMapping.class,
+//		DefaultWebClientExchangeTagsProvider.class,
+//		WebClientExchangeTagsProvider.class,
+//		MetricsWebFilter.class,
+//		DefaultWebFluxTagsProvider.class,
+//		WebFluxTagsProvider.class,
+//		MetricsWebClientCustomizer.class
+//	}, 
+			typeNames = {
+//		"org.springframework.boot.actuate.endpoint.web.reactive.ControllerEndpointHandlerMapping",
+//		"org.springframework.boot.actuate.endpoint.web.reactive.AbstractWebFluxEndpointHandlerMapping",
 		"org.springframework.boot.actuate.endpoint.web.reactive.WebFluxEndpointHandlerMapping$WebFluxLinksHandler",
 		"org.springframework.boot.actuate.endpoint.web.reactive.AbstractWebFluxEndpointHandlerMapping$LinksHandler",
 		"org.springframework.boot.actuate.endpoint.web.reactive.AbstractWebFluxEndpointHandlerMapping$ReadOperationHandler",
 		"org.springframework.boot.actuate.autoconfigure.web.reactive.ReactiveManagementChildContextConfiguration",
 		"org.springframework.boot.actuate.endpoint.web.reactive.AbstractWebFluxEndpointHandlerMapping$WriteOperationHandler",
 		"org.springframework.boot.actuate.autoconfigure.web.reactive.ReactiveManagementContextFactory",
-	})
+	}, access=AccessBits.LOAD_AND_CONSTRUCT|AccessBits.DECLARED_METHODS)
 })
 public class WebFluxEndpointManagementContextConfigurationHints implements NativeImageConfiguration {
 

spring-graalvm-native-configuration/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/servlet/WebMvcEndpointManagementContextConfigurationHints.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.boot.actuate.autoconfigure.endpoint.web.servlet;
 
-import org.springframework.boot.actuate.autoconfigure.endpoint.web.CorsEndpointProperties;
 import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
 import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
 import org.springframework.boot.actuate.autoconfigure.web.ManagementContextType;
@@ -28,13 +27,10 @@
 import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpointsSupplier;
 import org.springframework.boot.actuate.endpoint.web.annotation.EndpointWebExtension;
 import org.springframework.boot.actuate.endpoint.web.annotation.WebEndpoint;
-import org.springframework.boot.actuate.endpoint.web.annotation.WebEndpointDiscoverer;
-//import org.springframework.boot.actuate.endpoint.web.servlet.AbstractWebMvcEndpointHandlerMapping;
-//import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping;
-import org.springframework.boot.actuate.management.HeapDumpWebEndpoint;
 import org.springframework.graalvm.extension.NativeImageConfiguration;
 import org.springframework.graalvm.extension.NativeImageHint;
 import org.springframework.graalvm.extension.TypeInfo;
+import org.springframework.graalvm.type.AccessBits;
 import org.springframework.graalvm.type.TypeSystem;
 
 // The configurations related to actuator are in this key in spring.factories:
@@ -46,33 +42,28 @@
 @NativeImageHint(trigger=WebMvcEndpointManagementContextConfiguration.class, 
 	importInfos = CommonWebActuatorTypes.class,
  	typeInfos = {
+		@TypeInfo(types = { PathMappedEndpoints.class }, access=AccessBits.LOAD_AND_CONSTRUCT),
  		@TypeInfo(types = {
 		ControllerEndpointDiscoverer.class,
 		ControllerEndpointsSupplier.class,
-		org.springframework.boot.actuate.autoconfigure.endpoint.web.ServletEndpointManagementContextConfiguration.class,
 		ManagementContextType.class,
-		HeapDumpWebEndpoint.class,
 		EndpointMediaTypes.class,
-		PathMappedEndpoints.class,
 		WebEndpointsSupplier.class,
-		CorsEndpointProperties.class,
 		EndpointWebExtension.class,
 		WebEndpoint.class,
-		WebEndpointDiscoverer.class,
 		// web package
 		ManagementContextConfiguration.class,
 		ManagementContextFactory.class,
 		ManagementContextType.class,
 		PathMapper.class,
 		ManagementPortType.class,
-		org.springframework.boot.actuate.autoconfigure.security.servlet.SecurityRequestMatchersManagementContextConfiguration.class,
 	}, typeNames = {
-		"org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementChildContextConfiguration",
-		"org.springframework.boot.actuate.autoconfigure.web.servlet.WebMvcEndpointChildContextConfiguration",
+//		"org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementChildContextConfiguration",
+//		"org.springframework.boot.actuate.autoconfigure.web.servlet.WebMvcEndpointChildContextConfiguration",
 		"org.springframework.boot.actuate.endpoint.web.servlet.AbstractWebMvcEndpointHandlerMapping$LinksHandler",
 		"org.springframework.boot.actuate.endpoint.web.servlet.AbstractWebMvcEndpointHandlerMapping$OperationHandler",
 		"org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping$WebMvcLinksHandler",
-	})
+	})//,access=AccessBits.LOAD_AND_CONSTRUCT|AccessBits.PUBLIC_METHODS)
 })
 public class WebMvcEndpointManagementContextConfigurationHints implements NativeImageConfiguration {