2419 Commits

Author SHA1 Message Date
Phillip Webb
100bedc07d Merge branch '3.2.x' into 3.3.x
Closes gh-42440
2024-09-24 14:29:09 -07:00
Phillip Webb
ad72411e2b Apply conventions plugin to all subprojects
Closes gh-42438
2024-09-24 14:26:32 -07:00
Phillip Webb
72f379a5b2 Merge branch '3.2.x' into 3.3.x
Closes gh-42434
2024-09-24 13:01:05 -07:00
Phillip Webb
eafe61c4ca Backport upgrade to Gradle 8.10.1
Cherry-pick commits d756bf4e86, 083ac67d13 and 162c929a80 to
upgrade to Gradle 8.10.1.

Closes gh-42433
2024-09-24 12:55:29 -07:00
Andy Wilkinson
391b643d8d Revert "Merge branch '3.2.x' into 3.3.x"
This reverts commit d86160d362ddf3d848d7134993a6e51b36536d67, reversing
changes made to 70d2907351bc8aa48c82a6484744a0a633a55e35.

See gh-42388
2024-09-20 11:07:30 +01:00
Andy Wilkinson
b4702612de Revert "Increase timeouts in ZipkinWebClientSenderTests"
This reverts commit 0aeea6f06940f94c5e80ec04bb7e53d881a8c910.

See gh-42375
2024-09-20 11:06:18 +01:00
Andy Wilkinson
a1593585e3 Merge branch '3.2.x' into 3.3.x
Closes gh-42397
2024-09-20 10:33:02 +01:00
Andy Wilkinson
267a642e0f Reduce duplicate binding of meters to user-defined composites
Fixes gh-42396
2024-09-20 10:32:20 +01:00
Andy Wilkinson
d86160d362 Merge branch '3.2.x' into 3.3.x
Closes gh-42388
2024-09-19 19:09:52 +01:00
Andy Wilkinson
0aeea6f069 Increase timeouts in ZipkinWebClientSenderTests
This is an attempt to stabilize the tests. They are currently flaky
due to a timeout that appears to occur because the mock web server isn't
responding quickly enough. A larger timeout will either confirm this if
the tests stabilize or indicate that the problem has a different cause
if they do not stabilize.

Closes gh-42375
2024-09-19 19:06:53 +01:00
Stéphane Nicoll
04891746ff Merge branch '3.2.x' into 3.3.x
Closes gh-42322
2024-09-16 09:45:23 +02:00
Stéphane Nicoll
78a140ae25 Polish "Use DataSource.unwrap to get routing data source"
See gh-42313
2024-09-16 09:37:22 +02:00
Dmytro Nosan
3f9f0490a6 Use DataSource.unwrap to get routing data source
This commit uses DataSource.isWrapperFor and DataSource.unwrap to detect
if a DataSource is an AbstractRoutingDataSource. Previously, it relied
on instanceof which does not account for cases where the datasource has
been proxied.

