root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
39,724 Commits 23 Branches 348 Tags 291 MiB
Commit Graph

39724 Commits

Author SHA1 Message Date
Scott Frederick 2e4529df27 Remove image banner smoke test 
See gh-28883
 2022-09-29 09:59:27 -05:00
Stephane Nicoll f9e53d81b2 Merge pull request #32534 from dreis2211 
* pr/32534:
  Use ByteArrayOutputStream.toString where possible

Closes gh-32534
 2022-09-29 15:03:34 +02:00
dreis2211 65ef8fc51a Use ByteArrayOutputStream.toString where possible 
See gh-32534
 2022-09-29 15:03:24 +02:00
Andy Wilkinson a036b30822 Merge branch '2.7.x' 2022-09-29 12:52:51 +01:00
Andy Wilkinson c31d99d3a0 Merge branch '2.6.x' into 2.7.x 2022-09-29 12:52:37 +01:00
Andy Wilkinson 8a93abfaaa Improve diagnostics when run does not produce expected logging 2022-09-29 12:52:02 +01:00
Andy Wilkinson 17953eeb33 Merge branch '2.7.x' 
Closes gh-32544
 2022-09-29 11:41:15 +01:00
Andy Wilkinson 3ef633b096 Merge branch '2.6.x' into 2.7.x 
Closes gh-32543
 2022-09-29 11:39:42 +01:00
Andy Wilkinson 84a25c7dcf Configure Log4j2 classpath overrides consistently 
Closes gh-32537
 2022-09-29 11:25:21 +01:00
Andy Wilkinson f10d696c46 Merge branch '2.7.x' 
Closes gh-32536
 2022-09-29 10:04:45 +01:00
Andy Wilkinson 9f5b7db553 Merge branch '2.6.x' into 2.7.x 
Closes gh-32535
 2022-09-29 10:04:19 +01:00
Andy Wilkinson be48f37a83 Fix LogbackMetrics auto-config test with Logback and Log4j2 on cp 
Closes gh-32533
 2022-09-29 10:03:52 +01:00
Stephane Nicoll fa0fcb3a41 Merge pull request #32526 from dreis2211 
* pr/32526:
  Remove unused MockReactiveWebServerFactory

Closes gh-32526
 2022-09-29 09:33:41 +02:00
dreis2211 388134713e Remove unused MockReactiveWebServerFactory 
See gh-32526
 2022-09-29 09:33:29 +02:00
Stephane Nicoll 9359760ee5 Merge pull request #32519 from dreis2211 
* pr/32519:
  Avoid usage of StringBuffer where possible

Closes gh-32519
 2022-09-29 09:32:59 +02:00
dreis2211 f0b4a65546 Avoid usage of StringBuffer where possible 
See gh-32519
 2022-09-29 09:29:10 +02:00
Andy Wilkinson 0bfa9cd704 Upgrade to Logback 1.4 and SLF4J 2.0 
Closes gh-12649
 2022-09-28 21:14:08 +01:00
Andy Wilkinson 05d2f3cc8e Merge pull request #32528 from marcingrzejszczak 
* gh-32528:
  Polish "Break cycles between Zipkin senders and HTTP client observation"
  Break cycles between Zipkin senders and HTTP client observation

Closes gh-32528
 2022-09-28 20:33:41 +01:00
Andy Wilkinson 574242b44f Polish "Break cycles between Zipkin senders and HTTP client observation" 
See gh-32528
 2022-09-28 20:28:11 +01:00
Marcin Grzejszczak b41ed44b60 Break cycles between Zipkin senders and HTTP client observation 
Previously, RestTemplateBuilder and WebClient.Builder beans were used
to create the HTTP client for sending out spans. Those same beans are
also instrumented for observability which results in a cycle.

This commit breaks the cycle by not using the application-web
builders to create the RestTemplate and WebClient's used by the Zipkin
senders. Instead, builders are created inline, with new callbacks
being introduced to allow the user to customize these Zipkin-specific
builders.

See gh-32528
 2022-09-28 20:11:44 +01:00
Andy Wilkinson 13c638ba39 Merge pull request #32529 from marcingrzejszczak 
* gh-32529:
  Polish "Prefer WebClient to RestTemplate for Zipkin's Sender"
  Prefer WebClient to RestTemplate for Zipkin's Sender

Closes gh-32529
 2022-09-28 19:07:40 +01:00
Andy Wilkinson 8c74b62888 Polish "Prefer WebClient to RestTemplate for Zipkin's Sender" 
See gh-32529
 2022-09-28 19:07:27 +01:00
Marcin Grzejszczak cd3b3d468a Prefer WebClient to RestTemplate for Zipkin's Sender 
Previously, a Webclient-based sender was only for reactive web
applications, falling back to a RestTemplate-based sender in all
other cases.

With this commit we now prefer to use WebClient if it is available,
irrespective of the web application type. The assumption is that
if the user has WebClient on the classpath, it's either a reactive
web application, or it's a servlet web application or non-web
application but WebClient is preferred.

See gh-32529
 2022-09-28 19:04:30 +01:00
Brian Clozel b325edbc55 Polish 
See gh-32484
 2022-09-27 22:45:46 +02:00
Brian Clozel eac50a8f0c Auto-configure Observation support for RestTemplate 
Prior to this commit, Spring Boot would auto-configure a customizer that
instruments `RestTemplate` through a `RestTemplateBuilder`. This would
install a request interceptor that instrumented client exchanges for
producing metrics.

