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

2100 Commits

Author SHA1 Message Date
Moritz Halbritter
cbbbecce37 Merge branch '3.0.x' into 3.1.x 2023-06-19 21:04:09 +02:00
Moritz Halbritter
975e2d110c Polish CompositePropagationFactory 
Remove shaded Guava import
 2023-06-19 21:03:05 +02:00
Phillip Webb
5d6a507142 Merge branch '3.0.x' into 3.1.x 2023-06-16 14:35:23 -07:00
Phillip Webb
48e13af8c4 Merge branch '2.7.x' into 3.0.x 2023-06-16 14:34:54 -07:00
Phillip Webb
b8d2c279ee Update copyright year of changed files 2023-06-16 14:32:43 -07:00
Phillip Webb
baddf4c857 Merge branch '3.0.x' into 3.1.x 2023-06-16 13:54:01 -07:00
Phillip Webb
9b72cc41ab Polish 'Add support for multiple tracing propagation formats' 
See gh-35611
 2023-06-16 13:43:46 -07:00
Moritz Halbritter
be471c58fe Merge branch '3.0.x' into 3.1.x 
Closes gh-35907
 2023-06-15 13:49:57 +02:00
Moritz Halbritter
8cd8d21720 Add support for multiple tracing propagation formats 
See gh-35611
 2023-06-15 13:37:33 +02:00
Andy Wilkinson
9b88128e3b Merge branch '3.0.x' into 3.1.x 2023-06-14 18:19:53 +01:00
Andy Wilkinson
4694e20628 Merge branch '2.7.x' into 3.0.x 2023-06-14 18:19:43 +01:00
Andy Wilkinson
7d07c0d09c Polish configuration related to predictive test selection 
Most notably, this commit splits the tests that use Spring REST Docs
out into a separate task for which predictive test selection is
disabled. This allows it to be cached and use Gradle's built-in
up-to-date checking, thereby avoiding the generation of new snippets
and the need to then run the asciidoctor and asciidoctorPdf tasks.

It also updates spring-boot-smoke-test-junit-vintage to disable
predictive test selection so that we can continue to assert that
the some tests were executed.

See gh-35869
 2023-06-14 18:15:04 +01:00
Moritz Halbritter
28a3cee5a2 Merge branch '3.0.x' 
Closes gh-35766
 2023-06-07 08:57:54 +02:00
Moritz Halbritter
85720a5d90 Merge branch '2.7.x' into 3.0.x 
Closes gh-35765
 2023-06-07 08:57:38 +02:00
Bernardo Bulgarelli
51afaa79a7 Add @AliasFor annotation to EndpointCloudFoundryExtension 
See gh-35716
 2023-06-07 08:45:57 +02:00
Moritz Halbritter
d841490f5f Enable ZipkinProperties in ZipkinAutoConfiguration 
Closes gh-35592
 2023-05-23 09:22:39 +02:00
Stephane Nicoll
9643dbeed2 Merge branch '3.0.x' 
Closes gh-35590
 2023-05-22 16:31:55 +02:00
Christoph Dreis
b2b5728995 Remove unnecessary exclude from spring-restdocs-mockmvc 
See gh-35568
 2023-05-22 16:31:22 +02:00
Stephane Nicoll
7a9bb55fdf Merge branch '3.0.x' 
Closes gh-35589
 2023-05-22 16:24:56 +02:00
Johnny Lim
1b5fc89b43 Polish 
See gh-35576
 2023-05-22 16:17:05 +02:00
Phillip Webb
0743da4987 Merge branch '3.0.x' 
Closes gh-35546
 2023-05-17 16:42:38 -07:00
Phillip Webb
4072588c29 Polish "Fix invalid Zipkin Reporter back-off behavior" 
See gh-35455
 2023-05-17 16:38:03 -07:00
ryosuke-hasebe
903e19854d Fix invalid Zipkin Reporter back-off behavior 
Update `ReporterConfiguration` so that `spanReporter` back off
if a `Reporter` bean is defined. Prior to this commit, only
`AsyncReporter` beans would be considered.

See gh-35455
 2023-05-17 16:36:19 -07:00
