2337 Commits

Author SHA1 Message Date
Phillip Webb
ad72411e2b Apply conventions plugin to all subprojects
Closes gh-42438
2024-09-24 14:26:32 -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
b4702612de Revert "Increase timeouts in ZipkinWebClientSenderTests"
This reverts commit 0aeea6f06940f94c5e80ec04bb7e53d881a8c910.

See gh-42375
2024-09-20 11:06:18 +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
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
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
b1db3ad8ae Clarify reason for deprecating autotime properties
Closes gh-41745
2024-09-09 15:25:23 +02:00
Phillip Webb
f1987e6f8b Update copyright year of changed files 2024-08-19 16:45:34 -07: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
4d66084c73 Add missing default value for aggregation-temporality property
Closes gh-41674
2024-08-01 14:23:17 +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
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
Moritz Halbritter
2605f86731 Polish BaggagePropagationIntegrationTests 2024-06-28 10:27:46 +02:00
Moritz Halbritter
3e98a932e0 Polish BaggagePropagationIntegrationTests 2024-06-27 11:30:04 +02:00
Phillip Webb
2a4582b084 Update copyright year of changed files 2024-06-19 22:54:40 -07: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
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
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
Brian Clozel
24f80154d4 Do not overwrite attributes in ClientObservationConventionAdapter
Prior to this commit, the `ClientObservationConventionAdapter` would
overwrite a request builder attribute. This would happen when the
request is not fully built when the observation starts. At that point,
the tags are built for long task timers, but not for the actual metric.
This effectively overrides the correct value of the URI template in the
builder.

This commit removes this builder update which was invalid in the first
place.

Fixes gh-40330
2024-04-12 16:31:02 +02:00
Andy Wilkinson
12e004f131 Revert "Exclude unwanted javax.inject dependency from Data Couchbase"
This reverts commit 06f5ab162f6b049f42f15c04d3a9a8810c0c6d63. The
dependency has been removed in Data Couchbase, making the exclude
unnecessary.

See gh-40200
2024-04-12 11:19:16 +01:00
Andy Wilkinson
1ea6f2f51f Revert "Revert "Exclude unwanted javax.inject dependency from Data Couchbase""
This reverts commit 3b76165f4e764300c58a52df9244ea9953abcc6f.

Turns out, the exclude's still needed for now? with Data Couchbase
5.1.x.

See gh-40200
2024-04-11 17:06:03 +01:00
Andy Wilkinson
7d3ea3f06f Merge branch '3.1.x' into 3.2.x
See gh-40212
2024-04-11 16:56:22 +01:00
Andy Wilkinson
3b76165f4e Revert "Exclude unwanted javax.inject dependency from Data Couchbase"
This reverts commit 06f5ab162f6b049f42f15c04d3a9a8810c0c6d63. The
dependency has been removed in Data Couchbase, making the exclude
unnecessary.

See gh-40200
2024-04-11 16:55:24 +01:00
Andy Wilkinson
3bb7baf90f Merge branch '3.1.x' into 3.2.x
See gh-40212
2024-04-09 09:07:52 +01:00
Andy Wilkinson
06f5ab162f Exclude unwanted javax.inject dependency from Data Couchbase
See gh-40200
2024-04-09 09:07:13 +01:00
Phillip Webb
12de6aa46a Merge branch '3.1.x' into 3.2.x 2024-02-21 15:27:27 -08:00
Phillip Webb
2c4909a89a Update copyright year of changed files 2024-02-21 13:58:53 -08:00
Brian Clozel
59693f2b12 Move "micrometer.observations.*" configuration properties
This commit moves the "micrometer.observations.*" configuration
properties to "management.observations.*" namespace, as it was
introduced in the wrong namespace initially.

The former configuration property is deprecated and will be removed in a
future version.

Fixes gh-39600
2024-02-16 15:03:18 +01:00
Moritz Halbritter
de35d2e443 Merge branch '3.1.x' into 3.2.x
Closes gh-39596
2024-02-16 09:28:39 +01:00
Moritz Halbritter
e2b29dc9cb Polish "Document default value for show-value configuration properties"
See gh-39589
2024-02-16 09:24:32 +01:00
lukasdooo
7ade54d304 Document default value for show-value configuration properties
See gh-39589
2024-02-16 09:21:55 +01:00
Moritz Halbritter
4387b79831 Merge branch '3.1.x' into 3.2.x 2024-02-12 10:18:46 +01:00
Moritz Halbritter
8ffcfc9b77 Harmonize style of igored exceptions across the codebase 2024-02-12 10:14:20 +01:00
Scott Frederick
cff9d464d3 Merge branch '3.1.x' into 3.2.x
Closes gh-39386
2024-02-02 16:05:32 -06:00
Stéphane Nicoll
c3664f372c Polish
See gh-39382
2024-02-02 16:02:50 -06:00
Phillip Webb
cff8cb98c7 Merge branch '3.1.x' into 3.2.x 2024-01-22 12:20:24 -08:00
Phillip Webb
9ddf15d97a Merge branch '3.1.x' into 3.2.x
Closes gh-39268
2024-01-22 11:50:40 -08:00
Phillip Webb
87ea2b75fb Polish 'Make PropagationType a public type'
See gh-39265
2024-01-22 11:49:45 -08:00
Vaibhav Jaiswal
16c0f035a9 Make PropagationType a public type
The PropagationType enum is returned from public methods so
should be public itself.

See gh-39265
2024-01-22 11:48:10 -08:00
Brian Clozel
46b7bd2f23 Add configuration property to enable micrometer annotations
Prior to this commit, the Micrometer annotations support (`@Timed`,
`@Counted`...) was guarded by the presence of both Micrometer and
AspectJ on the classpath.

This signal is too weak, considering the startup performance impact and
the fact that the AspectJ dependency can be brought transitively in many
cases.

This commit adds a new `micrometer.observations.annotations.enabled`
property that is set to `false` by default to only process the
annotations support when this property is enabled.

Fixes gh-39128
2024-01-15 13:51:15 +01:00
Andy Wilkinson
145fe15daf Merge branch '3.1.x' into 3.2.x
Closes gh-39122
2024-01-12 17:08:23 +00:00
Andy Wilkinson
3df77c67ec Fix request mapping of endpoint path-mapped to /
Closes gh-35426
2024-01-12 17:07:48 +00:00
Andy Wilkinson
6ec56da919 Ensure that reactive actuator security has an auth manager
This is a follow-on from afad358 and ensures that the auto-configured
security for Actuator in a WebFlux app has an authentication manager
to back its use of HTTP basic and form login.

Fixes gh-39069
2024-01-12 13:02:31 +00:00
Moritz Halbritter
a424ba2055 Restore configuration property for http requests names when using WebFlux
Closes gh-39083
2024-01-11 16:28:23 +01:00
Andy Wilkinson
7087897507 Merge branch '3.1.x' into 3.2.x
Closes gh-39091
2024-01-11 10:33:57 +00:00