Commit Graph

43405 Commits (c1b295fd71573209122b2321b256675babfacc96)
 

Author SHA1 Message Date
Jonatan Ivanov c1b295fd71 Log correlation IDs when Micrometer tracing is being used
Add support for logging correlation IDs with Logback or Log4J2 whenever
Micrometer tracing is being used.

The `LoggingSystemProperties` class now accepts a defualt value resolver
which will be used whenever a value isn't in the environment. The
`AbstractLoggingSystem` provides a resolver that supports the
`logging.pattern.correlation` property and will return a value whenever
`LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY` is set.

Using `LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY` allows us to
provide a consistent width for the correlation ID, even when it's
missing from the MDC.

The exact correlation pattern returned will depend on the `LoggingSytem`
implementation. Currently Logback and Log4J2 are supported and both
make use of a custom converter which delegates to a new
`CorrelationIdFormatter` class.

Closes gh-33280
1 year ago
Phillip Webb b6120d504a Replace LoggingSystemProperties constants with an Enum
Extract contants from `LoggingSystemProperty` and
`LogbackLoggingSystemProperties` in enum classes.

Closes gh-36015
1 year ago
Phillip Webb 3a796aedea Merge branch '3.1.x' 1 year ago
Phillip Webb 31f218c4e0 Merge branch '3.0.x' into 3.1.x 1 year ago
Phillip Webb 9db3c5a2f7 Polish 1 year ago
Phillip Webb 16265e925d Merge branch '3.1.x' 1 year ago
Phillip Webb 8ac5dc7ea3 Merge branch '3.0.x' into 3.1.x
Closes gh-36017
1 year ago
Phillip Webb f7af1bab5b Upgrade to Spring WS 4.0.5
Closes gh-36010
1 year ago
Phillip Webb 64525fb566 Merge branch '3.1.x' 1 year ago
Phillip Webb eb72d7e9f1 Merge branch '3.0.x' into 3.1.x 1 year ago
Phillip Webb 5c8ed944ca Start building against Spring WS 4.0.5 snapshots
See gh-36010
1 year ago
Andy Wilkinson 9e2c32a5db Merge branch '3.1.x' 1 year ago
Andy Wilkinson d789d3df1e Merge branch '3.0.x' into 3.1.x 1 year ago
Andy Wilkinson 86c6cc7e3a Merge branch '2.7.x' into 3.0.x 1 year ago
Andy Wilkinson f6841c3c16 Revert "Start building against Spring WS 3.1.7 snapshots"
This reverts commit 5e963b02a7.

See gh-35732
1 year ago
Phillip Webb 212acf44f7 Merge branch '3.1.x' 1 year ago
Phillip Webb 7a2fc9e636 Fix checkstyle violation
See gh-35914
1 year ago
Phillip Webb 2ce36b15b3 Merge branch '3.1.x' 1 year ago
Phillip Webb eb91a9270c Merge pull request #35914 from fcappi
* pr/35914:
  Polish 'Apply SslConfigurer in addition to configured mappers'
  Apply SslConfigurer in addition to configured mappers

Closes gh-35914
1 year ago
Phillip Webb 3c7fbf3423 Polish 'Apply SslConfigurer in addition to configured mappers'
See gh-35914
1 year ago
Fernando Cappi e6b5322f3e Apply SslConfigurer in addition to configured mappers
Update `ReactorClientHttpConnectorFactory` to that SSL configuration
is applied in addition to any configured mappers.

Prior to this commit, SSL configuration would prevent configured
mappers from being applied.

See gh-35914
1 year ago
Andy Wilkinson 7f5351c7b0 Merge branch '3.1.x' 1 year ago
Andy Wilkinson b770ffc160 Fully prepare connection when using SSL bundle
Fixes gh-36007
1 year ago
Andy Wilkinson 295702003d Merge branch '3.1.x' 1 year ago
Andy Wilkinson 7266d4863b Merge branch '3.0.x' into 3.1.x
Closes gh-36009
1 year ago
Andy Wilkinson 39c382713b Initialize WebSocket infrastructure when using WebFlux and Jetty
In Spring Framework 5.x with Jetty 9, the reactive
JettyRequestUpgradeStrategy was able to initialize Jetty's WebSocket
infrastructure itself. With Jetty 10 this is no longer possible and
Boot must perform the initialization as part of preparing the
reactive JettyWebServer.

This commit updates the reactive WebSocket auto-configuration to
initialize Jetty's WebSocket infrastructure as part of creating the
reactive JettyWebServer.

