Commit Graph

9 Commits

Author SHA1 Message Date
Phillip Webb 4265a0bcc2 Reset `Startables` COUNTER when testing parallel startup
Closes gh-43369
2024-12-03 19:07:16 -08:00
Andy Wilkinson 70d2907351 Merge branch '3.2.x' into 3.3.x
Closes gh-42386
2024-09-19 19:06:12 +01:00
Andy Wilkinson 319e33f786 Make a single scrape attempt, protected by Awaitility
Using a single scrape attempt that is protected by Awaitility should
protect against instability of the OpenTelemetry Collector instance
running in the container and will hopefully stabilize the test.

This commit has also increased the timeout for a successful response
to 30 seconds and removed the configuration of the configuration of
the polling delay and interval as the values being set were the same
as the defaults.

Closes gh-42377
2024-09-19 19:06:05 +01:00
Moritz Halbritter 2a84fe5760 Merge branch '3.2.x' into 3.3.x
Closes gh-41857
2024-08-14 16:47:52 +02:00
Moritz Halbritter 1d45016d8c Upgrade to spring-javaformat 0.0.43
Closes gh-41853
2024-08-14 16:32:41 +02:00
Andy Wilkinson c642f6d268 Merge branch '3.2.x' into 3.3.x
Closes gh-41613
2024-07-25 16:16:35 +01:00
Andy Wilkinson b0d4f1d356 Merge branch '3.2.x' into 3.3.x
Closes gh-41257
2024-06-27 10:16:36 +01:00
Andy Wilkinson 6fbf08fa9a Update spring-boot-docker-compose to use docker-test plugin
See gh-41228
2024-06-26 19:46:03 +01:00
Andy Wilkinson 3f1f801461 Update spring-boot-testcontainers to use docker-test plugin
See gh-41228
2024-06-26 19:45:52 +01:00