From 9cf1734a2e5dd7f7993195dfc62329c890a638cd Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Sat, 19 Oct 2019 07:32:13 +0800
Subject: [PATCH] Updates to Spring Boot 2.2 and stops using proxyBeanMethods

`proxyBeanMethods` is disablable in Spring 5.2, shipped with Spring Boot 2.2

Fixes https://github.com/openzipkin/zipkin/issues/2863
---
 pom.xml                                                   | 2 +-
 .../server/internal/InternalZipkinConfiguration.java      | 2 +-
 .../java/zipkin2/server/internal/ZipkinConfiguration.java | 8 ++++----
 .../zipkin2/server/internal/ZipkinHttpConfiguration.java  | 2 +-
 .../activemq/ZipkinActiveMQCollectorConfiguration.java    | 2 +-
 .../internal/brave/ZipkinSelfTracingConfiguration.java    | 2 +-
 .../cassandra/ZipkinCassandraStorageConfiguration.java    | 4 ++--
 .../cassandra3/ZipkinCassandra3StorageConfiguration.java  | 4 ++--
 .../ZipkinElasticsearchStorageConfiguration.java          | 2 +-
 .../internal/kafka/ZipkinKafkaCollectorConfiguration.java | 2 +-
 .../internal/mysql/ZipkinMySQLStorageConfiguration.java   | 2 +-
 .../mysql/ZipkinSelfTracingMySQLStorageConfiguration.java | 2 +-
 .../prometheus/ZipkinPrometheusMetricsConfiguration.java  | 2 +-
 .../rabbitmq/ZipkinRabbitMQCollectorConfiguration.java    | 2 +-
 .../scribe/ZipkinScribeCollectorConfiguration.java        | 2 +-
 .../zipkin2/server/internal/ui/ZipkinUiConfiguration.java | 2 +-
 .../zipkin2/server/internal/InMemoryConfiguration.java    | 2 +-
 .../server/internal/NoOpMeterRegistryConfiguration.java   | 2 +-
 .../server/internal/ZipkinActuatorImporterTest.java       | 6 +++---
 .../server/internal/ZipkinHttpConfigurationTest.java      | 2 +-
 .../zipkin2/server/internal/ZipkinModuleImporterTest.java | 4 ++--
 .../java/zipkin2/server/internal/activemq/Access.java     | 2 +-
 .../ZipkinElasticsearchStorageConfigurationTest.java      | 2 +-
 .../test/java/zipkin2/server/internal/kafka/Access.java   | 2 +-
 .../java/zipkin2/server/internal/rabbitmq/Access.java     | 2 +-
 .../zipkin2/storage/cassandra/v1/ITCassandraStorage.java  | 2 +-
 .../zipkin2/storage/cassandra/ITCassandraStorage.java     | 2 +-
 .../integration/ITElasticsearchStorageV6.java             | 2 +-
 .../integration/ITElasticsearchStorageV7.java             | 2 +-
 .../java/zipkin2/storage/mysql/v1/ITMySQLStorage.java     | 2 +-
 30 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6e82d380b67..ee07b1ae566 100755
--- a/pom.xml
+++ b/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/
 
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/InternalZipkinConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/InternalZipkinConfiguration.java
index 8109fc2d4b3..5a663671f0c 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/InternalZipkinConfiguration.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/InternalZipkinConfiguration.java
@@ -30,7 +30,7 @@
 import zipkin2.server.internal.scribe.ZipkinScribeCollectorConfiguration;
 import zipkin2.server.internal.ui.ZipkinUiConfiguration;
 
