Change unknownPath to unmapped

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java

@@ -57,7 +57,7 @@ import org.springframework.web.util.UrlPathHelper;
 public class MetricFilterAutoConfiguration {
 
 	private static final int UNDEFINED_HTTP_STATUS = 999;
-	private static final String UNKNOWN_PATH_SUFFIX = "/unknownPath";
+	private static final String UNKNOWN_PATH_SUFFIX = "/unmapped";
 
 	@Autowired
 	private CounterService counterService;
@@ -89,18 +89,19 @@ public class MetricFilterAutoConfiguration {
 			}
 			finally {
 				stopWatch.stop();
-				if(request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE) != null)
-				{
-					suffix = request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE).toString().replaceAll("[{}]", "-");
+				int status = getStatus(response);
+				if (request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE) != null) {
+					suffix = request
+							.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE)
+							.toString().replaceAll("[{}]", "-");
 				}
-				else if(getStatus(response) == HttpStatus.NOT_FOUND.value())
-				{
-					suffix=UNKNOWN_PATH_SUFFIX;
+				else if (HttpStatus.valueOf(status).is4xxClientError()) {
+					suffix = UNKNOWN_PATH_SUFFIX;
 				}
 				String gaugeKey = getKey("response" + suffix);
 				MetricFilterAutoConfiguration.this.gaugeService.submit(gaugeKey,
 						stopWatch.getTotalTimeMillis());
-				String counterKey = getKey("status." + getStatus(response) + suffix);
+				String counterKey = getKey("status." + status + suffix);
 				MetricFilterAutoConfiguration.this.counterService.increment(counterKey);
 			}
 		}

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java

@@ -16,17 +16,6 @@
 
 package org.springframework.boot.actuate.autoconfigure;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.mockito.BDDMockito.willAnswer;
-import static org.mockito.Matchers.anyDouble;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 
@@ -49,13 +38,23 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.mockito.BDDMockito.willAnswer;
+import static org.mockito.Matchers.anyDouble;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 /**
  * Tests for {@link MetricFilterAutoConfiguration}.
  *
  * @author Phillip Webb
  */
 public class MetricFilterAutoConfigurationTests {
-	
 
 	@Test
 	public void recordsHttpInteractions() throws Exception {
@@ -79,52 +78,55 @@ public class MetricFilterAutoConfigurationTests {
 				anyDouble());
 		context.close();
 	}
-	
+
 	@Test
 	public void recordsHttpInteractionsWithTemplateVariable() throws Exception {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				Config.class, MetricFilterAutoConfiguration.class);
 		Filter filter = context.getBean(Filter.class);
-		MockMvc mvc = MockMvcBuilders.standaloneSetup(new MetricFilterTestController()).addFilter(filter).build();
-		mvc.perform(get("/templateVarTest/foo"))
-		.andExpect(status().isOk());
-		
-		verify(context.getBean(CounterService.class)).increment("status.200.templateVarTest.-someVariable-");
-		verify(context.getBean(GaugeService.class)).submit(eq("response.templateVarTest.-someVariable-"),
-				anyDouble());
+		MockMvc mvc = MockMvcBuilders.standaloneSetup(new MetricFilterTestController())
+				.addFilter(filter).build();
+		mvc.perform(get("/templateVarTest/foo")).andExpect(status().isOk());
+
+		verify(context.getBean(CounterService.class)).increment(
+				"status.200.templateVarTest.-someVariable-");
+		verify(context.getBean(GaugeService.class)).submit(
+				eq("response.templateVarTest.-someVariable-"), anyDouble());
 		context.close();
 	}
-	
+
 	@Test
-	public void recordsKnown404HttpInteractionsAsSingleMetricWithPathAndTemplateVariable() throws Exception {
+	public void recordsKnown404HttpInteractionsAsSingleMetricWithPathAndTemplateVariable()
+			throws Exception {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				Config.class, MetricFilterAutoConfiguration.class);
 		Filter filter = context.getBean(Filter.class);
-		MockMvc mvc = MockMvcBuilders.standaloneSetup(new MetricFilterTestController()).addFilter(filter).build();
-		mvc.perform(get("/knownPath/foo"))
-		.andExpect(status().isNotFound());
-		
-		verify(context.getBean(CounterService.class)).increment("status.404.knownPath.-someVariable-");
-		verify(context.getBean(GaugeService.class)).submit(eq("response.knownPath.-someVariable-"),
-				anyDouble());
+		MockMvc mvc = MockMvcBuilders.standaloneSetup(new MetricFilterTestController())
+				.addFilter(filter).build();
+		mvc.perform(get("/knownPath/foo")).andExpect(status().isNotFound());
+
+		verify(context.getBean(CounterService.class)).increment(
+				"status.404.knownPath.-someVariable-");
+		verify(context.getBean(GaugeService.class)).submit(
+				eq("response.knownPath.-someVariable-"), anyDouble());
 		context.close();
 	}
-	
+
 	@Test
 	public void records404HttpInteractionsAsSingleMetric() throws Exception {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
 				Config.class, MetricFilterAutoConfiguration.class);
 		Filter filter = context.getBean(Filter.class);
-		MockMvc mvc = MockMvcBuilders.standaloneSetup(new MetricFilterTestController()).addFilter(filter).build();
-		mvc.perform(get("/unknownPath/1"))
-		.andExpect(status().isNotFound());
-		
-		mvc.perform(get("/unknownPath/2"))
-		.andExpect(status().isNotFound());
-		
-		verify(context.getBean(CounterService.class), times(2)).increment("status.404.unknownPath");
-		verify(context.getBean(GaugeService.class), times(2)).submit(eq("response.unknownPath"),
-				anyDouble());
+		MockMvc mvc = MockMvcBuilders.standaloneSetup(new MetricFilterTestController())
+				.addFilter(filter).build();
+		mvc.perform(get("/unknownPath/1")).andExpect(status().isNotFound());
+
+		mvc.perform(get("/unknownPath/2")).andExpect(status().isNotFound());
+
+		verify(context.getBean(CounterService.class), times(2)).increment(
+				"status.404.unmapped");
+		verify(context.getBean(GaugeService.class), times(2)).submit(
+				eq("response.unmapped"), anyDouble());
 		context.close();
 	}
 
@@ -148,27 +150,23 @@ public class MetricFilterAutoConfigurationTests {
 		public GaugeService gaugeService() {
 			return mock(GaugeService.class);
 		}
-		
+
 	}
 
 }
 
-
 @RestController
-class MetricFilterTestController
-{
-	
+class MetricFilterTestController {
+
 	@RequestMapping("templateVarTest/{someVariable}")
-	public String testTemplateVariableResolution(@PathVariable String someVariable)
-	{
+	public String testTemplateVariableResolution(@PathVariable String someVariable) {
 		return someVariable;
 	}
-	
+
 	@RequestMapping("knownPath/{someVariable}")
 	@ResponseStatus(HttpStatus.NOT_FOUND)
 	@ResponseBody
-	public String testKnownPathWith404Response(@PathVariable String someVariable)
-	{
+	public String testKnownPathWith404Response(@PathVariable String someVariable) {
 		return someVariable;
 	}
 }