2748 Commits

Author SHA1 Message Date
Moritz Halbritter
1cf4acfd1b Merge branch '3.4.x'
Closes gh-45921
2025-06-12 12:15:45 +02:00
Shekhar Aggarwal
dcd3a23d02 Add SSL response structure to actuator info endpoint documentation
See gh-45792

Signed-off-by: Shekhar Aggarwal <aggarwalshekhar99@gmail.com>
2025-06-12 12:03:24 +02:00
Andy Wilkinson
3e3be2b407 Polish 2025-06-10 11:07:38 +01:00
Andy Wilkinson
9a1ca2fe83 Stop ignoring prefixed environment variables in management context
Binding in the child context does not work correctly when an
environment prefix has been configured. The prefix is not applied
to the child context's Environment and, therefore, prefixed
environment variables are ignored during binding.

We can fix the problem by reusing the parent context's
ManagementServerProperties rather than binding them again in the
child context. Doing so will fix the problem reported in gh-45857
that was introduced in 020fd7b and will also avoid an unnecessary
second binding of the properties.

gh-45858 may fix the problem more generally by applying the prefix
to the child context's environment. This would benefit situations
where the properties need to be bound in the child context because
they haven't already been bound in the parent.

Closes gh-45847
2025-06-10 10:31:37 +01:00
Andy Wilkinson
abc0077140 Remove redundant test
Support for Zipkin export using a RestTemplate- or WebClient-based
sender was deprecated in 3.3 and then removed in 3.5. This made
redundant the tests that checked there was no cycle when using
RestTemplate or WebClient.

Closes gh-45847
2025-06-09 16:21:28 +01:00
Phillip Webb
564b65bc78 Permit write and delete operations on Cloud Foundry with Spring Security
Update `CloudFoundryActuatorAutoConfiguration` so that CSRF protection
is ignored for Cloud Foundry endpoint requests. This aligns with the
behavior of Spring Boot 3.4 where `ignoring()` was used for security
configuration. With the migration to `permitAll()` we now need
additional CSRF configuration.

Fixes gh-45848
2025-06-09 10:50:19 +01:00
Andy Wilkinson
56760ea365 Merge branch '3.4.x'
Closes gh-45804
2025-06-06 09:58:53 +01:00
Andy Wilkinson
086646100f Merge branch '3.4.x'
Closes gh-45803
2025-06-06 09:58:02 +01:00
Andy Wilkinson
954ae300b0 Stop relying on CloudFoundry in HealthEndpointAutoConfigurationTests
Closes gh-45721
2025-06-06 09:37:07 +01:00
Andy Wilkinson
6f1216c369 Use ConditionContext ClassLoader to load OutcomeExposureContributors
Fixes gh-45800
2025-06-06 09:37:07 +01:00
Phillip Webb
a9b52c5892 Merge branch '3.4.x' 2025-06-02 17:30:05 -07:00
Phillip Webb
e054aa899a Merge branch '3.3.x' into 3.4.x 2025-06-02 17:20:04 -07:00
Andy Wilkinson
76caa3cb29 Fix problems found by improved auto-configuration checks 2025-06-02 17:15:50 -07:00
Phillip Webb
644aeabf7b Polish 2025-06-02 13:38:37 -07:00
Stéphane Nicoll
9a8dcec36f Merge branch '3.4.x'
Closes gh-45736
2025-06-02 16:18:01 +02:00
Stéphane Nicoll
3595c7aa0a Run ManagementErrorPageCustomizer after core factory customizer
This commit orders ManagementErrorPageCustomizer so that is runs after
ManagementWebServerFactoryCustomizer. Previously, they had the same
order and could run either way.

Closes gh-45728
2025-06-02 16:11:41 +02:00
Stéphane Nicoll
ad862dbbfb Merge branch '3.4.x'
Closes gh-45712
2025-05-28 14:46:44 +02:00
Stéphane Nicoll
2bdbc1f8d2 Use RestClient in Spring MVC integration tests
Closes gh-45711
2025-05-28 14:44:22 +02:00
Stéphane Nicoll
e46c0ea7fc Merge branch '3.4.x'
Closes gh-45667
2025-05-25 09:52:41 +02:00
Stéphane Nicoll
7840a330e6 Polish "Harmonize Otlp*Configurations"
See gh-45643
2025-05-25 09:45:27 +02:00
Yanming Zhou
43d2abbcc6 Harmonize Otlp*Configurations
See gh-45643

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-05-25 09:45:07 +02:00
Phillip Webb
46e4f8bb1c Fix process into documentation to include virtual threads
See gh-45631
2025-05-20 18:09:30 -07:00
Lari Hotari
a9f5a4194e Make heapdump endpoint restricted by default
See gh-45624

