Commit Graph

2627 Commits

Author SHA1 Message Date
Andy Wilkinson 19c386040b Merge branch '3.4.x'
Closes gh-44698
2025-03-12 15:49:41 +00:00
Andy Wilkinson 59ddba1063 Merge branch '3.3.x' into 3.4.x
Closes gh-44697
2025-03-12 15:48:36 +00:00
Andy Wilkinson 9b15b4bce9 Consolidate mock web server factories
Closes gh-44674
2025-03-12 15:26:47 +00:00
Andy Wilkinson b61578d183 Merge branch '3.4.x'
Closes gh-44695
2025-03-12 12:54:27 +00:00
Andy Wilkinson 08b358e829 Merge branch '3.3.x' into 3.4.x
Closes gh-44694
2025-03-12 12:50:18 +00:00
Andy Wilkinson 3a6e4e9e58 Add checks for factories files
META-INF/spring.factories and META-INF/spring/aot.factories in the
main source set are now checked. The checks verify that:

- Each class listed in the values exists in the source set's output
- The classes are listed alphabetically
- Nested classes are identified using their binary name

Closes gh-44676
2025-03-12 12:44:18 +00:00
Stéphane Nicoll 3ea9c56ea0 Merge branch '3.4.x'
Closes gh-44685
2025-03-12 08:59:27 +01:00
Stéphane Nicoll 322191f288 Merge branch '3.3.x' into 3.4.x
Closes gh-44684
2025-03-12 08:58:58 +01:00
Andy Wilkinson 207c8f54ab Merge branch '3.4.x' 2025-03-07 17:02:36 +00:00
Andy Wilkinson 92a063faca Merge branch '3.3.x' into 3.4.x 2025-03-07 17:02:22 +00:00
Andy Wilkinson e30ae372e3 Move resources into same packages as documentation tests
See gh-44639
2025-03-07 17:01:58 +00:00
Andy Wilkinson ea7caf9b8f Merge branch '3.4.x'
Closes gh-44642
2025-03-07 10:38:59 +00:00
Andy Wilkinson ec985d260e Merge branch '3.3.x' into 3.4.x
Closes gh-44641
2025-03-07 10:37:19 +00:00
Andy Wilkinson edf3cb1421 Position endpoint documentation tests alongside endpoint's auto-config
Closes gh-44639
2025-03-07 10:28:04 +00:00
Dmytro Nosan b3f90337ec Polish OpenTelemetryResourceAttributesTests
See gh-44636

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-03-07 10:08:23 +01:00
Andy Wilkinson da5796f70c Merge branch '3.4.x'
Closes gh-44635
2025-03-06 18:35:16 +00:00
Andy Wilkinson ab66034e1b Merge branch '3.3.x' into 3.4.x
Closes gh-44634
2025-03-06 18:34:54 +00:00
Andy Wilkinson 67b0a26474 Improve structure of test resources in Actuator modules
Closes gh-44632
2025-03-06 18:31:35 +00:00
Stéphane Nicoll 0a84ebf9f1 Merge branch '3.4.x'
Closes gh-44626
2025-03-06 15:34:11 +01:00
Stéphane Nicoll e06244d007 Adapt EntityManagerFactoryBuilder to work with multiple data sources
This commit allows EntityManagerFactoryBuilder to provide the JPA
properties to use according to the DataSource used to build the
EntityManagerFactory. Previously the JPA properties were computed only
once based on the primary data source, which was a problem since its
default DDL setting may be different.

EntityManagerFactoryBuilder takes a function that provides the JPA
properties based on a data source, rather than the properties
themselves. Constructors with the previous variant have been deprecated
as a result.

Closes gh-44516
2025-03-06 15:33:53 +01:00
Moritz Halbritter 3fc07644ee Make auto-configured BatchSpanProcessor back off when the user defines their own
Closes gh-44601
2025-03-06 13:34:08 +01:00
Moritz Halbritter 7fd29cf7c6 Polish "Add support for OpenTelemetry's service.namespace"
See gh-44499
2025-03-06 09:56:09 +01:00
Vanio Begic cf2353bdb3 Add support for OpenTelemetry's service.namespace
See gh-44499

Signed-off-by: Vanio Begic <vanio.begic123@gmail.com>
2025-03-06 09:46:11 +01:00
Moritz Halbritter 4dabf16a06 Polish "Remove default value for OtlpMetricsProperties.url"
See gh-44493
2025-03-06 09:36:33 +01:00
Johnny Lim 75f72b6ee7 Remove default value for OtlpMetricsProperties.url
See gh-44493

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-03-06 09:32:14 +01:00
Moritz Halbritter ea87b9114d Polish "Remove support for URLConnectionSender"
See gh-44500
2025-03-06 09:17:23 +01:00
Vanio Begic 336fdff9df Remove support for URLConnectionSender
See gh-44500

Signed-off-by: Vanio Begic <vanio.begic123@gmail.com>
2025-03-06 09:00:16 +01:00
Moritz Halbritter 272939e45e Polish "Refine the handling of OpenTelemetry resource attributes"
See gh-44494
2025-03-03 09:35:56 +01:00
Dmytro Nosan e62d78ab11 Refine the handling of OpenTelemetry resource attributes
See gh-44494

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-03-03 09:28:46 +01:00
Moritz Halbritter 8f4e0518f3 Polish "Add support for OTel-specific environment variables"
See gh-44394
2025-02-28 14:52:10 +01:00
Dmytro Nosan bf015bfeb9 Add support for OTel-specific environment variables
This commit introduces the OpenTelementryAttributes class that fetches
OTEL_RESOURCE_ATTRIBUTES and OTEL_SERVICE_NAME environment variables
and merges it with user-defined resource attributes.

