Limit metrics collection of incoming requests #14173

nosan · 2018-08-22T17:27:10Z

snicoll

Thanks again for the PR @nosan!

I've added a few suggestions and am looking forward to your feedback on them. In particular, I'd like this PR to be minimal considering we target a maintenance release.

snicoll · 2018-08-28T13:59:03Z

...a/org/springframework/boot/actuate/autoconfigure/metrics/OnlyOnceLoggingDenyMeterFilter.java

+/**
+ * {@link MeterFilter} to log only once a warning message and deny {@link Meter.Id}.
+ *
+ * @author Dmytro Nosan


Missing a @since. I wonder if that wouldn't be something of interest for the library (ping @jkschneider)

snicoll · 2018-08-28T14:02:13Z

...re/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/test/MetricsRun.java

@@ -90,7 +91,7 @@ private MetricsRun() {
 	 * implementation.
 	 * @return the function to apply
 	 */
-	public static Function<ApplicationContextRunner, ApplicationContextRunner> simple() {
+	public static <T extends AbstractApplicationContextRunner> Function<T, T> simple() {


This is not strictly related to the scope of this PR. I am happy to revisit the tests here but I'd like to do that in a separate PR.

Could you please revert everything that's related to that?

(also if submit a new PR for this, there is a raw type use of AbstractApplicationContextRunner)

snicoll · 2018-08-28T14:03:39Z

...ingframework/boot/actuate/autoconfigure/web/servlet/WebMvcMetricsAutoConfigurationTests.java


 /**
 * Tests for {@link WebMvcMetricsAutoConfiguration}.
 *
 * @author Andy Wilkinson
+ * @author Dmytro Nosan
 */
 public class WebMvcMetricsAutoConfigurationTests {

 	private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()


Actually I prefer the former. I'd rather keep the auto-configurations explicit and only add what's strictly necessary for the task at hand (anyway, to be discussed in a separate PR anyway).

snicoll · 2018-08-28T14:05:04Z

spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -1489,6 +1489,8 @@ content into your application. Rather, pick only the properties that you need.
 	management.metrics.web.client.requests-metric-name=http.client.requests # Name of the metric for sent requests.
 	management.metrics.web.server.auto-time-requests=true # Whether requests handled by Spring MVC or WebFlux should be automatically timed.
 	management.metrics.web.server.requests-metric-name=http.server.requests # Name of the metric for received requests.
+	management.metrics.web.server.max-uri-tags=100 # Maximum number of unique URI tag values allowed. After the max number of tag values is reached, metrics with additional tag values are denied by filter.
+


Extra line to be removed here please.

snicoll · 2018-08-28T14:05:25Z

spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -1489,6 +1489,8 @@ content into your application. Rather, pick only the properties that you need.
 	management.metrics.web.client.requests-metric-name=http.client.requests # Name of the metric for sent requests.
 	management.metrics.web.server.auto-time-requests=true # Whether requests handled by Spring MVC or WebFlux should be automatically timed.
 	management.metrics.web.server.requests-metric-name=http.server.requests # Name of the metric for received requests.
+	management.metrics.web.server.max-uri-tags=100 # Maximum number of unique URI tag values allowed. After the max number of tag values is reached, metrics with additional tag values are denied by filter.


Please order the key alphabetically.

nosan · 2018-08-28T20:19:25Z

Thanks, @snicoll
PR has been updated.

snicoll · 2018-08-29T14:00:43Z

@nosan thanks for the feedback but I still see some unrelated changes in WebMvcMetricsAutoConfigurationTests. Can you please remove those? The test you've added there imports WebMvcMetricsAutoConfiguration again.

If you rebase to a single commit, then a diff should show a focused minimal change for this test as well. Thanks a lot for your efforts!

nosan · 2018-08-29T15:00:50Z

@snicoll
updated :)

closes spring-projectsgh-13913.

nosan · 2018-08-30T10:54:56Z

@snicoll I see that WebClientMetricsAutoConfiguration doesn't have a MeterFilter for uri tags as well. Should I add it?

snicoll · 2018-08-30T11:01:00Z

@nosan ah ah that's awesome, I just saw that as well 5 min ago. I think so yeah, looks like an oversight. This should be done as a separate issue/PR though. Do you want to give that a try? (I am almost done with this one).

nosan · 2018-08-30T11:03:53Z

@snicoll I'll create a separate PR.

See gh-14173

* pr/14173: Polish "Limit metrics collection of incoming requests" Limit metrics collection of incoming requests

snicoll · 2018-08-30T11:06:11Z

@nosan I am confused, there is a test for this in WebClientMetricsAutoConfigurationTests. It's on master only, that's why I thought it was an oversight when I was in 2.0.x.

nosan · 2018-08-30T11:07:19Z

@snicoll RestTemplateMetricsAutoConfiguration

	@Bean
	@Order(0)
	public MeterFilter metricsHttpClientUriTagFilter(MetricsProperties properties) {
		String metricName = properties.getWeb().getClient().getRequestsMetricName();
		MeterFilter denyFilter = new MaximumUriTagsReachedMeterFilter(metricName);
		return MeterFilter.maximumAllowableTags(metricName, "uri",
				properties.getWeb().getClient().getMaxUriTags(), denyFilter);
	}

snicoll · 2018-08-30T11:12:21Z

I don't understand why you refer to it. Metrics support for WebClient was added in #12228.

nosan · 2018-08-30T11:18:37Z

I'm talking about 'uri' tag filter. If you remove RestTemplateMetricsAutoConfiguration from MetricsRun.simple() in WebClientMetricsAutoConfigurationTests then afterMaxUrisReachedFurtherUrisAreDenied test will fail.

See spring-projects/spring-boot#14173

spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Aug 22, 2018

nosan force-pushed the gh-13913 branch 2 times, most recently from 6904c10 to 75733ba Compare August 23, 2018 09:18

snicoll mentioned this pull request Aug 24, 2018

Add support for MeterFilter#maximumAllowableTags #13913

Closed

snicoll added type: enhancement A general enhancement and removed status: waiting-for-triage An issue we've not yet triaged labels Aug 24, 2018

snicoll added this to the 2.0.x milestone Aug 24, 2018

snicoll reviewed Aug 28, 2018

View reviewed changes

snicoll added the status: waiting-for-feedback We need additional information before we can continue label Aug 28, 2018

nosan force-pushed the gh-13913 branch 4 times, most recently from 3abd033 to f55065b Compare August 28, 2018 20:17

snicoll removed the status: waiting-for-feedback We need additional information before we can continue label Aug 29, 2018

snicoll added the status: waiting-for-feedback We need additional information before we can continue label Aug 29, 2018

nosan force-pushed the gh-13913 branch from f55065b to ea1667e Compare August 29, 2018 14:59

Add support MeterFilter#maximumAllowableTags for WebFlux and WebMvc

80cd284

closes spring-projectsgh-13913.

nosan force-pushed the gh-13913 branch from ea1667e to 80cd284 Compare August 29, 2018 15:20

snicoll removed the status: waiting-for-feedback We need additional information before we can continue label Aug 30, 2018

snicoll self-assigned this Aug 30, 2018

snicoll changed the title ~~Add support MeterFilter#maximumAllowableTags for WebFlux and WebMvc~~ Limit metrics collection of incoming requests Aug 30, 2018

snicoll pushed a commit that referenced this pull request Aug 30, 2018

Limit metrics collection of incoming requests

81a6701

See gh-14173

snicoll added a commit that referenced this pull request Aug 30, 2018

Merge pull request #14173 from nosan:gh-13913

385216a

* pr/14173: Polish "Limit metrics collection of incoming requests" Limit metrics collection of incoming requests

snicoll modified the milestones: 2.0.x, 2.0.5 Aug 30, 2018

snicoll closed this in 0625443 Aug 30, 2018

nosan deleted the gh-13913 branch August 30, 2018 11:46

izeye added a commit to izeye/micrometer that referenced this pull request Sep 30, 2018

Limit metrics collection of incoming requests for Servlet

e48ccae

See spring-projects/spring-boot#14173

izeye mentioned this pull request Sep 30, 2018

Limit metrics collection of incoming requests for Servlet micrometer-metrics/micrometer#883

Merged

jkschneider pushed a commit to micrometer-metrics/micrometer that referenced this pull request Oct 4, 2018

Limit metrics collection of incoming requests for Servlet

cd2b22c

See spring-projects/spring-boot#14173

bclozel mentioned this pull request Oct 23, 2018

Response time increases due to WebMvcMetricsFilter.doFilter() #14929

Closed

PyvesB mentioned this pull request Oct 16, 2020

Align WebFluxTags#uri() with WebMvcTags#uri() #15609

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Limit metrics collection of incoming requests #14173

Limit metrics collection of incoming requests #14173

nosan commented Aug 22, 2018

snicoll left a comment •

edited

snicoll Aug 28, 2018

snicoll Aug 28, 2018 •

edited

snicoll Aug 28, 2018

snicoll Aug 28, 2018

snicoll Aug 28, 2018

nosan commented Aug 28, 2018 •

edited

snicoll commented Aug 29, 2018

nosan commented Aug 29, 2018

nosan commented Aug 30, 2018

snicoll commented Aug 30, 2018

nosan commented Aug 30, 2018

snicoll commented Aug 30, 2018 •

edited

nosan commented Aug 30, 2018

snicoll commented Aug 30, 2018

nosan commented Aug 30, 2018 •

edited

Limit metrics collection of incoming requests #14173

Limit metrics collection of incoming requests #14173

Conversation

nosan commented Aug 22, 2018

snicoll left a comment • edited

Choose a reason for hiding this comment

snicoll Aug 28, 2018

Choose a reason for hiding this comment

snicoll Aug 28, 2018 • edited

Choose a reason for hiding this comment

snicoll Aug 28, 2018

Choose a reason for hiding this comment

snicoll Aug 28, 2018

Choose a reason for hiding this comment

snicoll Aug 28, 2018

Choose a reason for hiding this comment

nosan commented Aug 28, 2018 • edited

snicoll commented Aug 29, 2018

nosan commented Aug 29, 2018

nosan commented Aug 30, 2018

snicoll commented Aug 30, 2018

nosan commented Aug 30, 2018

snicoll commented Aug 30, 2018 • edited

nosan commented Aug 30, 2018

snicoll commented Aug 30, 2018

nosan commented Aug 30, 2018 • edited

snicoll left a comment •

edited

snicoll Aug 28, 2018 •

edited

nosan commented Aug 28, 2018 •

edited

snicoll commented Aug 30, 2018 •

edited

nosan commented Aug 30, 2018 •

edited