Signed-off-by: Lari Hotari <lhotari@users.noreply.github.com>
2025-05-20 17:22:51 -07:00
Phillip Webb
ab162fa0bb Remove SSL status tag from metrics
Update `SslMeterBinder` to the status tag is no longer included in the
reported metrics. Instead the expiry date should be used directly by
the monitoring system.

Closes gh-45602
2025-05-20 17:17:53 -07:00
Phillip Webb
8070701b5c Merge branch '3.4.x' 2025-05-20 15:20:55 -07:00
Phillip Webb
004ae93df6 Fix process into documentation to include garbage collectors
See gh-45631
2025-05-20 15:19:30 -07:00
Phillip Webb
db68aea314 Polish 2025-05-20 15:19:02 -07:00
Phillip Webb
df2d0ec420 Merge branch '3.4.x'
Closes gh-45634
2025-05-20 14:38:41 -07:00
Phillip Webb
41be61da15 Merge branch '3.3.x' into 3.4.x
Closes gh-45633
2025-05-20 14:38:35 -07:00
Phillip Webb
5690791261 Document the java info contribution
Closes gh-45566
2025-05-20 14:37:44 -07:00
Phillip Webb
aa9cc4ae0e Fix errors accidentally added to InfoEndpointDocumentationTests 2025-05-20 14:26:11 -07:00
Phillip Webb
2dfe9de981 Merge branch '3.4.x' 2025-05-20 13:59:08 -07:00
Phillip Webb
7d8c921af9 Merge branch '3.3.x' into 3.4.x 2025-05-20 13:59:02 -07:00
Phillip Webb
3bdfa6459c Fix merge error 2025-05-20 13:58:48 -07:00
Phillip Webb
64aefcb658 Polish 'Document the os info contribution'
See gh-45565
2025-05-20 13:57:36 -07:00
Phillip Webb
4219c8342d Merge branch '3.4.x'
Closes gh-45632
2025-05-20 13:55:42 -07:00
Phillip Webb
c06fb87663 Merge branch '3.3.x' into 3.4.x
Closes gh-45631
2025-05-20 13:55:35 -07:00
Phillip Webb
752135d068 Document the process info contribution
Closes gh-45567
2025-05-20 13:54:42 -07:00
Phillip Webb
335de07203 Merge branch '3.4.x'
Closes gh-45630
2025-05-20 13:29:17 -07:00
Phillip Webb
f045ef4514 Merge branch '3.3.x' into 3.4.x
Closes gh-45629
2025-05-20 13:29:07 -07:00
Phillip Webb
c99521ff0f Document the os info contribution
Closes gh-45565
2025-05-20 13:18:13 -07:00
Stéphane Nicoll
d8fadaf86e Merge branch '3.4.x'
Closes gh-45617
2025-05-20 14:53:10 +02:00
Stéphane Nicoll
f26b3189ce Merge branch '3.3.x' into 3.4.x
Closes gh-45616
2025-05-20 14:46:18 +02:00
Stéphane Nicoll
25796e031c Polish "Consistent condition for ObservedAspectConfiguration"
See gh-45601
2025-05-20 14:45:44 +02:00
Dmytro Nosan
b22d3caaad Consistent condition for ObservedAspectConfiguration
This commit adds the same conditions that control some observation
aspects to control the creation of an `ObservedAspect` bean. It now is
guarded by  `management.observations.annotations.enabled` and
`micrometer.observations.annotations.enabled`.

See gh-45601

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-05-20 14:45:44 +02:00
Stéphane Nicoll
921b9fd6ac Merge branch '3.4.x'
Closes gh-45595
2025-05-18 09:28:38 +02:00
Stéphane Nicoll
fab15af876 Merge branch '3.3.x' into 3.4.x
Closes gh-45594
2025-05-18 09:26:57 +02:00
Johnny Lim
0a54804a0f Polish
See gh-45592

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-05-18 09:20:33 +02:00
Andy Wilkinson
4bdea6e308 Merge branch '3.4.x'
Closes gh-45587
2025-05-16 13:46:11 +01:00
Andy Wilkinson
b6bcd555b7 Merge branch '3.3.x' into 3.4.x
Closes gh-45586
2025-05-16 13:45:48 +01:00