924 Commits

Author SHA1 Message Date
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
d9ff51ccd3 Add StaticResourceRequest for WebFlux Security
Closes gh-11040
2018-01-20 10:00:08 +05:30
Madhura Bhave
5e2cc02499 Move servlet specific security auto-config 2018-01-20 09:41:50 +05:30
Stephane Nicoll
5c164d850e Upgrade to Spring Kafka 2.1.1.RELEASE
Closes gh-11524
2018-01-19 17:50:52 +01:00
Andy Wilkinson
fedc4647e1 Use same InetAddress for client and server in endpoint tests
Previously, the server was created with out an explicitly configured
address. This lead to it using any local address which will prefer
IPv6 (::0) if it's available. By contrast, the client was created
with a base URL that specified localhost as the host. This meant the
the client would prefer to connect to IPv4. Normally this wouldn't
cause a problem as nothing would be listening on the port in the IPv4
stack so the client would then connect to the server being tested
using the IPv6 stack. However, if another process was listening to the
port in the IPv4 stack, the client would connect to the wrong server.
This could lead to an unexpected 404 response (if the wrong server
was an HTTP server) or a hang if it was not.

There's a chance, although I think it's unlikely, that the problem
described above is the cause of gh-10569. I think it's unlikely as
the hang tracked by gh-10569 only occurs when running the WebFlux
endpoint integration tests using Reactor Netty. If it was the problem
described above, there's no reason that I can think of why we
wouldn't have also seen it with the Web MVC endpoint integration
tests.
2018-01-19 15:23:47 +00:00
Brian Clozel
fb7026b832 Add documentation for HTTP/2 support in Jetty
See gh-10902
2018-01-19 16:21:38 +01:00
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
Brian Clozel
247b7f0842 Fix WebFlux default error view for null exception messages
This commit prevents NullPointerExceptions when the default HTML error
view is being rendered with a `null` message.

Fixes gh-11677
2018-01-19 10:13:59 +01:00
Phillip Webb
0b81f78a2a Revert "Create CloudFoundry-specific EndpointWebExtension"
This reverts commit 7189f426ed68d48e2064135f377d8f8002b17a42.
2018-01-18 23:21:51 -08:00
Phillip Webb
fc29f54868 Make Context implement AnnotationConfigRegistry
Update `AnnotationConfigReactiveWebServerApplicationContext` to
implement `AnnotationConfigRegistry`.

Fixes gh-11686
2018-01-18 23:21:51 -08:00
Phillip Webb
f3379668ac Polish 2018-01-18 23:21:51 -08:00
Phillip Webb
6d93573db0 Merge branch '1.5.x' 2018-01-18 22:03:51 -08:00
Stephane Nicoll
ba6be4f22f Merge branch '1.5.x' 2018-01-18 22:35:32 +01:00
Stephane Nicoll
8704cf1fe7 Harmonize metric property names
See gh-11667
2018-01-18 17:21:40 +01:00
Stephane Nicoll
efd941bbe0 Merge branch '1.5.x' 2018-01-18 17:05:22 +01:00
Stephane Nicoll
6086bc714f Fix json structure 2018-01-18 17:04:37 +01:00
Stephane Nicoll
aa748cb0ef Polish "Use System.lineSeparator()""
Closes gh-11665
2018-01-18 16:45:29 +01:00
Johnny Lim
d8c83af987 Use System.lineSeparator()
See gh-11665
2018-01-18 16:45:09 +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
Andy Wilkinson
1d9f9716e9 Merge branch '1.5.x'
# Conflicts:
#	spring-boot-project/spring-boot-dependencies/pom.xml
2018-01-18 14:52:30 +00:00
Andy Wilkinson
e1ec0562b2 Revert "Disable Reactor Netty's use of kqueue/epoll"
The failure continued to occur so this commit reverts commit
42c1ce65e9507ef9267feadfa34da02e82409b13.

See gh-10569
2018-01-18 13:46:27 +00:00
Andy Wilkinson
d5c9b9e12f Start building against snapshots for Spring Data Kay SR3
See gh-11666
2018-01-18 13:45:51 +00:00
Stephane Nicoll
5cb6c086b6 Rename micrometer instrumentation flags
Closes gh-11667
2018-01-18 14:16:40 +01:00
Stephane Nicoll
49b5fe0c29 Polish
As `validation-api` 2 is available by default, this commit adds the
integration test as a regular test case. The integration test is kept to
exercise what happens in a standard project.

