461 Commits

Author SHA1 Message Date
Phillip Webb
bda9b892b3 Add direct WebFlux and WebMvc endpoint support
Add `@ControllerEndpoint` and `@RestControllerEndpoint` annotations that
can be used to develop a Spring-only request mapped endpoint. Both
Spring MVC and Spring WebFlux are supported.

This feature is primarily for use when deeper Spring integration is
required or when existing Spring Boot 1.5 projects want to migrate to
Spring Boot 2.0 without re-writing existing endpoints. It comes at the
expense of portability, since such endpoints will be missing from
Jersey.

Fixes gh-10257
2018-01-19 21:06:32 -08:00
Phillip Webb
340ef52f78 Refactor endpoint path concerns
Create a `PathMappedEndpoint` interface that allows any `ExposedEndpoint`
to provide root path details. The `EndpointPathResolver` interface has
been renamed to `PathMapper` and is now only used during endpoint
discovery.

`EndpointPathProvider` has been replaced with `PathMappedEndpoints`
which simply finds relevant path mapped endpoints.

Fixes gh-10985
2018-01-19 20:44:24 -08:00
Phillip Webb
1d39feffea Overhaul actuator endpoint code
Refactor several areas of the actuator endpoint code in order to make
future extensions easier. The primary goal is to introduce the concept
of an `ExposableEndpoint` that has technology specific subclasses and
can carry additional data for filters to use. Many other changes have
been made along the way including:

* A new EndpointSupplier interface that allows cleaner separation of
  supplying vs discovering endpoints. This allows cleaner class names
  and allows for better auto-configuration since a user can choose to
  provide their own supplier entirely.

* A `DiscoveredEndpoint` interface that allows the `EndpointFilter`
  to be greatly simplified. A filter now doesn't need to know about
  discovery concerns unless absolutely necessary.

* Improved naming and package structure. Many technology specific
  concerns are now grouped in a better way. Related concerns are
  co-located and concepts from one area no longer leakage into another.

* Simplified `HandlerMapping` implementations. Many common concerns have
  been pulled up helping to create simpler subclasses.

* Simplified JMX adapters. Many of the intermediary `Info` classes have
  been removed. The `DiscoveredJmxOperation` is now responsible for
  mapping methods to operations.

* A specific @`HealthEndpointCloudFoundryExtension` for Cloud Foundry.
  The extension logic used to create a "full" health endpoint extension
  has been made explicit.

Fixes gh-11428
Fixes gh-11581
2018-01-19 20:44:24 -08:00
Phillip Webb
dc935fba48 Polish 2018-01-19 20:44:18 -08:00
Madhura Bhave
5e2cc02499 Move servlet specific security auto-config 2018-01-20 09:41:50 +05:30
Stephane Nicoll
c926bed6f5 Polish "Fix modifiers order"
Closes gh-11681
2018-01-19 11:30:30 +01:00
igor-suhorukov
e2d05607f2 Fix modifiers order
See gh-11681
2018-01-19 11:30:06 +01:00
Johnny Lim
9d24186942 Use this() in EndpointRequests
Closes gh-11690
2018-01-19 11:15:42 +01:00
Phillip Webb
0b81f78a2a Revert "Create CloudFoundry-specific EndpointWebExtension"
This reverts commit 7189f426ed68d48e2064135f377d8f8002b17a42.
2018-01-18 23:21:51 -08:00
Phillip Webb
f3379668ac Polish 2018-01-18 23:21:51 -08:00
Stephane Nicoll
8704cf1fe7 Harmonize metric property names
See gh-11667
2018-01-18 17:21:40 +01:00
Stephane Nicoll
6086bc714f Fix json structure 2018-01-18 17:04:37 +01:00
Stephane Nicoll
7002507304 Polish 2018-01-18 16:34:56 +01:00
Stephane Nicoll
beaa49a2d6 Polish "Add auto-configuration for RabbitMQ metrics"
Closes gh-10887
2018-01-18 16:16:26 +01:00
Arnaud Cogoluègnes
58c8c4d56a Add auto-configuration for RabbitMQ metrics
See gh-10887
2018-01-18 16:11:50 +01:00
Stephane Nicoll
5cb6c086b6 Rename micrometer instrumentation flags
Closes gh-11667
2018-01-18 14:16:40 +01:00
Andy Wilkinson
849baa4c02 Do not require after in audit events endpoint
Closes gh-11605
2018-01-18 11:59:46 +00:00
Andy Wilkinson
54c0cf513b Polish 2018-01-17 19:03:23 +00:00
Andy Wilkinson
3cf1fb6763 Polish formatting in Actuator API documentation 2018-01-16 20:46:42 +00:00
Andy Wilkinson
67a299020b Rework mappings endpoint
Improve the structure of the response and include mappings from
WebFlux and Servlet and Filter registrations in addition to the
mappings from Spring MVC.

Closes gh-9979
2018-01-16 18:26:59 +00:00
Andy Wilkinson
5b8a2f9675 Improve context hierarchy handling in Actuator endpoints
Previously, a number of Actuator endpoints ignored a context hierarchy
or assumed that it would always be linear. This commit reworks the
affected endpoints so that the no longer assume a linear hierarchy.

