Skip to content

Commit 146a1ff

Browse files
authored
Ensure that unit tests can be run when WebEnvironment.NONE is used (#109)
Fixes #108
1 parent 1267f75 commit 146a1ff

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

opentracing-spring-web-starter/src/main/java/io/opentracing/contrib/spring/web/starter/SkipPatternAutoConfiguration.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ public SkipPattern skipPatternForActuatorEndpointsDifferentPort(
143143
@Configuration
144144
protected static class DefaultSkipPatternConfig {
145145

146+
@Autowired(required = false)
147+
WebTracingProperties webTracingProperties;
148+
146149
private static String combinedPatterns(String skipPattern) {
147150
String pattern = skipPattern;
148151
if (!StringUtils.hasText(skipPattern)) {
@@ -152,9 +155,12 @@ private static String combinedPatterns(String skipPattern) {
152155
}
153156

154157
@Bean
155-
SkipPattern defaultSkipPatternBean(WebTracingProperties webTracingProperties) {
158+
SkipPattern defaultSkipPatternBean() {
159+
if (webTracingProperties == null) {
160+
return Optional::empty;
161+
}
156162
return () -> Optional.of(Pattern.compile(combinedPatterns(webTracingProperties.getSkipPattern())));
157163
}
158164
}
159165

160-
}
166+
}

opentracing-spring-web-starter/src/test/java/io/opentracing/contrib/spring/web/starter/SkipPatternConfigTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,11 @@ public class SkipPatternConfigTest {
4343
public void testShouldPickSkipPatternFromWebProperties() {
4444
WebTracingProperties webTracingProperties = new WebTracingProperties();
4545
webTracingProperties.setSkipPattern("foo.*|bar.*");
46-
Pattern pattern = new SkipPatternAutoConfiguration.DefaultSkipPatternConfig()
47-
.defaultSkipPatternBean(webTracingProperties).pattern().get();
46+
SkipPatternAutoConfiguration.DefaultSkipPatternConfig defaultSkipPatternConfig =
47+
new SkipPatternAutoConfiguration.DefaultSkipPatternConfig();
48+
defaultSkipPatternConfig.webTracingProperties = webTracingProperties;
49+
Pattern pattern = defaultSkipPatternConfig
50+
.defaultSkipPatternBean().pattern().get();
4851

4952
then(pattern.pattern()).isEqualTo("foo.*|bar.*");
5053
}
@@ -195,4 +198,4 @@ public Collection<WebOperation> getOperations() {
195198
}
196199
};
197200
}
198-
}
201+
}

0 commit comments

Comments
 (0)