Commit Graph

27893 Commits

Author SHA1 Message Date
Stéphane Nicoll f866e20410 Polish "Add RuntimeHints for StackTracePrinter"
See gh-44242
2025-02-13 10:27:28 +01:00
Dmytro Nosan 5d781ffcbb Add RuntimeHints for StackTracePrinter
See gh-44242

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-13 09:00:10 +01:00
Stéphane Nicoll 9dea179d39 Polish contribution
See gh-44247
2025-02-13 08:52:09 +01:00
Dmytro Nosan b9772cd6f1 Polish
See gh-44247

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-13 08:47:16 +01:00
Andy Wilkinson 1710ff4eb5 Merge branch '3.4.x'
Closes gh-44248
2025-02-12 21:52:30 +00:00
Andy Wilkinson 4cb9d816b9 Include non-default candidates in metrics and health
Previously, when Actuator expected to find multiple beans of the same
type, it used Map<String, Type> to inject them. Unfortunately, this
does not include beans that are not default candidates and there's
no way to request that autowiring includes such beans with Map-based
injection.

This commit switches from Map-based injection to querying the bean
factory for the desired beans. This is done using
SimpleAutowireCandidateResolver's new helper method,
resolveAutowireCandidates, that returns a Map<String, Type> of
beans including those that are not default candidates but excluding
those that are not autowire candidates.

Closes gh-43481
2025-02-12 21:44:41 +00:00
Stéphane Nicoll 1d74d3df6f Merge branch '3.4.x'
Closes gh-44246
2025-02-12 20:25:43 +01:00
Stéphane Nicoll f6f0daa47d Merge branch '3.3.x' into 3.4.x
Closes gh-44245
2025-02-12 20:25:20 +01:00
Stéphane Nicoll a57fd8002f Update copyright year of changed file
See gh-44240
2025-02-12 20:22:48 +01:00
zhoudong 6177010b11 Polish variable name in ServletWebServerApplicationContext.selfInitialize()
See gh-44240

Signed-off-by: zhoudong <jearton1024@gmail.com>
2025-02-12 20:22:14 +01:00
Stéphane Nicoll be7a646d55 Upgrade to MariaDB 3.5.2
Closes gh-44239
2025-02-12 09:09:31 +01:00
Stéphane Nicoll d4ad8f57cb Upgrade to Json-smart 2.5.2
Closes gh-44238
2025-02-12 09:09:26 +01:00
Stéphane Nicoll 961fcbd1ca Upgrade to Elasticsearch Client 8.17.2
Closes gh-44226
2025-02-12 09:09:22 +01:00
Phillip Webb 28495d7d13 Polish `SanitizingFunction`
See gh-39243
2025-02-11 19:26:29 -08:00
Phillip Webb 3eee1f1ad0 Add convenience methods to `SanitizingFunction`
Add a `sanitizeValue()` factory method and `if...` methods that can
be used to quickly build a `SanitizingFunction`.