A side-effect of a non-linear hierarchy is that there may be multiple
different beans with the same name (in a linear hierarchy, a bean
with the same name as one in an ancestor context, replaces that bean).
The affected endpoints have also been updated so that, when bean names
are used as keys, those keys are grouped by application context. This
prevents a bean in one context from accidentially overwriting a bean
in another context.

Closes gh-11019
2018-01-16 09:53:52 +00:00
Andy Wilkinson
23d8d608c4 Polish 2018-01-15 13:35:46 +00:00
Andy Wilkinson
2b99962a85 Replace use of Date with OffsetDateTime and Instant in Actuator
Closes gh-10976
2018-01-12 17:26:05 +00:00
Stephane Nicoll
ae3cd75d1a Polish "Upgrade to Micrometer 1.0.0-rc.6"
Closes gh-11598
2018-01-11 18:35:31 +01:00
Jon Schneider
ccc820f723 Upgrade to Micrometer 1.0.0-rc.6
See gh-11598
2018-01-11 18:35:31 +01:00
Brian Clozel
69d5b7a4e8 Add missing header expectations in tests
Fixes gh-11318
2018-01-11 14:44:50 +01:00
Stephane Nicoll
7189f426ed Create CloudFoundry-specific EndpointWebExtension
Closes gh-11428
2018-01-11 11:23:20 +01:00
Brian Clozel
d264af8142 Apply server.tomcat.* config to reactive servers
This commit applies most `server.tomcat.*` configuration
properties to Tomcat when set up as a reactive web server.

Some Servlet-specific properties are not applied:

* server.tomcat.additional-tld-skip-patterns
* server.tomcat.redirect-context-root
* server.tomcat.use-relative-redirects

Fixes gh-11334
2018-01-11 11:15:02 +01:00
Madhura Bhave
e57aafd63d Provide EndpointRequest for WebFlux-based Security
Closes gh-11022
2018-01-09 16:06:36 -08:00
Madhura Bhave
fa8bca41f8 Fix javadoc 2018-01-09 14:47:32 -08:00
Madhura Bhave
8fedc29ed7 Update copyright year of changed files 2018-01-09 14:45:43 -08:00
Madhura Bhave
3d30c62162 Fix package tangle in cloudfoundry configuration
Fixes gh-11273
2018-01-09 14:42:28 -08:00
Phillip Webb
b078698f20 Update copyright year of changed files 2018-01-09 12:13:27 -08:00
Johnny Lim
0f0c6e0729 Polish
Closes gh-11536
2018-01-09 09:28:56 +01:00
Phillip Webb
cae02ce0b8 Make WebMvcMetricsFilter lazy
Update `WebMvcMetricsFilter` so that it no longer causes early
initialization of Spring MVC concerns.

Fixes gh-11571
2018-01-08 15:19:06 -08:00
Phillip Webb
25609c060e Polish 2018-01-08 15:19:06 -08:00
Stephane Nicoll
ac004eabf3 Update copyright header
See gh-11510
2018-01-05 10:30:43 +01:00
Johnny Lim
37d8eedae3 Polish
Closes gh-11510
2018-01-05 10:29:22 +01:00
Phillip Webb
bee5fa7fc6 Polish 2018-01-03 13:24:04 -08:00
Phillip Webb
6bac365a72 Polish micrometer cache metrics
Change `CacheMeterBinderProvider` to include a cache type
generic which helps to simplify implementations. Also move
and extract a few classes.

See gh-11221
2018-01-03 13:19:31 -08:00
Stephane Nicoll
0515ca0dd0 Auto configure micrometer cache metrics
Closes gh-11221
2018-01-03 15:22:08 +01:00
Johnny Lim
24b5a78e39 Polish
Closes gh-11448
2017-12-30 17:21:13 +01:00
Madhura Bhave
8102dc78cb Remove redundant throws declarations 2017-12-29 12:10:13 -08:00
Johnny Lim
8ae2be6043 Fix property names in MeterBindersConfiguration
Closes gh-11443
2017-12-29 14:36:56 +01:00
Madhura Bhave
c29fe05708 Remove redundant property from tests 2017-12-28 12:45:51 -08:00
Stephane Nicoll
8d1bd7eb3c Polish 2017-12-28 14:57:49 +01:00
Stephane Nicoll
81af02fde7 Improve JVM metrics
This commit adds GC and thread jvm metrics to the existing memory
metrics. All three are now managed by a unique
management.metrics.binders.jvm.enabled property.

Closes gh-11425
2017-12-28 14:57:13 +01:00
Stephane Nicoll
f0d94a46fd Polish 2017-12-28 12:09:27 +01:00
Stephane Nicoll
afba8fed79 Harmonize management.server.context-path property
This commit moves management.server.context-path to
management.server.servlet.context-path to align with the configuration
key for the application's main context path.

Closes gh-11359
2017-12-28 12:08:51 +01:00
Stephane Nicoll
2738147947 Polish "Move CorsEndpointProperties to the parent package"
Closes gh-11439
2017-12-28 11:01:14 +01:00