fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,235 Commits 22 Branches 339 Tags
Commit Graph

559 Commits

Author SHA1 Message Date
Johnny Lim
9f6c5e4e39 Polish 2019-02-11 17:19:19 +00:00
dreis2211
1c50e7cf87 Polish 
Closes gh-15823
 2019-02-10 10:36:37 +01:00
Brian Clozel
99656b9dd8 Merge branch '2.1.x' 2019-02-08 18:35:12 +01:00
Brian Clozel
72c8e5d366 Collect HTTP trace at commit time for WebFlux 
Prior to this commit, the `HttpTraceWebFilter` would collect the
response information (status and headers) for tracing purposes, after
the handling chain is done with the exchange - inside a
`doAfterSuccessOrError`.

Once the handler has processed the exchange, there is no strong
guarantee about the HTTP resources being still present. Depending on the
web server implementation, HTTP resources (including HTTP header maps)
might be recycled, because pooled in the first place.

This commit moves the collection and processing of the HTTP trace right
before the response is committed. This removes the need to handle
special cases with exceptions, since by that time all exception handlers
have processed the response and the information that we extract is the
information that's about to be written to the network.

Fixes gh-15819
 2019-02-08 18:16:39 +01:00
Andy Wilkinson
ecb7e240eb Merge branch '2.1.x' 2019-02-05 12:33:19 +00:00
Andy Wilkinson
ebcc53a9b7 Include tasks with custom triggers in scheduledtasks endpoint output 
Closes gh-15815
 2019-02-05 12:12:07 +00:00
Andy Wilkinson
45cc649c7d Merge branch '2.1.x' 2019-02-04 12:36:33 +00:00
Andy Wilkinson
82bc87560c Use AssertJ’s exception assertions rather than fail 
Closes gh-15761
 2019-02-04 11:48:26 +00:00
Stephane Nicoll
a6815bb2c9 Merge branch '2.1.x' 2019-01-25 10:45:26 +01:00
Vedran Pavic
d7550d73a3 Remove duplicate code from HealthWebEndpointResponseMapper 
Closes gh-15784
 2019-01-25 10:38:16 +01:00
Stephane Nicoll
6baa6b291e Polish contribution 
Closes gh-15695
 2019-01-14 08:11:20 -05:00
Johnny Lim
af3ed9ff9f Polish 
See gh-15695
 2019-01-14 08:09:32 -05:00
Phillip Webb
2f77ef7722 Merge branch '2.1.x' 2019-01-11 16:45:05 -08:00
Phillip Webb
9e58942698 Update copyright year for changed files 2019-01-11 16:42:02 -08:00
Phillip Webb
6a901199f5 Polish 2019-01-11 16:42:02 -08:00
Stephane Nicoll
8d1d3fb087 Polish "Avoid string concatenation inside StringBuilder append()" 
Closes gh-15589
 2019-01-11 08:30:12 +01:00
igor-suhorukov
59ac85d371 Avoid string concatenation inside StringBuilder append() 
See gh-15589
 2019-01-11 08:28:19 +01:00
Brian Clozel
a3737cd76d Merge branch '2.1.x' 2019-01-08 21:45:54 +01:00
Brian Clozel
958e08c413 Merge branch '2.0.x' into 2.1.x 2019-01-08 21:45:41 +01:00
dreis2211
95e26ffcb9 Avoid uri tag explosion when use of path variable is undetected 
This commit aligns the Spring WebFlux instrumentation on Spring MVC
since gh-12447.
From now on, if the best matching path pattern is not found,
the recorded uri tag will be "UNKNOWN".

Note that for WebFlux.fn, the pattern information is properly
recorded as of SPR-17395.

Closes gh-15609
 2019-01-08 21:45:06 +01:00
Brian Clozel
d5ae59dad7 Polish 
Closes gh-15594
 2019-01-08 18:58:48 +01:00
Nishant Raut
21df40b6c7 Add an outcome tag to web client metrics 
Similar to what's ben done in gh-15420 for Spring MVC and Spring
WebFlux, this commit adds an outcome tag for the client side on both
`RestTemplate` and `WebClient`.

See gh-15594
 2019-01-08 18:57:05 +01:00
