root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
43,575 Commits 24 Branches 345 Tags 277 MiB
Commit Graph

2020 Commits

Author SHA1 Message Date
Stephane Nicoll 7195d87e6c Merge branch '3.0.x' into 3.1.x 
Closes gh-36429
 2023-07-17 15:48:30 +02:00
Stephane Nicoll 750096b9c2 Polish "Allow custom ExemplarSampler to be used" 
See gh-35619
 2023-07-17 15:46:48 +02:00
Johnny Goncalves 94b17ecd26 Allow custom ExemplarSampler to be used 
See gh-35619
 2023-07-17 15:44:05 +02:00
Stephane Nicoll 588129318c Merge branch '3.0.x' into 3.1.x 
Closes gh-36423
 2023-07-17 15:06:00 +02:00
Jonatan Ivanov 58cfdbfa2d Add missing OTel Span attributes 
OTel semantic conventions mandate certain resource attributes to present
on exported spans. This commits make sure that the attribute we add are
merged with the defaults, rather than replacing them.

See gh-36155
 2023-07-17 15:00:51 +02:00
Stephane Nicoll d2912c6442 Update copyright year of changed files 
See gh-36306
 2023-07-17 09:40:57 +02:00
Christoph Dreis 8321887d6a Fix typos 
See gh-36306
 2023-07-17 09:40:16 +02:00
Andy Wilkinson c4157bb515 Merge branch '3.0.x' into 3.1.x 
Closes gh-36276
 2023-07-07 12:07:07 +01:00
Andy Wilkinson cc80bb78fe Merge branch '2.7.x' into 3.0.x 
Closes gh-36275
 2023-07-07 12:06:51 +01:00
Andy Wilkinson 52f732920b Support multiple health groups with an additional path with Jersey 
This commit knowingly makes breaking API changes to
JerseyHealthEndpointAdditionalPathResourceFactory. We considered
other options but they all had the potential to be backwards
incompatible in one way or another. Faced with that situation we
concluded that the likelihood of anyone using the modified API
directly is small enough to warrant making the breaking changes.
If it becomes apparent that we have misjudged things we can revisit
the changes in the future.

Closes gh-36250
 2023-07-07 11:21:56 +01:00
Andy Wilkinson 3f7fe25cb9 Merge branch '3.0.x' into 3.1.x 
Closes gh-36044
 2023-06-23 15:58:36 +01:00
Andy Wilkinson 2fae5de245 Merge branch '2.7.x' into 3.0.x 
Closes gh-36043
 2023-06-23 15:50:02 +01:00
Andy Wilkinson d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking" 
See gh-35915
 2023-06-23 12:38:12 +01:00
ThomazPassarelli f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking 
See gh-35915
 2023-06-23 12:16:26 +01:00
Phillip Webb 31f218c4e0 Merge branch '3.0.x' into 3.1.x 2023-06-22 00:27:51 -07:00
Phillip Webb 9db3c5a2f7 Polish 2023-06-22 00:24:39 -07:00
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
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 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