Commit Graph

26045 Commits

Author SHA1 Message Date
Stephane Nicoll
0a189e9cc1 Merge pull request #20967 from dreis2211
* pr/20967:
  Prevent shaded imports from Datastax

Closes gh-20967
2020-04-15 09:22:29 +02:00
dreis2211
b0eea26260 Prevent shaded imports from Datastax
See gh-20967
2020-04-15 09:21:56 +02:00
Stephane Nicoll
c6a55a5455 Merge pull request #20936 from dreis2211
* pr/20936:
  Upgrade to Testcontainers 1.14.0

Closes gh-20936
2020-04-15 09:21:19 +02:00
dreis2211
5b9d8bfc17 Upgrade to Testcontainers 1.14.0
See gh-20936
2020-04-15 09:20:31 +02:00
Stephane Nicoll
17e5b08cba Polish 2020-04-15 09:09:27 +02:00
Stephane Nicoll
5b4c13d767 Start building against Spring Kafka 2.4.6 snapshots
See gh-20953
2020-04-15 08:49:51 +02:00
Stephane Nicoll
88d790a96c Start building against Spring Integration 5.3.0 snapshots
See gh-20951
2020-04-15 08:49:51 +02:00
Stephane Nicoll
d02218d838 Start building against Spring Data Neumann-RC2 snapshots
See gh-20949
2020-04-15 08:49:51 +02:00
Stephane Nicoll
b05bdbbf0b Start building against Spring AMQP 2.2.6 snapshots
See gh-20947
2020-04-15 08:49:51 +02:00
Stephane Nicoll
abfe8940e0 Start building against Spring Framework 5.2.6 snapshots
See gh-20945
2020-04-15 08:49:51 +02:00
Stephane Nicoll
55c8811f2c Start building against Reactor Dysprosium-SR7 snapshots
See gh-20943
2020-04-15 08:49:51 +02:00
Stephane Nicoll
8fa6ec36f4 Remove @ConditionalOnMissingBean check on deprecated class
Closes gh-20968
2020-04-15 08:49:37 +02:00
Madhura Bhave
d648b98991 Merge branch '2.2.x'
Closes gh-20964
2020-04-14 16:55:40 -07:00
Madhura Bhave
947594addd Merge branch '2.1.x' into 2.2.x
Closes gh-20963
2020-04-14 16:54:54 -07:00
Madhura Bhave
c98fe51914 Make it more obvious that Jolokia does not work with a WebFlux app
Closes gh-20623
2020-04-14 16:45:31 -07:00
Phillip Webb
24ee9737c0 Rework some aspects of the probes support
Closes gh-20962
2020-04-14 16:40:56 -07:00
Phillip Webb
28da1da241 Update availability/probe documentation
Update the application availability and probes documentation following
the recent set of updates.

See gh-20962
2020-04-14 16:40:36 -07:00
Phillip Webb
5311c04437 Change HealthEndpointGroups customization support
Update the `HealthEndpointGroups` customization support to use a
post-processor rather than a mutable registry. Although this approach
is slightly less flexible, it removes a lot of complexity from the
`HealthEndpointGroups` code. Specifically, it allows us to drop the
`HealthEndpointGroupsRegistry` interface entirely.

The probe health groups are now added via the post-processor if they
aren't already defined. Unlike the previous implementation, users are
no longer able to customize status aggregation and http status code
mapping rules _unless_ they also re-define the health indicators that
are members of the group.

See gh-20962
2020-04-14 16:40:36 -07:00
Phillip Webb
f32a37e289 Support management.health.probes.enabled=false
Update `AvailabilityProbesAutoConfiguration` to allow the
`management.health.probes.enabled` property to override the platform
detection logic. Prior to this commit, it was possible to use the
property to enable the probes, but it was not possible to disable
them when deploying to Kubernates.

See gh-20962
2020-04-14 16:40:36 -07:00
Phillip Webb
82cfd7c6c9 Restructure probes auto-configuration
Relocate probe auto-configuration from the `kubernetes` package to
`availability` since probes could also be used on other platforms.

The classes have also been renamed to named to `AvailabilityProbes...`

See gh-20962
2020-04-14 16:40:36 -07:00
Phillip Webb
71e4801e68 Rename probe health indicators
Rename `LivenessProbeHealthIndicator` to `LivenessStateHealthIndicator`
and `ReadinessProbeHealthIndicator` to `ReadinessStateHealthIndicator`.

Also introduce a general purpose `AvailabilityStateHealthIndicator`
class.

See gh-20962
2020-04-14 16:40:36 -07:00
Phillip Webb
bb79c847b2 Allow custom availability states
Create a general purpose `AvailabilityState` interface and refactor
the existing `LivenessState` and `ReadinessState` to use it. A single
`AvailabilityChangeEvent` is now used to carry all availability state
updates.

This commit also renames `ApplicationAvailabilityProvider` to
`ApplicationAvailabilityBean` and extracts an `ApplicationAvailability`
interface that other beans can inject. The helps to hide the event
listener method, which is really internal.

