Skip to content

Commit 77767bf

Browse files
joshistejoshiste
committed
Add properties to configure timeouts when querying the applications
Until now the thread querying the application endpoint can be blocked for a very long time when the application is inresponsive. With this commit two new properties `spring.boot.admin.monitor.read-timeout` (default: 2s) and `spring.boot.admin.monitor.connect-timeout` (default: 5s) are added. closes #462
1 parent 39264b1 commit 77767bf

File tree

4 files changed

+231
-210
lines changed

4 files changed

+231
-210
lines changed

‎spring-boot-admin-docs/src/main/asciidoc/server.adoc‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@
1717
| Lifetime of application statuses in ms. The applications /health-endpoint will not be queried until the lifetime has expired.
1818
| 10.000
1919

20+
| spring.boot.admin.monitor.connect-timeout
21+
| Lifetime of application statuses in ms. The applications /health-endpoint will not be queried until the lifetime has expired.
22+
| 2.000
23+
24+
| spring.boot.admin.monitor.read-timeout
25+
| Lifetime of application statuses in ms. The applications /health-endpoint will not be queried until the lifetime has expired.
26+
| 5.000
27+
2028
| spring.boot.admin.routes.endpoints
2129
| The enpoints which will be available via spring boot admin zuul proxy. If you write ui modules using other endpoints you need to add them.
2230
| `"env, metrics, trace, dump, jolokia, info, configprops, activiti, logfile, refresh, flyway, liquibase, loggers"`

‎spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/config/AdminServerCoreConfiguration.java‎

Lines changed: 96 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,6 @@
1515
*/
1616
package de.codecentric.boot.admin.config;
1717

18-
import org.springframework.beans.factory.annotation.Qualifier;
19-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
20-
import org.springframework.boot.context.properties.EnableConfigurationProperties;
21-
import org.springframework.boot.web.client.RestTemplateBuilder;
22-
import org.springframework.context.annotation.Bean;
23-
import org.springframework.context.annotation.Configuration;
24-
import org.springframework.http.HttpStatus;
25-
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
26-
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
27-
import org.springframework.web.client.DefaultResponseErrorHandler;
28-
2918
import de.codecentric.boot.admin.journal.ApplicationEventJournal;
3019
import de.codecentric.boot.admin.journal.store.JournaledEventStore;
3120
import de.codecentric.boot.admin.journal.store.SimpleJournaledEventStore;
@@ -40,97 +29,104 @@
4029
import de.codecentric.boot.admin.web.client.BasicAuthHttpHeaderProvider;
4130
import de.codecentric.boot.admin.web.client.HttpHeadersProvider;
4231

