Commit Graph

2523 Commits

Author SHA1 Message Date
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
Moritz Halbritter 2144a159f2 Remove spring-web dependency from ZipkinHttpClientSender
Closes gh-42160
2024-09-06 08:21:38 +02:00
Andy Wilkinson 9f79769030 Start building against Micrometer 1.14.0 snapshots
See gh-42137
2024-09-04 16:22:05 +01:00
Andy Wilkinson d756bf4e86 Upgrade build to Gradle 8.10
Closes gh-41980
2024-08-23 12:41:05 +01:00
Andy Wilkinson d71fe11d10 Try to stop test from being flaky
See gh-42005
See gh-41439
2024-08-23 12:06:08 +01:00
Phillip Webb 8418b18907 Use early static registration of EventPublishingContextWrapper
Add `OpenTelemetryEventPublisherApplicationListener` which uses a single
static `ContextStorage` wrapper which gets applied as early as possible.
The static wrapper is then updated as beans come and go.

By adding the wrapper early, we hope to avoid silent failures which
can occur if the `ContextStorage` gets initialized before the wrapper
is added.

Closes gh-41439
2024-08-21 15:35:06 -07:00
Phillip Webb f832dcfbdc Add @ConditionalOnAvailableEndpoint value alias
Closes gh-41969
2024-08-20 16:23:45 -07:00
Andy Wilkinson 73f71d5560 Rework Cloud Foundry actuator support behind a pluggable abstraction
Deprecate `EndpointExposure.CLOUD_FOUNDRY` and introduce an alternative
implementation based on a pluggable abstraction.

The new `EndpointExposureOutcomeContributor` interface may now be used
to influence `@OnAvailableEndpointCondition` exposure results. Several
infrastructure beans that previously used the condition have been
refactored to always be registered, but tolerate missing endpoints.

A new smoke test application has been added that demonstrates how the
abstraction can be used by a third-party.

Closes gh-41135

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2024-08-20 16:22:56 -07: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
Phillip Webb 890b4ede7a Further polish SslInfoContributor and SslHealthIndicator
See gh-41205
2024-08-19 16:44:43 -07:00
Moritz Halbritter 8665636e88 Fix casing
See gh-41205
2024-08-19 10:57:16 +02:00
Moritz Halbritter fd1472784e Polish "Add SslInfoContributor and SslHealthIndicator"
See gh-41205
2024-08-19 10:41:29 +02:00
Jonatan Ivanov 5e3796e814 Add SslInfoContributor and SslHealthIndicator
See gh-41205
2024-08-19 10:00:00 +02:00
Andy Wilkinson f78ec43dd6 Merge branch '3.3.x'
Closes gh-41891
2024-08-16 13:30:49 +01: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 810fbca34f Auto-configure remote fields on BraveBaggageManager
Closes gh-41884
2024-08-16 10:05:47 +02:00
Moritz Halbritter 46150bae89 Merge branch '3.3.x'
Closes gh-41858
2024-08-14 17:20:59 +02: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
Moritz Halbritter 0473ac1292 Fix consistency of method name
See gh-41460
2024-08-08 15:22:25 +02:00
Stéphane Nicoll 788417df7f Remove duplicate metadata for Enum default values
See gh-7562
2024-08-01 15:43:22 +02:00
Stéphane Nicoll e2a984c75f Merge branch '3.3.x'
Closes gh-41677
2024-08-01 14:28:40 +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 26be24acad Merge branch '3.3.x'
Closes gh-41671
2024-08-01 13:33:23 +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
Brian Clozel 627220554b Activate health probes in Cloud Foundry environments
This commit ensures that Health probes are automatically enabled when
the application runs on Cloud Foundry. This was already the case for
Kubernetes, but now that Cloud Foundry supports this feature we should
do the same.

Closes gh-39804
2024-07-26 11:08:46 +02:00
Andy Wilkinson f47ff3181a Merge branch '3.3.x'
Closes gh-41620
2024-07-25 18:31:44 +01: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 e201b94d4f Merge branch '3.3.x'
Closes gh-41616
2024-07-25 16:17:52 +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
Brian Clozel e8391f121e Add execution metadata to scheduled tasks actuator endpoint
As of spring-projects/spring-framework#24560, Spring provides additional
metadata for scheduled tasks:
* next execution time
* last execution outcome (including status, time and raised exception)

This commit leverages this information to enhance the existing
`scheduledtasks` Actuator endpoint.

Closes gh-17585
2024-07-25 09:26:50 +02:00
Phillip Webb 000600c68a Merge branch '3.3.x' 2024-07-22 18:41:53 +01:00
Phillip Webb 61dc82d836 Update copyright year of changed files 2024-07-22 18:16:19 +01:00
Andy Wilkinson cddf92e047 Polish "Deprecate @MockBean and @SpyBean"
See gh-39864
2024-07-12 13:49:11 +01:00
Jakob Wanger 24763940a0 Deprecate @MockBean and @SpyBean
- Deprecate Deprecate @MockBean and @SpyBean in favor of Spring
  Framework 6.2's @MockitoBean and @MockitoSpy
