feat: reconfigure ZipkinAutoConfiguration (#1728)

* feat: reconfigure ZipkinAutoConfiguration

* configure zipkin after stackdriver

spring-cloud-gcp-autoconfigure/src/main/java/com/google/cloud/spring/autoconfigure/trace/StackdriverTraceAutoConfiguration.java

@@ -40,6 +40,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.actuate.autoconfigure.tracing.BraveAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -68,7 +69,7 @@
     value = {"spring.cloud.gcp.trace.enabled"},
     matchIfMissing = true)
 @ConditionalOnClass(StackdriverSender.class)
-@AutoConfigureBefore(BraveAutoConfiguration.class)
+@AutoConfigureBefore({BraveAutoConfiguration.class, ZipkinAutoConfiguration.class})
 public class StackdriverTraceAutoConfiguration {
 
   private static final Log LOGGER = LogFactory.getLog(StackdriverTraceAutoConfiguration.class);
@@ -168,7 +169,7 @@ public ManagedChannel stackdriverSenderChannel() {
 
   @Bean(REPORTER_BEAN_NAME)
   @ConditionalOnMissingBean(name = REPORTER_BEAN_NAME)
-  public Reporter<Span> stackdriverReporter(
+  public AsyncReporter<Span> stackdriverReporter(
       ReporterMetrics reporterMetrics,
       GcpTraceProperties trace,
       @Qualifier(SENDER_BEAN_NAME) Sender sender) {

spring-cloud-gcp-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -10,6 +10,3 @@ com.google.cloud.spring.autoconfigure.secretmanager.SecretManagerConfigDataLocat
 # ConfigData Loaders
 org.springframework.boot.context.config.ConfigDataLoader=\
 com.google.cloud.spring.autoconfigure.secretmanager.SecretManagerConfigDataLoader
-
-org.springframework.boot.autoconfigure.AutoConfigurationImportFilter=\
-com.google.cloud.spring.autoconfigure.trace.TraceAutoConfigurationFilter

spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/trace/StackdriverTraceAutoConfigurationTests.java

@@ -17,7 +17,6 @@
 package com.google.cloud.spring.autoconfigure.trace;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.awaitility.Awaitility.await;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -52,9 +51,7 @@
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.boot.actuate.autoconfigure.tracing.BraveAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
@@ -83,8 +80,7 @@ void init() {
                 StackdriverTraceAutoConfiguration.class,
                 GcpContextAutoConfiguration.class,
                 BraveAutoConfiguration.class,
-                RefreshAutoConfiguration.class,
-                TraceAutoConfigurationFilter.class))
+                RefreshAutoConfiguration.class))
         .withUserConfiguration(MockConfiguration.class)
         .withPropertyValues(
             "spring.cloud.gcp.project-id=proj");
@@ -107,16 +103,6 @@ void test() {
             });
   }
 
-  @Test
-  void testDisableZipkinAutoConfiguration() {
-    this.contextRunner
-        .run(
-            context ->
-                assertThatThrownBy(() -> context.getBean(ZipkinAutoConfiguration.class))
-                    .isExactlyInstanceOf(NoSuchBeanDefinitionException.class)
-                    .hasMessageContaining("ZipkinAutoConfiguration"));
-  }
-
   @Test
   void testEncodingSchema() {
     this.contextRunner