Closes gh-39243
2025-02-11 19:05:42 -08:00
Stéphane Nicoll 60adee359a Upgrade to SQLite JDBC 3.49.0.0
Closes gh-44232
2025-02-11 15:43:20 +01:00
Stéphane Nicoll bc36485e6a Upgrade to Reactor Bom 2024.0.3
Closes gh-44157
2025-02-11 15:43:20 +01:00
Stéphane Nicoll cf3b74ec76 Upgrade to Rabbit AMQP Client 5.25.0
Closes gh-44231
2025-02-11 15:43:20 +01:00
Stéphane Nicoll fc05658cd5 Upgrade to Oracle Database 23.7.0.25.01
Closes gh-44230
2025-02-11 15:43:20 +01:00
Stéphane Nicoll 90309394ef Upgrade to OpenTelemetry 1.47.0
Closes gh-44229
2025-02-11 15:29:41 +01:00
Stéphane Nicoll 11ca7949b8 Upgrade to Netty 4.1.118.Final
Closes gh-44228
2025-02-11 15:29:40 +01:00
Stéphane Nicoll e4da89cfa9 Upgrade to Micrometer Tracing 1.5.0-M2
Closes gh-44156
2025-02-11 15:29:40 +01:00
Stéphane Nicoll e180e7aff2 Upgrade to Micrometer 1.15.0-M2
Closes gh-44155
2025-02-11 15:29:40 +01:00
Stéphane Nicoll c22033440f Upgrade to Hibernate 6.6.7.Final
Closes gh-44227
2025-02-11 15:29:40 +01:00
Stéphane Nicoll 3b37805dc3 Merge branch '3.4.x'
Closes gh-44225
2025-02-11 15:18:36 +01:00
Stéphane Nicoll 69c23e86d8 Merge branch '3.3.x' into 3.4.x
Closes gh-44222
2025-02-11 15:11:44 +01:00
Stéphane Nicoll 6e33bd9fbb Prevent upgrade to Tomcat 10.1.35
Closes gh-44219
2025-02-11 15:11:15 +01:00
Stéphane Nicoll 16b7ac948f Upgrade to Reactor Bom 2024.0.3
Closes gh-44117
2025-02-11 13:52:45 +01:00
Stéphane Nicoll 486825415e Upgrade to Netty 4.1.118.Final
Closes gh-44221
2025-02-11 13:52:44 +01:00
Stéphane Nicoll 020dfb64c1 Upgrade to Micrometer Tracing 1.4.3
Closes gh-44116
2025-02-11 13:52:40 +01:00
Stéphane Nicoll 6bce2b4736 Upgrade to Micrometer 1.14.4
Closes gh-44115
2025-02-11 13:52:39 +01:00
Stéphane Nicoll 812bc4e09b Upgrade to Hibernate 6.6.7.Final
Closes gh-44220
2025-02-11 13:52:39 +01:00
Stéphane Nicoll c5779b2f8b Upgrade to Reactor Bom 2023.0.15
Closes gh-44104
2025-02-11 13:51:35 +01:00
Stéphane Nicoll 2ee5e23a47 Upgrade to Netty 4.1.118.Final
Closes gh-44218
2025-02-11 13:51:35 +01:00
Stéphane Nicoll 18c64524a8 Upgrade to Micrometer Tracing 1.3.9
Closes gh-44103
2025-02-11 13:51:31 +01:00
Stéphane Nicoll 6fe757f72e Upgrade to Micrometer 1.13.11
Closes gh-44102
2025-02-11 13:51:30 +01:00
Andy Wilkinson 5fc442471a Upgrade to Elasticsearch Client 8.17.1
Closes gh-44217
2025-02-11 12:42:18 +00:00
Andy Wilkinson 24ead90e13 Merge branch '3.4.x'
Closes gh-44216
2025-02-11 12:31:19 +00:00
Andy Wilkinson 18db70533d Merge branch '3.3.x' into 3.4.x
Closes gh-44215
2025-02-11 12:31:07 +00:00
Andy Wilkinson 3e5929a446 Remove duplicate dispatcher servlet auto-config tests
Closes gh-44207
2025-02-11 12:19:45 +00:00
Andy Wilkinson 0be4062116 Merge branch '3.4.x'
Closes gh-44213
2025-02-11 11:35:12 +00:00
Andy Wilkinson 30d7af4e38 Add CI with Java 24
Closes gh-44205
2025-02-11 11:34:43 +00:00
Andy Wilkinson 8dc21cf219 Merge branch '3.4.x'
Closes gh-44210
2025-02-11 11:03:28 +00:00
Andy Wilkinson c5d21e0e63 Add TWENTY_FOUR to JavaVersion enum
Closes gh-44209
2025-02-11 11:03:02 +00:00
Andy Wilkinson 7c27cc52ee Try to fix Windows build failures
Text blocks use \n as their separator on all platforms. Update
withLineSeparatorUsesLineSeparator() to replace \n rather than
System.lineSeparator()

createPrinterWhenStandardAppliesCustomizations() limits the length of
the output. On Windows, the default \r\n line separator uses an
extra byte per separator compared to \n. Configure the printer to use
\n as a line separator so that non-whitespace output is the same on
all platforms.

See gh-43864
2025-02-11 09:43:59 +00:00
Phillip Webb 491a335ec7 Attempt to fix Windows build failures
See gh-43864
2025-02-10 23:29:55 -08:00
Phillip Webb 7433b93769 Add stack trace printer support for structured logging
Introduce a new `StackTracePrinter` interface (and a standard
implementation) that can be used to print stack traces in a custom
form. The existing `StructuredLoggingJsonProperties` have been updated
with a nested `StackTrace` record that supports common customization
options or allows a custom `StackTracePrinter` to be used.

Closes gh-43864
2025-02-10 22:34:28 -08:00
Phillip Webb 291e5d8bd3 Polish 2025-02-10 17:02:01 -08:00
Brian Clozel afcc780e61 Write TraceId in HTTP Response headers
Prior to this commit, the Micrometer instrumentation support would
auto-configure a `ServerHttpObservationFilter` for creating observations
in Spring MVC applications.

As of Spring Framework 6.2, applications can extend this filter class to
get notified of the observation scope being opened.
This commit contributes a new `TraceHeaderObservationFilter`
implementation that writes the current Trace Id (if present) to the
`X-Trace-Id` HTTP response header.

This feature is disabled by default, applications will need to enable
`management.observations.http.server.requests.write-trace-header`.
`
Closes gh-40857
2025-02-10 18:08:31 +01:00
Andy Wilkinson f5f888dbdd Polish
See gh-44197
2025-02-10 15:28:05 +00:00