Fixes gh-33347
1 year ago
Andy Wilkinson fc403f4f18 Merge branch '3.1.x' 1 year ago
Andy Wilkinson d3522a78a8 Merge branch '3.0.x' into 3.1.x 1 year ago
Andy Wilkinson 641f00f24c Disable test when Java version is too high
Gradle 7.3.3 does not support Java 20 so the test that verifies that
the plugin fails fast when running on a version of Gradle that it
does not support needs to be disabled on Java 20 and later.

See gh-35931
1 year ago
Andy Wilkinson 68aec97ee7 Merge branch '3.1.x' 1 year ago
Andy Wilkinson 5b69580d5d Merge branch '3.0.x' into 3.1.x
Closes gh-36004
1 year ago
Andy Wilkinson f584d6dbd9 Replace `@EnableBatchProcessing` in slice test examples
Using `@EnableBatchProcessing` is no longer necessary to enable
Batch's auto-configuration so it's no longer a good example when
discussing sliced tests and user configuration.

This commit replaces `@EnableBatchProcessing` with an alternative
annotation, `@EnableMongoAuditing` and updates the accompanying
text.

Closes gh-33435
1 year ago
Andy Wilkinson b394553b30 Merge branch '3.1.x' 1 year ago
Andy Wilkinson 660dbb9afd Fix Maven-built native images with Docker Compose dependency
Previously, we tried to prevent spring-boot-docker-compose from
causing problems with AOT and native images by excluding it from
the AOT processing classpath. This allowed AOT processing to
succeed. We cannot apply the same exclusion to the native image
classpath so spring-boot-docker-compose was still included in the
native image. This results in a failure at runtime due to missing
reflection hints.

This commit reverts that changes that excluded
spring-boot-docker-compose from the AOT processing classpath. This
allows AOT processing to generate reflection hints but reintroduces
the failure caused by the connection details bean definitions using
an instance supplier callback. To overcome this problem we disable
DockerComposeLifecycleManager during AOT processing and in a native
image. This ensures that no attempt is made to call docker compose up
and no connection details beans are defined.

Fixes gh-35676
1 year ago
Andy Wilkinson 56f88a3977 Merge branch '3.1.x' 1 year ago
Andy Wilkinson 06604ef5ed Merge branch '3.0.x' into 3.1.x 1 year ago
Andy Wilkinson 35ee52275e Upgrade to Spring Integration 6.0.6
Closes gh-35740
1 year ago
Andy Wilkinson e2b6384462 Merge branch '3.1.x' 1 year ago
Andy Wilkinson 5384872cbd Merge branch '3.0.x' into 3.1.x
Closes gh-36003
1 year ago
Andy Wilkinson 2fd5319eda Merge branch '2.7.x' into 3.0.x
Closes gh-36002
1 year ago
Andy Wilkinson 0fb4c9a095 Prohibit upgrades to RSocket 1.1.4
Closes gh-35798
1 year ago
Andy Wilkinson 5a70198880 Merge branch '3.1.x' 1 year ago
Andy Wilkinson 5cda56cc68 Upgrade to Spring Integration 6.1.1
Closes gh-35859
1 year ago
Andy Wilkinson 818f096890 Merge branch '3.1.x' 1 year ago
Andy Wilkinson 853caf9a59 Do not exclude DevTools from Maven AOT processing classpath
When excluded from the AOT processing classpath, a reflection hint
for DevTools' RestartScopeInitializer that's registered in
spring.factories is not generated. When the native image is compiled
we have no control over its classpath so DevTools is included. This
causes a failure at runtime as RestartScopeInitializer cannot be
loaded due to the missing reflection hint.

Until we have control over the native image classpath, we need to
include DevTools on the AOT processing classpath and then rely on
DevTools disabling itself in a native image which it already does.

Fixes gh-35853
1 year ago
Stephane Nicoll 16e993f3ca Merge branch '3.1.x' 1 year ago
Stephane Nicoll 9a2b9cb066 Merge branch '3.0.x' into 3.1.x 1 year ago
Stephane Nicoll 0c46af9452 Merge branch '2.7.x' into 3.0.x 1 year ago
Stephane Nicoll 75ca6030a8 Upgrade to Spring Session 3.1.1
Closes gh-35755
1 year ago
Stephane Nicoll 424e8e6924 Upgrade to Spring Security 6.1.1
Closes gh-35754
1 year ago