Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
45,468 Commits 22 Branches 322 Tags 248 MiB
24f80154d4
Commit Graph

2184 Commits

Author SHA1 Message Date
Scott Frederick
1e85bf7ca8 Fix mapping of consumed types to propagators 
Fixes gh-37161
 2023-09-01 14:40:01 -05:00
Moritz Halbritter
b86937bb8e Merge branch '3.0.x' into 3.1.x 
Closes gh-37156
 2023-08-31 11:51:15 +02:00
Moritz Halbritter
61739bd917 Prevent propagation for local fields when using W3C propagation 
Closes gh-37109
 2023-08-31 11:50:05 +02:00
Andy Wilkinson
ee9574d399 Merge branch '3.0.x' into 3.1.x 
Closes gh-36567
 2023-07-25 15:04:30 +01:00
Andy Wilkinson
e106828fc8 Merge branch '2.7.x' into 3.0.x 
Closes gh-36566
 2023-07-25 14:59:44 +01:00
Andy Wilkinson
5c6a9122cb Polish "Test Micrometer config to property exposure" 
See gh-33743
 2023-07-25 14:43:14 +01:00
Mirko Sobeck
19e70055a5 Test Micrometer config to property exposure 
See gh-33743
 2023-07-25 14:37:25 +01:00
Andy Wilkinson
2766c4b648 Merge branch '3.0.x' into 3.1.x 
Closes gh-36559
 2023-07-25 13:07:48 +01:00
Andy Wilkinson
d290d05f63 Add missing Stackdriver metric-type-prefix property 
Closes gh-36499
 2023-07-25 13:01:59 +01:00
Andy Wilkinson
22fa904590 Merge branch '3.0.x' into 3.1.x 
Closes gh-36556
 2023-07-25 12:54:34 +01:00
Andy Wilkinson
45624c0a78 Merge branch '2.7.x' into 3.0.x 
Closes gh-36555
 2023-07-25 12:53:11 +01:00
Andy Wilkinson
aae8665db1 Add missing management.metrics.export.wavefront properties 
Closes gh-36498
 2023-07-25 12:35:58 +01:00
Andy Wilkinson
5d1b2348e8 Merge branch '3.0.x' into 3.1.x 
Closes gh-36553
 2023-07-25 12:08:43 +01:00
Andy Wilkinson
826bad5820 Merge branch '2.7.x' into 3.0.x 
Closes gh-36552
 2023-07-25 12:08:19 +01:00
Andy Wilkinson
a6c19dae07 Add missing management.metrics.export.signalfx properties 
Closes gh-36497
 2023-07-25 11:35:57 +01:00
Andy Wilkinson
54323d1a95 Merge branch '3.0.x' into 3.1.x 
Closes gh-36526
 2023-07-24 14:35:14 +01:00
Andy Wilkinson
2db45e9ba3 Merge branch '2.7.x' into 3.0.x 
Closes gh-36525
 2023-07-24 14:34:50 +01:00
Andy Wilkinson
a5d5908c27 Add missing management.metrics.export.atlas properties 
Closes gh-36496
 2023-07-24 14:34:11 +01:00
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
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
Madhura Bhave
3522714c13 Use endpoint mappings in CloudFoundry integration 
Closes gh-35085
 2023-04-20 07:50:44 +01:00
Andy Wilkinson
c55d398f95 Validate health group includes and excludes 
Closes gh-34360
 2023-04-19 19:51:57 +01:00
Andy Wilkinson
45068c777f Document default value for management.otlp.tracing.compression 
See gh-34508
 2023-04-19 17:21:14 +01:00
Andy Wilkinson
c543d9172c Polish "Add auto-configuration for OTLP span exporter" 
See gh-34508
 2023-04-19 15:11:00 +01:00
Jonatan Ivanov
ceaafeca0b Add auto-configuration for OTLP span exporter 
With these changes an OTLP HTTP/protobuf exporter is auto-configured
if opentelemetry-exporter-otlp is on the classpath.

See gh-34508
 2023-04-19 14:44:56 +01:00
Stephane Nicoll
a323bd90a8 Polish "Reintroduce support for ActiveMQ" 
See gh-35048
 2023-04-19 13:08:14 +02:00
Martin BENDA
3e9908a797 Reintroduce support for ActiveMQ 
See gh-35048
 2023-04-19 11:00:40 +02:00
Andy Wilkinson
1ad428129d Polish "Add customizer for SdkTracerProviderBuilder" 
See gh-34945
 2023-04-18 10:02:17 +01:00
Yanming Zhou
f40e9738b6 Add customizer for SdkTracerProviderBuilder 
See gh-34945
 2023-04-18 10:01:53 +01:00
Phillip Webb
1849b82334 Don't apply configuration-properties from auto-configuration plugin 
Update the auto-configuration gradle plugin so that the
configuration-properties plugin is not longer automatically applied.
This  allows us to have auto-configuration modules that don't ship
configuration properties.

Closes gh-35028
 2023-04-17 00:41:25 -07:00
Phillip Webb
00dc942e94 Migrate to Spring Security lambda config 
Closes gh-35011
 2023-04-14 17:39:48 -07:00
Jonatan Ivanov
9774d8a439
Add aggregation temporality to OtlpProperties 
In Micrometer 1.11.0-RC1, a new property was introduced in OtlpConfig
to define aggregation temporality.
See https://github.com/micrometer-metrics/micrometer/pull/3625
 2023-04-13 10:10:19 -07:00
Andy Wilkinson
d4980ea993 Always define connection details beans 
Closes gh-34776
 2023-04-13 18:02:35 +01:00
Phillip Webb
e9a198a68f Merge branch '3.0.x' 2023-04-12 22:16:35 -07:00
Phillip Webb
7fea4c84b4 Update copyright year of changed files 2023-04-12 22:16:07 -07:00
Phillip Webb
8d2f550f8c Merge branch '3.0.x' 2023-04-10 21:14:42 -07:00