Merge pull request #38 from zalando/feature/auto-configuration-interc…

…eptor Added interceptors to AutoConfiguration
zalando · May 27, 2016 · c870719 · c870719
2 parents 2e28a5a + dace413
commit c870719
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/tracer-spring-boot-starter/pom.xml b/tracer-spring-boot-starter/pom.xml
@@ -34,6 +34,10 @@
             <groupId>org.zalando</groupId>
             <artifactId>tracer-aspectj</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.zalando</groupId>
+            <artifactId>tracer-httpclient</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.zalando</groupId>
             <artifactId>tracer-servlet</artifactId>

diff --git a/...-spring-boot-starter/src/main/java/org/zalando/tracer/spring/TracerAutoConfiguration.java b/...-spring-boot-starter/src/main/java/org/zalando/tracer/spring/TracerAutoConfiguration.java
@@ -41,6 +41,7 @@
 import org.zalando.tracer.TraceListener;
 import org.zalando.tracer.Tracer;
 import org.zalando.tracer.aspectj.TracedAspect;
+import org.zalando.tracer.httpclient.TracerHttpRequestInterceptor;
 import org.zalando.tracer.servlet.TracerFilter;
 
 import javax.servlet.Filter;
@@ -84,6 +85,12 @@ public FilterRegistrationBean tracerFilter(final Tracer tracer) {
         return registration;
     }
 
+    @Bean
+    @ConditionalOnMissingBean(TracerHttpRequestInterceptor.class)
+    public TracerHttpRequestInterceptor tracerHttpRequestInterceptor(final Tracer tracer) {
+        return new TracerHttpRequestInterceptor(tracer);
+    }
+
     @ConditionalOnClass(Aspect.class)
     @ConditionalOnProperty(name = "tracer.aspect.enabled", havingValue = "true", matchIfMissing = true)
     @EnableAspectJAutoProxy