Merge branch '2.0.x'

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsFilterAutoTimedTests.java

@@ -95,8 +95,8 @@ public class WebMvcMetricsFilterAutoTimedTests {
 		@Bean
 		public WebMvcMetricsFilter webMetricsFilter(WebApplicationContext context,
 				MeterRegistry registry) {
-			return new WebMvcMetricsFilter(context, registry,
-					new DefaultWebMvcTagsProvider(), "http.server.requests", true);
+			return new WebMvcMetricsFilter(registry, new DefaultWebMvcTagsProvider(),
+					"http.server.requests", true);
 		}
 
 	}

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetricsIntegrationTests.java

@@ -110,7 +110,7 @@ public class WebMvcMetricsIntegrationTests {
 		@Bean
 		public WebMvcMetricsFilter webMetricsFilter(MeterRegistry registry,
 				WebApplicationContext ctx) {
-			return new WebMvcMetricsFilter(ctx, registry, new DefaultWebMvcTagsProvider(),
+			return new WebMvcMetricsFilter(registry, new DefaultWebMvcTagsProvider(),
 					"http.server.requests", true);
 		}