See gh-42313
2024-09-16 09:28:46 +02:00
Stéphane Nicoll
0cef42c2b1 Merge branch '3.2.x' into 3.3.x
Closes gh-42193
2024-09-09 15:42:22 +02:00
Stéphane Nicoll
b1db3ad8ae Clarify reason for deprecating autotime properties
Closes gh-41745
2024-09-09 15:25:23 +02:00
Moritz Halbritter
1679a72b0e Remove spring-web dependency from ZipkinHttpClientSender
Closes gh-42161
2024-09-06 08:46:20 +02:00
Phillip Webb
1d337b7c76 Merge branch '3.2.x' into 3.3.x 2024-08-19 16:46:51 -07:00
Phillip Webb
f1987e6f8b Update copyright year of changed files 2024-08-19 16:45:34 -07:00
Andy Wilkinson
d4762eca22 Auto-configure SBOM endpoint web extension when only exposed on CF
Fixes gh-41890
2024-08-16 13:25:01 +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
Stéphane Nicoll
c27209085c Merge branch '3.2.x' into 3.3.x
Closes gh-41676
2024-08-01 14:27:20 +02:00
Stéphane Nicoll
4d66084c73 Add missing default value for aggregation-temporality property
Closes gh-41674
2024-08-01 14:23:17 +02:00
Stéphane Nicoll
479e88ea89 Merge branch '3.2.x' into 3.3.x
Closes gh-41670
2024-08-01 13:33:13 +02:00
Stéphane Nicoll
b9d8bc4715 Add missing default value for client-provider-type property
Closes gh-41666
2024-08-01 13:26:17 +02:00
Andy Wilkinson
4c9013fe0d Polish "Deprecate ControllerEndpointsSupplier and ExposableControllerEndpoint"
See gh-41596
2024-07-25 18:31:28 +01:00
cms04
e35016422a Deprecate ControllerEndpointsSupplier and ExposableControllerEndpoint
See gh-41596
2024-07-25 18:31:27 +01: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
5f666eec5b Reduce warnings reported by Eclipse
Closes gh-41598
2024-07-25 14:55:00 +01:00
Phillip Webb
61dc82d836 Update copyright year of changed files 2024-07-22 18:16:19 +01:00
Scott Frederick
70e14d648d Polish documentation headings
Title case should be used in all headings.
2024-07-01 11:23:41 -05:00
Johnny Lim
5a387a85a9 Polish gh-40023
See gh-41208
2024-06-28 12:17:24 +02:00
Moritz Halbritter
448089f935 Merge branch '3.2.x' into 3.3.x 2024-06-28 12:10:24 +02:00
Moritz Halbritter
2605f86731 Polish BaggagePropagationIntegrationTests 2024-06-28 10:27:46 +02:00
Moritz Halbritter
b2ddea74ee Merge branch '3.2.x' into 3.3.x 2024-06-27 11:36:30 +02:00
Moritz Halbritter
3e98a932e0 Polish BaggagePropagationIntegrationTests 2024-06-27 11:30:04 +02:00
Phillip Webb
9dda006a18 Merge branch '3.2.x' 2024-06-19 22:55:00 -07:00
Phillip Webb
2a4582b084 Update copyright year of changed files 2024-06-19 22:54:40 -07:00
Moritz Halbritter
3c37e4557c Use properties from Prometheus config in PrometheusScrapeEndpoint
Closes gh-40904
2024-06-11 14:38:18 +02:00
Moritz Halbritter
d98987f11e Merge branch '3.2.x'
Closes gh-40701
2024-05-13 11:31:55 +02:00
Moritz Halbritter
364af04377 Merge branch '3.1.x' into 3.2.x
Closes gh-40700
2024-05-13 11:30:42 +02:00
Yanming Zhou
0e450d602d Use CollectionUtils.isEmpty() and StringUtils.hasLength()
See gh-40645
2024-05-13 11:26:56 +02:00
Johnny Lim
9eeddbe89e Add metadata for default value of management.zipkin.tracing.encoding
See gh-40588
2024-05-02 09:46:53 +02:00
Andy Wilkinson
592571c16e Merge branch '3.2.x'
Closes gh-40528
2024-04-26 09:34:00 +01:00
Andy Wilkinson
087e467387 Merge branch '3.1.x' into 3.2.x
Closes gh-40527
2024-04-26 09:33:12 +01:00
Andy Wilkinson
83f692237d Migrate to com.gradle.develocity plugin
Closes gh-40153
2024-04-26 09:30:48 +01:00
Phillip Webb
ec10673b48 Merge branch '3.2.x'
Closes gh-40483
2024-04-22 17:57:05 -07:00
Phillip Webb
5c9d5e262f Merge branch '3.1.x' into 3.2.x
Closes gh-40482
2024-04-22 17:56:52 -07:00
Phillip Webb
3e5d6c9cce Register ServiceLevelObjectiveBoundary reflection hinds
Register hints for `ServiceLevelObjectiveBoundary` so that the `valueOf`
method can be used when binding in a native image.

Fixes gh-40480
2024-04-22 17:56:11 -07:00
Phillip Webb
6963bd884b Merge branch '3.2.x' 2024-04-18 12:53:26 -07:00