Commit Graph

6962 Commits

Author SHA1 Message Date
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
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
Jon Schneider
112ffd7890 Cleanup URLs before using them for metrics
Update `WebMvcTags` to cleanup URLs by removing any double
slashes and any trailing slash.

Fixes gh-11808
2018-01-26 19:40:57 -08:00
Phillip Webb
1da0f2c6b0 Remove FIXME
See gh-11807
2018-01-26 14:44:49 -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
Johnny Lim
a46e047c5d Polish
Closes gh-11792
2018-01-26 18:19:44 +01:00
Andy Wilkinson
498f66fcdc Test the Gradle plugin against Gradle 4.5
Closes gh-11768
2018-01-26 15:55:25 +00:00
Andy Wilkinson
82d41c1e83 Reinstate information about web endpoints' default URL mapping
Closes gh-11755
2018-01-26 15:41:13 +00:00
Andy Wilkinson
92138e4c32 Polish "Mark thread as interrupted after catching InterruptedException"
See gh-11784
2018-01-26 15:27:09 +00:00
igor-suhorukov
0c30c969bf Mark thread as interrupted after catching InterruptedException
Closes gh-11784
2018-01-26 15:27:09 +00:00
Andy Wilkinson
192fe929c7 Polish "Use custom DataSource if Flyway or Liquibase has user or url"
Closes gh-11751
2018-01-26 14:51:43 +00:00
Dominic Gunn
5d3cd23eed Use custom DataSource if Flyway or Liquibase has user or url
This commit enables a more flexible Liquibase/Flyway configuration by
allowing for a combination of the provider's and the primary
DataSource's configuration to be used. This gives developers the
flexibility to specify only a user or a url and having
Liquibase/Flyway fall back to individual datasource properties rather
than ignoring the Liquibase/Flyway properties and falling back to the
default data source.

See gh-11751
2018-01-26 14:51:43 +00:00
Stephane Nicoll
1c195f5b9a Polish "Migrate server customizer to PropertyMapper"
Closes gh-11772
2018-01-26 13:48:07 +01:00
yulin
19542b975f Migrate server customizer to PropertyMapper
See gh-11772
2018-01-26 13:48:07 +01:00
Andy Wilkinson
988fc18f8c Simplify endpoint enablement and update reference documentation
Closes gh-11755
2018-01-26 12:12:11 +00:00
Stephane Nicoll
1880a25cfb Polish
Closes gh-11788
2018-01-26 12:31:30 +01:00
Johnny Lim
946593238e Align missed bits from trace endpoint changes
Closes gh-11789
2018-01-26 12:16:04 +01:00