GoogleCloudPlatform · JoeWang1127 · Jan 19, 2023 · Sep 13, 2022 · Oct 11, 2022 · Oct 11, 2022
@@ -50,26 +50,10 @@ jobs:
         id: date
         run: echo "::set-output name=date::$(date +'%Y-%m-%d' --utc)"
       - uses: actions/checkout@v2
-      - name: Setup Java 11
+      - name: Setup Java 17
         uses: actions/setup-java@v1
-        if: matrix.it != 'native'
         with:
-          java-version: 11
-      - name: Setup GraalVM
-        uses: DeLaGuardo/setup-graalvm@4.0
-        if: matrix.it == 'native' # note that this is no longer in the matrix
-        with:
-          graalvm: '21.2.0'
-          java: 'java11'
-          arch: 'amd64'
-      - name: Install GraalVM Native Image
-        if: matrix.it == 'native'
-        run: gu install native-image
-      - uses: actions/cache@v2
-        id: mvn-cache
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.date }}
+          java-version: 17
       - name: Setup gcloud
         uses: google-github-actions/setup-gcloud@v0
         with:

@@ -21,10 +21,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Cache SonarCloud packages
         uses: actions/cache@v2
         with:

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11, 17]
+        java: [17, 19]
     steps:
     - name: Get current date
       id: date
@@ -103,7 +103,7 @@ jobs:
 
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
 
       - uses: actions/cache@v2
         id: mvn-cache

@@ -36,7 +36,6 @@ Currently, this repository provides support for:
 ** link:spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-mysql[Google Cloud SQL MySQL]
 ** link:spring-cloud-gcp-starters/spring-cloud-gcp-starter-sql-postgresql[Google Cloud SQL PostgreSQL]
 ** link:spring-cloud-gcp-starters/spring-cloud-gcp-starter-storage[Google Cloud Storage]
-** link:spring-cloud-gcp-starters/spring-cloud-gcp-starter-trace[Google Cloud Trace with Spring Cloud Sleuth]
 ** link:spring-cloud-gcp-starters/spring-cloud-gcp-starter-secretmanager[Google Secret Manager]
 ** link:spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-firebase[Firebase Authentication]
 ** link:spring-cloud-gcp-starters/spring-cloud-gcp-starter-security-iap[Google Cloud IAP Authentication]