Phillip Webb
08c3cccc92 Merge branch '3.0.x' 2023-05-15 22:20:39 -07:00
Phillip Webb
4e305cc209 Merge branch '2.7.x' into 3.0.x 2023-05-15 22:20:32 -07:00
Phillip Webb
a75cd014fc Merge branch '2.6.x' into 2.7.x 2023-05-15 22:20:23 -07:00
Phillip Webb
95d1cb9884 Merge branch '2.5.x' into 2.6.x 2023-05-15 22:20:11 -07:00
Phillip Webb
8316a96515 Polish 2023-05-15 22:19:06 -07:00
Phillip Webb
25b0a4a67b Merge branch '2.5.x' into 2.6.x 
Fixes gh-35438
 2023-05-15 22:12:57 -07:00
Andy Wilkinson
086b1e5f58 Stop WebFilterChainPostProcessor from causing eager init 
Fixes gh-35437
 2023-05-15 22:12:32 -07:00
Phillip Webb
ef1401fcc9 Fix formatting 2023-05-12 14:20:40 -07:00
Phillip Webb
27c8da66f1 Merge branch '2.5.x' into 2.6.x 
Closes gh-35412
 2023-05-12 13:27:46 -07:00
Madhura Bhave
307f3c3399 Use endpoint mappings in CloudFoundry integration 
Closes gh-35411
 2023-05-12 13:23:13 -07:00
Phillip Webb
e3ed87d165 Merge branch '3.0.x' 2023-05-12 13:21:52 -07:00
Phillip Webb
92e420a098 Merge branch '2.7.x' into 3.0.x 2023-05-12 13:14:12 -07:00
Johnny Lim
ff9fd1abeb Polish 
See gh-35185
 2023-05-10 08:31:36 +02:00
Stephane Nicoll
ae0efba523 Merge branch '3.0.x' 
See gh-35312
 2023-05-05 12:09:03 +02:00
Stephane Nicoll
1b4f9a7e9c Remove GraphQL's tracing observation auto-configuration 
This commit removes the auto-configuration for
PropagationWebGraphQlInterceptor as it has been deprecated with no
replacement.

See gh-35303
 2023-05-05 12:07:12 +02:00
Stephane Nicoll
66cc9d73b8 Merge branch '3.0.x' 2023-05-05 11:58:30 +02:00
Stephane Nicoll
be29ab389a Merge branch '2.7.x' into 3.0.x 2023-05-05 11:57:51 +02:00
Stephane Nicoll
eeefb2a1de Polish 2023-05-05 11:55:46 +02:00
Marc Leroux
b61834c92d Replace Mockito argument captors with assertArg 
See gh-35015
 2023-05-05 11:34:55 +02:00
Jonatan Ivanov
5142e8e157
Support Brave's joint spans 
Brave has a feature called joint spans that was enabled by default with
Spring Cloud Sleuth (and Boot 2.x). This has changed with
Micrometer Tracing and Boot 3.x. In order to make migration simpler,
joint spans should be set through a property.
This is a Brave+B3-only feature, W3C is not supported by Brave and
OTel does not have this capability.

See gh-35165
 2023-05-03 17:22:12 -07:00
Phillip Webb
a890323758 Merge branch '3.0.x' 2023-05-02 14:52:42 -07:00
Andy Wilkinson
b03f1e47d0 Merge branch '3.0.x' 
Closes gh-35171
 2023-04-26 12:10:34 +01:00
Andy Wilkinson
d6e3db9c36 Merge branch '2.7.x' into 3.0.x 
Closes gh-35170
 2023-04-26 11:59:19 +01:00
Andy Wilkinson
472afafd4b Stop WebFilterChainPostProcessor from causing eager init 
Fixes gh-35163
 2023-04-25 22:08:58 +01:00
Scott Frederick
66db13b962 Refactor web server support to use SslBundles 
Update Tomcat, Jetty, Undertow and Netty servers so that an SslBundle
is used to apply SSL configuration. Existing `Ssl` properties are
internally adapted to an `SslBundle` using the `WebServerSslBundle`
class. Additionally, if `Ssl.getBundle()` returns a non-null value the
the `SslBundles` bean will be used to find a registered bundle by name.

See gh-34814
 2023-04-21 01:02:47 -07:00
Andy Wilkinson
04780650a1 Merge branch '3.0.x' 
Closes gh-35087
 2023-04-20 08:04:37 +01:00
Andy Wilkinson
32444fed4b Merge branch '2.7.x' into 3.0.x 
Closes gh-35086
 2023-04-20 08:04:18 +01:00