Commit Graph

26227 Commits

Author SHA1 Message Date
Moritz Halbritter
3664df61eb Polish API of SpanExporters and SpanProcessors 2023-06-16 14:54:44 +02:00
Stephane Nicoll
fe65806582 Merge branch '3.1.x' 2023-06-16 14:32:39 +02:00
Sébastien Deleuze
db8dee5aac Refine SpringApplication.Augmented.with Kotlin extension
This commit allows to specify multiple Kotlin classes.

See gh-35784
2023-06-16 14:22:18 +02:00
Moritz Halbritter
27add2bbe3 Rework @AutoConfigureObservability and tracing auto-configurations
@ConditionalOnEnabledTracing is now applied to the minimal amount of
beans. The beans which are annotated with it are beans that will lead
to span sending to backends.

This leaves the majority of the Micrometer Tracing, Brave and
OpenTelemetry infrastructure untouched in tests.

Closes gh-35354
2023-06-16 14:09:10 +02:00
Andy Wilkinson
fb4b26a842 Merge branch '3.1.x' 2023-06-16 10:45:44 +01:00
Andy Wilkinson
1652c27b3c Apply additional sources once when using SpringApplication.from()
Previously, when using SpringApplication.from() any additional
sources configured using with() would be applied to every
SpringApplication that was created within the scope of the call to
run(). This caused problems with Spring Cloud's bootstrap context
where the additional sources would be applied to both the user's
application and to the boostrap context's application.

This commit updates the hook that's used to apply the additional
sources so that it's only applied once. This results in the
additional sources only being added to the first SpringApplication
that is run.

Closes gh-35873
2023-06-16 10:39:20 +01:00
Moritz Halbritter
c25b084391 Polish 2023-06-16 10:36:33 +02:00
Moritz Halbritter
929283f4dc Support overriding OTel SpanExporters
See gh-35596
2023-06-16 10:24:45 +02:00
Moritz Halbritter
d51559956f Support overriding default OTel SpanProcessor
Also makes it easier to set the MeterProvider used in the default
SpanProcessor.

Closes gh-35560
2023-06-16 09:54:27 +02:00
Phillip Webb
0439b630d1 Merge branch '3.1.x'
Closes gh-35923
2023-06-15 14:27:11 -07:00
Phillip Webb
c192fb85b2 Merge branch '3.0.x' into 3.1.x
Closes gh-35922
2023-06-15 14:26:55 -07:00
Phillip Webb
4c8b93b37d Merge branch '2.7.x' into 3.0.x
Closes gh-35920
2023-06-15 14:26:36 -07:00
Phillip Webb
137f4ee451 Support reporting of custom Log4J2 log levels from the LoggersEndpoint
Support custom Log4J2 log levels by changing `LoggerConfiguration` so
that it can now report levels using a `LevelConfiguration` object
rather than the limited `LogLevel` enum.

The `Log4J2LoggingSystem` class now uses `LevelConfiguration.ofCustom`
for custom logging levels, rather than throwing an exception.

The `LoggersEndpoint` has also been updated so that it can return the
custom logger name.

