Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.4.x'

Browse Source 
Closes gh-45632
This commit is contained in:
Phillip Webb
2025-05-20 13:55:42 -07:00
parent 335de07203 c06fb87663
commit 4219c8342d
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-actuator-autoconfigure/src/docs/antora/modules/api/pages/rest/actuator/info.adoc
View File

@@ -56,3 +56,13 @@ The following table describes the structure of the `os` section of the response:
[cols="2,1,3"]
include::partial$rest/actuator/info/response-fields-beneath-os.adoc[]
[[info.retrieving.response-structure.process]]
==== Process Response Structure
The following table describes the structure of the `process` section of the response:
[cols="2,1,3"]
include::partial$rest/actuator/info/response-fields-beneath-process.adoc[]

22
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointDocumentationTests.java
View File

@@ -28,6 +28,7 @@ import org.springframework.boot.actuate.info.GitInfoContributor;
import org.springframework.boot.actuate.info.InfoContributor;
import org.springframework.boot.actuate.info.InfoEndpoint;
import org.springframework.boot.actuate.info.OsInfoContributor;
import org.springframework.boot.actuate.info.ProcessInfoContributor;
import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.info.GitProperties;
import org.springframework.context.annotation.Bean;
@@ -50,9 +51,16 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.response
class InfoEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
@Test
<<<<<<< HEAD
void info() {
assertThat(this.mvc.get().uri("/actuator/info")).hasStatusOk()
.apply(MockMvcRestDocumentation.document("info", gitInfo(), buildInfo(), osInfo()));
=======
void info() throws Exception {
this.mockMvc.perform(get("/actuator/info"))
.andExpect(status().isOk())
.andDo(MockMvcRestDocumentation.document("info", gitInfo(), buildInfo(), osInfo(), processInfo()));
>>>>>>> 3.3.x
}
private ResponseFieldsSnippet gitInfo() {
@@ -88,6 +96,15 @@ class InfoEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
.optional();
}
private ResponseFieldsSnippet processInfo() {
return responseFields(beneathPath("process"),
fieldWithPath("pid").description("Process ID.").type(JsonFieldType.NUMBER),
fieldWithPath("parentPid").description("Parent Process ID (or -1).").type(JsonFieldType.NUMBER),
fieldWithPath("owner").description("Process owner.").type(JsonFieldType.STRING),
fieldWithPath("cpus").description("Number of CPUs available to the process.")
.type(JsonFieldType.NUMBER));
}
@Configuration(proxyBeanMethods = false)
static class TestConfiguration {
@@ -122,6 +139,11 @@ class InfoEndpointDocumentationTests extends MockMvcEndpointDocumentationTests {
return new OsInfoContributor();
}
@Bean
ProcessInfoContributor processInfoContributor() {
return new ProcessInfoContributor();
}
}
}