Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
53,493 Commits 23 Branches 0 Tags
191a7eccffc65766d5bc8700a00add75b6548d5e
Commit Graph

2613 Commits

Author SHA1 Message Date
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
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
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
2bdbc1f8d2 Use RestClient in Spring MVC integration tests 
Closes gh-45711
 2025-05-28 14:44:22 +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
db68aea314 Polish 2025-05-20 15:19:02 -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
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
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
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
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
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
b6bcd555b7 Merge branch '3.3.x' into 3.4.x 
Closes gh-45586
 2025-05-16 13:45:48 +01:00
Andy Wilkinson
13b95a5da8 Polish Cassandra health auto-configuration 
The indicators that require Spring Data were removed. This commit
updates the auto-configuration ordering as there's no longer a need
for Spring Data Cassandra to have been auto-configured first. It also
simplifies the tests as Spring Data no longer needs to be considered.

Closes gh-45585
 2025-05-16 12:46:32 +01:00
Andy Wilkinson
363aeaa28a Merge branch '3.3.x' into 3.4.x 
Closes gh-45562
 2025-05-15 08:28:03 +01:00
Andy Wilkinson
2bb4278f96 Use Framework's ResolvableType 
Replace accidental use of Lettuce's class of the same name.

Closes gh-45561
 2025-05-15 08:25:14 +01:00
Andy Wilkinson
bdef7d2314 Merge branch '3.3.x' into 3.4.x 
Closes gh-45396
 2025-05-08 16:01:44 +01:00
Andy Wilkinson
9582ac7991 Update test to check for correct health indicator type 
Closes gh-45395
 2025-05-08 15:57:16 +01:00
Phillip Webb
3cfeac4cc6 Merge branch '3.3.x' into 3.4.x 
Closes gh-45364
 2025-05-05 16:55:57 -07:00
Phillip Webb
2f242cad50 Use reference stubs in Antora playbook for actuator-autoconfigure 
Use reference stubs so that we can include a link to the supported
metrics backends.

Closes gh-45158
 2025-05-05 16:55:12 -07:00
Moritz Halbritter
46a709a850 Merge branch '3.3.x' into 3.4.x 2025-04-24 08:31:13 +02:00
Moritz Halbritter
55f67c9a52 Fix potential null problem in actuator 2025-04-24 08:23:49 +02:00
Phillip Webb
35dc8e6f88 Merge branch '3.3.x' into 3.4.x 2025-04-11 09:42:13 -07:00
Phillip Webb
2143d702f2 Polish boolean members that can use the default false value 2025-04-11 09:32:35 -07:00
Phillip Webb
5a3fc4a48b Merge branch '3.3.x' into 3.4.x 
Closes gh-45153
 2025-04-10 16:08:56 -07:00
Phillip Webb
c071f56653 Protect against empty OS string in Docker Image 
Update `Image` to protect against `os` being `null` or and empty
String.

Fixes gh-45152
 2025-04-10 15:47:55 -07:00
Stéphane Nicoll
87cd1bb7fd Merge branch '3.3.x' into 3.4.x 
Closes gh-45047
 2025-04-10 10:14:11 +02:00
Stéphane Nicoll
cfd5e45d57 Remove link 
See gh-44767
 2025-04-10 10:13:31 +02:00
Andy Wilkinson
3580f1aa36 Polish "Add details of the purpose of the metrics endpoint" 
See gh-44767
 2025-04-10 10:08:02 +02:00
Jonatan Ivanov
23c3c2753a Add details of the purpose of the metrics endpoint 
See gh-44767
 2025-04-10 10:08:02 +02:00
Phillip Webb
fc9937d05a Merge branch '3.3.x' into 3.4.x 2025-04-03 18:06:33 -07:00
Phillip Webb
c96835bc9d Merge branch '3.3.x' into 3.4.x 
Closes gh-44992
 2025-04-03 18:02:57 -07:00
Andy Wilkinson
7630c7c505 Merge branch '3.3.x' into 3.4.x 
Closes gh-44972
 2025-04-02 10:40:55 +01:00
Johnny Lim
f3d2ab824e Polish 
See gh-44949

Signed-off-by: Johnny Lim <izeye@naver.com>
 2025-04-02 10:15:36 +01:00
Andy Wilkinson
6ad48639c2 Back port 246c4a2 to 3.3.x 
The changes do not apply cleanly when cherry-picked so they
have been redone manually.

Closes gh-44941
 2025-03-28 16:48:50 +00:00
Dmytro Nosan
48b7467d38 Add tests for OtlpTracingAutoConfiguration 
See gh-44789

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
 2025-03-26 10:25:58 +01:00
Andy Wilkinson
e237390e66 Ignore prototype DataSource beans for metrics and health 
Previously, if a prototype DataSource bean was defined, Actuator's
metrics and health would try to access an instance of it. At best
this was wasteful as the new instance would only be used for metrics
and health and would not be indicative of the app's DataSource usage.
At worst, it could cause a failure in the unusual case of the
prototype bean definition requiring arguments to be supplied using
ObjectProvider.getObject(Object...) or the like.

This commit address the problem by ignoring prototype DataSource
for metrics and health.

Other types of beans for which Actuator provides metrics and health
are similarly affected. They have not be fixed here as the situation
is so unusual. Should another problem arise in the future, it can be
addressed at that time when there's a clear need.

Closes gh-44706
 2025-03-18 19:10:45 +00:00