Commit Graph

2497 Commits

Author SHA1 Message Date
Andy Wilkinson 83afef4f60 Start building against Micrometer 1.14.0 snapshots
See gh-42555
2024-10-09 17:10:00 +01:00
Moritz Halbritter e6165b0311 Add transport and connect timeout properties for OTLP logging
Closes gh-42528
Closes gh-42527
2024-10-08 16:01:09 +02:00
Moritz Halbritter b997c0c53a Add connect timeout properties for OTLP tracing
- Rename OtlpProperties to OtlpTracingProperties

See gh-41460
See gh-42528
2024-10-08 16:01:08 +02:00
Moritz Halbritter 40bb81419d Rename OtlpAutoConfiguration to OtlpTracingAutoConfiguration
Closes gh-42529
2024-10-08 15:56:18 +02:00
Moritz Halbritter fdcc8d9d1f Rename OtlpProperties to OtlpMetricsProperties
See gh-41460
2024-10-08 15:51:25 +02:00
Johnny Lim 1585c5a109 Polish
See gh-42503
2024-10-03 07:33:40 +02:00
Andy Wilkinson 6aa5ed705a Merge branch '3.3.x'
Closes gh-42499
2024-10-02 13:47:39 +01:00
Andy Wilkinson 93e5b3a0ff Deprecate ControllerEndpointHandlerMapping for MVC and WebFlux
Closes gh-42498
2024-10-02 13:46:57 +01:00
Andy Wilkinson fae3cd1ca5 Harmonize configuration properties that accept a list of values
Closes gh-42478
2024-10-02 10:56:15 +01:00
Johnny Lim 3882dcc2fa Polish
See gh-42457
2024-09-27 12:13:36 +02:00
Moritz Halbritter 593d2cccc4 Polish "Add support for virtual threads in OtlpMetricRegistry configuration"
See gh-42407
2024-09-26 13:42:39 +02:00
Mike Turbe e615eb313a Add support for virtual threads in OtlpMetricRegistry configuration
See gh-42407
2024-09-26 13:26:30 +02:00
Phillip Webb 7b3077280c Merge branch '3.3.x'
Closes gh-42441
2024-09-24 14:32:48 -07:00
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 3952d63369 Revert "Merge branch '3.3.x'"
This reverts commit ba0ef11b6b, reversing
changes made to d380ada4b2.

See gh-42389
2024-09-20 11:08:37 +01:00
Andy Wilkinson 391b643d8d Revert "Merge branch '3.2.x' into 3.3.x"
This reverts commit d86160d362, reversing
changes made to 70d2907351.

See gh-42388
2024-09-20 11:07:30 +01:00
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 4a7d6c445a Merge branch '3.3.x'
Closes gh-42398
2024-09-20 10:33:17 +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 ba0ef11b6b Merge branch '3.3.x'
Closes gh-42389
2024-09-19 19:10:06 +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
Andy Wilkinson 6346d4fd6b Accommodate absence of last execution
A task's last execution is absent if it has not yet been executed.
This commit updates the documentation test to accommodate this
possibility.

See gh-42351
2024-09-19 12:03:04 +01:00
Phillip Webb d72a9d9eb5 Allow EndpointRequest to match additional paths
Add `toAdditionalPaths(...)` methods on the servlet and reactive
`EndpointRequest` classes to support matching of additional paths.

A new `AdditionalPathsMapper` interface provides the mappings between
endpoint IDs and any additional paths that they might use. The existing
`AutoConfiguredHealthEndpointGroups` class has been updated to implement
the interface.

Auto-configurations have also been updated so that additional health
endpoint paths (typically `/livez` and `/readyz`) are permitted
when using Spring Security without any custom configuration.

Fixes gh-40962
2024-09-18 23:47:13 -07:00
Andy Wilkinson 713afae013 Accommodate next execution time being unknown
A task's next execution time is unknown if, for example, it's
currently running. When it's unknown the nextExecution.time will be
missing from the json describing the task. This commit updates the
documentation test to accommodate this possibility.

Closes gh-42351
2024-09-18 11:55:35 +01:00
Johnny Lim a0d1c10d8a Polish
See gh-42340
2024-09-18 11:19:59 +02:00
Stéphane Nicoll eff76131fb Merge branch '3.3.x'
Closes gh-42323
2024-09-16 09:45:30 +02: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
Phillip Webb 06e3f37afd Polish 2024-09-11 15:06:37 -07:00
Phillip Webb 81853d4ae4 Use early static registration of EventPublishingContextWrapper in tests
Add `OpenTelemetryEventPublisherBeansTestExecutionListener` JUnit
class to automatically trigger early addition of the `ContextStorage`
wrapper. The listener has also been updated with a static `addWrapper()`
method that can be called directly for other test frameworks.

Closes gh-42005
2024-09-10 23:05:47 -07:00
Andy Wilkinson bcb2049c40 Polish OpenTelemetryTracingAutoConfiguration 2024-09-10 09:12:11 +01:00
Phillip Webb e5fde685d4 Rename OpenTelemetryAutoConfiguration in tracing package
Deprecate and replace `OpenTelemetryAutoConfiguration` with
`OpenTelemetryTracingAutoConfiguration`.

Closes gh-41991
2024-09-09 20:06:23 -07:00
Stéphane Nicoll eb8fe66cb8 Merge branch '3.3.x'
Closes gh-42194
2024-09-09 15:42:31 +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
Stéphane Nicoll 6cd6f75664 Add configuration support for ExponentialHistogram in OTLP Registry
Closes gh-41837
2024-09-06 15:59:45 +02:00
Moritz Halbritter 861e5209ef Add transport selection to OtlpLoggingConnectionDetails
Closes gh-42171
2024-09-06 14:26:03 +02:00
Moritz Halbritter bac330354b Polish "Support Otlp Tracing's GRPC port from service connections"
See gh-41333
2024-09-06 13:18:26 +02:00
Eddú Meléndez 7baa553760 Support Otlp Tracing's GRPC port from service connections
Otlp Tracing's exporter is configured using Transport. Current support
for service connections read the mapped port for HTTP transport 4318.
This commits adds support to read port for GRPC transport 4317.

See gh-41333
2024-09-06 13:18:26 +02:00
Stéphane Nicoll 3651ff87cd Reinstate auto-configuration support for embedded ActiveMQ
This commit restores auto-configuration for using an Embedded broker
with ActiveMQ classic.

Contrary to its 2.7.x version, "spring-boot-starter-activemq" no longer
adds the broker for consistency with Artemis, and to keep the existing
3.x behavior. Rather than "inMemory", a "s.a.embedded.enabled"
property has been reintroduced that matches the name used by Artemis.

The documentation has been updated to mention that the broker
dependency must be added to use it.

Closes gh-38404
2024-09-06 11:34:35 +02:00
Moritz Halbritter 9a81796e62 Polish "Reapply "Merge pull request #41213 from timpeeters""
See gh-41213
2024-09-06 09:57:45 +02:00
Moritz Halbritter e39d9434ea Reapply "Merge pull request #41213 from timpeeters"
This reverts commit 653443adc1.

See gh-41213
2024-09-06 09:45:43 +02:00
Moritz Halbritter 1679a72b0e Remove spring-web dependency from ZipkinHttpClientSender
Closes gh-42161
2024-09-06 08:46:20 +02:00
Moritz Halbritter dc428e3fc9 Fix deprecations for OpenTelemetry in tests 2024-09-06 08:30:44 +02:00