[Backport release-1.18] bump to rc4 and jobs api stable

.github/workflows/build.yml

@@ -118,7 +118,7 @@ jobs:
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
       DAPR_CLI_VER: 1.17.0
-      DAPR_RUNTIME_VER: 1.18.0-rc.3
+      DAPR_RUNTIME_VER: 1.18.0-rc.4
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.17.0/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:

.github/workflows/validate.yml

@@ -38,7 +38,7 @@ jobs:
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
       DAPR_CLI_VER: 1.17.0
-      DAPR_RUNTIME_VER: 1.18.0-rc.3
+      DAPR_RUNTIME_VER: 1.18.0-rc.4
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.17.0/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:

pom.xml

@@ -16,7 +16,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <grpc.version>1.79.0</grpc.version>
     <protobuf.version>3.25.5</protobuf.version>
-    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.18.0-rc.3/dapr/proto</dapr.proto.baseurl>
+    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.18.0-rc.4/dapr/proto</dapr.proto.baseurl>
     <durabletask.proto.baseurl>https://raw.githubusercontent.com/dapr/durabletask-protobuf/main/protos</durabletask.proto.baseurl>
     <dapr.sdk.version>1.18.0-rc-2</dapr.sdk.version>
     <os-maven-plugin.version>1.7.1</os-maven-plugin.version>

sdk/src/main/java/io/dapr/client/DaprClientImpl.java

@@ -1517,13 +1517,23 @@ public Mono<Void> scheduleJob(ScheduleJobRequest scheduleJobRequest) {
         jobBuilder.setFailurePolicy(FailurePolicyUtils.getJobFailurePolicy(scheduleJobRequest.getFailurePolicy()));
       }
 
+      DaprJobsProtos.ScheduleJobRequest request = DaprJobsProtos.ScheduleJobRequest.newBuilder()
+          .setOverwrite(scheduleJobRequest.getOverwrite())
+          .setJob(jobBuilder.build())
+          .build();
+
       Mono<DaprJobsProtos.ScheduleJobResponse> scheduleJobResponseMono =
-          Mono.deferContextual(context -> this.createMono(
-                  it -> intercept(context, asyncStub)
-                      .scheduleJobAlpha1(DaprJobsProtos.ScheduleJobRequest.newBuilder()
-                                  .setOverwrite(scheduleJobRequest.getOverwrite())
-                                  .setJob(jobBuilder.build()).build(), it)
-              )
+          Mono.deferContextual(context ->
+              this.<DaprJobsProtos.ScheduleJobResponse>createMono(
+                  it -> intercept(context, asyncStub).scheduleJob(request, it)
+              ).onErrorResume(throwable -> {
+                // The stable ScheduleJob RPC is unavailable on pre-1.18 sidecars, fall back to Alpha1.
+                if (isUnimplemented(throwable)) {
+                  return this.<DaprJobsProtos.ScheduleJobResponse>createMono(
+                      it -> intercept(context, asyncStub).scheduleJobAlpha1(request, it));
+                }
+                return Mono.error(throwable);
+              })
           );
 
       return scheduleJobResponseMono.then();
@@ -1539,12 +1549,22 @@ public Mono<GetJobResponse> getJob(GetJobRequest getJobRequest) {
     try {
       validateGetJobRequest(getJobRequest);
 
+      DaprJobsProtos.GetJobRequest request = DaprJobsProtos.GetJobRequest.newBuilder()
+          .setName(getJobRequest.getName())
+          .build();
+
       Mono<DaprJobsProtos.GetJobResponse> getJobResponseMono =
-          Mono.deferContextual(context -> this.createMono(
-                  it -> intercept(context, asyncStub)
-                      .getJobAlpha1(DaprJobsProtos.GetJobRequest.newBuilder()
-                          .setName(getJobRequest.getName()).build(), it)
-              )
+          Mono.deferContextual(context ->
+              this.<DaprJobsProtos.GetJobResponse>createMono(
+                  it -> intercept(context, asyncStub).getJob(request, it)
+              ).onErrorResume(throwable -> {
+                // The stable GetJob RPC is unavailable on pre-1.18 sidecars, fall back to Alpha1.
+                if (isUnimplemented(throwable)) {
+                  return this.<DaprJobsProtos.GetJobResponse>createMono(
+                      it -> intercept(context, asyncStub).getJobAlpha1(request, it));
+                }
+                return Mono.error(throwable);
+              })
           );
 
       return getJobResponseMono.map(response -> {
@@ -1602,12 +1622,22 @@ public Mono<Void> deleteJob(DeleteJobRequest deleteJobRequest) {
     try {
       validateDeleteJobRequest(deleteJobRequest);
 
+      DaprJobsProtos.DeleteJobRequest request = DaprJobsProtos.DeleteJobRequest.newBuilder()
+          .setName(deleteJobRequest.getName())
+          .build();
+
       Mono<DaprJobsProtos.DeleteJobResponse> deleteJobResponseMono =
-          Mono.deferContextual(context -> this.createMono(
-                  it -> intercept(context, asyncStub)
-                      .deleteJobAlpha1(DaprJobsProtos.DeleteJobRequest.newBuilder()
-                          .setName(deleteJobRequest.getName()).build(), it)
-              )
+          Mono.deferContextual(context ->
+              this.<DaprJobsProtos.DeleteJobResponse>createMono(
+                  it -> intercept(context, asyncStub).deleteJob(request, it)
+              ).onErrorResume(throwable -> {
+                // The stable DeleteJob RPC is unavailable on pre-1.18 sidecars, fall back to Alpha1.
+                if (isUnimplemented(throwable)) {
+                  return this.<DaprJobsProtos.DeleteJobResponse>createMono(
+                      it -> intercept(context, asyncStub).deleteJobAlpha1(request, it));
+                }
+                return Mono.error(throwable);
+              })
           );
 
       return deleteJobResponseMono.then();
@@ -1616,6 +1646,16 @@ public Mono<Void> deleteJob(DeleteJobRequest deleteJobRequest) {
     }
   }
 
+  /**
+   * Returns true when a failed RPC indicates the sidecar has not implemented the stable RPC,
+   * so the caller should retry against the deprecated Alpha1 RPC. The gRPC status is wrapped in a
+   * {@link DaprException} (and an {@link java.util.concurrent.ExecutionException}), so we let gRPC
+   * walk the cause chain to recover the original status code.
+   */
+  private static boolean isUnimplemented(Throwable throwable) {
+    return io.grpc.Status.fromThrowable(throwable).getCode() == io.grpc.Status.Code.UNIMPLEMENTED;
+  }
+
   private void validateScheduleJobRequest(ScheduleJobRequest scheduleJobRequest) {
     if (scheduleJobRequest == null) {
       throw new IllegalArgumentException("scheduleJobRequest cannot be null");