chore: Spring Boot 3.3 updates

pom.xml

@@ -39,9 +39,9 @@
 		<spring-cloud-dependencies.version>2023.0.1</spring-cloud-dependencies.version>
 		<spring-boot-dependencies.version>3.3.0</spring-boot-dependencies.version>
 		<spring-cloud-gcp-dependencies.version>${project.parent.version}</spring-cloud-gcp-dependencies.version>
-		<zipkin-gcp.version>1.1.1</zipkin-gcp.version>
+		<zipkin-gcp.version>2.2.4</zipkin-gcp.version>
 		<java-cfenv.version>2.5.0</java-cfenv.version>
-		<micrometer-tracing.verison>1.2.5</micrometer-tracing.verison>
+		<micrometer-tracing.version>1.2.5</micrometer-tracing.version>
 
 		<!-- Plugin versions -->
 		<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
@@ -111,6 +111,18 @@
 				<version>0.1.5</version>
 			</dependency>
 
+			<dependency>
+				<groupId>io.zipkin.gcp</groupId>
+				<artifactId>zipkin-encoder-stackdriver</artifactId>
+				<version>${zipkin-gcp.version}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>io.zipkin.gcp</groupId>
+				<artifactId>brave-encoder-stackdriver</artifactId>
+				<version>${zipkin-gcp.version}</version>
+			</dependency>
+
 			<dependency>
 				<groupId>io.zipkin.gcp</groupId>
 				<artifactId>zipkin-sender-stackdriver</artifactId>
@@ -150,7 +162,7 @@
 			<dependency>
 				<groupId>io.micrometer</groupId>
 				<artifactId>micrometer-tracing-bom</artifactId>