Fixes gh-35227
2023-06-15 14:03:22 -07:00
Andy Wilkinson
c033484815 Merge branch '3.1.x' 2023-06-15 15:50:34 +01:00
Andy Wilkinson
3d9a308053 Merge branch '3.0.x' into 3.1.x
Closes gh-35913
2023-06-15 15:50:07 +01:00
Andy Wilkinson
eeea065595 Merge branch '2.7.x' into 3.0.x
Closes gh-35912
2023-06-15 15:49:36 +01:00
Andy Wilkinson
e779fb0bc4 Validate constructor bound config props that implement Validator
Closes gh-33669
2023-06-15 15:29:20 +01:00
Andy Wilkinson
91fdae45b6 Merge branch '3.1.x' 2023-06-15 14:47:32 +01:00
Andy Wilkinson
61752184f2 Merge branch '3.0.x' into 3.1.x
Closes gh-35911
2023-06-15 14:47:21 +01:00
Andy Wilkinson
7bb3caf914 Merge branch '2.7.x' into 3.0.x
Closes gh-35910
2023-06-15 14:47:01 +01:00
Andy Wilkinson
ee606db34a Update Data REST starter description to mention Spring MVC
Closes gh-35678
2023-06-15 14:46:23 +01:00
Andy Wilkinson
740815da03 Merge branch '3.1.x' 2023-06-15 14:38:43 +01:00
Andy Wilkinson
251b5f2d0f Merge branch '3.0.x' into 3.1.x
Closes gh-35909
2023-06-15 14:38:31 +01:00
Andy Wilkinson
a5981a4dac Merge branch '2.7.x' into 3.0.x
Closes gh-35908
2023-06-15 14:38:13 +01:00
Andy Wilkinson
9feb84e234 Add DynmicPropertySource to ordered list of property sources
Closes gh-32901
2023-06-15 14:36:38 +01:00
Moritz Halbritter
6e86f5c444 Register uncategorized ObservationHandlers after categorized ones
Closes gh-34399
2023-06-15 15:01:13 +02:00
Moritz Halbritter
5bad242bfb Merge branch '3.1.x' 2023-06-15 13:50:17 +02: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
2c06f274dc Merge branch '3.1.x' 2023-06-15 12:21:08 +01:00
Andy Wilkinson
cb36df47c8 Merge branch '3.0.x' into 3.1.x
Closes gh-35905
2023-06-15 12:20:55 +01:00
Andy Wilkinson
6def7252d6 Merge branch '2.7.x' into 3.0.x
Closes gh-35904
2023-06-15 12:20:27 +01:00
Andy Wilkinson
088006ff60 Use ephemeral port for Hazelcast
When Hazelcast is started on a fixed port and that port is already in
use, it does not fail to start which makes the problem hard to
detect. A symptom of the problem is that clients will not be able to
connect and will either retry indefinitely or will timeout depending
on their configuration.

This commit updates the Hazelcast client tests to start the Hazelcast
instance on an ephemeral port and to customize the client
configuration with the instance's address before use. This should
allow the client tests to work reliably in an environment where
Hazelcast's default port is already in use.

Closes gh-35903
2023-06-15 12:19:34 +01:00
Moritz Halbritter
efcc65bc5b Apply filter order to ServerHttpObservationFilter
Closes gh-35067
2023-06-15 11:45:05 +02:00
Moritz Halbritter
140c37ceba Enable virtual threads on Jetty
Closes gh-35703
2023-06-15 11:01:11 +02:00
Moritz Halbritter
3e4a9f5204 Add property to limit maximum connections for Jetty
Closes gh-35899
2023-06-15 09:42:51 +02:00
Moritz Halbritter
f81787e65d Enable virtual threads on Tomcat
Closes gh-35704
2023-06-15 08:30:09 +02:00
Moritz Halbritter
6e604ad65c Implement @ConditionalOnVirtualThreads
Closes gh-35892
2023-06-15 08:30:09 +02:00
Moritz Halbritter
fb64f6744e Add 21 to JavaVersion
See gh-35892
2023-06-15 08:30:08 +02:00
Andy Wilkinson
0ce2b054d2 Merge branch '3.1.x' 2023-06-14 18:20:07 +01: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
Stephane Nicoll
67fc2f9346 Merge branch '3.1.x' 2023-06-14 09:36:47 +02:00
Stephane Nicoll
f299a2473e Upgrade to Reactor Bom 2022.0.8
Closes gh-35747
2023-06-14 09:35:39 +02:00
Stephane Nicoll
61bae46deb Upgrade to Micrometer Tracing 1.1.2
Closes gh-35746
2023-06-14 09:35:38 +02:00
Stephane Nicoll
b17c948d61 Upgrade to Micrometer 1.11.1
Closes gh-35745
2023-06-14 09:35:38 +02:00
Stephane Nicoll
4f3761c852 Upgrade to Logback 1.4.8
Closes gh-35885
2023-06-14 09:35:37 +02:00
Stephane Nicoll
9e642c9843 Upgrade to Hazelcast 5.2.4
Closes gh-35884
2023-06-14 09:35:32 +02:00
Stephane Nicoll
1093d172a4 Upgrade to Couchbase Client 3.4.7
Closes gh-35883
2023-06-14 09:35:25 +02:00