See gh-11512
2018-01-18 14:05:24 +01:00
Stephane Nicoll
60f5cf10ba Merge branch '1.5.x' 2018-01-18 13:59:19 +01:00
Andy Wilkinson
849baa4c02 Do not require after in audit events endpoint
Closes gh-11605
2018-01-18 11:59:46 +00:00
Brian Clozel
c233125f1d Don't render error view if response is committed
This commit prevents the default error view from rendering itself if the
response has been committed already. In this case, it is impossible to
change the HTTP response status and write a proper response - trying to
do so often results in a `IllegalStateException` since the response body
has already been written to.

Fixes gh-11580
2018-01-18 11:40:11 +01:00
Andy Wilkinson
42c1ce65e9 Disable Reactor Netty's use of kqueue/epoll
There is a suspicion that the use of epoll is causing the intermittent
failures being tracked by gh-10569. This commit disables the use of
epoll to see if it improves the situation.

See gh-10569
2018-01-18 10:18:13 +00:00
Stephane Nicoll
40c537daa0 Polish 2018-01-18 10:20:48 +01:00
Andy Wilkinson
87182a3a2b Stop configuring the Logback console appender to use UTF-8
Previously, the default Logback configuration set the console
appenders charset to UTF-8. This was inconsistent with the Logback
file appender and Log4j2's console and file appenders, all of which
used the platform's default.

This commit removes the configuration of the Logback console
appender's charset. This means that it will use the platform's
default charset, aligning it with the Logback file appender and
both Log4j2 appenders.

Closes gh-11611
2018-01-17 19:07:34 +00:00
Andy Wilkinson
54c0cf513b Polish 2018-01-17 19:03:23 +00:00
Andy Wilkinson
3904f49c9f Configure ServletContext before initializing S…C…Initializer beans
Previously, the ServletContext was configured after any
ServletContextInitializer beans had been initialized. This meant that
any configuration class that provided such a bean would be initialized
before the ServletContext was configured. If the configuration class
used the ServletContext in its initializtaion that it would see it in
its default, unconfigured state.

This commit reworks the configuration of the ServletContext so that
it happens before any ServletContextInitializer beans are initialized.

Closes gh-10699
2018-01-17 17:32:23 +00:00
Andy Wilkinson
d8b3c7cc3c Make AnnotationConfigSWSApp…Context implement AnnotationConfigRegistry
Closes gh-11658
2018-01-17 17:30:16 +00:00
Johnny Lim
e7185ea2b1 Polish
Closes gh-11655
2018-01-17 14:16:07 +01:00
Stephane Nicoll
d43346d6c2 Polish "Fix potential resource leaks"
Closes gh-11624
2018-01-17 13:56:53 +01:00
igor-suhorukov
5a4238acfc Fix potential resource leaks
See gh-11624
2018-01-17 13:54:50 +01:00
Johnny Lim
d27b46cf73 Fix a wrong import for SocketChannel
Closes gh-11648
2018-01-17 13:49:57 +01:00
Eddú Meléndez
cecef7a7df Upgrade to JUnit Jupiter 5.0.3
Closes gh-11649
2018-01-17 13:48:06 +01:00
Stephane Nicoll
f8af6c8134 Merge branch '1.5.x' 2018-01-17 13:42:56 +01:00
Andy Wilkinson
ffc99b03dd Remove use of deprecated Gradle API from plugin's public API
This commit removes the use of the incubating PropertyState and
Provider API that was introduced in Gradle 4.0 and deprecated in
Gradle 4.3. A not-deprecated-but-still-incubating replacement was
introduced in Gradle 4.3. The short life of PropertyState and Provider
has made me wary of using an incubating Gradle API in our public API
as it may not be stable for long. Therefore, this commit does not move
to the replacement as it is incubating. Instead, it falls back to
using Gradle's convention mapping. This is internal API, but its use
is not part of our public API and I perceive the risk of using it to
be lower than using the deprecated and/or incubating API alternatives.

Closes gh-11640
2018-01-17 12:20:30 +00:00
Andy Wilkinson
5e17fc775c Test the Gradle plugin against Gradle 4.4.1
Closes gh-11654
2018-01-17 11:57:02 +00:00
Andy Wilkinson
2668e41dd5 Make it easier to just use Boot’s dependency management with Gradle
Closes gh-11059
2018-01-17 11:39:59 +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
Brian Clozel
1f26a0314c Sanitize inputs in default reactive HTML error view
This commit uses HTML escaping to sanitize error inputs that are
displayed in the default reactive HTML error view.

Fixes gh-11582
2018-01-16 17:20:12 +01:00