SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding order for TraceFilter; fixes gh-1020

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-08-22 11:02:44 +02:00
parent 707f3714d6
commit e2de25f02d
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/SleuthWebProperties.java
View File

@@ -25,6 +25,12 @@ public class SleuthWebProperties {
*/
private String skipPattern = DEFAULT_SKIP_PATTERN;
/**
* Order in which the {@link TraceFilter} should be registered.
* Defaults to {@link TraceFilter#ORDER}
*/
private int filterOrder = TraceFilter.ORDER;
private Client client;
public boolean isEnabled() {
@@ -43,6 +49,18 @@ public class SleuthWebProperties {
this.skipPattern = skipPattern;
}
public static String getDefaultSkipPattern() {
return DEFAULT_SKIP_PATTERN;
}
public int getFilterOrder() {
return this.filterOrder;
}
public void setFilterOrder(int filterOrder) {
this.filterOrder = filterOrder;
}
public Client getClient() {
return this.client;
}

4
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
View File

@@ -89,12 +89,12 @@ public class TraceWebAutoConfiguration {
}
@Bean
public FilterRegistrationBean traceWebFilter(TraceFilter traceFilter) {
public FilterRegistrationBean traceWebFilter(TraceFilter traceFilter, SleuthWebProperties sleuthWebProperties) {
FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(
traceFilter);
filterRegistrationBean.setDispatcherTypes(ASYNC, ERROR, FORWARD, INCLUDE,
REQUEST);
filterRegistrationBean.setOrder(TraceFilter.ORDER);
filterRegistrationBean.setOrder(sleuthWebProperties.getFilterOrder());
return filterRegistrationBean;
}