- Migrate usages of @MockBean and @SpyBean to @MockitoBean and
  @MockitoSpy

Signed-off-by: Jakob Wanger <jakobwanger@gmail.com>

See gh-39864
2024-07-12 12:18:01 +01:00
Andy Wilkinson 653443adc1 Revert "Merge pull request #41213 from timpeeters"
This reverts commit b4017f0ef4, reversing
changes made to 156237227c.

See gh-41213
2024-07-11 18:01:12 +01:00
Andy Wilkinson d9cebc4b17 Stop BaggagePropagationIntegrationTests from being flaky
Depending on what tests had already run, Otel tests in
BaggagePropagationIntegrationTests could fail due to missing baggage
related entries in the MDC. The entries were missing if Otel's
ContextStorageWrappers had been marked as initialized without an
EventPublishingContextWrapper containing event publisher that will
publish to Slf4JBaggageEventListener.

ContextStorageWrappers uses a static so this commit avoids to problem
by forking a new classpath in BaggagePropagationIntegrationTests. This
ensures that any previous static state in ContextStorageWrappers has
no effect upon BaggagePropagationIntegrationTests.
2024-07-10 14:10:43 +01:00
Andy Wilkinson 375b3b16a0 Remove APIs that were deprecated for removal in 3.4.0
Closes gh-41435
2024-07-10 13:31:21 +01:00
Andy Wilkinson d28f5ba113 Upgrade to Reactor Bom 2024.0.0-M3
Closes gh-41422
2024-07-09 16:07:04 +01:00
Moritz Halbritter abf923ee9a Polish "Add auto-configuration for OTLP gRPC format when using tracing"
See gh-41213
2024-07-04 09:53:30 +02:00
Peeters Tim EXT 6b50d6783b Add auto-configuration for OTLP gRPC format when using tracing
See gh-41213
2024-07-04 09:43:42 +02:00
Stéphane Nicoll 156237227c Migrate MockMvc tests to MockMvcTester
See gh-41198
2024-07-03 15:09:10 +02:00
Moritz Halbritter de001f5af1 Polish "Add standardized property to distinguish a group of applications"
See gh-39957
2024-07-03 11:54:49 +02:00
Jakob Wanger 8ddb77f628 Add standardized property to distinguish a group of applications
This adds a property to provide some indicator that a set of
applications are part of a larger "business application" so that they
can be viewed in metrics, portals, traces and more.

See gh-39957
2024-07-03 11:06:46 +02:00
Scott Frederick 17c5538062 Merge branch '3.3.x' 2024-07-01 11:24:00 -05:00
Scott Frederick 70e14d648d Polish documentation headings
Title case should be used in all headings.
2024-07-01 11:23:41 -05:00
Moritz Halbritter 7c3576bda8 Polish "Add ProxyConnectionFactoryCustomizer"
See gh-40555
2024-06-28 14:41:04 +02:00
Tadaya Tsuyukubo 75ae7c968a Add ProxyConnectionFactoryCustomizer
See gh-40555
2024-06-28 14:08:47 +02:00
Moritz Halbritter 9bd6ec59b7 Merge branch '3.3.x'
Closes gh-41267
2024-06-28 12:21:35 +02:00
Johnny Lim 5a387a85a9 Polish gh-40023
See gh-41208
2024-06-28 12:17:24 +02:00
Moritz Halbritter b292fd0e58 Merge branch '3.3.x' 2024-06-28 12:12:38 +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 70a5dc64f6 Add missing default value for management.otlp.logging.compression
See gh-40961
2024-06-28 08:48:07 +02:00
Moritz Halbritter cfa05716ef Polish "Provide auto configuration for OpenTelemetry Logs"
See gh-40961
2024-06-28 08:37:43 +02:00
Toshiaki Maki 2d6f2488b7 Provide auto configuration for OpenTelemetry Logs
See gh-40961
2024-06-27 18:16:53 +02:00
Moritz Halbritter 09650c8df5 Merge branch '3.3.x' 2024-06-27 11:45:05 +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
Moritz Halbritter f900d0ba4e Add properties to enable/disable tracing per exporter
There are now three new properties, which control the trace exporting on
a more fine-grained level:

- management.otlp.tracing.export.enabled
- management.wavefront.tracing.export.enabled
- management.zipkin.tracing.export.enabled

They default to null, and if set, take precedence over the global
management.metrics.enabled property.

Closes gh-34620
2024-06-21 09:05: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