root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Brian Clozel 2018-04-12 14:51:34 +02:00
parent efd4245785 3fa8fe85af
commit 70826f5478
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/reactive/server/RouterFunctionMetrics.java
View File

@ -36,7 +36,9 @@ import org.springframework.web.reactive.function.server.ServerResponse;
*
* @author Jon Schneider
* @since 2.0.0
* @deprecated in favor of the auto-configured {@link MetricsWebFilter}
*/
@Deprecated
public class RouterFunctionMetrics {
private final MeterRegistry registry;

17
spring-boot-project/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
View File

@ -1684,14 +1684,12 @@ To customize the tags, provide a `@Bean` that implements `WebMvcTagsProvider`.
[[production-ready-metrics-web-flux]]
==== Spring WebFlux Metrics
Auto-configuration enables the instrumentation of all requests handled by WebFlux
controllers. You can also use a helper class, `RouterFunctionMetrics`, to instrument
applications that use WebFlux's functional programming model.
controllers and functional handlers.
By default, metrics are generated with the name `http.server.requests`. You can customize
the name by setting the `management.metrics.web.server.requests-metric-name` property.
By default, WebFlux-related metrics for the annotation-based programming model are tagged
with the following information:
By default, WebFlux-related metrics are tagged with the following information:
* `method`, the request's method (for example, `GET` or `POST`).
* `uri`, the request's URI template prior to variable substitution, if possible (for
@ -1702,17 +1700,6 @@ request.
To customize the tags, provide a `@Bean` that implements `WebFluxTagsProvider`.
By default, metrics for the functional programming model are tagged with the following
information:
* `method`, the request's method (for example, `GET` or `POST`).
* `uri`, the request's URI template prior to variable substitution, if possible (for
example, `/api/person/{id}`).
* `status`, the response's HTTP status code (for example, `200` or `500`).
To customize the tags, use the `defaultTags` method on your `RouterFunctionMetrics`
instance.
[[production-ready-metrics-rest-template]]