Commit Graph

16443 Commits

Author SHA1 Message Date
Brian Clozel
77be10e7bc Fix "status" metrics tag for error responses
Prior to this commit, the metrics `WebFilter` would handle exceptions
flowing through the pipeline and extract tag information right away.
Since error handling turns the exception information into error HTTP
responses later in the chain, the information extracted from the
response earlier is invalid.
In this case, the "status" information could be "200" whereas error
handlers would later set that status to "500".

This commit delays the tags extraction later in the process, right
before the response is comitted. The happy path is not changed, as
handlers signal that the response is fully taken care of at that point.

Fixes gh-11514
2018-04-12 11:30:43 +02:00
Stephane Nicoll
7198b038aa Merge branch '2.0.x' 2018-04-12 09:44:49 +02:00
Stephane Nicoll
68c6860d88 Merge pull request #12842 from origoni:document-fix-typo-constructor-name
* pr/12842:
  Fix WebClient example constructor name
2018-04-12 09:44:39 +02:00
DK Lee
1f91ae541f Fix WebClient example constructor name
Closes gh-12842
2018-04-12 09:44:03 +02:00
Madhura Bhave
94362d51ec Merge branch '2.0.x' 2018-04-11 19:36:35 -07:00
Madhura Bhave
62a8f60bb3 Second attempt at fixing email notification script 2018-04-11 19:34:44 -07:00
Madhura Bhave
d375808d42 Merge branch '2.0.x' 2018-04-11 19:21:52 -07:00
Madhura Bhave
68a9aa56f0 Fix determine email body script 2018-04-11 18:09:08 -07:00
Madhura Bhave
eff6ce5c3c Merge branch '2.0.x' 2018-04-11 14:32:07 -07:00
Madhura Bhave
8d4e5cbfb7 No need to create output directory 2018-04-11 14:13:11 -07:00
Madhura Bhave
ad5b8e8bfb Merge branch '2.0.x' 2018-04-11 13:50:39 -07:00
Madhura Bhave
ee8188a19c Send email if build is successful after failure
See gh-10790
2018-04-11 13:41:52 -07:00
Madhura Bhave
d27ad41a88 Merge branch '2.0.x' 2018-04-11 10:42:22 -07:00
Madhura Bhave
4fab679829 Upgrade testcontainers to 1.7.0
Closes gh-12821
2018-04-11 10:40:54 -07:00
Stephane Nicoll
8944fa503b Upgrade to AspectJ 1.9.0
Closes gh-12834
2018-04-11 18:28:10 +02:00
Stephane Nicoll
eabe9949dd Merge branch '2.0.x' 2018-04-11 17:43:44 +02:00
Stephane Nicoll
f55753c1dc Add reference to Axon Framework 2018-04-11 17:43:33 +02:00
Stephane Nicoll
2d0e3fb81c Merge branch '2.0.x' 2018-04-11 11:53:46 +02:00
Stephane Nicoll
5cba7400e1 Add reference to Flowable 2018-04-11 11:53:33 +02:00
Stephane Nicoll
105105db3e Merge branch '2.0.x' 2018-04-11 11:37:16 +02:00
Stephane Nicoll
3c169b4e0a Fix bean name of EnvironmentEndpointWebExtension
Closes gh-12827
2018-04-11 11:34:44 +02:00
Stephane Nicoll
5f3bccc3ba Merge branch '2.0.x' 2018-04-11 10:52:03 +02:00
Stephane Nicoll
8d81bcd101 Merge pull request #12825 from thsnoopy:fix-typo
* pr/12825:
  Fix typo
2018-04-11 10:51:53 +02:00
Ken Kwon
16ad34aa19 Fix typo
Closes gh-12825
2018-04-11 10:51:20 +02:00
Madhura Bhave
5cfbd33235 Merge branch '2.0.x' 2018-04-10 12:00:31 -07:00
Madhura Bhave
a09a6f223b Reinstate commit status for concourse builds
Fixes gh-10851
2018-04-10 11:59:17 -07:00
Stephane Nicoll
55ea9f796f Merge branch '2.0.x' 2018-04-10 20:24:19 +02:00
Stephane Nicoll
e8fac7d9c4 Properly discover endpoints that are proxied
Previously to this commit, if a `@ControllerEndpoint`,
`@RestControllerEndpoint` or `@ServletEndpoint` annotated bean was
proxied, the endpoint wasn't properly detected.

This commit makes sure that annotation retrieval works on the user class
while preserving the get (vs. find) retrieval semantic

Closes gh-12441
2018-04-10 20:23:55 +02:00
Stephane Nicoll
86b96254a1 Migrate to ApplicationContextRunner 2018-04-10 20:23:54 +02:00
Andy Wilkinson
02c0425a15 Merge branch '2.0.x' 2018-04-10 16:48:03 +01:00
Andy Wilkinson
d8b2a17e1c Reinstate CI image builds for 2.0.x pipeline 2018-04-10 16:47:42 +01:00
Stephane Nicoll
ea8e5acd22 Merge branch '2.0.x' 2018-04-10 11:47:33 +02:00
Stephane Nicoll
729f07907f Merge pull request #12812 from izeye:polish-20180410
* pr/12812:
  Polish contribution
  Polish
2018-04-10 11:46:45 +02:00
Stephane Nicoll
f83934e192 Polish contribution
Closes gh-12812
2018-04-10 11:46:16 +02:00
Johnny Lim
f03849d502 Polish
See gh-12812
2018-04-10 11:46:16 +02:00
Andy Wilkinson
50ffec0e92 Merge branch '2.0.x' 2018-04-10 09:53:45 +01:00
Andy Wilkinson
a9020df9b9 Remove pull request and CI image builds from 2.0.x pipeline 2018-04-10 09:53:15 +01:00
Andy Wilkinson
7c3696bd64 Next development version (v2.1.0.BUILD-SNAPSHOT) 2018-04-10 09:46:49 +01:00
Andy Wilkinson
ce0f2d2fe5 Merge branch '2.0.x' 2018-04-10 09:45:22 +01:00
Andy Wilkinson
a50ef54e3b Create 2.0.x branch and CI pipeline 2018-04-10 09:42:30 +01:00
Andy Wilkinson
4fbe0b1283 Add dependency management for Kafka
Closes gh-12815
2018-04-10 09:07:19 +01:00
Phillip Webb
8c4080b914 Merge branch '1.5.x' 2018-04-09 18:21:11 -07:00
Phillip Webb
370915f8f0 Fixup version numbers following release 2018-04-09 18:20:41 -07:00
Spring Buildmaster
c10aad165f Next Development Version 2018-04-09 23:14:33 +00:00
Phillip Webb
ba85cefce3 Polish 2018-04-09 14:50:03 -07:00
Stephane Nicoll
d89048300a Merge branch '1.5.x' 2018-04-09 19:59:21 +02:00
Stephane Nicoll
ba5ed5b97c Upgrade to Spring Framework 4.3.16
Closes gh-12806
2018-04-09 19:43:31 +02:00
Andy Wilkinson
8d5b9f37d5 Merge branch '1.5.x' 2018-04-09 17:59:53 +01:00
Andy Wilkinson
cd0e4fe945 Sanitize sun.java.command by default
Closes gh-12796
2018-04-09 17:44:51 +01:00
Andy Wilkinson
8b1a101cb6 Merge branch '1.5.x' 2018-04-09 17:39:26 +01:00