Stephane Nicoll
960d375f57 Merge branch '2.1.x' 2018-12-30 10:04:01 +01:00
Stephane Nicoll
a8efcadc90 Merge branch '2.0.x' into 2.1.x 2018-12-30 10:02:53 +01:00
Stephane Nicoll
4509164789 Polish "Add unit test for cassandra health checker" 
Closes gh-15583
 2018-12-30 10:01:37 +01:00
Oleksii Bondar
db22a81742 Add unit test for cassandra health checker 
See gh-15583
 2018-12-30 10:00:59 +01:00
Stephane Nicoll
9d67400afa Merge branch '2.1.x' 2018-12-20 17:54:08 +01:00
Stephane Nicoll
06989d884b Polish "Fix StringSequence.equals() for different lengths" 
Closes gh-15438
 2018-12-20 17:52:18 +01:00
igor-suhorukov
e578d30722 Replace anonymous inner class with lambda 
See gh-15438
 2018-12-20 17:47:29 +01:00
Andy Wilkinson
3a7406fe3a Merge branch '2.0.x' into 2.1.x 2018-12-20 15:58:03 +00:00
Andy Wilkinson
0741c90489 Avoid blocking on a Mono indefinitely 
Closes gh-15535
 2018-12-20 15:31:39 +00:00
Andy Wilkinson
9d2d6d5812 Merge branch '2.1.x' 2018-12-20 15:30:51 +00:00
Andy Wilkinson
9a33d1a2f9 Merge branch '2.0.x' into 2.1.x 2018-12-20 15:30:42 +00:00
Andy Wilkinson
8c68da0882 Avoid blocking on a Mono indefinitely 
Closes gh-15535
 2018-12-20 15:24:53 +00:00
Andy Wilkinson
064f6478df Move back to JUnit 4 until SUREFIRE-1614 has been resolved 
See gh-14736
See gh-14737
See gh-14738
 2018-12-12 16:49:30 +00:00
Andy Wilkinson
2b453bbb16 Minimise dependencies on Log4j2 
Closes gh-15441
 2018-12-12 08:19:34 +00:00
Brian Clozel
9a6dbb5290 Merge branch '2.1.x' 2018-12-11 11:54:08 +01:00
Brian Clozel
036aace2cc Add details in Jest ElasticSearch HealthIndicator 
This commit polishes the previous one and aligns the Jest
HealthIndicator with the changes made for the REST variant.

Closes gh-15366
 2018-12-11 11:51:57 +01:00
Filip Hrisafov
1ec2bbf54f Include details in ElasticsearchRestHealthIndicator 
This commit adds more information to the ElasticSearch REST
health indicator.

When the ES instance responds with an error HTTP status,
the health details now include the actual status code and reason phrase.
When the ES instance returns a HTTP 200 response, the entire response
map is used as health details.

See gh-15366
 2018-12-11 11:51:49 +01:00
igor-suhorukov
2b1653d009 Simplify code by using try-with-resources statement 
Closes gh-15427
 2018-12-10 09:05:33 +01:00
igor-suhorukov
5c1813aef8 Replace this lambda with a method reference 
See gh-15401
 2018-12-07 11:01:42 +01:00
Madhura Bhave
59d2b0a3fb Upgrade tests to Junit5 
See gh-14737
 2018-12-05 17:49:09 -08:00
Andy Wilkinson
8b21044902 Merge branch '2.1.x' 2018-12-03 15:07:54 +00:00
Andy Wilkinson
917108cce7 Merge branch '2.0.x' into 2.1.x 2018-12-03 15:07:30 +00:00
Andy Wilkinson
425a3aacf5 Add JAXB API dependency that is no longer transitive via testcontainers 
See gh-15371
 2018-12-03 15:06:32 +00:00
Stephane Nicoll
a85e27c7cd Further replace magic number by HttpStatus 
See gh-15130
 2018-12-03 15:48:13 +01:00
Stephane Nicoll
f2ca2533d5 Polish "Replace magic number by HttpStatus" 
Closes gh-15130
 2018-12-03 15:33:57 +01:00
holy12345
ffdc9f0ff3 Replace magic number by HttpStatus 
See gh-15130
 2018-12-03 15:33:35 +01:00
Stephane Nicoll
9483c91d58 Make sure to include validation query in case of failure 
See gh-15055
 2018-12-03 15:27:52 +01:00
Stephane Nicoll
9e84abc46b Polish "Add validation query to DataSourceHealthIndicator details" 
Closes gh-15055
 2018-12-03 15:10:59 +01:00