-				<version>${micrometer-tracing.verison}</version>
+				<version>${micrometer-tracing.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

spring-cloud-gcp-autoconfigure/pom.xml

@@ -188,6 +188,18 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>io.zipkin.gcp</groupId>
+            <artifactId>zipkin-encoder-stackdriver</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>io.zipkin.gcp</groupId>
+            <artifactId>brave-encoder-stackdriver</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>io.zipkin.gcp</groupId>
             <artifactId>zipkin-sender-stackdriver</artifactId>

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

@@ -16,8 +16,10 @@
 
 package com.google.cloud.spring.autoconfigure.trace;
 
+import brave.Tags;
 import brave.TracingCustomizer;
 import brave.baggage.BaggagePropagation;
+import brave.handler.MutableSpan;
 import brave.handler.SpanHandler;
 import brave.propagation.B3Propagation;
 import brave.propagation.Propagation;
@@ -49,18 +51,12 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
-import zipkin2.CheckResult;
-import zipkin2.Span;
-import zipkin2.codec.BytesEncoder;
-import zipkin2.codec.SpanBytesEncoder;
-import zipkin2.reporter.AsyncReporter;
-import zipkin2.reporter.Reporter;
+import zipkin2.reporter.BytesEncoder;
 import zipkin2.reporter.ReporterMetrics;
-import zipkin2.reporter.Sender;
-import zipkin2.reporter.brave.ZipkinSpanHandler;
-import zipkin2.reporter.stackdriver.StackdriverEncoder;
+import zipkin2.reporter.brave.AsyncZipkinSpanHandler;
 import zipkin2.reporter.stackdriver.StackdriverSender;
 import zipkin2.reporter.stackdriver.StackdriverSender.Builder;
+import zipkin2.reporter.stackdriver.brave.StackdriverV2Encoder;
 
 /** Config for Stackdriver Trace. */
 @AutoConfiguration
@@ -75,10 +71,9 @@ public class StackdriverTraceAutoConfiguration {
   private static final Log LOGGER = LogFactory.getLog(StackdriverTraceAutoConfiguration.class);
 
   /**
-   * Stackdriver reporter bean name. Name of the bean matters for supporting multiple tracing
-   * systems.
+   * Stackdriver encoder bean name. Name of the bean matters for supporting multiple tracing systems.
    */
-  public static final String REPORTER_BEAN_NAME = "stackdriverReporter";
+  public static final String ENCODER_BEAN_NAME = "stackdriverEncoder";
 
   /**
    * Stackdriver sender bean name. Name of the bean matters for supporting multiple tracing systems.
@@ -129,9 +124,16 @@ public TracingCustomizer stackdriverTracingCustomizer(
 
   @Bean(SPAN_HANDLER_BEAN_NAME)
   @ConditionalOnMissingBean(name = SPAN_HANDLER_BEAN_NAME)
-  public SpanHandler stackdriverSpanHandler(
-      @Qualifier(REPORTER_BEAN_NAME) Reporter<Span> stackdriverReporter) {
-    return ZipkinSpanHandler.create(stackdriverReporter);
+  public AsyncZipkinSpanHandler stackdriverSpanHandler(
+      @Qualifier(SENDER_BEAN_NAME) StackdriverSender sender,
+      @Qualifier(ENCODER_BEAN_NAME) BytesEncoder<MutableSpan> encoder,
+      ReporterMetrics reporterMetrics,
+      GcpTraceProperties trace) {
+    return AsyncZipkinSpanHandler.newBuilder(sender)
+        .metrics(reporterMetrics)
+        .queuedMaxSpans(1000)
+        .messageTimeout(trace.getMessageTimeout(), TimeUnit.SECONDS)
+        .build(encoder);
   }
 
   @Bean
@@ -167,33 +169,9 @@ public ManagedChannel stackdriverSenderChannel() {
         .build();
   }
 
-  @Bean(REPORTER_BEAN_NAME)
-  @ConditionalOnMissingBean(name = REPORTER_BEAN_NAME)
-  public AsyncReporter<Span> stackdriverReporter(
-      ReporterMetrics reporterMetrics,
-      GcpTraceProperties trace,
-      @Qualifier(SENDER_BEAN_NAME) Sender sender) {
-
-    AsyncReporter<Span> asyncReporter =
-        AsyncReporter.builder(sender)
-            // historical constraint. Note: AsyncReporter supports memory bounds
-            .queuedMaxSpans(1000)
-            .messageTimeout(trace.getMessageTimeout(), TimeUnit.SECONDS)
-            .metrics(reporterMetrics)
-            .build(StackdriverEncoder.V2);
-
-    CheckResult checkResult = asyncReporter.check();
-    if (!checkResult.ok()) {
-      LOGGER.warn(
-          "Error when performing Stackdriver AsyncReporter health check.", checkResult.error());
-    }
-
-    return asyncReporter;
-  }
-
   @Bean(SENDER_BEAN_NAME)
   @ConditionalOnMissingBean(name = SENDER_BEAN_NAME)
-  public Sender stackdriverSender(
+  public StackdriverSender stackdriverSender(
       GcpTraceProperties traceProperties,
       @Qualifier("traceExecutorProvider") ExecutorProvider executorProvider,
       @Qualifier("stackdriverSenderChannel") ManagedChannel channel)
@@ -253,11 +231,10 @@ public BaggagePropagation.FactoryBuilder baggagePropagationFactoryBuilder() {
     return BaggagePropagation.newFactoryBuilder(StackdriverTracePropagation.newFactory(primary));
   }
 
-  // Add this bean to suppress other encoding schema, e.g., JSON.
-  @Bean
-  @ConditionalOnMissingBean
-  public BytesEncoder<Span> spanBytesEncoder() {
-    return SpanBytesEncoder.PROTO3;
+  @Bean(ENCODER_BEAN_NAME)
+  @ConditionalOnMissingBean(name = ENCODER_BEAN_NAME)
+  public BytesEncoder<MutableSpan> spanBytesEncoder() {
+    return new StackdriverV2Encoder(Tags.ERROR);
   }
 
   @PreDestroy

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

@@ -19,8 +19,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import brave.Tracer;
@@ -36,6 +34,7 @@
 import com.google.devtools.cloudtrace.v2.TraceServiceGrpc;
 import com.google.protobuf.Empty;
 import io.grpc.CallOptions;
+import io.grpc.Channel;
 import io.grpc.ManagedChannel;
 import io.grpc.Server;
 import io.grpc.inprocess.InProcessChannelBuilder;
@@ -57,15 +56,13 @@
 import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
-import zipkin2.Call;
-import zipkin2.CheckResult;
-import zipkin2.codec.BytesEncoder;
-import zipkin2.codec.Encoding;
-import zipkin2.codec.SpanBytesEncoder;
-import zipkin2.reporter.AsyncReporter;
-import zipkin2.reporter.Sender;
+import zipkin2.reporter.BytesEncoder;
+import zipkin2.reporter.BytesMessageSender;
+import zipkin2.reporter.Encoding;
+import zipkin2.reporter.SpanBytesEncoder;
 import zipkin2.reporter.brave.AsyncZipkinSpanHandler;
 import zipkin2.reporter.stackdriver.StackdriverSender;
+import zipkin2.reporter.stackdriver.brave.StackdriverV2Encoder;
 
 /** Tests for auto-config. */
 class StackdriverTraceAutoConfigurationTests {
@@ -97,7 +94,7 @@ void test() {
             context -> {
               assertThat(
                       context.getBean(
-                          StackdriverTraceAutoConfiguration.SENDER_BEAN_NAME, Sender.class))
+                          StackdriverTraceAutoConfiguration.SENDER_BEAN_NAME, StackdriverSender.class))
                   .isNotNull();
               assertThat(context.getBean(ManagedChannel.class)).isNotNull();
             });
@@ -109,7 +106,7 @@ void testEncodingSchema() {
         .run(
             context -> assertThat(
                 context.getBean(BytesEncoder.class))
-                .isEqualTo(SpanBytesEncoder.PROTO3));
+                .isInstanceOf(StackdriverV2Encoder.class));
   }
 
   @Test