-@Configuration
+@Configuration(proxyBeanMethods=false)
 @Import({
   ArmeriaAutoConfiguration.class,
   ZipkinConfiguration.class,
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/ZipkinConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/ZipkinConfiguration.java
index 4912a82f713..4f565ebcd44 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/ZipkinConfiguration.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/ZipkinConfiguration.java
@@ -39,7 +39,7 @@
 import zipkin2.storage.StorageComponent;
 
 /** Base collector and storage configurations needed for higher-level integrations */
-@Configuration
+@Configuration(proxyBeanMethods=false)
 public class ZipkinConfiguration {
 
   @Bean CollectorSampler traceIdSampler(@Value("${zipkin.collector.sample-rate:1.0}") float rate) {
@@ -50,7 +50,7 @@ public class ZipkinConfiguration {
     return new MicrometerCollectorMetrics(registry);
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods=false)
   @EnableConfigurationProperties(ZipkinStorageThrottleProperties.class)
   @ConditionalOnThrottledStorage
   static class ThrottledStorageComponentEnhancer implements BeanPostProcessor, BeanFactoryAware {
@@ -87,7 +87,7 @@ static class ThrottledStorageComponentEnhancer implements BeanPostProcessor, Bea
     }
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods=false)
   @ConditionalOnSelfTracing
   static class TracingStorageComponentEnhancer implements BeanPostProcessor {
 
@@ -113,7 +113,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) {
    * 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
+  @Configuration(proxyBeanMethods=false)
   @Conditional(StorageTypeMemAbsentOrEmpty.class)
   @ConditionalOnMissingBean(StorageComponent.class)
   static class InMemoryConfiguration {
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/ZipkinHttpConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/ZipkinHttpConfiguration.java
index 49f7e50fdeb..c3ac535b51b 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/ZipkinHttpConfiguration.java
+++ b/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");
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/activemq/ZipkinActiveMQCollectorConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/activemq/ZipkinActiveMQCollectorConfiguration.java
index f7a8ad77509..2622810ab09 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/activemq/ZipkinActiveMQCollectorConfiguration.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/activemq/ZipkinActiveMQCollectorConfiguration.java
@@ -27,7 +27,7 @@
 import zipkin2.storage.StorageComponent;
 
 /** Auto-configuration for {@link ActiveMQCollector}. */
-@Configuration
+@Configuration(proxyBeanMethods=false)
 @ConditionalOnClass(ActiveMQCollector.class)
 @EnableConfigurationProperties(ZipkinActiveMQCollectorProperties.class)
 @Conditional(ZipkinActiveMQCollectorConfiguration.ActiveMQUrlSet.class)
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/brave/ZipkinSelfTracingConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/brave/ZipkinSelfTracingConfiguration.java
index 3477332c245..205021b4776 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/brave/ZipkinSelfTracingConfiguration.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/brave/ZipkinSelfTracingConfiguration.java
@@ -45,7 +45,7 @@
 import zipkin2.server.internal.ConditionalOnSelfTracing;
 import zipkin2.storage.StorageComponent;
 
-@Configuration
+@Configuration(proxyBeanMethods=false)
 @EnableConfigurationProperties(SelfTracingProperties.class)
 @ConditionalOnSelfTracing
 public class ZipkinSelfTracingConfiguration {
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/cassandra/ZipkinCassandraStorageConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/cassandra/ZipkinCassandraStorageConfiguration.java
index 2a3e52c4ad6..230b80dde9a 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/cassandra/ZipkinCassandraStorageConfiguration.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/cassandra/ZipkinCassandraStorageConfiguration.java
@@ -35,7 +35,7 @@
  * contain a single span, which is TBinaryProtocol big-endian, then base64 encoded. Decoded spans
  * are stored asynchronously.
  */
-@Configuration
+@Configuration(proxyBeanMethods=false)
 @ConditionalOnClass(CassandraStorage.class)
 @EnableConfigurationProperties(ZipkinCassandraStorageProperties.class)
 @ConditionalOnProperty(name = "zipkin.storage.type", havingValue = "cassandra")
@@ -65,7 +65,7 @@ StorageComponent storage(
       .sessionFactory(sessionFactory).build();
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods=false)
   @ConditionalOnSelfTracing
   static class TracingSessionFactoryEnhancer implements BeanPostProcessor {
 
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/cassandra3/ZipkinCassandra3StorageConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/cassandra3/ZipkinCassandra3StorageConfiguration.java
index 4b427dea5c1..b6faf1e2f72 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/cassandra3/ZipkinCassandra3StorageConfiguration.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/cassandra3/ZipkinCassandra3StorageConfiguration.java
@@ -35,7 +35,7 @@
  * contain a single span, which is TBinaryProtocol big-endian, then base64 encoded. Decoded spans
  * are stored asynchronously.
  */
-@Configuration
+@Configuration(proxyBeanMethods=false)
 @ConditionalOnClass(CassandraStorage.class)
 @EnableConfigurationProperties(ZipkinCassandra3StorageProperties.class)
 @ConditionalOnProperty(name = "zipkin.storage.type", havingValue = "cassandra3")
@@ -67,7 +67,7 @@ StorageComponent storage(
       .sessionFactory(sessionFactory).build();
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods=false)
   @ConditionalOnSelfTracing
   static class TracingSessionFactoryEnhancer implements BeanPostProcessor {
 
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/elasticsearch/ZipkinElasticsearchStorageConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/elasticsearch/ZipkinElasticsearchStorageConfiguration.java
index f77a5a3acc4..621183c0b94 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/elasticsearch/ZipkinElasticsearchStorageConfiguration.java
+++ b/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)
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/kafka/ZipkinKafkaCollectorConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/kafka/ZipkinKafkaCollectorConfiguration.java
index 7b2b0b336c5..bc48aa99f7d 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/kafka/ZipkinKafkaCollectorConfiguration.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/kafka/ZipkinKafkaCollectorConfiguration.java
@@ -30,7 +30,7 @@
  * This collector consumes a topic, decodes spans from thrift messages and stores them subject to
  * sampling policy.
  */
-@Configuration
+@Configuration(proxyBeanMethods=false)
 @ConditionalOnClass(KafkaCollector.class)
 @Conditional(ZipkinKafkaCollectorConfiguration.KafkaBootstrapServersSet.class)
 @EnableConfigurationProperties(ZipkinKafkaCollectorProperties.class)
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/mysql/ZipkinMySQLStorageConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/mysql/ZipkinMySQLStorageConfiguration.java
index bd12c121c06..085ddc1fa10 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/mysql/ZipkinMySQLStorageConfiguration.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/mysql/ZipkinMySQLStorageConfiguration.java
@@ -30,7 +30,7 @@
 import zipkin2.storage.StorageComponent;
 import zipkin2.storage.mysql.v1.MySQLStorage;
 
-@Configuration
+@Configuration(proxyBeanMethods=false)
 @EnableConfigurationProperties(ZipkinMySQLStorageProperties.class)
 @ConditionalOnClass(MySQLStorage.class)
 @ConditionalOnProperty(name = "zipkin.storage.type", havingValue = "mysql")
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/mysql/ZipkinSelfTracingMySQLStorageConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/mysql/ZipkinSelfTracingMySQLStorageConfiguration.java
index 0781041f446..296f6210173 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/mysql/ZipkinSelfTracingMySQLStorageConfiguration.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/mysql/ZipkinSelfTracingMySQLStorageConfiguration.java
@@ -31,7 +31,7 @@
 /** Sets up the MySQL tracing in Brave as an initialization. */
 @ConditionalOnSelfTracing
 @ConditionalOnProperty(name = "zipkin.storage.type", havingValue = "mysql")
-@Configuration
+@Configuration(proxyBeanMethods=false)
 class ZipkinSelfTracingMySQLStorageConfiguration extends DefaultExecuteListener {
 
   @Autowired ZipkinMySQLStorageProperties mysql;
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/prometheus/ZipkinPrometheusMetricsConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/prometheus/ZipkinPrometheusMetricsConfiguration.java
index 83d519f2bac..d82fa3927fa 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/prometheus/ZipkinPrometheusMetricsConfiguration.java
+++ b/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");
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/rabbitmq/ZipkinRabbitMQCollectorConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/rabbitmq/ZipkinRabbitMQCollectorConfiguration.java
index cd47365499f..7e56085ab33 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/rabbitmq/ZipkinRabbitMQCollectorConfiguration.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/rabbitmq/ZipkinRabbitMQCollectorConfiguration.java
@@ -30,7 +30,7 @@
 import zipkin2.storage.StorageComponent;
 
 /** Auto-configuration for {@link RabbitMQCollector}. */
-@Configuration
+@Configuration(proxyBeanMethods=false)
 @ConditionalOnClass(RabbitMQCollector.class)
 @Conditional(ZipkinRabbitMQCollectorConfiguration.RabbitMQAddressesOrUriSet.class)
 @EnableConfigurationProperties(ZipkinRabbitMQCollectorProperties.class)
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/scribe/ZipkinScribeCollectorConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/scribe/ZipkinScribeCollectorConfiguration.java
index adde9f31234..8dcf43028a7 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/scribe/ZipkinScribeCollectorConfiguration.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/scribe/ZipkinScribeCollectorConfiguration.java
@@ -28,7 +28,7 @@
  * a single span, which is TBinaryProtocol big-endian, then base64 encoded. Decoded spans are stored
  * asynchronously.
  */
-@Configuration
+@Configuration(proxyBeanMethods=false)
 @ConditionalOnClass(ScribeCollector.class)
 @ConditionalOnProperty(value = "zipkin.collector.scribe.enabled", havingValue = "true")
 public class ZipkinScribeCollectorConfiguration {
diff --git a/zipkin-server/src/main/java/zipkin2/server/internal/ui/ZipkinUiConfiguration.java b/zipkin-server/src/main/java/zipkin2/server/internal/ui/ZipkinUiConfiguration.java
index 44803c7a7a7..450d2bb4680 100644
--- a/zipkin-server/src/main/java/zipkin2/server/internal/ui/ZipkinUiConfiguration.java
+++ b/zipkin-server/src/main/java/zipkin2/server/internal/ui/ZipkinUiConfiguration.java
@@ -75,7 +75,7 @@
  * Since index.html links to hashed resource names, any change to it will orphan old resources.
  * That's why hashed resource age can be 365 days.
  */
-@Configuration
+@Configuration(proxyBeanMethods=false)
 @EnableConfigurationProperties({ZipkinUiProperties.class, CompressionProperties.class})
 @ConditionalOnProperty(name = "zipkin.ui.enabled", matchIfMissing = true)
 public class ZipkinUiConfiguration {
diff --git a/zipkin-server/src/test/java/zipkin2/server/internal/InMemoryConfiguration.java b/zipkin-server/src/test/java/zipkin2/server/internal/InMemoryConfiguration.java
index 6b75277220a..5d6d79d0891 100644
--- a/zipkin-server/src/test/java/zipkin2/server/internal/InMemoryConfiguration.java
+++ b/zipkin-server/src/test/java/zipkin2/server/internal/InMemoryConfiguration.java
@@ -20,7 +20,7 @@
 import zipkin2.storage.InMemoryStorage;
 import zipkin2.storage.StorageComponent;
 
-@Configuration
+@Configuration(proxyBeanMethods=false)
 public class InMemoryConfiguration {
   @Bean public CollectorSampler sampler() {
     return CollectorSampler.ALWAYS_SAMPLE;
diff --git a/zipkin-server/src/test/java/zipkin2/server/internal/NoOpMeterRegistryConfiguration.java b/zipkin-server/src/test/java/zipkin2/server/internal/NoOpMeterRegistryConfiguration.java
index 4ce6bca58a8..d72a26b5314 100644
--- a/zipkin-server/src/test/java/zipkin2/server/internal/NoOpMeterRegistryConfiguration.java
+++ b/zipkin-server/src/test/java/zipkin2/server/internal/NoOpMeterRegistryConfiguration.java
@@ -18,7 +18,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-@Configuration
+@Configuration(proxyBeanMethods=false)
 public class NoOpMeterRegistryConfiguration {
   @Bean public MeterRegistry noOpMeterRegistry() {
     return NoopMeterRegistry.get();
diff --git a/zipkin-server/src/test/java/zipkin2/server/internal/ZipkinActuatorImporterTest.java b/zipkin-server/src/test/java/zipkin2/server/internal/ZipkinActuatorImporterTest.java
index 1837655f23d..beaf3aad709 100644
--- a/zipkin-server/src/test/java/zipkin2/server/internal/ZipkinActuatorImporterTest.java
+++ b/zipkin-server/src/test/java/zipkin2/server/internal/ZipkinActuatorImporterTest.java
@@ -99,15 +99,15 @@ public class ZipkinActuatorImporterTest {
     context.getBean(Include2.class);
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods=false)
   static class ActuatorImpl {
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods=false)
   static class Include1 {
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods=false)
   static class Include2 {
   }
 }
diff --git a/zipkin-server/src/test/java/zipkin2/server/internal/ZipkinHttpConfigurationTest.java b/zipkin-server/src/test/java/zipkin2/server/internal/ZipkinHttpConfigurationTest.java
index e52ba3939c5..8247bdd75ad 100644
--- a/zipkin-server/src/test/java/zipkin2/server/internal/ZipkinHttpConfigurationTest.java
+++ b/zipkin-server/src/test/java/zipkin2/server/internal/ZipkinHttpConfigurationTest.java
@@ -94,7 +94,7 @@ public void httpCollector_canDisable() {
       .isEqualTo(false);
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods=false)
   public static class Config {
     @Bean MeterRegistry registry() {
       return new PrometheusMeterRegistry(PrometheusConfig.DEFAULT);
diff --git a/zipkin-server/src/test/java/zipkin2/server/internal/ZipkinModuleImporterTest.java b/zipkin-server/src/test/java/zipkin2/server/internal/ZipkinModuleImporterTest.java
index 417fd3491c0..6bd13f5dd47 100644
--- a/zipkin-server/src/test/java/zipkin2/server/internal/ZipkinModuleImporterTest.java
+++ b/zipkin-server/src/test/java/zipkin2/server/internal/ZipkinModuleImporterTest.java
@@ -67,11 +67,11 @@ public class ZipkinModuleImporterTest {
     context.getBean(Module2.class);
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods=false)
   static class Module1 {
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods=false)
   static class Module2 {
   }
 }
diff --git a/zipkin-server/src/test/java/zipkin2/server/internal/activemq/Access.java b/zipkin-server/src/test/java/zipkin2/server/internal/activemq/Access.java
index 5ae5c570e76..120cb81d7b0 100644
--- a/zipkin-server/src/test/java/zipkin2/server/internal/activemq/Access.java
+++ b/zipkin-server/src/test/java/zipkin2/server/internal/activemq/Access.java
@@ -29,7 +29,7 @@ public static void registerActiveMQProperties(AnnotationConfigApplicationContext
         PropertyPlaceholderAutoConfiguration.class, EnableActiveMQCollectorProperties.class);
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods=false)
   @EnableConfigurationProperties(ZipkinActiveMQCollectorProperties.class)
   static class EnableActiveMQCollectorProperties {}
 
diff --git a/zipkin-server/src/test/java/zipkin2/server/internal/elasticsearch/ZipkinElasticsearchStorageConfigurationTest.java b/zipkin-server/src/test/java/zipkin2/server/internal/elasticsearch/ZipkinElasticsearchStorageConfigurationTest.java
index dd74d22c3c0..6bf1fdd2b26 100644
--- a/zipkin-server/src/test/java/zipkin2/server/internal/elasticsearch/ZipkinElasticsearchStorageConfigurationTest.java
+++ b/zipkin-server/src/test/java/zipkin2/server/internal/elasticsearch/ZipkinElasticsearchStorageConfigurationTest.java
@@ -135,7 +135,7 @@ public void doesntProvideStorageComponent_whenStorageTypeNotElasticsearch() {
       .isEqualTo(443);
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods=false)
   static class CustomizerConfiguration {
 
     @Bean @Qualifier("zipkinElasticsearch") public Consumer<ClientOptionsBuilder> one() {
diff --git a/zipkin-server/src/test/java/zipkin2/server/internal/kafka/Access.java b/zipkin-server/src/test/java/zipkin2/server/internal/kafka/Access.java
index a0cc5b90a39..d1296bd3c9f 100644
--- a/zipkin-server/src/test/java/zipkin2/server/internal/kafka/Access.java
+++ b/zipkin-server/src/test/java/zipkin2/server/internal/kafka/Access.java
@@ -28,7 +28,7 @@ public static void registerKafkaProperties(AnnotationConfigApplicationContext co
         PropertyPlaceholderAutoConfiguration.class, EnableKafkaCollectorProperties.class);
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods=false)
   @EnableConfigurationProperties(ZipkinKafkaCollectorProperties.class)
   static class EnableKafkaCollectorProperties {}
 
diff --git a/zipkin-server/src/test/java/zipkin2/server/internal/rabbitmq/Access.java b/zipkin-server/src/test/java/zipkin2/server/internal/rabbitmq/Access.java
index eca2a468c48..41b66b4c80a 100644
--- a/zipkin-server/src/test/java/zipkin2/server/internal/rabbitmq/Access.java
+++ b/zipkin-server/src/test/java/zipkin2/server/internal/rabbitmq/Access.java
@@ -28,7 +28,7 @@ public static void registerRabbitMQProperties(AnnotationConfigApplicationContext
         PropertyPlaceholderAutoConfiguration.class, EnableRabbitMQCollectorProperties.class);
   }
 
-  @Configuration
+  @Configuration(proxyBeanMethods=false)
   @EnableConfigurationProperties(ZipkinRabbitMQCollectorProperties.class)
   static class EnableRabbitMQCollectorProperties {}
 
diff --git a/zipkin-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java b/zipkin-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java
index faf732f0ae9..aca9149bd04 100644
--- a/zipkin-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java
+++ b/zipkin-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java
@@ -43,7 +43,7 @@
 class ITCassandraStorage {
 
   @RegisterExtension CassandraStorageExtension backend =
-    new CassandraStorageExtension("openzipkin/zipkin-cassandra:2.17.1");
+    new CassandraStorageExtension("openzipkin/zipkin-cassandra:2.18.2");
 
   @Nested
   class ITTraces extends zipkin2.storage.ITTraces<CassandraStorage> {
diff --git a/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/ITCassandraStorage.java b/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/ITCassandraStorage.java
index 7a1a2c7ca40..61250b0d8b8 100644
--- a/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/ITCassandraStorage.java
+++ b/zipkin-storage/cassandra/src/test/java/zipkin2/storage/cassandra/ITCassandraStorage.java
@@ -45,7 +45,7 @@
 class ITCassandraStorage {
 
   @RegisterExtension CassandraStorageExtension backend = new CassandraStorageExtension(
-    "openzipkin/zipkin-cassandra:2.17.1");
+    "openzipkin/zipkin-cassandra:2.18.2");
 
   @Nested
   class ITTraces extends zipkin2.storage.ITTraces<CassandraStorage> {
diff --git a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java
index 474a7361c21..275290ce026 100644
--- a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java
+++ b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV6.java
@@ -20,7 +20,7 @@
 class ITElasticsearchStorageV6 extends ITElasticsearchStorage {
 
   @RegisterExtension ElasticsearchStorageExtension backend = new ElasticsearchStorageExtension(
-    "openzipkin/zipkin-elasticsearch6:2.17.1");
+    "openzipkin/zipkin-elasticsearch6:2.18.2");
 
   @Override ElasticsearchStorageExtension backend() {
     return backend;
diff --git a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV7.java b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV7.java
index 07ebbf9eb12..001f3bd081f 100644
--- a/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV7.java
+++ b/zipkin-storage/elasticsearch/src/test/java/zipkin2/elasticsearch/integration/ITElasticsearchStorageV7.java
@@ -20,7 +20,7 @@
 class ITElasticsearchStorageV7 extends ITElasticsearchStorage {
 
   @RegisterExtension ElasticsearchStorageExtension backend = new ElasticsearchStorageExtension(
-    "openzipkin/zipkin-elasticsearch7:2.17.1");
+    "openzipkin/zipkin-elasticsearch7:2.18.2");
 
   @Override ElasticsearchStorageExtension backend() {
     return backend;
diff --git a/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/ITMySQLStorage.java b/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/ITMySQLStorage.java
index f66422a1bb5..7a4a8bb5657 100644
--- a/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/ITMySQLStorage.java
+++ b/zipkin-storage/mysql-v1/src/test/java/zipkin2/storage/mysql/v1/ITMySQLStorage.java
@@ -34,7 +34,7 @@
 class ITMySQLStorage {
 
   @RegisterExtension MySQLStorageExtension backend = new MySQLStorageExtension(
-    "openzipkin/zipkin-mysql:2.17.1");
+    "openzipkin/zipkin-mysql:2.18.2");
 
   @Nested
   class ITTraces extends zipkin2.storage.ITTraces<MySQLStorage> {