@@ -84,7 +84,7 @@ Below is a code snippet of how to load a CSV data `InputStream` to a BigQuery ta
 BigQueryTemplate bigQueryTemplate;
 
 public void loadData(InputStream dataInputStream, String tableName) {
-  ListenableFuture<Job> bigQueryJobFuture =
+  CompletableFuture<Job> bigQueryJobFuture =
       bigQueryTemplate.writeDataToTable(
           tableName,
           dataFile.getInputStream(),
@@ -111,7 +111,7 @@ BigQueryTemplate bigQueryTemplate;
    */
   public void loadJsonStream(String tableName, InputStream jsonInputStream)
       throws ExecutionException, InterruptedException {
-    ListenableFuture<WriteApiResponse> writeApFuture =
+    CompletableFuture<WriteApiResponse> writeApFuture =
         bigQueryTemplate.writeJsonStream(tableName, jsonInputStream);
     WriteApiResponse apiRes = writeApFuture.get();//get the WriteApiResponse
     if (!apiRes.isSuccessful()){
@@ -139,7 +139,7 @@ BigQueryTemplate bigQueryTemplate;
    */
   public void createTableAndloadJsonStream(String tableName, InputStream jsonInputStream, Schema tableSchema)
       throws ExecutionException, InterruptedException {
-    ListenableFuture<WriteApiResponse> writeApFuture =
+    CompletableFuture<WriteApiResponse> writeApFuture =
         bigQueryTemplate.writeJsonStream(tableName, jsonInputStream, tableSchema);//using the overloaded method which created the table when tableSchema is passed
     WriteApiResponse apiRes = writeApFuture.get();//get the WriteApiResponse
     if (!apiRes.isSuccessful()){
@@ -200,12 +200,12 @@ Alternatively, you may omit these headers and explicitly set the table name or f
 After the `BigQueryFileMessageHandler` processes a message to load data to your BigQuery table, it will respond with a `Job` on the reply channel.
 The https://googleapis.dev/java/google-cloud-clients/latest/index.html?com/google/cloud/bigquery/package-summary.html[Job object] provides metadata and information about the load file operation.
 
-By default, the `BigQueryFileMessageHandler` is run in asynchronous mode, with `setSync(false)`, and it will reply with a `ListenableFuture<Job>` on the reply channel.
+By default, the `BigQueryFileMessageHandler` is run in asynchronous mode, with `setSync(false)`, and it will reply with a `CompletableFuture<Job>` on the reply channel.
 The future is tied to the status of the data loading job and will complete when the job completes.
 
 If the handler is run in synchronous mode with `setSync(true)`, then the handler will block on the completion of the loading job and block until it is complete.
 
-NOTE: If you decide to use Spring Integration Gateways and you wish to receive `ListenableFuture<Job>` as a reply object in the Gateway, you will have to call `.setAsyncExecutor(null)` on your `GatewayProxyFactoryBean`.
+NOTE: If you decide to use Spring Integration Gateways and you wish to receive `CompletableFuture<Job>` as a reply object in the Gateway, you will have to call `.setAsyncExecutor(null)` on your `GatewayProxyFactoryBean`.
 This is needed to indicate that you wish to reply on the built-in async support rather than rely on async handling of the gateway.
 
 === Sample

@@ -17,7 +17,7 @@ Spring Framework on Google Cloud lets you leverage the power and simplicity of t
 - Map objects, relationships, and collections with Spring Data Cloud Spanner, Spring Data Cloud Datastore and Spring Data Reactive Repositories for Cloud Firestore
 - Write and read from Spring Resources backed up by Google Cloud Storage
 - Exchange messages with Spring Integration using Google Cloud Pub/Sub on the background
-- Trace the execution of your app with Spring Cloud Sleuth and Google Cloud Trace
+- Trace the execution of your app with Micrometer and Google Cloud Trace
 - Configure your app with Spring Cloud Config, backed up by the Google Runtime Configuration API
 - Consume and produce Google Cloud Storage data via Spring Integration GCS Channel Adapters
 - Use Spring Security via Google Cloud IAP

@@ -17,7 +17,7 @@ Spring Framework on Google Cloud lets you leverage the power and simplicity of t
 - Map objects, relationships, and collections with Spring Data Cloud Spanner, Spring Data Cloud Datastore and Spring Data Reactive Repositories for Cloud Firestore
 - Write and read from Spring Resources backed up by Google Cloud Storage
 - Exchange messages with Spring Integration using Google Cloud Pub/Sub on the background
-- Trace the execution of your app with Spring Cloud Sleuth and Google Cloud Trace
+- Trace the execution of your app with Micrometer and Google Cloud Trace
 - Configure your app with Spring Cloud Config, backed up by the Google Runtime Configuration API
 - Consume and produce Google Cloud Storage data via Spring Integration GCS Channel Adapters
 - Use Spring Security via Google Cloud IAP

@@ -23,8 +23,8 @@ dependencies {
 https://cloud.google.com/logging/[Cloud Logging] is the managed logging service provided by Google Cloud.
 
 This module provides support for associating a web request trace ID with the corresponding log entries.
-It does so by retrieving the `X-B3-TraceId` value from the https://logback.qos.ch/manual/mdc.html[Mapped Diagnostic Context (MDC)], which is set by Spring Cloud Sleuth.
-If Spring Cloud Sleuth isn't used, the configured `TraceIdExtractor` extracts the desired header value and sets it as the log entry's trace ID.
+It does so by retrieving the `X-B3-TraceId` value from the https://logback.qos.ch/manual/mdc.html[Mapped Diagnostic Context (MDC)], which is set by Micrometer.
+If Micrometer isn't used, the configured `TraceIdExtractor` extracts the desired header value and sets it as the log entry's trace ID.
 This allows grouping of log messages by request, for example, in the https://console.cloud.google.com/logs/viewer[Google Cloud Console Logs viewer].
 
 NOTE: Due to the way logging is set up, the Google Cloud project ID and credentials defined in `application.properties` are ignored.
@@ -35,12 +35,12 @@ You can do this easily if you're using the https://cloud.google.com/sdk[Google C
 
 For use in Web MVC-based applications, `TraceIdLoggingWebMvcInterceptor` is provided that extracts the request trace ID from an HTTP request using a `TraceIdExtractor` and stores it in a thread-local, which can then be used in a logging appender to add the trace ID metadata to log messages.
 
-WARNING: If Spring Framework on Google Cloud Trace is enabled, the logging module disables itself and delegates log correlation to Spring Cloud Sleuth.
+WARNING: If Spring Framework on Google Cloud Trace is enabled, the logging module disables itself and delegates log correlation to Micrometer.
 
 `LoggingWebMvcConfigurer` configuration class is also provided to help register the `TraceIdLoggingWebMvcInterceptor` in Spring MVC applications.
 
 Applications hosted on the Google Cloud include trace IDs under the `x-cloud-trace-context` header, which will be included in log entries.
-However, if Sleuth is used the trace ID will be picked up from the MDC.
+However, if Micrometer is used the trace ID will be picked up from the MDC.
 
 === Logback Support
 
@@ -141,7 +141,7 @@ If `projectId` is not set and cannot be determined, then it'll log `traceId` wit
 | `includeLevel` | `true` | Should the severity be included
 | `includeThreadName` | `true` | Should the thread name be included
 | `includeMDC` | `true` | Should all MDC properties be included.
-The MDC properties `X-B3-TraceId`, `X-B3-SpanId` and `X-Span-Export` provided by Spring Sleuth will get excluded as they get handled separately
+The MDC properties `X-B3-TraceId`, `X-B3-SpanId` and `X-Span-Export` provided by Micrometer will get excluded as they get handled separately
 | `includeLoggerName` | `true` | Should the name of the logger be included
 | `includeFormattedMessage` | `true` | Should the formatted log message be included.
 | `includeExceptionInMessage` | `true` | Should the stacktrace be appended to the formatted log message.

@@ -3,7 +3,7 @@
 
 Spring Framework on Google Cloud provides an abstraction layer to publish to and subscribe from Google Cloud Pub/Sub topics and to create, list or delete Google Cloud Pub/Sub topics and subscriptions.
 
-A Spring Boot starter is provided to auto-configure the various required Pub/Sub components.
+A Spring Boot starter is provided to autoconfigure the various required Pub/Sub components.
 
 Maven coordinates, using <<getting-started.adoc#bill-of-materials, Spring Framework on Google Cloud BOM>>:
 
@@ -44,7 +44,7 @@ This section describes options for enabling the integration, specifying the Goog
 Google Cloud Pub/Sub API, if different from the ones in the
 <<spring-cloud-gcp-core,Spring Framework on Google Cloud Core Module>> | No |
 | `spring.cloud.gcp.pubsub.emulator-host` | The host and port of the local running emulator.
-If provided, this will setup the client to connect against a running https://cloud.google.com/pubsub/docs/emulator[Google Cloud Pub/Sub Emulator]. | No |
+If provided, this will set up the client to connect against a running https://cloud.google.com/pubsub/docs/emulator[Google Cloud Pub/Sub Emulator]. | No |
 | `spring.cloud.gcp.pubsub.credentials.encoded-key` | Base64-encoded contents of OAuth2 account private key for authenticating with the
 Google Cloud Pub/Sub API, if different from the ones in the
 <<spring-cloud-gcp-core,Spring Framework on Google Cloud Core Module>> | No |
@@ -58,9 +58,9 @@ Pub/Sub credentials | No | https://www.googleapis.com/auth/pubsub
 This section describes configuration options to customize the behavior of the application's Pub/Sub publishers and subscribers.
 Subscriber settings can be either global or subscription-specific.
 
-NOTE: A custom configuration (injected through a setter in `DefaultSubscriberFactory` or a custom bean) will take precedence over auto-configuration.
+NOTE: A custom configuration (injected through a setter in `DefaultSubscriberFactory` or a custom bean) will take precedence over autoconfiguration.
 Hence, if one wishes to use per-subscription configuration for a Pub/Sub setting, there must not be a custom bean for that setting.
-When using auto-configuration, if both global and per-subscription configurations are provided, then the per-subscription configuration will be used.
+When using autoconfiguration, if both global and per-subscription configurations are provided, then the per-subscription configuration will be used.
 However, if a per-subscription configuration is not set then the global or default configuration will be used.
 
 |===
@@ -231,21 +231,23 @@ So, take care not to configure a subscription that has a business impact, or ins
 
 If you are using Spring Boot Actuator, you can take advantage of the Cloud Pub/Sub subscription health indicator called `pubsub-subscriber`.
 The subscription health indicator will verify whether Pub/Sub subscriptions are actively processing messages from the subscription's backlog.
-To enable it, you need to add the https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#production-ready[Spring Boot Actuator] to your project and the https://cloud.google.com/monitoring/docs/reference/libraries[Google Cloud Monitoring].
-Also you need to set the following properties `spring.cloud.gcp.pubsub.health.lagThreshold`, `spring.cloud.gcp.pubsub.health.backlogThreshold`.
+To enable it, you need to add the https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#production-ready[Spring Boot Actuator] to your project and the https://cloud.google.com/monitoring/docs/reference/libraries[GCP Monitoring].
+Also, you need to set the following properties `spring.cloud.gcp.pubsub.health.lagThreshold`, `spring.cloud.gcp.pubsub.health.backlogThreshold`.
 
 The `pubsub-subscriber` indicator will then roll up to the overall application status visible at http://localhost:8080/actuator/health (use the `management.endpoint.health.show-details` property to view per-indicator details).
 
 [source,xml]
 ----
-<dependency>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-actuator</artifactId>
-</dependency>
-<dependency>
-    <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-monitoring</artifactId>
-</dependency>
+<dependencies>
+	<dependency>
+    	<groupId>org.springframework.boot</groupId>
+    	<artifactId>spring-boot-starter-actuator</artifactId>
+ 	</dependency>
+	<dependency>
+    	<groupId>com.google.cloud</groupId>
+    	<artifactId>google-cloud-monitoring</artifactId>
+	</dependency>
+</dependencies>
 ----
 
 The health indicator validates a subscriber's health by checking the subscription's message backlog and the last processed message.
@@ -255,7 +257,7 @@ If a message has been recently processed in a reasonable time threshold, then th
 If the backlog of messages for a subscription is big but the subscriber consumes messages then subscriber is still healthy.
 If there hasn't been any processing of recent messages but the backlog increases, then the subscriber is unhealthy.
 
-NOTE: The health indicator will not behave entirely as expected if Dead Letter Queueing is enabled on the subscription being checked, num_undelivered_messages will drop down by itself after DLQ threshold is reached.
+NOTE: The health indicator will not behave entirely as expected if Dead Letter Queueing is enabled on the subscription being checked, num_undelivered_messages will drop by itself after DLQ threshold is reached.
 
 |===
 | Name | Description | Required | Default value
@@ -373,7 +375,7 @@ Using these methods for acknowledging messages in batches is more efficient than
 
 . To acknowledge messages individually you can use the `ack()` or `nack()` method on each of them (to acknowledge or negatively acknowledge, correspondingly).
 
-NOTE: All `ack()`, `nack()`, and `modifyAckDeadline()` methods on messages, as well as `PubSubSubscriberTemplate`, are implemented asynchronously, returning a `ListenableFuture<Void>` to enable asynchronous processing.
+NOTE: All `ack()`, `nack()`, and `modifyAckDeadline()` methods on messages, as well as `PubSubSubscriberTemplate`, are implemented asynchronously, returning a `CompletableFuture<Void>` to enable asynchronous processing.
 
 ===== Dead Letter Topics
 
@@ -399,7 +401,7 @@ public Subscription newSubscription() {
 }
 ----
 
-Dead letter topics are no different than any other topic, though some https://cloud.google.com/pubsub/docs/dead-letter-topics#granting_forwarding_permissions[additional permissions] are necessary to ensure the Cloud Pub/Sub service can successfully `ack` the original message and re-`publish` it on the dead letter topic.
+Dead letter topics are no different from any other topic, though some https://cloud.google.com/pubsub/docs/dead-letter-topics#granting_forwarding_permissions[additional permissions] are necessary to ensure the Cloud Pub/Sub service can successfully `ack` the original message and re-`publish` on the dead letter topic.
 
 ==== JSON support
 
@@ -427,7 +429,7 @@ You can serialize objects to JSON on publish automatically:
 include::{project-root}/spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/pubsub/it/PubSubTemplateDocumentationIntegrationTests.java[tag=json_publish]
 ----
 
-And that's how you convert messages to objects on pull:
+And that's how you convert messages to object on pull:
 [source,java,indent=0]
 ----
 include::{project-root}/spring-cloud-gcp-autoconfigure/src/test/java/com/google/cloud/spring/autoconfigure/pubsub/it/PubSubTemplateDocumentationIntegrationTests.java[tag=json_pull]
@@ -483,7 +485,7 @@ It allows for the creation, deletion and listing of topics and subscriptions.
 
 NOTE: Generally when referring to topics and subscriptions, you can either use the short canonical name within the current project, or the fully-qualified name referring to a topic or subscription in a different project using the `projects/[project_name]/(topics|subscriptions)/<name>` format.
 
-The Spring Boot starter for Spring Framework on Google Cloud Pub/Sub auto-configures a `PubSubAdmin` object using the `GcpProjectIdProvider` and the `CredentialsProvider` auto-configured by the Spring Framework on Google Cloud Core Starter.
+The Spring Boot starter for GCP Pub/Sub autoconfigures a `PubSubAdmin` object using the `GcpProjectIdProvider` and the `CredentialsProvider` autoconfigured by the Spring Boot GCP Core starter.
 
 ==== Creating a topic
 
@@ -547,6 +549,9 @@ public Subscription createSubscription(String subscriptionName, String topicName
 
 public Subscription createSubscription(String subscriptionName, String topicName, Integer ackDeadline)
 
+public Subscription createSubscription(
+      String subscriptionName, String topicName, String pushEndpoint)
+
 public Subscription createSubscription(String subscriptionName, String topicName, Integer ackDeadline, String pushEndpoint)
 
 public Subscription createSubscription(Subscriber.Builder builder)