Phillip Webb
691b549e36
Merge branch '2.7.x' into 3.0.x
2023-06-16 10:18:43 -07:00
Phillip Webb
f3f8610539
Polish
2023-06-16 10:17:08 -07:00
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
Stephane Nicoll
d3ff04fa4b
Upgrade to Reactor Bom 2022.0.8
...
Closes gh-35736
2023-06-14 09:23:44 +02:00
Stephane Nicoll
1900910008
Upgrade to Micrometer Tracing 1.0.7
...
Closes gh-35735
2023-06-14 09:23:44 +02:00
Stephane Nicoll
2d43f345de
Upgrade to Micrometer 1.10.8
...
Closes gh-35734
2023-06-14 09:23:43 +02:00
Stephane Nicoll
7cf41e9e0a
Upgrade to Logback 1.4.8
...
Closes gh-35881
2023-06-14 09:23:43 +02:00
Stephane Nicoll
10b66975dd
Upgrade to Glassfish JAXB 4.0.3
...
Closes gh-35880
2023-06-14 09:23:38 +02:00
Stephane Nicoll
2dbfe54762
Upgrade to Couchbase Client 3.4.7
...
Closes gh-35879
2023-06-14 09:23:33 +02:00
Stephane Nicoll
f2a44d7f06
Upgrade to Reactor Bom 2020.0.33
...
Closes gh-35726
2023-06-14 09:20:05 +02:00
Stephane Nicoll
7576117dd9
Upgrade to Micrometer 1.9.12
...
Closes gh-35725
2023-06-14 09:20:04 +02:00
Scott Frederick
4950e2a6b7
Merge branch '3.1.x'
2023-06-13 16:42:38 -05:00
Scott Frederick
7e6452edee
Fix Redis URL property userinfo parsing
...
Fixes gh-35850
2023-06-13 16:42:19 -05:00
Andy Wilkinson
b3e2f9a212
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35868
2023-06-13 15:49:33 +01:00
Andy Wilkinson
ac8ea1d841
Upgrade to Neo4j Java Driver 5.9.0
...
Closes gh-35867
2023-06-13 15:48:52 +01:00
Andy Wilkinson
21a54ec66d
Merge branch '3.1.x'
2023-06-13 13:52:36 +01:00
Andy Wilkinson
e12ae5add5
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35865
2023-06-13 13:52:10 +01:00
Andy Wilkinson
bdbbbc6470
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35864
2023-06-13 13:51:51 +01:00
Andy Wilkinson
984dc1d58f
Allow package-private main classes to be used with Devtools
...
Fixes gh-35858
2023-06-13 13:50:27 +01:00
Moritz Halbritter
c73315b4a3
Add property to prevent observations starting with a prefix
...
For example, setting management.observations.enable.denied.prefix=false
will prevent all observations starting with 'denied.prefix'
Closes gh-34802
2023-06-13 14:04:33 +02:00
Moritz Halbritter
7b90fbb0b2
Add property to specify the order of ServerHttpObservationFilter
...
The property is named 'management.observations.http.server.filter.order'
Closes gh-35067
2023-06-13 12:14:58 +02:00
Andy Wilkinson
1955139b72
Start building against Spring Integration 6.1.1 snapshots
...
See gh-35859
2023-06-13 11:04:31 +01:00
Moritz Halbritter
491e12ab5e
Add property to disable Spring Security observations
...
Setting 'management.observations.spring-security.enabled' installs an
ObservationPredicate, which prevents all observations starting with
'spring.security.' to be created.
Closes gh-34802
2023-06-13 11:18:05 +02:00
Moritz Halbritter
6eede829d2
Merge branch '3.1.x'
2023-06-13 10:21:06 +02:00
Sungchan Cho
96d5f8641c
Fix typo in Docker Compose documentation
...
See gh-35818
2023-06-13 10:18:16 +02:00
Moritz Halbritter
5b06224af5
Add property for common key/values on observations
...
- Deprecates 'management.metrics.tags.*'
Closes gh-33241
2023-06-13 09:56:42 +02:00
Moritz Halbritter
214f06083b
Auto-configure OtlpHttpSpanExporter only if property is set
...
- Remove the default value of 'management.otlp.tracing.endpoint'
Closes gh-35596
2023-06-13 08:14:22 +02:00
Stephane Nicoll
cd018aff9c
Merge branch '3.1.x'
2023-06-12 09:45:49 +02:00
Stephane Nicoll
71856687d7
Upgrade to Undertow 2.3.7.Final
...
Closes gh-35849
2023-06-12 08:46:00 +02:00
Stephane Nicoll
c6bb958ce3
Upgrade to UnboundID LDAPSDK 6.0.9
...
Closes gh-35848
2023-06-12 08:45:56 +02:00
Stephane Nicoll
815fe626f8
Upgrade to Testcontainers 1.18.3
...
Closes gh-35847
2023-06-12 08:45:51 +02:00
Stephane Nicoll
9048686080
Upgrade to SQLite JDBC 3.41.2.2
...
Closes gh-35846
2023-06-12 08:45:45 +02:00
Stephane Nicoll
bba8569c25
Upgrade to R2DBC Proxy 1.1.1.RELEASE
...
Closes gh-35845
2023-06-12 08:45:40 +02:00
Stephane Nicoll
009b4bbcd9
Upgrade to R2DBC MySQL 1.0.2
...
Closes gh-35844
2023-06-12 08:45:35 +02:00
Stephane Nicoll
e51402ef59
Upgrade to R2DBC MSSQL 1.0.1.RELEASE
...
Closes gh-35843
2023-06-12 08:45:30 +02:00
Stephane Nicoll
10fbaea743
Upgrade to Netty 4.1.93.Final
...
Closes gh-35842
2023-06-12 08:45:25 +02:00
Stephane Nicoll
dac5023c52
Upgrade to Lombok 1.18.28
...
Closes gh-35841
2023-06-12 08:45:21 +02:00
Stephane Nicoll
99aeb4eef6
Upgrade to Kafka 3.4.1
...
Closes gh-35840
2023-06-12 08:45:16 +02:00
Stephane Nicoll
f3efc963b1
Upgrade to Json-smart 2.4.11
...
Closes gh-35839
2023-06-12 08:45:11 +02:00
Stephane Nicoll
63994f86bc
Upgrade to Jersey 3.1.2
...
Closes gh-35838
2023-06-12 08:45:06 +02:00
Stephane Nicoll
4cdd2a86a2
Upgrade to JBoss Logging 3.5.1.Final
...
Closes gh-35837
2023-06-12 08:45:02 +02:00
Stephane Nicoll
68d82df065
Upgrade to Jaybird 5.0.2.java11
...
Closes gh-35836
2023-06-12 08:44:57 +02:00
Stephane Nicoll
2c013129c8
Upgrade to Jakarta Mail 2.1.2
...
Closes gh-35835
2023-06-12 08:44:52 +02:00
Stephane Nicoll
1468a63658
Upgrade to Jakarta Json 2.1.2
...
Closes gh-35834
2023-06-12 08:44:47 +02:00
Stephane Nicoll
3052bfed94
Upgrade to Jackson Bom 2.15.2
...
Closes gh-35833
2023-06-12 08:44:42 +02:00
Stephane Nicoll
a8e924ca7e
Upgrade to Infinispan 14.0.10.Final
...
Closes gh-35832
2023-06-12 08:44:37 +02:00
Stephane Nicoll
033b0b180b
Upgrade to HSQLDB 2.7.2
...
Closes gh-35831
2023-06-12 08:44:32 +02:00
Stephane Nicoll
cfdb61b50c
Upgrade to Hibernate 6.2.4.Final
...
Closes gh-35830
2023-06-12 08:44:27 +02:00
Stephane Nicoll
eae3453dfd
Upgrade to Glassfish JAXB 4.0.3
...
Closes gh-35829
2023-06-12 08:44:22 +02:00
Stephane Nicoll
574094ec93
Upgrade to Git Commit ID Maven Plugin 5.0.1
...
Closes gh-35828
2023-06-12 08:44:18 +02:00
Stephane Nicoll
3d2c8d6941
Upgrade to Dropwizard Metrics 4.2.19
...
Closes gh-35827
2023-06-12 08:44:12 +02:00