200 Commits

Author SHA1 Message Date
Jon Schneider
09181d6b16 Fix CompositeMeterRegistryPostProcessor autowire
Update `CompositeMeterRegistryPostProcessor` to use constructor
autowiring for `Clock` detection.

Fixes gh-11856
2018-01-30 20:27:22 -08:00
Stephane Nicoll
f7bf79c9b3 Polish deprecated metadata 2018-01-30 17:45:01 +01:00
Stephane Nicoll
8b3c2b01e3 Fix broken replacement ids 2018-01-30 15:23:21 +01:00
Andy Wilkinson
356efaa7c8 Rename trace to httptrace
Closes gh-11806
2018-01-30 12:55:27 +00:00
Jon Schneider
2612b43179 Restrict maximum URI tags to prevent memory issues
Add MeterFilter to restrict the maximum number of web client URI tags
created. Prior to this commit, if a user was manually building URIs for
use with a RestTemplate (rather than using uriVariables) the JVM could
run out of memory.

Fixes gh-11338

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
2018-01-30 00:32:09 -08:00
Phillip Webb
8f23ee4e58 Apply micrometer MeterFilter beans automatically
Update `MeterRegistryPostProcessor` and `MetricsAutoConfiguration` so
that micrometer `MeterFilter` beans are automatically applied.

Fixes gh-11843
2018-01-30 00:15:33 -08:00
Phillip Webb
c90a5a9e9e Polish 2018-01-29 21:35:56 -08:00
Phillip Webb
5632d043ff Fix enums following upstream micrometer change
See gh-11575
2018-01-29 19:51:51 -08:00
Phillip Webb
9a8c182d19 Only use micrometer composites when necessary
Update micrometer auto-configuration so that a `CompositeMeterRegistry`
is only created when more than one `MeterRegistry` bean is declared.
When a composite is crated, it is marked as `@Primary` so that it
can be directly injected. Meter registries can now be defined directly
as beans, and auto-configuration can back off in the usual way.

The `MeterRegistryConfigurer` is now called `MeterRegistryCustomizer`
and is generically types so it's easy to apply customizations to a
particular `MeterRegistry` implementation.

Fixes gh-11799

Co-authored-by: Jon Schneider <jschneider@pivotal.io>
2018-01-29 16:52:01 -08:00
Andy Wilkinson
e834b25ef1 Polish 2018-01-29 20:20:58 +00:00
Phillip Webb
af50a18da9 Polish 2018-01-29 09:47:03 -08:00
Stephane Nicoll
eba476ba6e Disable LoggersEndpoint if the logging system is disabled
Closes gh-11793
2018-01-29 16:37:28 +01:00
Andy Wilkinson
9edcd25c25 Simply test for async dispatch metrics filter registration
Previously, the test in MetricsAutoConfigurationIntegrationTests was
testing the functionality of WebMvcMetricsFilter to verify that the
auto-configuration had registered the filter for async dispatches.
This test was complex and covered the same code as a test in
WebMvcMetricsFilterTests.

This commit reworks the test to examine the dispatcher types on the
filter registration directly instead.

Closes gh-11826
2018-01-29 11:23:58 +00:00
Stephane Nicoll
a515c5b7d1 Polish contribution
Closes gh-11811
2018-01-29 08:12:35 +01:00
Johnny Lim
914bdb393f Polish
See gh-11811
2018-01-29 08:11:09 +01:00
Phillip Webb
5767350380 Polish 2018-01-26 22:12:07 -08:00
Johnny Lim
6d68806275 Polish
Closes gh-11805
2018-01-27 05:22:04 +01:00
Jon Schneider
b254761c5e Support micrometer Graphite tagsAsPrefix property
Fixes gh-11797
2018-01-26 19:57:48 -08:00
Phillip Webb
0b689a5b10 Polish MetricsFilter registration async support
Closes gh-11348
2018-01-26 19:51:03 -08:00
Nikolay Rybak
b6af06a55f Fix MetricsFilter registration to support async
Update `WebMvcMetricsConfiguration` so that the filter is registered
with the correct settings to support async requests.

See gh-11348
2018-01-26 19:51:03 -08:00
Phillip Webb
25815ca7e1 Refine WebMvcMetricsFilter for async support
Rework `WebMvcMetricsFilter` so that async requests can be handled
correctly.

See gh-11348
2018-01-26 19:51:02 -08:00
Phillip Webb
643cda480f Migrate to updated micrometer Tags class
See gh-11575
2018-01-26 14:42:38 -08:00
Jon Schneider
fd237f85cc Extract common micrometer test setup
Create `MetricsRun` that can be used to apply common micrometer test
configuration to a `ApplicationContextRunner`.

Closes gh-11804
2018-01-26 14:42:22 -08:00
Jon Schneider
d1de1cd053 Upgrade to micrometer 1.0.0-SNAPSHOT
Move to the snapshots and rework changed APIs in preparation for
the upcoming rc8 release.

See gh-11575
2018-01-26 11:40:37 -08:00
Phillip Webb
b234501af3 Polish 2018-01-26 11:39:41 -08:00
Andy Wilkinson
988fc18f8c Simplify endpoint enablement and update reference documentation
Closes gh-11755
2018-01-26 12:12:11 +00:00
Stephane Nicoll
fe7d7e2fc9 Polish 2018-01-26 09:51:54 +01:00
Johnny Lim
15fb62718d Remove unused parameters
Closes gh-11785
2018-01-26 09:30:02 +01:00
Andy Wilkinson
3565961d68 Rework HTTP exchange tracing and add support for WebFlux
Closes gh-9980
2018-01-25 13:27:07 +00:00
Andy Wilkinson
4c23afdcd8 Polish 2018-01-25 11:04:16 +00:00
Phillip Webb
017efda6ec Add @EndpointServlet and migrate Jolokia
Add first class support for Servlet based endpoints and rework the
Jolokia endpoint to use it.

Fixes gh-10264
2018-01-24 17:06:13 -08:00
Phillip Webb
3bd940baaa Polish "Add more WebEndpointAutoConfiguration tests"
Closes gh-11754
2018-01-24 16:24:50 -08:00
Yunkun Huang
d8527a9708 Add tests for WebEndpointAutoConfiguration
Closes gh-11754
See gh-11684
2018-01-24 16:24:50 -08:00
Phillip Webb
ab6ad6aa4b Polish 2018-01-24 16:09:14 -08:00
Andy Wilkinson
292025936e Omit null properties from actuator endpoint API response examples
Closes gh-11757
2018-01-24 16:40:10 +00:00
Madhura Bhave
55c8ceb440 Polish 2018-01-23 17:01:46 +05:30
andrey.onufreyko
b19dcb13e2 Replace string arguments with char
Optimize method calls by replacing single character String arguments
with char.

Closes gh-11680
2018-01-22 16:35:06 -08:00
Johnny Lim
768e7c07e6 Polish
Closes gh-11720
2018-01-22 16:06:45 -08:00
Andy Wilkinson
fbb1ba1bb3 Move actuator mappings introspection classes into dedicated packages
Closes gh-9979
2018-01-22 11:25:40 +00:00
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