Skip to content

Commit 020fd7b

Browse files
mpalourdiomhalbritter
authored andcommitted
Add property to specify the management access log prefix
See gh-43434
1 parent 0cd843c commit 020fd7b

File tree

3 files changed

+60
-9
lines changed

3 files changed

+60
-9
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerProperties.java

+24
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ public class ManagementServerProperties {
5757
@NestedConfigurationProperty
5858
private Ssl ssl;
5959

60+
private final Accesslog accesslog = new Accesslog();
61+
6062
/**
6163
* Returns the management port or {@code null} if the
6264
* {@link ServerProperties#getPort() server port} should be used.
@@ -117,4 +119,26 @@ private String cleanBasePath(String basePath) {
117119
return candidate;
118120
}
119121

122+
public Accesslog getAccesslog() {
123+
return this.accesslog;
124+
}
125+
126+
public static class Accesslog {
127+
128+
/**
129+
* Enable management access logs prefix customization
130+
* management.server.accesslog.prefix.
131+
*/
132+
private String prefix = "management_";
133+
134+
public String getPrefix() {
135+
return this.prefix;
136+
}
137+
138+
public void setPrefix(String prefix) {
139+
this.prefix = prefix;
140+
}
141+
142+
}
143+
120144
}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementChildContextConfiguration.java

+30-9
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryCustomizer;
4848
import org.springframework.boot.autoconfigure.web.servlet.TomcatServletWebServerFactoryCustomizer;
4949
import org.springframework.boot.autoconfigure.web.servlet.UndertowServletWebServerFactoryCustomizer;
50+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
5051
import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory;
5152
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
5253
import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
@@ -73,6 +74,7 @@
7374
*/
7475
@ManagementContextConfiguration(value = ManagementContextType.CHILD, proxyBeanMethods = false)
7576
@ConditionalOnWebApplication(type = Type.SERVLET)
77+
@EnableConfigurationProperties(ManagementServerProperties.class)
7678
class ServletManagementChildContextConfiguration {
7779

7880
@Bean
@@ -83,20 +85,22 @@ ServletManagementWebServerFactoryCustomizer servletManagementWebServerFactoryCus
8385

8486
@Bean
8587
@ConditionalOnClass(name = "io.undertow.Undertow")
86-
UndertowAccessLogCustomizer undertowManagementAccessLogCustomizer() {
87-
return new UndertowAccessLogCustomizer();
88+
UndertowAccessLogCustomizer undertowManagementAccessLogCustomizer(
89+
ManagementServerProperties managementServerProperties) {
90+
return new UndertowAccessLogCustomizer(managementServerProperties);
8891
}
8992

9093
@Bean
9194
@ConditionalOnClass(name = "org.apache.catalina.valves.AccessLogValve")
92-
TomcatAccessLogCustomizer tomcatManagementAccessLogCustomizer() {
93-
return new TomcatAccessLogCustomizer();
95+
TomcatAccessLogCustomizer tomcatManagementAccessLogCustomizer(
96+
ManagementServerProperties managementServerProperties) {
97+
return new TomcatAccessLogCustomizer(managementServerProperties);
9498
}
9599

96100
@Bean
97101
@ConditionalOnClass(name = "org.eclipse.jetty.server.Server")
98-
JettyAccessLogCustomizer jettyManagementAccessLogCustomizer() {
99-
return new JettyAccessLogCustomizer();
102+
JettyAccessLogCustomizer jettyManagementAccessLogCustomizer(ManagementServerProperties managementServerProperties) {
103+
return new JettyAccessLogCustomizer(managementServerProperties);
100104
}
101105

102106
@Configuration(proxyBeanMethods = false)
@@ -145,14 +149,18 @@ private String getContextPath(ManagementServerProperties managementServerPropert
145149

146150
abstract static class AccessLogCustomizer implements Ordered {
147151

148-
private static final String MANAGEMENT_PREFIX = "management_";
152+
protected final ManagementServerProperties managementServerProperties;
153+
154+
AccessLogCustomizer(ManagementServerProperties managementServerProperties) {
155+
this.managementServerProperties = managementServerProperties;
156+
}
149157

150158
protected String customizePrefix(String prefix) {
151159
prefix = (prefix != null) ? prefix : "";
152-
if (prefix.startsWith(MANAGEMENT_PREFIX)) {
160+
if (prefix.startsWith(this.managementServerProperties.getAccesslog().getPrefix())) {
153161
return prefix;
154162
}
155-
return MANAGEMENT_PREFIX + prefix;
163+
return this.managementServerProperties.getAccesslog().getPrefix() + prefix;
156164
}
157165

158166
@Override
@@ -165,12 +173,17 @@ public int getOrder() {
165173
static class TomcatAccessLogCustomizer extends AccessLogCustomizer
166174
implements WebServerFactoryCustomizer<TomcatServletWebServerFactory> {
167175

176+
TomcatAccessLogCustomizer(ManagementServerProperties managementServerProperties) {
177+
super(managementServerProperties);
178+
}
179+
168180
@Override
169181
public void customize(TomcatServletWebServerFactory factory) {
170182
AccessLogValve accessLogValve = findAccessLogValve(factory);
171183
if (accessLogValve == null) {
172184
return;
173185
}
186+
174187
accessLogValve.setPrefix(customizePrefix(accessLogValve.getPrefix()));
175188
}
176189

@@ -188,6 +201,10 @@ private AccessLogValve findAccessLogValve(TomcatServletWebServerFactory factory)
188201
static class UndertowAccessLogCustomizer extends AccessLogCustomizer
189202
implements WebServerFactoryCustomizer<UndertowServletWebServerFactory> {
190203

204+
UndertowAccessLogCustomizer(ManagementServerProperties managementServerProperties) {
205+
super(managementServerProperties);
206+
}
207+
191208
@Override
192209
public void customize(UndertowServletWebServerFactory factory) {
193210
factory.setAccessLogPrefix(customizePrefix(factory.getAccessLogPrefix()));
@@ -198,6 +215,10 @@ public void customize(UndertowServletWebServerFactory factory) {
198215
static class JettyAccessLogCustomizer extends AccessLogCustomizer
199216
implements WebServerFactoryCustomizer<JettyServletWebServerFactory> {
200217

218+
JettyAccessLogCustomizer(ManagementServerProperties managementServerProperties) {
219+
super(managementServerProperties);
220+
}
221+
201222
@Override
202223
public void customize(JettyServletWebServerFactory factory) {
203224
factory.addServerCustomizers(this::customizeServer);

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerPropertiesTests.java

+6
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,10 @@ void slashOfBasePathIsDefaultValue() {
6868
assertThat(properties.getBasePath()).isEmpty();
6969
}
7070

71+
@Test
72+
void accessLogsArePrefixedByDefault() {
73+
ManagementServerProperties properties = new ManagementServerProperties();
74+
assertThat(properties.getAccesslog().getPrefix()).isEqualTo("management_");
75+
}
76+
7177
}

0 commit comments

Comments
 (0)