As of spring-projects/spring-framework#28341, the instrumentation is
done at the `RestTemplate` level directly using the `Observation` API.
The `Tag` (now `KeyValue`) extraction, observation name and
instrumentation behavior now lives in the Spring Framework project.

This commit updates the auto-configuration to switch from Boot-specific
Metrics instrumentation to a generic Observation instrumentation.
As a migration path, some configuration properties are deprecated in
favor of the new `management.observations.*` namespace.

Closes gh-32484
 2022-09-27 22:19:01 +02:00
Andy Wilkinson 3acd9b80e8 Merge pull request #32480 from marcingrzejszczak 
* gh-32480:
  Polish "Add support for MDC, Context Propagation (via B3 and W3C), and Baggage"
  Add support for MDC, Context Propagation (via B3 and W3C), and Baggage

Closes gh-32480
 2022-09-27 17:13:44 +01:00
Andy Wilkinson 36a4b36ccb Polish "Add support for MDC, Context Propagation (via B3 and W3C), and Baggage" 
See gh-32480
 2022-09-27 16:47:09 +01:00
Marcin Grzejszczak 52d1436dc6 Add support for MDC, Context Propagation (via B3 and W3C), and Baggage 
See gh-32480
 2022-09-27 16:47:03 +01:00
Brian Clozel bf5bd4f91c Upgrade to SnakeYAML 1.33 
Closes gh-32522
 2022-09-27 14:51:04 +02:00
Andy Wilkinson 243075d3b2 Disable DevTools during AOT processing 
Closes gh-32517
 2022-09-27 11:13:38 +01:00
Andy Wilkinson 5449397463 Require micrometer-tracing-bridge-otel to auto-configure OTel 
Closes gh-32503
 2022-09-27 09:10:44 +01:00
Andy Wilkinson 6cc3619675 Require micrometer-tracing-bridge-brave to auto-configure Brave 
Closes gh-32502
 2022-09-27 08:35:22 +01:00
Stephane Nicoll fcafd2abdb Merge branch '2.7.x' 
Closes gh-32516
 2022-09-27 09:00:57 +02:00
Stephane Nicoll cb191dfec2 Merge branch '2.6.x' into 2.7.x 
Closes gh-32515
 2022-09-27 08:59:11 +02:00
Stephane Nicoll f415541afe Merge pull request #32476 from 1993heqiang 
* pr/32476:
  Remove redundant @ExtendWith(SpringExtension.class) for sample

Closes gh-32476
 2022-09-27 08:51:57 +02:00
heqiang 5db6cc1cba Remove redundant @ExtendWith(SpringExtension.class) for sample 
See gh-32476
 2022-09-27 08:49:46 +02:00
Stephane Nicoll bac1bfcd1c Merge branch '2.7.x' 
Closes gh-32514
 2022-09-27 08:41:35 +02:00
Stephane Nicoll eb4b0a3f3c Merge branch '2.6.x' into 2.7.x 
Closes gh-32513
 2022-09-27 08:41:20 +02:00
Stephane Nicoll 1928177da2 Merge pull request #32505 from micopiira 
* pr/32505:
  Polish "Use non-blocking API in CouchbaseReactiveHealthIndicator"
  Use non-blocking API in CouchbaseReactiveHealthIndicator

Closes gh-32505
 2022-09-27 08:37:23 +02:00
Stephane Nicoll 8f598f876b Polish "Use non-blocking API in CouchbaseReactiveHealthIndicator" 
See gh-32505
 2022-09-27 08:34:22 +02:00
Mico Piira f51c4c3df0 Use non-blocking API in CouchbaseReactiveHealthIndicator 
See gh-32505
 2022-09-27 08:31:57 +02:00
Stephane Nicoll 72fc1f0018 Merge branch '2.7.x' 
Closes gh-32512
 2022-09-27 08:30:44 +02:00
Stephane Nicoll 9a004a6508 Merge branch '2.6.x' into 2.7.x 
Closes gh-32511
 2022-09-27 08:30:37 +02:00
Stephane Nicoll 8a27f0b46c Merge pull request #32501 from izeye 
* pr/32501:
  Enable LoaderIntegrationTests with Java 19

Closes gh-32501
 2022-09-27 08:30:32 +02:00
Johnny Lim 975affc497 Enable LoaderIntegrationTests with Java 19 
See gh-32501
 2022-09-27 08:30:13 +02:00
Stephane Nicoll f6f545dbf1 Merge branch '2.7.x' 
Closes gh-32510
 2022-09-27 08:28:40 +02:00
Stephane Nicoll 33680e5acc Merge branch '2.6.x' into 2.7.x 
Closes gh-32509
 2022-09-27 08:28:15 +02:00
Stephane Nicoll 01cef2d7b6 Merge pull request #32504 from dreis2211 
* pr/32504:
  Polish "Avoid using JUnit 4 assertions"
  Avoid using JUnit 4 assertions

Closes gh-32504
 2022-09-27 08:27:52 +02:00
Stephane Nicoll 0457536d72 Polish "Avoid using JUnit 4 assertions" 
See gh-32504
 2022-09-27 08:24:03 +02:00
dreis2211 cee353fba6 Avoid using JUnit 4 assertions 
See gh-32504
 2022-09-27 08:11:47 +02:00