Actuator endpoint skipped by default (#99)

opentracing-contrib · Apr 12, 2019 · 701ab4e · 701ab4e
1 parent 3a35c7d
commit 701ab4e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/...starter/src/main/java/io/opentracing/contrib/spring/web/starter/WebTracingProperties.java b/...starter/src/main/java/io/opentracing/contrib/spring/web/starter/WebTracingProperties.java
@@ -27,7 +27,7 @@ public class WebTracingProperties {
     public static final String CONFIGURATION_PREFIX = "opentracing.spring.web";
 
     public static final Pattern DEFAULT_SKIP_PATTERN = Pattern.compile(
-            "/api-docs.*|/autoconfig|/configprops|/dump|/health|/info|/metrics.*|" +
+            "/api-docs.*|/autoconfig|/configprops|/dump|/health|/info|/metrics.*|/actuator.*|" +
             "/mappings|/swagger.*|.*\\.png|.*\\.css|.*\\.js|.*\\.html|/favicon.ico|/hystrix.stream");
 
     private boolean enabled = true;

diff --git a/...io/opentracing/contrib/spring/web/starter/ServerTracingAutoConfigurationDefaultsTest.java b/...io/opentracing/contrib/spring/web/starter/ServerTracingAutoConfigurationDefaultsTest.java
@@ -52,6 +52,8 @@ public class ServerTracingAutoConfigurationDefaultsTest extends AutoConfiguratio
 
     private static CountDownLatch infoCountDownLatch = new CountDownLatch(1);
 
+    private static CountDownLatch actuatorInfoCountDownLatch = new CountDownLatch(1);
+
     @RestController
     @Configuration
     @EnableAutoConfiguration
@@ -73,6 +75,11 @@ public void nestedHello() {
         public void info() {
             infoCountDownLatch.countDown();
         }
+
+        @RequestMapping("/actuator/info")
+        public void actuatorInfo() {
+            actuatorInfoCountDownLatch.countDown();
+        }
     }
 
     @Autowired
@@ -106,7 +113,7 @@ public void testNestedRequestIsTraced() {
 
     // Test that /info is excluded due to the default skipPattern
     @Test
-    public void testExcluded() throws InterruptedException {
+    public void testInfoExcluded() throws InterruptedException {
         testRestTemplate.getForEntity("/info", String.class);
         infoCountDownLatch.await();
 
@@ -115,6 +122,17 @@ public void testExcluded() throws InterruptedException {
         assertThat(Mockito.mockingDetails(mockDecorator2).getInvocations()).hasSize(0);
     }
 
+    // Test that /actuator/info is excluded due to the default skipPattern
+    @Test
+    public void testActuatorExcluded() throws InterruptedException {
+        testRestTemplate.getForEntity("/actuator/info", String.class);
+        actuatorInfoCountDownLatch.await();
+
+        assertThat(mockTracer.finishedSpans()).hasSize(0);
+        assertThat(Mockito.mockingDetails(mockDecorator1).getInvocations()).hasSize(0);
+        assertThat(Mockito.mockingDetails(mockDecorator2).getInvocations()).hasSize(0);
+    }
+
     public Callable<Integer> reportedSpansSize() {
         return () -> mockTracer.finishedSpans().size();
     }