Commit Graph

39707 Commits

Author SHA1 Message Date
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
Scott Frederick b191bf1c09 Merge branch '2.7.x'
Closes gh-32508
2022-09-26 14:19:22 -05:00
Scott Frederick 4ecc6656f3 Merge branch '2.6.x' into 2.7.x
Closes gh-32507
2022-09-26 14:18:47 -05:00
Scott Frederick 81598b51f9 Use task outputs in distZip Paketo system tests
Using the outputs from `distZip` and `bootDistZip` as input to the
`bootBuildImage` task instead of indirectly using the output file
path prevents Gradle warnings about implicit task dependencies.

Fixes gh-32506
2022-09-26 14:18:17 -05:00
Andy Wilkinson 0f44e69995 Merge branch '2.7.x'
Closes gh-32500
2022-09-26 13:15:39 +01:00
Andy Wilkinson 5124ae94ae Merge branch '2.6.x' into 2.7.x
Closes gh-32499
2022-09-26 13:15:11 +01:00
Andy Wilkinson cfac7f55a4 Correct annotations on BootBuildImage's file-based inputs
Closes gh-32495
2022-09-26 13:13:16 +01:00
Andy Wilkinson f9b12ca01a Upgrade to Log4j2 2.19.0
Closes gh-32498
2022-09-26 11:04:20 +01:00
Andy Wilkinson 7d583939ff Auto-configure stream template and env irrespective of listener type
Closes gh-32477
2022-09-23 17:28:17 +01:00
Andy Wilkinson 9d30de9966 Exclude all tools projects from the aggregated javadoc
Closes gh-31955
2022-09-23 16:44:57 +01:00
Andy Wilkinson f67db3d9ad Move spring-boot-cli into spring-boot-tools
Closes gh-32492
2022-09-23 16:44:57 +01:00
Stephane Nicoll 0c5d0ac717 Merge pull request #32489 from izeye
* pr/32489:
  Polish JavaVersionTests.currentJavaVersionNineteen()

Closes gh-32489
2022-09-23 17:26:55 +02:00
Johnny Lim 7f36fb155d Polish JavaVersionTests.currentJavaVersionNineteen()
See gh-32489
2022-09-23 17:25:12 +02:00
Andy Wilkinson 4a05230d5d Move spring-boot-properties-migrator into spring-boot-tools
Closes gh-32491
2022-09-23 16:18:30 +01:00
Stephane Nicoll bd8f53a989 Use Native Build Tools new goal name
Closes gh-32482
2022-09-23 14:51:38 +02:00
Andy Wilkinson 26eff5ae7a Publish ApplicationPreparedEvent before AOT processing abandons run 2022-09-23 12:02:25 +01:00
Madhura Bhave afce559050 Remove unused dependency from Maven integration test 2022-09-22 14:07:26 -07:00
Andy Wilkinson 6e3a87d315 Merge pull request #31255 from vpavic
* gh-31255:
  Migrate to AuthorizationFilter in Spring Security auto-config

Closes gh-31255
2022-09-22 13:54:36 +01:00