32+
import org.springframework.beans.factory.annotation.Qualifier;
33+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
34+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
35+
import org.springframework.boot.web.client.RestTemplateBuilder;
36+
import org.springframework.context.annotation.Bean;
37+
import org.springframework.context.annotation.Configuration;
38+
import org.springframework.http.HttpStatus;
39+
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
40+
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
41+
import org.springframework.web.client.DefaultResponseErrorHandler;
42+
4343
@Configuration
4444
@EnableConfigurationProperties(AdminServerProperties.class)
4545
public class AdminServerCoreConfiguration {
46-
private final AdminServerProperties adminServerProperties;
47-
48-
public AdminServerCoreConfiguration(AdminServerProperties adminServerProperties) {
49-
this.adminServerProperties = adminServerProperties;
50-
}
51-
52-
@Bean
53-
@ConditionalOnMissingBean
54-
public ApplicationRegistry applicationRegistry(ApplicationStore applicationStore,
55-
ApplicationIdGenerator applicationIdGenerator) {
56-
return new ApplicationRegistry(applicationStore, applicationIdGenerator);
57-
}
58-
59-
@Bean
60-
@ConditionalOnMissingBean
61-
public ApplicationIdGenerator applicationIdGenerator() {
62-
return new HashingApplicationUrlIdGenerator();
63-
}
64-
65-
@Bean
66-
@ConditionalOnMissingBean
67-
public HttpHeadersProvider httpHeadersProvider() {
68-
return new BasicAuthHttpHeaderProvider();
69-
}
70-
71-
@Bean
72-
@ConditionalOnMissingBean
73-
public ApplicationOperations applicationOperations(RestTemplateBuilder restTemplBuilder,
74-
HttpHeadersProvider headersProvider) {
75-
RestTemplateBuilder builder = restTemplBuilder
76-
.messageConverters(new MappingJackson2HttpMessageConverter())
77-
.errorHandler(new DefaultResponseErrorHandler() {
78-
@Override
79-
protected boolean hasError(HttpStatus statusCode) {
80-
return false;
81-
}
82-
});
83-
return new ApplicationOperations(builder.build(), headersProvider);
84-
};
85-
86-
@Bean
87-
@ConditionalOnMissingBean
88-
public StatusUpdater statusUpdater(ApplicationStore applicationStore,
89-
ApplicationOperations applicationOperations) {
90-
91-
StatusUpdater statusUpdater = new StatusUpdater(applicationStore, applicationOperations);
92-
statusUpdater.setStatusLifetime(adminServerProperties.getMonitor().getStatusLifetime());
93-
return statusUpdater;
94-
}
95-
96-
@Bean
97-
@Qualifier("updateTaskScheduler")
98-
public ThreadPoolTaskScheduler updateTaskScheduler() {
99-
ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
100-
taskScheduler.setPoolSize(1);
101-
taskScheduler.setRemoveOnCancelPolicy(true);
102-
taskScheduler.setThreadNamePrefix("updateTask");
103-
return taskScheduler;
104-
}
105-
106-
@Bean
107-
@ConditionalOnMissingBean
108-
public StatusUpdateApplicationListener statusUpdateApplicationListener(
109-
StatusUpdater statusUpdater,
110-
@Qualifier("updateTaskScheduler") ThreadPoolTaskScheduler taskScheduler) {
111-
StatusUpdateApplicationListener listener = new StatusUpdateApplicationListener(
112-
statusUpdater, taskScheduler);
113-
listener.setUpdatePeriod(adminServerProperties.getMonitor().getPeriod());
114-
return listener;
115-
}
116-
117-
@Bean
118-
@ConditionalOnMissingBean
119-
public ApplicationEventJournal applicationEventJournal(
120-
JournaledEventStore journaledEventStore) {
121-
return new ApplicationEventJournal(journaledEventStore);
122-
}
123-
124-
@Bean
125-
@ConditionalOnMissingBean
126-
public JournaledEventStore journaledEventStore() {
127-
return new SimpleJournaledEventStore();
128-
}
129-
130-
@Bean
131-
@ConditionalOnMissingBean
132-
public ApplicationStore applicationStore() {
133-
return new SimpleApplicationStore();
134-
}
46+
private final AdminServerProperties adminServerProperties;
47+
48+
public AdminServerCoreConfiguration(AdminServerProperties adminServerProperties) {
49+
this.adminServerProperties = adminServerProperties;
50+
}
51+
52+
@Bean
53+
@ConditionalOnMissingBean
54+
public ApplicationRegistry applicationRegistry(ApplicationStore applicationStore,
55+
ApplicationIdGenerator applicationIdGenerator) {
56+
return new ApplicationRegistry(applicationStore, applicationIdGenerator);
57+
}
58+
59+
@Bean
60+
@ConditionalOnMissingBean
61+
public ApplicationIdGenerator applicationIdGenerator() {
62+
return new HashingApplicationUrlIdGenerator();
63+
}
64+
65+
@Bean
66+
@ConditionalOnMissingBean
67+
public HttpHeadersProvider httpHeadersProvider() {
68+
return new BasicAuthHttpHeaderProvider();
69+
}
70+
71+
@Bean
72+
@ConditionalOnMissingBean
73+
public ApplicationOperations applicationOperations(RestTemplateBuilder restTemplBuilder,
74+
HttpHeadersProvider headersProvider) {
75+
RestTemplateBuilder builder = restTemplBuilder.messageConverters(new MappingJackson2HttpMessageConverter())
76+
.errorHandler(new DefaultResponseErrorHandler() {
77+
@Override
78+
protected boolean hasError(HttpStatus statusCode) {
79+
return false;
80+
}
81+
});
82+
builder = builder.setConnectTimeout(adminServerProperties.getMonitor().getConnectTimeout())
83+
.setReadTimeout(adminServerProperties.getMonitor().getReadTimeout());
84+
return new ApplicationOperations(builder.build(), headersProvider);
85+
}
86+
87+
@Bean
88+
@ConditionalOnMissingBean
89+
public StatusUpdater statusUpdater(ApplicationStore applicationStore, ApplicationOperations applicationOperations) {
90+
StatusUpdater statusUpdater = new StatusUpdater(applicationStore, applicationOperations);
91+
statusUpdater.setStatusLifetime(adminServerProperties.getMonitor().getStatusLifetime());
92+
return statusUpdater;
93+
}
94+
95+
@Bean
96+
@Qualifier("updateTaskScheduler")
97+
public ThreadPoolTaskScheduler updateTaskScheduler() {
98+
ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
99+
taskScheduler.setPoolSize(1);
100+
taskScheduler.setRemoveOnCancelPolicy(true);
101+
taskScheduler.setThreadNamePrefix("updateTask");
102+
return taskScheduler;
103+
}
104+
105+
@Bean
106+
@ConditionalOnMissingBean
107+
public StatusUpdateApplicationListener statusUpdateApplicationListener(StatusUpdater statusUpdater,
108+
@Qualifier("updateTaskScheduler") ThreadPoolTaskScheduler taskScheduler) {
109+
StatusUpdateApplicationListener listener = new StatusUpdateApplicationListener(statusUpdater, taskScheduler);
110+
listener.setUpdatePeriod(adminServerProperties.getMonitor().getPeriod());
111+
return listener;
112+
}
113+
114+
@Bean
115+
@ConditionalOnMissingBean
116+
public ApplicationEventJournal applicationEventJournal(JournaledEventStore journaledEventStore) {
117+
return new ApplicationEventJournal(journaledEventStore);
118+
}
119+
120+
@Bean
121+
@ConditionalOnMissingBean
122+
public JournaledEventStore journaledEventStore() {
123+
return new SimpleJournaledEventStore();
124+
}
125+
126+
@Bean
127+
@ConditionalOnMissingBean
128+
public ApplicationStore applicationStore() {
129+
return new SimpleApplicationStore();
130+
}
135131

136132
}

0 commit comments

Comments
 (0)