Removes remaining use of proxying

pom.xml

@@ -60,7 +60,7 @@
     <cassandra-driver-core.version>3.7.2</cassandra-driver-core.version>
     <jooq.version>3.12.1</jooq.version>
     <micrometer.version>1.3.0</micrometer.version>
-    <spring-boot.version>2.1.9.RELEASE</spring-boot.version>
+    <spring-boot.version>2.2.0.RELEASE</spring-boot.version>
     <!-- MySQL connector is GPL, even if it has an OSS exception.
          https://www.mysql.com/about/legal/licensing/foss-exception/
 

zipkin-server/src/main/java/zipkin2/server/internal/InternalZipkinConfiguration.java

@@ -14,7 +14,6 @@
 package zipkin2.server.internal;
 
 import com.linecorp.armeria.spring.ArmeriaAutoConfiguration;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import zipkin2.server.internal.activemq.ZipkinActiveMQCollectorConfiguration;
 import zipkin2.server.internal.brave.ZipkinSelfTracingConfiguration;
@@ -30,7 +29,6 @@
 import zipkin2.server.internal.scribe.ZipkinScribeCollectorConfiguration;
 import zipkin2.server.internal.ui.ZipkinUiConfiguration;
 
-@Configuration
 @Import({
   ArmeriaAutoConfiguration.class,
   ZipkinConfiguration.class,

zipkin-server/src/main/java/zipkin2/server/internal/ZipkinConfiguration.java

@@ -19,7 +19,6 @@
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -28,7 +27,7 @@
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 import zipkin2.collector.CollectorMetrics;
 import zipkin2.collector.CollectorSampler;
@@ -39,7 +38,11 @@
 import zipkin2.storage.StorageComponent;
 
 /** Base collector and storage configurations needed for higher-level integrations */
-@Configuration
+@Import({
+  ZipkinConfiguration.InMemoryConfiguration.class,
+  ZipkinConfiguration.ThrottledStorageComponentEnhancer.class,
+  ZipkinConfiguration.TracingStorageComponentEnhancer.class
+})
 public class ZipkinConfiguration {
 
   @Bean CollectorSampler traceIdSampler(@Value("${zipkin.collector.sample-rate:1.0}") float rate) {
@@ -50,31 +53,26 @@ public class ZipkinConfiguration {
     return new MicrometerCollectorMetrics(registry);
   }
 
-  @Configuration
   @EnableConfigurationProperties(ZipkinStorageThrottleProperties.class)
   @ConditionalOnThrottledStorage
   static class ThrottledStorageComponentEnhancer implements BeanPostProcessor, BeanFactoryAware {
-    @Autowired(required = false)
-    Tracing tracing;
 
     /**
-     * Need this to resolve cyclic instantiation issue with spring.  Mostly, this is for
-     * MeterRegistry as really bad things happen if you try to Autowire it (loss of JVM metrics) but
-     * also using it for properties just to make sure no cycles exist at all as a result of turning
-     * throttling on.
+     * Need this to resolve cyclic instantiation issue with spring when instantiating with metrics
+     * and tracing.
      *
      * <p>Ref: <a href="https://stackoverflow.com/a/19688634">Tracking down cause of Spring's "not
      * eligible for auto-proxying"</a></p>
      */
-    private BeanFactory beanFactory;
+    BeanFactory beanFactory;
 
     @Override public Object postProcessAfterInitialization(Object bean, String beanName) {
       if (bean instanceof StorageComponent) {
         ZipkinStorageThrottleProperties throttleProperties =
           beanFactory.getBean(ZipkinStorageThrottleProperties.class);
         return new ThrottledStorageComponent((StorageComponent) bean,
           beanFactory.getBean(MeterRegistry.class),
-          tracing,
+          beanFactory.containsBean("tracing") ? beanFactory.getBean(Tracing.class) : null,
           throttleProperties.getMinConcurrency(),
           throttleProperties.getMaxConcurrency(),
           throttleProperties.getMaxQueueSize());
@@ -87,33 +85,37 @@ static class ThrottledStorageComponentEnhancer implements BeanPostProcessor, Bea
     }
   }
 
-  @Configuration
   @ConditionalOnSelfTracing
-  static class TracingStorageComponentEnhancer implements BeanPostProcessor {
-
-    @Autowired(required = false)
-    Tracing tracing;
+  static class TracingStorageComponentEnhancer implements BeanPostProcessor, BeanFactoryAware {
+    /**
+     * Need this to resolve cyclic instantiation issue with spring when instantiating with tracing.
+     *
+     * <p>Ref: <a href="https://stackoverflow.com/a/19688634">Tracking down cause of Spring's "not
+     * eligible for auto-proxying"</a></p>
+     */
+    BeanFactory beanFactory;
 
-    @Override
-    public Object postProcessBeforeInitialization(Object bean, String beanName) {
+    @Override public Object postProcessBeforeInitialization(Object bean, String beanName) {
       return bean;
     }
 
-    @Override
-    public Object postProcessAfterInitialization(Object bean, String beanName) {
-      if (tracing == null) return bean;
-      if (bean instanceof StorageComponent) {
+    @Override public Object postProcessAfterInitialization(Object bean, String beanName) {
+      if (bean instanceof StorageComponent && beanFactory.containsBean("tracing")) {
+        Tracing tracing = beanFactory.getBean(Tracing.class);
         return new TracingStorageComponent(tracing, (StorageComponent) bean);
       }
       return bean;
     }
+
+    @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+      this.beanFactory = beanFactory;
+    }
   }
 
   /**
    * This is a special-case configuration if there's no StorageComponent of any kind. In-Mem can
    * supply both read apis, so we add two beans here.
    */
-  @Configuration
   @Conditional(StorageTypeMemAbsentOrEmpty.class)
   @ConditionalOnMissingBean(StorageComponent.class)
   static class InMemoryConfiguration {

zipkin-server/src/main/java/zipkin2/server/internal/ZipkinHttpConfiguration.java

@@ -33,7 +33,7 @@
 import zipkin2.server.internal.health.ZipkinHealthController;
 import zipkin2.server.internal.prometheus.ZipkinMetricsController;
 
-@Configuration
+@Configuration(proxyBeanMethods=false)
 public class ZipkinHttpConfiguration {
   public static final MediaType MEDIA_TYPE_ACTUATOR =
     MediaType.parse("application/vnd.spring-boot.actuator.v2+json;charset=UTF-8");

zipkin-server/src/main/java/zipkin2/server/internal/activemq/ZipkinActiveMQCollectorConfiguration.java

@@ -19,15 +19,13 @@
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 import zipkin2.collector.CollectorMetrics;
 import zipkin2.collector.CollectorSampler;
 import zipkin2.collector.activemq.ActiveMQCollector;
 import zipkin2.storage.StorageComponent;
 
 /** Auto-configuration for {@link ActiveMQCollector}. */
-@Configuration
 @ConditionalOnClass(ActiveMQCollector.class)
 @EnableConfigurationProperties(ZipkinActiveMQCollectorProperties.class)
 @Conditional(ZipkinActiveMQCollectorConfiguration.ActiveMQUrlSet.class)

zipkin-server/src/main/java/zipkin2/server/internal/brave/ZipkinSelfTracingConfiguration.java

@@ -31,7 +31,6 @@
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import zipkin2.Call;
 import zipkin2.CheckResult;
 import zipkin2.Span;
@@ -45,7 +44,6 @@
 import zipkin2.server.internal.ConditionalOnSelfTracing;
 import zipkin2.storage.StorageComponent;
 
-@Configuration
 @EnableConfigurationProperties(SelfTracingProperties.class)
 @ConditionalOnSelfTracing
 public class ZipkinSelfTracingConfiguration {

zipkin-server/src/main/java/zipkin2/server/internal/cassandra/ZipkinCassandraStorageConfiguration.java

@@ -16,15 +16,17 @@
 import brave.Tracing;
 import brave.cassandra.driver.TracingSession;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import zipkin2.server.internal.ConditionalOnSelfTracing;
 import zipkin2.storage.StorageComponent;
 import zipkin2.storage.cassandra.v1.CassandraStorage;
@@ -35,11 +37,11 @@
  * contain a single span, which is TBinaryProtocol big-endian, then base64 encoded. Decoded spans
  * are stored asynchronously.
  */
-@Configuration
 @ConditionalOnClass(CassandraStorage.class)
 @EnableConfigurationProperties(ZipkinCassandraStorageProperties.class)
 @ConditionalOnProperty(name = "zipkin.storage.type", havingValue = "cassandra")
 @ConditionalOnMissingBean(StorageComponent.class)
+@Import(ZipkinCassandraStorageConfiguration.TracingSessionFactoryEnhancer.class)
 public class ZipkinCassandraStorageConfiguration {
 
   @Bean SessionFactory sessionFactory() {
@@ -65,23 +67,31 @@ StorageComponent storage(
       .sessionFactory(sessionFactory).build();
   }
 
-  @Configuration
   @ConditionalOnSelfTracing
-  static class TracingSessionFactoryEnhancer implements BeanPostProcessor {
-
-    @Autowired(required = false) Tracing tracing;
+  static class TracingSessionFactoryEnhancer implements BeanPostProcessor, BeanFactoryAware {
+    /**
+     * Need this to resolve cyclic instantiation issue with spring when instantiating with tracing.
+     *
+     * <p>Ref: <a href="https://stackoverflow.com/a/19688634">Tracking down cause of Spring's "not
+     * eligible for auto-proxying"</a></p>
+     */
+    BeanFactory beanFactory;
 
     @Override public Object postProcessBeforeInitialization(Object bean, String beanName) {
       return bean;
     }
 
     @Override public Object postProcessAfterInitialization(Object bean, String beanName) {
-      if (tracing == null) return bean;
-      if (bean instanceof SessionFactory) {
+      if (bean instanceof SessionFactory && beanFactory.containsBean("tracing")) {
         SessionFactory delegate = (SessionFactory) bean;
+        Tracing tracing = beanFactory.getBean(Tracing.class);
         return (SessionFactory) storage -> TracingSession.create(tracing, delegate.create(storage));
       }
       return bean;
     }
+
+    @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+      this.beanFactory = beanFactory;
+    }
   }
 }

zipkin-server/src/main/java/zipkin2/server/internal/cassandra3/ZipkinCassandra3StorageConfiguration.java

@@ -16,15 +16,17 @@
 import brave.Tracing;
 import brave.cassandra.driver.TracingSession;
 import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import zipkin2.server.internal.ConditionalOnSelfTracing;
 import zipkin2.storage.StorageComponent;
 import zipkin2.storage.cassandra.CassandraStorage;
@@ -35,11 +37,11 @@
  * contain a single span, which is TBinaryProtocol big-endian, then base64 encoded. Decoded spans
  * are stored asynchronously.
  */
-@Configuration
 @ConditionalOnClass(CassandraStorage.class)
 @EnableConfigurationProperties(ZipkinCassandra3StorageProperties.class)
 @ConditionalOnProperty(name = "zipkin.storage.type", havingValue = "cassandra3")
 @ConditionalOnMissingBean(StorageComponent.class)
+@Import(ZipkinCassandra3StorageConfiguration.TracingSessionFactoryEnhancer.class)
 // This component is named .*Cassandra3.* even though the package already says cassandra3 because
 // Spring Boot configuration endpoints only printout the simple name of the class
 public class ZipkinCassandra3StorageConfiguration {
@@ -67,23 +69,31 @@ StorageComponent storage(
       .sessionFactory(sessionFactory).build();
   }
 
-  @Configuration
   @ConditionalOnSelfTracing
-  static class TracingSessionFactoryEnhancer implements BeanPostProcessor {
-
-    @Autowired(required = false) Tracing tracing;
+  static class TracingSessionFactoryEnhancer  implements BeanPostProcessor, BeanFactoryAware {
+    /**
+     * Need this to resolve cyclic instantiation issue with spring when instantiating with tracing.
+     *
+     * <p>Ref: <a href="https://stackoverflow.com/a/19688634">Tracking down cause of Spring's "not
+     * eligible for auto-proxying"</a></p>
+     */
+    BeanFactory beanFactory;
 
     @Override public Object postProcessBeforeInitialization(Object bean, String beanName) {
       return bean;
     }
 
     @Override public Object postProcessAfterInitialization(Object bean, String beanName) {
-      if (tracing == null) return bean;
-      if (bean instanceof SessionFactory) {
+      if (bean instanceof SessionFactory && beanFactory.containsBean("tracing")) {
         SessionFactory delegate = (SessionFactory) bean;
+        Tracing tracing = beanFactory.getBean(Tracing.class);
         return (SessionFactory) storage -> TracingSession.create(tracing, delegate.create(storage));
       }
       return bean;
     }
+
+    @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+      this.beanFactory = beanFactory;
+    }
   }
 }

zipkin-server/src/main/java/zipkin2/server/internal/elasticsearch/ZipkinElasticsearchStorageConfiguration.java

@@ -47,7 +47,7 @@
 
 import static zipkin2.server.internal.elasticsearch.ZipkinElasticsearchStorageProperties.Ssl;
 
-@Configuration
+@Configuration(proxyBeanMethods=false)
 @EnableConfigurationProperties(ZipkinElasticsearchStorageProperties.class)
 @ConditionalOnProperty(name = "zipkin.storage.type", havingValue = "elasticsearch")
 @ConditionalOnMissingBean(StorageComponent.class)

zipkin-server/src/main/java/zipkin2/server/internal/kafka/ZipkinKafkaCollectorConfiguration.java

@@ -19,7 +19,6 @@
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 import zipkin2.collector.CollectorMetrics;
 import zipkin2.collector.CollectorSampler;
@@ -30,7 +29,6 @@
  * This collector consumes a topic, decodes spans from thrift messages and stores them subject to
  * sampling policy.
  */
-@Configuration
 @ConditionalOnClass(KafkaCollector.class)
 @Conditional(ZipkinKafkaCollectorConfiguration.KafkaBootstrapServersSet.class)
 @EnableConfigurationProperties(ZipkinKafkaCollectorProperties.class)

zipkin-server/src/main/java/zipkin2/server/internal/mysql/ZipkinMySQLStorageConfiguration.java

@@ -24,13 +24,11 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import zipkin2.storage.StorageComponent;
 import zipkin2.storage.mysql.v1.MySQLStorage;
 
-@Configuration
 @EnableConfigurationProperties(ZipkinMySQLStorageProperties.class)
 @ConditionalOnClass(MySQLStorage.class)
 @ConditionalOnProperty(name = "zipkin.storage.type", havingValue = "mysql")

zipkin-server/src/main/java/zipkin2/server/internal/mysql/ZipkinSelfTracingMySQLStorageConfiguration.java

@@ -25,13 +25,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import zipkin2.server.internal.ConditionalOnSelfTracing;
 
 /** Sets up the MySQL tracing in Brave as an initialization. */
 @ConditionalOnSelfTracing
 @ConditionalOnProperty(name = "zipkin.storage.type", havingValue = "mysql")
-@Configuration
 class ZipkinSelfTracingMySQLStorageConfiguration extends DefaultExecuteListener {
 
   @Autowired ZipkinMySQLStorageProperties mysql;

zipkin-server/src/main/java/zipkin2/server/internal/prometheus/ZipkinPrometheusMetricsConfiguration.java

@@ -42,7 +42,7 @@
 import org.springframework.core.annotation.Order;
 import org.springframework.util.StringUtils;
 
-@Configuration
+@Configuration(proxyBeanMethods=false)
 public class ZipkinPrometheusMetricsConfiguration {
   // from io.micrometer.spring.web.servlet.WebMvcTags
   private static final Tag URI_NOT_FOUND = Tag.of("uri", "NOT_FOUND");