Andy Wilkinson
b4702612de
Revert "Increase timeouts in ZipkinWebClientSenderTests"
...
This reverts commit 0aeea6f069
.
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
Brian Clozel
647a5ec6be
Deprecate framework-specific @*Endpoint annotations
...
Prior to this commit, applications could declare Actuator Endpoints
using web framework-specific annotations, such as `@ServletEndpoint`,
@ControllerEndpoint and @RestControllerEndpoint.
Such annotations are closely tied to the programming model of specific
web technologies, such as Servlet or Spring MVC. Unlike other
`@Endpoint` support, they are not portable and will not work
transparently over blocking/reactive and transports.
Because of the strong adherence of this support with the underlying
infrastructure, it makes it impossible to evolve the implementation of
Actuator support without breaking this use case. The reference
documentation has been advocating for using `@Endpoint` and
`@*Operation` for custom endpoints for a long time now.
This commit deprecates this specific support in favor of the recommended
approach.
Closes gh-31768
2024-04-15 18:58:52 +02: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 06f5ab162f
. 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 3b76165f4e
.
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
93c8513a78
Merge branch '3.2.x'
...
See gh-40224
2024-04-11 16:56:41 +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 06f5ab162f
. 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
3699bcfb87
Merge branch '3.2.x'
...
See gh-40224
2024-04-09 09:09:12 +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
Moritz Halbritter
ce358c601b
Polish "Auto-config support for latest Prometheus client and simpleclient"
...
See gh-40023
2024-04-05 10:45:14 +02:00
Tommy Ludwig
7f26b67e61
Auto-config support for latest Prometheus client and simpleclient
...
Deprecates the support for simpleclient but ensures that it can work in
conjunction with support for the latest Prometheus client
auto-configuration.
This involves breaking changes to update public classes to support the
latest Prometheus client. Deprecated support for Prometheus simpleclient
is provided in renamed classes.
See gh-40023
2024-04-05 10:12:52 +02:00
Phillip Webb
10260c084b
Rename Antora component from spring-boot to boot
...
Closes gh-40131
2024-03-28 13:21:27 -07:00
Scott Frederick
ad79c373f8
Add SNI support to web server SSL auto-configuration
...
Properties under `server.ssl.server-name-bundles` and
`management.server.ssl.server-name-bundles` can be used to configure
mappings of host names to SSL bundles to support SNI in embedded web
servers.
Closes gh-26022
2024-03-28 14:12:20 -05:00
Phillip Webb
af0353ddd3
Remove anchor-rewrite.properties
...
Remove `anchor-rewrite.properties` now that we have `rewrite.adoc` to
replace them.
See gh-40062
2024-03-26 11:27:03 -07:00
Moritz Halbritter
c662e9b6ff
Add configuration property to disable long timers in Micrometer Observations
...
Set management.observations.long-task-timer.enabled = false to disable
the LongTaskTimer creation.
Closes gh-39618
2024-03-26 11:12:39 +01:00
Moritz Halbritter
2d9b1ad592
Use xref for documentation links
...
Closes gh-33745
2024-03-26 10:11:47 +01:00
Moritz Halbritter
de150daf12
Upgrade Cassandra driver to 4.18.0 and change coordinates
...
Closes gh-39090
2024-03-26 08:58:22 +01:00
Phillip Webb
6bb6a798ce
Set version to `true` in antora.yml to allow docs generation
...
See gh-33766
2024-03-25 08:52:51 -07:00
Johnny Lim
12b4353e28
Polish
...
See gh-40034
2024-03-22 11:06:34 +01:00
Moritz Halbritter
4047c00aa5
Implement SBOM actuator endpoint
...
Closes gh-39799
2024-03-21 18:06:48 -07:00
Phillip Webb
f35d6b6bd6
Migrate actuator-autoconfigure to Antora
...
See gh-33766
2024-03-20 15:21:22 -07:00
Matt Pavlovich
af18a69d54
Use activemq-client instead of transitional activemq-client-jakarta
...
See gh-40028
2024-03-20 11:02:01 +00:00
Phillip Webb
b4208edd4e
Attempt to fix flaky Zipkin test
...
Update `ZipkinHttpClientSenderTests` to use one mock server per test
rather than a shared static. For some reason the mock server sometimes
seems to get itself in a deadlock state which causes the client to
fail with a `HttpTimeoutException`.
2024-03-18 15:03:59 -07:00
Andy Wilkinson
a01e068059
Start building against Micrometer 1.13.0 snapshots
...
See gh-39889
2024-03-12 09:28:27 +00:00
Stéphane Nicoll
4dfbeaf93f
Simplify injection points declaration
...
This commit simplifies the generics used for SessionRepository and
FindByIdNameSessionRepository as their type signatures already declare
that `S` extends from `Session`.
See gh-39751
2024-02-27 13:46:59 -06:00
Phillip Webb
e6fe273105
Polish
2024-02-21 16:38:48 -08:00
Phillip Webb
f8a1dae835
Merge branch '3.2.x'
2024-02-21 15:27:57 -08: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
Moritz Halbritter
ed4d13a8bf
Move zipkin.Span types in the OpenTelemetry auto-configuration
...
Brave can work without zipkin2 on the classpath, OpenTelemetry can't.
To not force users to have zipkin2 on the classpath, move it into the
OpenTelemetry auto-configuration.
See gh-39049
2024-02-21 10:07:25 +01:00
Moritz Halbritter
013e148526
Implement JDK HttpClient based Zipkin sender
...
Closes gh-39545
2024-02-20 14:21:44 +01:00
Moritz Halbritter
7555f6c71e
Polish "Migrate to Brave 6 and Zipkin Reporter 3"
...
See gh-39049
2024-02-20 13:42:27 +01:00
Adrian Cole
4b0bed23b0
Migrate to Brave 6 and Zipkin Reporter 3
...
Signed-off-by: Adrian Cole <adrian@tetrate.io>
See gh-39049
2024-02-20 12:00:36 +01:00
Moritz Halbritter
3a565e4e4b
Use Jersey's ObservationRequestEventListener for Jersey observability
...
Closes gh-39633
2024-02-20 11:46:14 +01:00
Brian Clozel
77922af3ba
Merge branch '3.2.x'
...
Closes gh-39603
2024-02-16 15:10:14 +01: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
2280aa30cb
Merge branch '3.2.x'
...
Closes gh-39597
2024-02-16 09:29:27 +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
7f55cae90f
Merge branch '3.2.x'
2024-02-12 10:19:46 +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
Andy Wilkinson
1f7a983701
Switch to jersey-micrometer for Jersey metrics
...
Closes gh-39502
2024-02-09 14:22:55 +00:00
Scott Frederick
d216474ef0
Merge branch '3.2.x'
...
Closes gh-39387
2024-02-02 16:07:03 -06: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
Wzy19930507
dae3952144
Include the environment default profiles in the env endpoint's response
...
See gh-39257
2024-01-30 13:51:17 +01:00
Phillip Webb
8f1a330dd5
Update copyright header of cleaned up code
...
See gh-39259
2024-01-23 10:18:50 -08:00
Tobias Lippert
ac5a08a49b
Avoid redundant boxing
...
See gh-39259
2024-01-23 10:18:49 -08:00
Tobias Lippert
def7523398
Inline redundant if statements
...
See gh-39259
2024-01-23 09:07:35 -08:00
Tobias Lippert
9cdd0c3776
Remove unnecessary semicolons
...
See gh-39259
2024-01-23 09:07:29 -08:00
Phillip Webb
a0a804cfdf
Merge branch '3.2.x'
2024-01-22 12:20:41 -08:00
Phillip Webb
cff8cb98c7
Merge branch '3.1.x' into 3.2.x
2024-01-22 12:20:24 -08:00