[pull] main from Azure:main

eng/emitter-package.json

@@ -1,7 +1,7 @@
 {
   "main": "dist/src/index.js",
   "dependencies": {
-    "@azure-tools/typespec-java": "0.27.0"
+    "@azure-tools/typespec-java": "0.27.1"
   },
   "devDependencies": {
     "@azure-tools/typespec-autorest": "0.49.0",

eng/versioning/version_client.txt

@@ -211,60 +211,60 @@ com.azure:identity-test-webapp;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-ai-vision-face;1.0.0-beta.2;1.0.0-beta.3
 com.azure.spring:azure-monitor-spring-native;1.0.0-beta.1;1.0.0-beta.1
 com.azure.spring:azure-monitor-spring-native-test;1.0.0-beta.1;1.0.0-beta.1
-com.azure.spring:spring-cloud-azure-appconfiguration-config-web;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-appconfiguration-config;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-feature-management-web;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-feature-management;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-dependencies;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-messaging-azure;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-messaging-azure-eventhubs;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-messaging-azure-servicebus;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-messaging-azure-storage-queue;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-integration-azure-core;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-integration-azure-eventhubs;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-integration-azure-servicebus;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-integration-azure-storage-queue;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-core;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-actuator-autoconfigure;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-actuator;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-autoconfigure;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-docker-compose;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-resourcemanager;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-service;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-active-directory;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-actuator;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-appconfiguration;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-cosmos;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-data-cosmos;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-data-redis-lettuce;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-eventhubs;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-eventgrid;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;5.18.0;5.19.0-beta.1
+com.azure.spring:spring-cloud-azure-appconfiguration-config-web;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-appconfiguration-config;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-feature-management-web;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-feature-management;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-dependencies;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-messaging-azure;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-messaging-azure-eventhubs;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-messaging-azure-servicebus;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-messaging-azure-storage-queue;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-integration-azure-core;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-integration-azure-eventhubs;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-integration-azure-servicebus;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-integration-azure-storage-queue;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-core;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-actuator-autoconfigure;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-actuator;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-autoconfigure;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-docker-compose;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-resourcemanager;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-service;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-active-directory;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-actuator;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-appconfiguration;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-cosmos;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-data-cosmos;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-data-redis-lettuce;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-eventhubs;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-eventgrid;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-keyvault;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;5.19.0;5.20.0-beta.1
 com.azure.spring:spring-cloud-azure-starter-monitor;1.0.0-beta.6;1.0.0-beta.7
-com.azure.spring:spring-cloud-azure-starter-servicebus-jms;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-servicebus;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-blob;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-file-share;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-storage-queue;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-servicebus;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter-stream-servicebus;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-starter;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-stream-binder-servicebus;5.18.0;5.19.0-beta.1
-com.azure.spring:spring-cloud-azure-testcontainers;5.18.0;5.19.0-beta.1
-com.azure:azure-spring-data-cosmos;5.18.0;5.19.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-servicebus-jms;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-servicebus;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-storage;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-storage-blob;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-storage-file-share;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-storage-queue;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-integration-servicebus;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter-stream-servicebus;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-starter;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-stream-binder-servicebus;5.19.0;5.20.0-beta.1
+com.azure.spring:spring-cloud-azure-testcontainers;5.19.0;5.20.0-beta.1
+com.azure:azure-spring-data-cosmos;5.19.0;5.20.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager;2.45.0;2.46.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-appplatform;2.45.0;2.46.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-appservice;2.45.0;2.46.0-beta.1
@@ -326,7 +326,7 @@ com.azure.resourcemanager:azure-resourcemanager-frontdoor;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-mixedreality;1.0.0-beta.3;1.0.0-beta.4
 com.azure.resourcemanager:azure-resourcemanager-automation;1.0.0-beta.3;1.0.0-beta.4
 com.azure.resourcemanager:azure-resourcemanager-resourcemover;1.2.0;1.3.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-datafactory;1.0.0-beta.30;1.0.0-beta.31
+com.azure.resourcemanager:azure-resourcemanager-datafactory;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-advisor;1.0.0-beta.3;1.0.0-beta.4
 com.azure.resourcemanager:azure-resourcemanager-appconfiguration;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-attestation;1.0.0-beta.3;1.0.0-beta.4
@@ -460,21 +460,21 @@ com.azure.resourcemanager:azure-resourcemanager-workloadssapvirtualinstance;1.0.
 com.azure.resourcemanager:azure-resourcemanager-largeinstance;1.0.0-beta.2;1.0.0-beta.3
 com.azure.resourcemanager:azure-resourcemanager-migrationdiscoverysap;1.0.0-beta.2;1.0.0-beta.3
 com.azure.resourcemanager:azure-resourcemanager-storageactions;1.0.0-beta.2;1.0.0-beta.3
-com.azure.resourcemanager:azure-resourcemanager-deviceregistry;1.0.0-beta.1;1.0.0-beta.2
+com.azure.resourcemanager:azure-resourcemanager-deviceregistry;1.0.0-beta.2;1.0.0-beta.3
 com.azure.resourcemanager:azure-resourcemanager-standbypool;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-edgezones;1.0.0-beta.2;1.0.0-beta.3
 com.azure.resourcemanager:azure-resourcemanager-devopsinfrastructure;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-oracledatabase;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-informaticadatamanagement;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-mongocluster;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-computefleet;1.0.0;1.1.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-servicefabricmanagedclusters;1.0.0-beta.2;1.0.0-beta.3
+com.azure.resourcemanager:azure-resourcemanager-servicefabricmanagedclusters;1.0.0-beta.3;1.0.0-beta.4
 com.azure.resourcemanager:azure-resourcemanager-healthdataaiservices;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-redhatopenshift;1.0.0-beta.1;1.0.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-fabric;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-computeschedule;1.0.0-beta.1;1.0.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-trustedsigning;1.0.0-beta.1;1.0.0-beta.2
-com.azure.resourcemanager:azure-resourcemanager-iotoperations;1.0.0-beta.1;1.0.0-beta.2
+com.azure.resourcemanager:azure-resourcemanager-iotoperations;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-containerorchestratorruntime;1.0.0-beta.1;1.0.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-terraform;1.0.0-beta.1;1.0.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-connectedcache;1.0.0-beta.1;1.0.0-beta.2

sdk/boms/spring-cloud-azure-dependencies/pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.azure.spring</groupId>
   <artifactId>spring-cloud-azure-dependencies</artifactId>
-  <version>5.19.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
+  <version>5.20.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
   <packaging>pom</packaging>
 
   <name>Spring Cloud Azure Dependencies</name>
@@ -53,7 +53,7 @@
       <dependency>
         <groupId>com.azure</groupId>
         <artifactId>azure-sdk-bom</artifactId>
-        <version>1.2.29</version>   <!-- NOTE: This should be updated manually. -->
+        <version>1.2.30</version>   <!-- NOTE: This should be updated manually. -->
         <type>pom</type>
         <scope>import</scope>
       </dependency>

sdk/core/azure-core-http-vertx/src/main/java/com/azure/core/http/vertx/implementation/VertxRequestWriteSubscriber.java

@@ -5,7 +5,9 @@
 
 import com.azure.core.http.HttpResponse;
 import com.azure.core.util.ProgressReporter;
+import com.azure.core.util.logging.ClientLogger;
 import io.netty.buffer.Unpooled;
+import io.vertx.core.Promise;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpClientRequest;
 import org.reactivestreams.Subscriber;
@@ -22,8 +24,10 @@
  */
 @SuppressWarnings("ReactiveStreamsSubscriberImplementation")
 public final class VertxRequestWriteSubscriber implements Subscriber<ByteBuffer> {
+    private static final ClientLogger LOGGER = new ClientLogger(VertxRequestWriteSubscriber.class);
+
     private final HttpClientRequest request;
-    private final io.vertx.core.Promise<HttpResponse> promise;
+    private final Promise<HttpResponse> promise;
     private final ProgressReporter progressReporter;
     private final ContextView contextView;
 
@@ -42,7 +46,7 @@ public final class VertxRequestWriteSubscriber implements Subscriber<ByteBuffer>
      * @param progressReporter The {@link ProgressReporter} to report progress to.
      * @param contextView The {@link ContextView} to use when dropping errors.
      */
-    public VertxRequestWriteSubscriber(HttpClientRequest request, io.vertx.core.Promise<HttpResponse> promise,
+    public VertxRequestWriteSubscriber(HttpClientRequest request, Promise<HttpResponse> promise,
         ProgressReporter progressReporter, ContextView contextView) {
         this.request = request.exceptionHandler(this::onError).drainHandler(ignored -> requestNext());
         this.promise = promise;
@@ -101,6 +105,10 @@ private void write(ByteBuffer bytes) {
                 }
             } else {
                 this.state = State.ERROR;
+                if (error != null) {
+                    // Don't lose any reactive error that may have occurred while writing.
+                    result.cause().addSuppressed(error);
+                }
                 resetRequest(result.cause());
             }
         });
@@ -122,19 +130,53 @@ private void onErrorInternal(Throwable throwable) {
         // code 2 and greater are completion states which means the error should be dropped as we already completed.
         if (state.code >= 2) {
             Operators.onErrorDropped(throwable, Context.of(contextView));
+
+            // Also, even though Reactor may have an operator for the dropped error or will be logged by Operators
+            // itself, we should log as well as at least this will help associate the error with this class.
+            LOGGER.atInfo()
+                .log(() -> "VertxRequestWriteSubscriber dropped an exception as it already reached a "
+                    + "completion state.", throwable);
         }
 
         this.state = State.ERROR;
         if (state != State.WRITING) {
             resetRequest(throwable);
         } else {
-            error = throwable;
+            if (error != null) {
+                // Already saw another error while writing, add this as a suppressed exception.
+                error.addSuppressed(throwable);
+            } else {
+                // First error seen while writing, maintain it for future use.
+                error = throwable;
+            }
         }
     }
 
     private void resetRequest(Throwable throwable) {
         subscription.cancel();
-        promise.fail(throwable);
+        if (!promise.tryFail(throwable)) {
+            // Seems the promise has already completed in some form.
+            // Attempt to associate this error with the existing failure.
+            Throwable cause = promise.future().cause();
+            if (cause != null) {
+                cause.addSuppressed(throwable);
+
+                // Also, even though the exception was added as a suppressed exception to the failed Promise, we should
+                // log as well as at least this will help associate the error with this class.
+                LOGGER.atInfo()
+                    .log(() -> "VertxRequestWriteSubscriber added an exception as a suppressed exception "
+                        + "as the Promise already failed.", throwable);
+            } else {
+                // Turns out the future was completed as successfully externally, drop the error.
+                Operators.onErrorDropped(LOGGER.logThrowableAsError(throwable), Context.of(contextView));
+
+                // Also, even though Reactor may have an operator for the dropped error or will be logged by Operators
+                // itself, we should log as well as at least this will help associate the error with this class.
+                LOGGER.atInfo()
+                    .log(() -> "VertxRequestWriteSubscriber dropped an exception as the Promise already "
+                        + "completed successfully.", throwable);
+            }
+        }
         request.reset(0, throwable);
     }