@@ -123,13 +120,13 @@ void testDefaultConfig() {
             context -> {
               assertThat(
                       context.getBean(
-                          StackdriverTraceAutoConfiguration.SENDER_BEAN_NAME, Sender.class))
+                          StackdriverTraceAutoConfiguration.SENDER_BEAN_NAME, StackdriverSender.class))
                   .isNotNull()
                   .isInstanceOf(StackdriverSender.class);
               final StackdriverSender sender =
                   (StackdriverSender)
                       context.getBean(
-                          StackdriverTraceAutoConfiguration.SENDER_BEAN_NAME, Sender.class);
+                          StackdriverTraceAutoConfiguration.SENDER_BEAN_NAME, StackdriverSender.class);
               final CallOptions callOptions =
                   (CallOptions) FieldUtils.readField(sender, "callOptions", true);
               assertThat(callOptions).isNotNull();
@@ -155,13 +152,13 @@ void testServerResponseTimeout() {
             context -> {
               assertThat(
                       context.getBean(
-                          StackdriverTraceAutoConfiguration.SENDER_BEAN_NAME, Sender.class))
+                          StackdriverTraceAutoConfiguration.SENDER_BEAN_NAME, StackdriverSender.class))
                   .isNotNull()
                   .isInstanceOf(StackdriverSender.class);
               final StackdriverSender sender =
                   (StackdriverSender)
                       context.getBean(
-                          StackdriverTraceAutoConfiguration.SENDER_BEAN_NAME, Sender.class);
+                          StackdriverTraceAutoConfiguration.SENDER_BEAN_NAME, StackdriverSender.class);
               assertThat(FieldUtils.readField(sender, "serverResponseTimeoutMs", true))
                   .isEqualTo(1000L);
             });
