3372 Commits

Author SHA1 Message Date
Andy Wilkinson
d7da2d9eb2 Merge branch '3.0.x' into 3.1.x
Closes gh-36139
2023-06-30 13:00:37 +01:00
Andy Wilkinson
66aa55b65d Merge branch '2.7.x' into 3.0.x
Closes gh-36138
2023-06-30 13:00:25 +01:00
JuHyeong Ahn
dbdb4d4e8d Fix typo in Using R2DBC
See gh-36019
2023-06-30 12:59:49 +01:00
Moritz Halbritter
b655523ef9 Merge branch '3.1.x'
Closes gh-36132
2023-06-30 10:44:48 +02:00
Moritz Halbritter
3d15b02441 Merge branch '3.0.x' into 3.1.x
Closes gh-36131
2023-06-30 10:44:34 +02:00
Moritz Halbritter
606063589f Document trace propagation with RestTemplate and WebClient
Closes gh-34053
2023-06-30 10:44:14 +02:00
Moritz Halbritter
cff26d9843 Merge branch '3.1.x'
Closes gh-36113
2023-06-29 11:42:12 +02:00
Moritz Halbritter
20321b5685 Merge branch '3.0.x' into 3.1.x
Closes gh-36112
2023-06-29 11:39:20 +02:00
Moritz Halbritter
2b398827de Add "baggage" section to tracing docs
Closes gh-34977
2023-06-29 11:30:58 +02:00
Scott Frederick
67725d4781 Merge branch '3.1.x'
Closes gh-36052
2023-06-23 15:26:53 -06:00
James Stansell
ea41a22284 Fix typo in docker compose service connections note
See gh-36016
2023-06-23 15:25:30 -06:00
Jonatan Ivanov
228b8eb8e4
Polish log correlation docs
Docs related to gh-33280 (log correlation) and
gh-35593 (application name in each log line) need some polishing:
- Fix project names
- Show how to avoid having the application name duplicated in logs
- Call out that a trailing space is needed in the correlation pattern

Closes gh-36035
See gh-33280
See gh-35593
2023-06-22 14:51:02 -07:00
Phillip Webb
493777d3c9 Include the application name on each log line when it is available
Update Logback and Log4J2 so that they include the application name on
each log line. If `spring.application.name` had not been set, or if
`logging.include-application-name` is `false` then the name is not
logged.

Closes gh-35593
2023-06-22 00:40:51 -07:00
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
2023-06-22 00:28:45 -07:00
Phillip Webb
3a796aedea Merge branch '3.1.x' 2023-06-22 00:28:01 -07: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
Andy Wilkinson
68aec97ee7 Merge branch '3.1.x' 2023-06-21 12:44:06 +01:00
Andy Wilkinson
5b69580d5d Merge branch '3.0.x' into 3.1.x
Closes gh-36004
2023-06-21 12:43:48 +01:00
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
2023-06-21 12:41:28 +01:00
Phillip Webb
23eb7ec1f8 Merge branch '3.1.x' 2023-06-16 14:35:44 -07: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
Jonatan Ivanov
85934c3919
Merge branch '3.1.x'
Closes gh-35930
2023-06-16 13:03:08 -07:00
Johnny Lim
06157837e5
Polish
See gh-35872
2023-06-16 12:39:03 -07: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
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
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
2e37c0da18 Merge branch '3.0.x'
Closes gh-35769
2023-06-07 09:32:14 +02:00
Moritz Halbritter
a9b4e9327c Merge branch '2.7.x' into 3.0.x
Closes gh-35768
2023-06-07 09:32:07 +02:00
twobiers
0dbc0fcf91 Move property notes up to external configuration section
See gh-35662
2023-06-07 09:29:23 +02:00
Moritz Halbritter
0cf93f1aa4 Merge branch '3.0.x'
Closes gh-35767
2023-06-07 09:08:54 +02:00
Steve Riesenberg
ba9f92fa86 Improve OAuth2 Client section of docs
* Add an OpenID Connect login client example
* Update redirect-uri examples to match Security docs and not require
  any customization
* Update client-authentication-method for Spring Security 6 usage
* Update provider configuration example to align with Spring
  Authorization Server
* Format Java DSL according to Spring Security docs
* Use Kotlin DSL
* Update redirection endpoint base uri example to use ant pattern

See gh-35679
2023-06-07 09:07:14 +02:00
Phillip Webb
1669b81af7 Add 'fromApplication' and 'with' Kotlin extension functions
Update `SpringApplicationExtensions.kt` with `fromApplication` and
`with` functions that make `SpringApplication.from(...)` easier to use
with Kotlin.

Fixes gh-35756
2023-06-05 21:49:41 -07:00
Yanming Zhou
e8659da59b Fix error in SSL bundle documentation
See gh-35665
2023-05-30 17:15:50 -05:00
Moritz Halbritter
eb9077df86 Document how to customize the JDBC parameters when using Docker Compose
Closes gh-35636
2023-05-26 13:28:40 +02:00
Andy Wilkinson
6a74f63143 Merge branch '3.0.x'
Closes gh-35634
2023-05-25 14:20:17 +01:00
Andy Wilkinson
a9f89a1e3c Merge branch '2.7.x' into 3.0.x
Closes gh-35633
2023-05-25 14:19:58 +01:00
Andy Wilkinson
f452a86175 Polish "Document audience support in Oauth2 resource server"
See gh-35286
2023-05-25 14:11:44 +01:00
Bikash Adhikari
13c5c6efb1 Document audience support in Oauth2 resource server
See gh-35286
2023-05-25 14:11:27 +01:00
Moritz Halbritter
b82e7a72b1 Move @Testcontainers before @SpringBootTest in documentation
Closes gh-35572
2023-05-23 09:33:25 +02:00
Stephane Nicoll
7a9bb55fdf Merge branch '3.0.x'
Closes gh-35589
2023-05-22 16:24:56 +02:00
Phillip Webb
060581d078 Remove pluggable docker compose ReadinessCheck
Remove pluggable `ReadinessCheck` interface and only use the
`TcpConnectServiceReadinessCheck` implementation for now. We
may re-introduce pluggable checks in a future version.

See gh-35544
2023-05-17 16:26:59 -07:00
Andy Wilkinson
1097164a0e Merge branch '3.0.x'
Closes gh-35457
2023-05-17 10:18:58 +01:00