Besides that, this commit includes spec-compliant proper handling of
OTEL_RESOURCE_ATTRIBUTES in OtlpMetricsPropertiesConfigAdapter and
OpenTelemetryAutoConfiguration.

See gh-44394

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-28 14:52:10 +01:00
Andy Wilkinson 51885c9d38 Remove deprecated management.otlp.metrics.export.resource-attributes
It was deprecated in 3.2 and should have been removed in 3.4 so its
removal is overdue.

Closes gh-44468
2025-02-27 19:01:10 +00:00
Stéphane Nicoll ed5ec225a7 Merge branch '3.4.x'
Closes gh-44417
2025-02-24 08:04:36 +01:00
Phillip Webb 651a39b3f6 Merge branch '3.4.x' 2025-02-18 15:12:07 -08:00
Phillip Webb eeced8c629 Merge branch '3.3.x' into 3.4.x 2025-02-18 15:11:51 -08:00
Stéphane Nicoll cacb3d4820 Polish "Remove deprecated micrometer.observations.annotations.enabled"
See gh-44320
2025-02-18 11:22:39 +01:00
Johnny Lim 1c9bc7f336 Remove deprecated micrometer.observations.annotations.enabled
See gh-44320

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-18 11:20:07 +01:00
Moritz Halbritter dc4dbd1bf2 Rename management.server.accesslog.prefix
Closes gh-44196
2025-02-17 14:48:49 +01:00
Andy Wilkinson b2ba2a53fe Polish "Add support for MVC router functions to mappings endpoint"
See gh-44163
2025-02-13 11:18:17 +00:00
puppy4c a747bcf6d4 Add support for MVC router functions to mappings endpoint
See gh-44163

Signed-off-by: puppy4c <puppy4c@foxmail.com>
2025-02-13 10:52:23 +00:00
Andy Wilkinson 4c097b9841 Merge branch '3.4.x'
Closes gh-44257
2025-02-13 10:50:02 +00:00
Yanming Zhou 437fc028a0 Include non-default HikariDataSource candidates in metrics
See https://github.com/spring-projects/spring-boot/issues/43481#issuecomment-2655527313

See gh-44253

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-02-13 10:35:08 +00:00
Andy Wilkinson 1710ff4eb5 Merge branch '3.4.x'
Closes gh-44248
2025-02-12 21:52:30 +00:00
Andy Wilkinson 4cb9d816b9 Include non-default candidates in metrics and health
Previously, when Actuator expected to find multiple beans of the same
type, it used Map<String, Type> to inject them. Unfortunately, this
does not include beans that are not default candidates and there's
no way to request that autowiring includes such beans with Map-based
injection.

This commit switches from Map-based injection to querying the bean
factory for the desired beans. This is done using
SimpleAutowireCandidateResolver's new helper method,
resolveAutowireCandidates, that returns a Map<String, Type> of
beans including those that are not default candidates but excluding
those that are not autowire candidates.

Closes gh-43481
2025-02-12 21:44:41 +00:00
Phillip Webb 291e5d8bd3 Polish 2025-02-10 17:02:01 -08:00
Brian Clozel afcc780e61 Write TraceId in HTTP Response headers
Prior to this commit, the Micrometer instrumentation support would
auto-configure a `ServerHttpObservationFilter` for creating observations
in Spring MVC applications.

As of Spring Framework 6.2, applications can extend this filter class to
get notified of the observation scope being opened.
This commit contributes a new `TraceHeaderObservationFilter`
implementation that writes the current Trace Id (if present) to the
`X-Trace-Id` HTTP response header.

This feature is disabled by default, applications will need to enable
`management.observations.http.server.requests.write-trace-header`.
`
Closes gh-40857
2025-02-10 18:08:31 +01:00
Andy Wilkinson f5f888dbdd Polish
See gh-44197
2025-02-10 15:28:05 +00:00
Andy Wilkinson 62b217e0da Apply mgmt access log prefix to reactive Jetty, Tomcat, and Undertow
Fixes gh-44197
2025-02-10 14:53:35 +00:00
Andy Wilkinson ceaffaab4e Merge branch '3.4.x'
Closes gh-44192
2025-02-10 10:28:08 +00:00
Andy Wilkinson c3c7ed4c2e Fix class cast during additional path matching with health probes
Previously, when health probes were enabled, the post-processor of
AutoConfiguredHealthEndpointGroups resulted in the bean no longer
implementing AdditionalPathMapper. This then caused a
ClassCastException when working with AdditionalPathMapper beans
in EndpointRequest's additional path mapping support.

This commit updates the type returned by the post-processor to
implement both HealthEndpointGroups and AdditionalPathMapper, as
AutoConfiguredHealthEndpointGroups does. Its implementation of
getAdditionalPaths produces a result that combines both the
additional paths of the original HealthEndpointGroups bean and its
own additional paths for the probes.

Fixes gh-44052
2025-02-10 10:01:19 +00:00