@@ -180,8 +177,8 @@ void supportsMultipleReporters() {
         .run(
             context -> {
               assertThat(context.getBean(ManagedChannel.class)).isNotNull();
-              assertThat(context.getBeansOfType(Sender.class)).hasSize(2);
-              assertThat(context.getBeansOfType(Sender.class))
+              assertThat(context.getBeansOfType(BytesMessageSender.Base.class)).hasSize(2);
+              assertThat(context.getBeansOfType(BytesMessageSender.Base.class))
                   .containsKeys("stackdriverSender", "otherSender");
               assertThat(context.getBeansOfType(SpanHandler.class))
                   .containsKeys("stackdriverSpanHandler", "otherSpanHandler");
@@ -229,20 +226,18 @@ void supportsMultipleReporters() {
 
   @Test
   void testAsyncReporterHealthCheck() {
-    Sender senderMock = mock(Sender.class);
-    when(senderMock.check()).thenReturn(CheckResult.OK);
-    when(senderMock.encoding()).thenReturn(SpanBytesEncoder.PROTO3.encoding());
+    StackdriverSender senderMock = StackdriverSender.newBuilder(mock(Channel.class))
+        .projectId("proj").build();
 
     this.contextRunner
         .withBean(
-            StackdriverTraceAutoConfiguration.SENDER_BEAN_NAME, Sender.class, () -> senderMock)
+            StackdriverTraceAutoConfiguration.SENDER_BEAN_NAME, StackdriverSender.class, () -> senderMock)
         .run(
             context -> {
               SpanHandler spanHandler =
                   context.getBean(
                       StackdriverTraceAutoConfiguration.SPAN_HANDLER_BEAN_NAME, SpanHandler.class);
               assertThat(spanHandler).isNotNull();
-              verify(senderMock, times(1)).check();
             });
   }
 
@@ -316,8 +311,7 @@ TracingCustomizer otherTracingCustomizer(SpanHandler otherSpanHandler) {
 
     @Bean
     SpanHandler otherSpanHandler(OtherSender otherSender) {
-      AsyncReporter<zipkin2.Span> reporter = AsyncReporter.create(otherSender);
-      return AsyncZipkinSpanHandler.create(reporter);
+      return AsyncZipkinSpanHandler.create(otherSender);
     }
 
     @Bean
@@ -326,17 +320,16 @@ OtherSender otherSender() {
     }
 
     /** Custom sender for verification. */
-    static class OtherSender extends Sender {
+    static class OtherSender extends BytesMessageSender.Base {
 
       private boolean spanSent = false;
 
-      boolean isSpanSent() {
-        return this.spanSent;
+      protected OtherSender() {
+        super(Encoding.JSON);
       }
 
-      @Override
-      public Encoding encoding() {
-        return Encoding.JSON;
+      boolean isSpanSent() {
+        return this.spanSent;
       }
 
       @Override
@@ -350,9 +343,12 @@ public int messageSizeInBytes(List<byte[]> encodedSpans) {
       }
 
       @Override
-      public Call<Void> sendSpans(List<byte[]> encodedSpans) {
+      public void send(List<byte[]> encodedSpans) {
         this.spanSent = true;
-        return Call.create(null);
+      }
+
+      @Override
+      public void close() throws IOException {
       }
     }
 

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

@@ -16,7 +16,6 @@
 
 package com.google.cloud.spring.autoconfigure.trace.pubsub;
 
-import static com.google.cloud.spring.autoconfigure.trace.StackdriverTraceAutoConfiguration.REPORTER_BEAN_NAME;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -45,6 +44,7 @@
 import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
 import zipkin2.reporter.Reporter;
 import zipkin2.reporter.Sender;
+import zipkin2.reporter.stackdriver.StackdriverSender;
 
 /** Tests for Trace Pub/Sub auto-config. */
 class TracePubSubAutoConfigurationTest {
@@ -67,8 +67,6 @@ void init() {
                 StackdriverTraceAutoConfiguration.SPAN_HANDLER_BEAN_NAME,
                 SpanHandler.class,
                 () -> SpanHandler.NOOP)
-            // Prevent health-check from triggering a real call to Trace.
-            .withBean(REPORTER_BEAN_NAME, Reporter.class, () -> mock(Reporter.class))
             .withPropertyValues(
                 "spring.cloud.gcp.project-id=proj");
   }
@@ -78,7 +76,7 @@ void test() {
     this.contextRunner.run(
         context -> {
           assertThat(
-                  context.getBean(StackdriverTraceAutoConfiguration.SENDER_BEAN_NAME, Sender.class))
+                  context.getBean(StackdriverTraceAutoConfiguration.SENDER_BEAN_NAME, StackdriverSender.class))
               .isNotNull();
           assertThat(context.getBean(ManagedChannel.class)).isNotNull();
         });

spring-cloud-gcp-data-datastore/src/test/java/com/google/cloud/spring/data/datastore/repository/query/PartTreeDatastoreQueryTests.java

@@ -73,6 +73,7 @@
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
 import org.springframework.data.repository.query.DefaultParameters;
+import org.springframework.data.repository.query.ParametersSource;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.Nullable;
 
@@ -1058,7 +1059,7 @@ private void queryWithMockResult(
           boolean mockOptionalNullable,
           ProjectionInformation projectionInformation) {
     when(this.queryMethod.getName()).thenReturn(queryName);
-    doReturn(new DefaultParameters(m)).when(this.queryMethod).getParameters();
+    doReturn(new DefaultParameters(ParametersSource.of(m))).when(this.queryMethod).getParameters();
     if (mockOptionalNullable) {
       DefaultRepositoryMetadata mockMetadata = mock(DefaultRepositoryMetadata.class);
       doReturn(m.getReturnType()).when(mockMetadata).getReturnedDomainClass(m);