Complete the Spring Actuator support

Author: hsdmiranda

simpleclient_spring_boot/src/main/java/io/prometheus/client/spring/boot/PrometheusEndpointConfiguration.java

@@ -1,6 +1,8 @@
 package io.prometheus.client.spring.boot;
 
 import io.prometheus.client.CollectorRegistry;
+import org.springframework.boot.actuate.condition.ConditionalOnEnabledEndpoint;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -11,4 +13,11 @@ class PrometheusEndpointConfiguration {
   public PrometheusEndpoint prometheusEndpoint() {
     return new PrometheusEndpoint(CollectorRegistry.defaultRegistry);
   }
+
+  @Bean
+  @ConditionalOnBean(PrometheusEndpoint.class)
+  @ConditionalOnEnabledEndpoint("prometheus")
+  public PrometheusMVCEndpoint prometheusEndpointFix(PrometheusEndpoint prometheusEndpoint) {
+  	return new PrometheusMVCEndpoint(prometheusEndpoint);
+  }
 }

simpleclient_spring_boot/src/main/java/io/prometheus/client/spring/boot/PrometheusMVCEndpoint.java

@@ -0,0 +1,25 @@
+package io.prometheus.client.spring.boot;
+
+import io.prometheus.client.exporter.common.TextFormat;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.endpoint.mvc.AbstractEndpointMvcAdapter;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+public class PrometheusMVCEndpoint extends AbstractEndpointMvcAdapter<PrometheusEndpoint> {
+
+	@Autowired
+	public PrometheusMVCEndpoint(PrometheusEndpoint delegate) {
+		super(delegate);
+	}
+
+	@RequestMapping(value = "", method = RequestMethod.GET, produces = TextFormat.CONTENT_TYPE_004)
+	public Object invoke() {
+		if (!getDelegate().isEnabled()) {
+			// Shouldn't happen because the request mapping should not be registered
+			return getDisabledResponse();
+		} else {
+			return getDelegate().invoke();
+		}
+	}
+}

simpleclient_spring_boot/src/test/java/io/prometheus/client/spring/boot/PrometheusEndpointTest.java

@@ -1,15 +1,16 @@
 package io.prometheus.client.spring.boot;
 
 import io.prometheus.client.Counter;
+import io.prometheus.client.exporter.common.TextFormat;
 import io.prometheus.client.matchers.CustomMatchers;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.TestRestTemplate;
 import org.springframework.boot.test.WebIntegrationTest;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.web.client.RestTemplate;
@@ -48,7 +49,7 @@ public void testMetricsExportedThroughPrometheusEndpoint() {
 
     // then:
     assertEquals(HttpStatus.OK, metricsResponse.getStatusCode());
-    assertTrue(MediaType.TEXT_PLAIN.isCompatibleWith(metricsResponse.getHeaders().getContentType()));
+    assertTrue(StringUtils.deleteWhitespace(TextFormat.CONTENT_TYPE_004).equals(metricsResponse.getHeaders().getContentType().toString()));
 
     List<String> responseLines = Arrays.asList(metricsResponse.getBody().split("\n"));
     assertThat(responseLines, CustomMatchers.<String>exactlyNItems(1,

simpleclient_spring_web/src/test/java/io/prometheus/client/spring/web/MethodTimerTest.java

@@ -5,7 +5,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.aop.aspectj.annotation.AspectJProxyFactory;
-import org.springframework.context.annotation.Import;
 
 import java.util.Enumeration;