Commit Graph

17131 Commits

Author SHA1 Message Date
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
3f5adfbccc Upgrade to micrometer 1.0.0-rc.8
Closes gh-11575
2018-01-29 23:19:31 -08:00
Phillip Webb
1a2186e6ef Attempt to fix lambda error detection on JDK 9
Update `LambdaSafe` to also detect `ClassCastException` messages that
start with "module/name".

See gh-11584
2018-01-29 23:05:38 -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
Madhura Bhave
134628a62d Add PathRequest to reactive security for parity 2018-01-29 18:34:46 -08:00
Madhura Bhave
e80c22cbf8 Add RequestMatcher for H2 console
Fixes gh-11704
2018-01-29 18:34:46 -08:00
dreis2211
e7248ff273 Use interfaces for collection declarations
Closes gh-11839
2018-01-29 16:54:11 -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
Phillip Webb
3a12f98bab Migrate callbacks to LambdaSafe util
Migrate existing code to the new `LambaSafe` callback handler.

Closes gh-11584
2018-01-29 14:31:10 -08:00
Phillip Webb
b0cb728944 Add general utility to deal with lambda callbacks
Add `LambdaSafe` utility that provides a consistent way to deal with
the problems that can occur when calling lambda based callbacks.

See gh-11584
2018-01-29 14:31:10 -08:00
Andy Wilkinson
6582afea4a Polish 2018-01-29 21:04:41 +00:00
Andy Wilkinson
e834b25ef1 Polish 2018-01-29 20:20:58 +00:00
Andy Wilkinson
f5102516fa Merge branch '1.5.x' 2018-01-29 20:16:55 +00:00
Andy Wilkinson
a58c8d5f7b Upgrade to Spring Kafka 2.1.2.RELEASE
Closes gh-11837
2018-01-29 20:02:54 +00:00
Andy Wilkinson
06ca702161 Upgrade to Spring Integration 5.0.1.RELEASE
Closes gh-11501
2018-01-29 19:58:13 +00:00
Andy Wilkinson
244a287484 Merge branch '1.5.x' 2018-01-29 19:51:50 +00:00
Phillip Webb
af50a18da9 Polish 2018-01-29 09:47:03 -08:00
Gary Russell
d20585db6f Upgrade to Spring AMQP 2.0.2
Closes gh-11834
2018-01-29 17:12:35 +00:00
Andy Wilkinson
32a80f7091 Merge branch '1.5.x' 2018-01-29 16:07:06 +00: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
7a75ca4685 Upgrade to Postgresql 42.2.1
Closes gh-11833
2018-01-29 14:48:55 +00:00
Andy Wilkinson
11e6bcaf4f Upgrade to Jolokia 1.4.0
Closes gh-11832
2018-01-29 14:48:55 +00:00
Andy Wilkinson
2b01d5c70b Upgrade to Narayana 5.7.2.Final
Closes gh-11831
2018-01-29 14:48:54 +00:00
Andy Wilkinson
d908d0e876 Upgrade to Jackson 2.9.4
Closes gh-11830
2018-01-29 14:48:53 +00:00
Andy Wilkinson
70dabdbf39 Add application/json and /xml to default compressible mime types
Closes gh-11828
2018-01-29 14:33:02 +00:00
Andy Wilkinson
844782b20b Remove default JUL handler to prevent duplicate console logging
By default, JUL configures a single root handler. That handler is a
ConsoleHandler. Previously, we removed all root handlers from JUL but
this is problematic in environments where other handlers are
registered with JUL and those handlers need to be retained.
0679d436 attempted to fix the problem by leaving the root handlers in
place and only adding and removing the bridge handler. This resulted
in log output from Tomcat (and anything else that uses JUL) being
duplicated.

This commit makes another attempt at tackling the problem. It attempts
to detect JUL's default configuration (a single root handler that's a
ConsoleHandler) and only removes the handler if it appears to be from
the default configuration. For environments where default JUL
configuration is being used, this will prevent duplicate logging and
for environments where custom JUL configuration is being used, this
will prevent that configuration from being undone.

Closes gh-8933
2018-01-29 14:22:28 +00:00
Stephane Nicoll
c2a2999799 Use proper classloader for value serialization
Closes gh-11822
2018-01-29 13:55:05 +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
Andy Wilkinson
199088b0c9 Set kotlin.version when Kotlin's Gradle plugin is applied
Closes gh-11711
2018-01-29 10:13:54 +00:00
Stephane Nicoll
bdd532cc20 Clarify when a property was not renamed due to an incompatible type
Closes gh-11794
2018-01-29 10:30:59 +01:00
Stephane Nicoll
43e5e83d9c Transparently handle migration from number to java.util.Duration
See gh-11794
2018-01-29 09:59:38 +01:00
Vedran Pavic
df28ee7122 Use Spring Session BOM in dependency management
Closes gh-11815
2018-01-29 08:24:38 +01: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
dreis2211
c1675c2d5f Use InvocationOnMock.getArgument() where possible
Closes gh-11818
2018-01-29 08:06:00 +01:00
dreis2211
a7663c88d3 Replace casted Mockito.any() calls
Closes gh-11817
2018-01-29 07:50:29 +01:00
Stephane Nicoll
ab02e48c44 Fix security section indents
Closes gh-11813
2018-01-28 09:40:40 +01:00
Phillip Webb
5767350380 Polish 2018-01-26 22:12:07 -08:00
Phillip Webb
53b0f0db60 Fix NPE when normalizing client tag URIs
See gh-11798
2018-01-26 22:12:07 -08:00
Stephane Nicoll
3266c68a78 Polish 2018-01-27 06:18:14 +01:00
Stephane Nicoll
5e26d04c05 Only generate time-to-live property for matching endpoints
This commit makes sure that a "cache.time-to-live" property is not
generated for endpoints that do not have a main read operation (i.e. a
read operation with no parameter or only nullable parameters).

This matches the endpoint feature that provides caching for only such
operation.

Closes gh-11703
2018-01-27 06:11:01 +01:00
Stephane Nicoll
90545fb0c6 Update LocalDevToolsAutoConfiguration to use constructor injection
Closes gh-11769
2018-01-27 05:55:56 +01:00
Stephane Nicoll
6569ed8739 Polish contribution
Closes gh-11809
2018-01-27 05:33:49 +01:00
Johnny Lim
a0fb138771 Fix to assert parameter names in EndpointServlet.withInitParameters()
See gh-11809
2018-01-27 05:31:56 +01:00
Johnny Lim
6d68806275 Polish
Closes gh-11805
2018-01-27 05:22:04 +01:00
Phillip Webb
1d8942941e Normalize micrometer client tag URIs
Update `MetricsClientHttpRequestInterceptor` so that captured URIs
are normalize to always contain a leading slash.

Fixes gh-11798
2018-01-26 20:16:03 -08: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