Finally the state enums have been renamed as follows:

 - `LivenessState.LIVE` -> `LivenessState.CORRECT`
 - `ReadinessState.READY` -> `ReadinessState.ACCEPTING_TRAFFIC`
 - `ReadinessState.UNREADY` -> `ReadinessState.REFUSING_TRAFFIC`

See gh-20962
2020-04-14 16:40:36 -07:00
Phillip Webb
473d4fd73d Add gradle default task 2020-04-14 16:40:28 -07:00
Stephane Nicoll
7c3369cca8 Merge branch '2.2.x' 2020-04-14 15:15:10 +02:00
Brian Clozel
7a4fa7ee3e Upgrade to Spring Doc Resources 0.2.1.RELEASE
Closes gh-20958
2020-04-14 14:47:42 +02:00
Stephane Nicoll
6e1ff50328 Start building against Spring Kafka 2.3.8 snapshots
See gh-20952
2020-04-14 14:29:41 +02:00
Stephane Nicoll
fafac58311 Start building against Spring Integration 5.2.6 snapshots
See gh-20950
2020-04-14 14:29:06 +02:00
Stephane Nicoll
fb11285279 Start building against Spring Data Moore-SR7 snapshots
See gh-20948
2020-04-14 14:28:21 +02:00
Stephane Nicoll
99b576707e Start building against Spring AMQP 2.2.6 snapshots
See gh-20946
2020-04-14 14:27:46 +02:00
Stephane Nicoll
ea1345d074 Start building against Spring Framework 5.2.6 snapshots
See gh-20944
2020-04-14 14:27:11 +02:00
Stephane Nicoll
4474da8850 Start building against Reactor Dysprosium-SR7 snapshots
See gh-20942
2020-04-14 14:26:28 +02:00
Stephane Nicoll
c20cd0ac30 Merge branch '2.1.x' into 2.2.x 2020-04-14 14:25:59 +02:00
Brian Clozel
939bb87a02 Merge branch '2.2.x'
Closes gh-20957
2020-04-14 14:18:48 +02:00
Brian Clozel
49bbcceda9 Fix Undertow compression config with invalid Mime Types
Prior to this commit, the Undertow compression configuration provided by
Spring Boot would fail and throw an exception for invalid MIME Types
when trying to check them against the list of configured types for
compression.

This commit ensures that invalid MIME Types are ignored and that
compression is disabled for those.

Fixes gh-20955
2020-04-14 14:15:39 +02:00
Stephane Nicoll
a3095d5956 Start building against Spring Integration 5.1.10 snapshots
See gh-20941
2020-04-14 10:35:23 +02:00
Stephane Nicoll
35c66d9088 Start building against Spring Data Lovelace-SR17 snapshots
See gh-20940
2020-04-14 10:32:41 +02:00
Stephane Nicoll
16334304d6 Start building against Spring AMQP 2.1.14 snapshots
See gh-20939
2020-04-14 10:32:04 +02:00
Stephane Nicoll
6a4fbe18c2 Start building against Spring Framework 5.1.15 snapshots
See gh-20938
2020-04-14 10:24:08 +02:00
Stephane Nicoll
fca3601477 Start building against Reactor Californium-SR18 snapshots
See gh-20937
2020-04-14 10:22:45 +02:00
Phillip Webb
1604cb2a1e Polish 2020-04-13 14:05:48 -07:00
Stephane Nicoll
c3b61db8cf Merge pull request #20931 from izeye
* pr/20931:
  Polish

Closes gh-20931
2020-04-13 14:36:35 +02:00
Johnny Lim
cb320288a4 Polish
See gh-20931
2020-04-13 14:35:21 +02:00
Stephane Nicoll
2ee73a6c83 Merge pull request #20872 from Konrado85
* pr/20872:
  Change PropertiesLauncher equals method to use URI

Closes gh-20872
2020-04-13 13:58:17 +02:00
Konrado85
9f4c39c985 Change PropertiesLauncher equals method to use URI
See gh-20872
2020-04-13 13:55:17 +02:00
Stephane Nicoll
41f46149aa Merge pull request #20915 from mnusan
* pr/20915:
  Polish "Add reference to Mule 4 starter"
  Add reference to Mule 4 starter

Closes gh-20915
2020-04-13 13:53:58 +02:00
Stephane Nicoll
81e1f1a94a Polish "Add reference to Mule 4 starter"
See gh-20915
2020-04-13 13:53:44 +02:00
Manuel Núñez
22cd477a60 Add reference to Mule 4 starter
See gh-20915
2020-04-13 13:52:41 +02:00
Stephane Nicoll
04368107cc Merge pull request #20926 from dreis2211
* pr/20926:
  Remove unused fields in tests

Closes gh-20926
2020-04-13 13:47:51 +02:00
dreis2211
4b9986d790 Remove unused fields in tests
See gh-20926
2020-04-13 13:46:43 +02:00
Brian Clozel
ce653059c8 Improve recording of cancellation signal in WebClient
With its initial fix in gh-18444, the `WebClient` instrumentation would
record all CANCEL signals, including:

* when a `timeout` expires and the response has not been received
* when the client partially consumes the response body

Since the second use case is arguable intentional, this commit restricts
the instrumentation and thus avoids recording two events for a single
request in that case.

Closes gh-18444
2020-04-11 21:52:18 +02:00