Merge branch 'master' into SDK-3252

Author: Quinn-With-Two-Ns

.github/workflows/ci.yml

@@ -102,6 +102,7 @@ jobs:
          --dynamic-config-value system.refreshNexusEndpointsMinWait=1000 \
          --dynamic-config-value component.callbacks.allowedAddresses='[{"Pattern":"*","AllowInsecure":true}]' \
          --dynamic-config-value frontend.workerVersioningWorkflowAPIs=true \
+         --dynamic-config-value frontend.activityAPIsEnabled=true \
          --dynamic-config-value system.enableDeploymentVersions=true &
          sleep 10s
 

.github/workflows/prepare-release.yml

@@ -134,6 +134,12 @@ jobs:
           - runner: macos-13
             os_family: macOS
             arch: amd64
+          - runner: macos-latest
+            os_family: macOS
+            arch: arm64
+          - runner: ubuntu-24.04-arm
+            os_family: linux
+            arch: arm64
           - runner: windows-2019
             os_family: windows
             arch: amd64
@@ -154,8 +160,8 @@ jobs:
         if: matrix.os_family != 'Linux'
         uses: actions/setup-java@v4
         with:
-          java-version: "11"
-          distribution: "temurin"
+          java-version: "21"
+          distribution: "graalvm"
 
       - name: Set up Gradle
         if: matrix.os_family != 'Linux'
@@ -164,24 +170,22 @@ jobs:
       - name: Build native test server (non-Docker)
         if: matrix.os_family != 'Linux'
         run: |
-          ./gradlew :temporal-test-server:build
+          ./gradlew -PnativeBuild :temporal-test-server:nativeBuild
 
       - name: Build native test server (Docker)
         if: matrix.os_family == 'Linux'
         run: |
           docker run \
             --rm -w /github/workspace -v "$(pwd):/github/workspace" \
             $(docker build -q ./docker/native-image) \
-            sh -c "./gradlew :temporal-test-server:build"
+            sh -c "./gradlew -PnativeBuild :temporal-test-server:nativeBuild"
       # path ends in a wildcard because on windows the file ends in '.exe'
-      # path excludes *.txt because native-image also writes a build manifest txt file
       - name: Upload executable to workflow
         uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.os_family }}_${{ matrix.arch }}
           path: |
-            temporal-test-server/build/graal/temporal-test-server*
-            !temporal-test-server/build/graal/*.txt
+            temporal-test-server/build/native/nativeCompile/temporal-test-server*
           if-no-files-found: error
           retention-days: 1
 

CONTRIBUTING.md

@@ -8,7 +8,7 @@ before we can merge in any of your changes
 
 ## Development Environment
 
-* Java 11+
+* Java 21+
 * Docker to run Temporal Server
 
 ## Build

docker/native-image/dockerfile

@@ -1,8 +1,8 @@
 # Use an old version of Ubuntu to build the test server to maintain compatibility with 
 # older versions of glibc, specifically glib 2.17.
 FROM ubuntu:18.04
-ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
+ENV JAVA_HOME=/usr/lib64/graalvm/graalvm-community-java21
+COPY --from=ghcr.io/graalvm/jdk-community:21 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
 RUN apt-get update
 RUN apt-get install -y git build-essential zlib1g-dev

gradle/java.gradle

@@ -6,16 +6,16 @@ subprojects {
 
     java {
         // graal only supports java 8, 11, 16, 17, 21, 23
-        sourceCompatibility = project.hasProperty("edgeDepsTest") ? JavaVersion.VERSION_21 : JavaVersion.VERSION_1_8
-        targetCompatibility = project.hasProperty("edgeDepsTest") ? JavaVersion.VERSION_21 : JavaVersion.VERSION_1_8
+        sourceCompatibility = project.hasProperty("edgeDepsTest") || project.hasProperty("nativeBuild") ? JavaVersion.VERSION_21 : JavaVersion.VERSION_1_8
+        targetCompatibility = project.hasProperty("edgeDepsTest") || project.hasProperty("nativeBuild") ? JavaVersion.VERSION_21 : JavaVersion.VERSION_1_8
         withJavadocJar()
         withSourcesJar()
     }
 
     compileJava {
         options.encoding = 'UTF-8'
         options.compilerArgs << '-Xlint:none' << '-Xlint:deprecation' << '-Werror' << '-parameters'
-        if (JavaVersion.current().isJava9Compatible() && !project.hasProperty("edgeDepsTest")) {
+        if (JavaVersion.current().isJava9Compatible() && !project.hasProperty("edgeDepsTest") && !project.hasProperty("nativeBuild")) {
             // https://stackoverflow.com/a/43103115/525203
             options.compilerArgs.addAll(['--release', '8'])
         }
@@ -24,7 +24,7 @@ subprojects {
     compileTestJava {
         options.encoding = 'UTF-8'
         options.compilerArgs << '-Xlint:none' << '-Xlint:deprecation' << '-Werror' << '-parameters'
-        if (JavaVersion.current().isJava9Compatible() && !project.hasProperty("edgeDepsTest")) {
+        if (JavaVersion.current().isJava9Compatible() && !project.hasProperty("edgeDepsTest") && !project.hasProperty("nativeBuild")) {
             // https://stackoverflow.com/a/43103115/525203
             options.compilerArgs.addAll(['--release', '8'])
         }

releases/v1.29.0

@@ -0,0 +1,46 @@
+# **💥 BREAKING CHANGES**
+
+## Slot Supplier
+
+The `SlotSupplier` interface was changed to be async to match other languages and allow for future optimizations in the SDK.
+
+# **Highlights**
+
+## Priority (Pre-release)
+
+Users can now set a priority key when scheduling a workflow, activity or child workflow. The priority key will be used to help prioritize certain tasks over others when there is a backlog. Priority is currently not supported in any OSS Temporal release, but support will be coming soon. To experiment with this feature please see the [pre-release development server](https://github.com/temporalio/cli/releases/tag/v1.3.1-priority.0) or if you are a Temporal Cloud customer reach out to your SA.
+
+## Activity Pause (Pre-release)
+
+The Java SDK now supports activity pause for heart beating activities. If an activity is paused while an attempt is running and the activity is heart-beating the heartbeat will throw an `io.temporal.clientActivityPausedException`.
+
+## Versioning / Safe Deploy (Pre-release)
+
+This release introduces a preview of new APIs that gracefully manage code changes and worker pools that support them. The goal is to better control which workers should execute new, and existing, workflows and activities tasks, based on their code and configuration.
+
+`AutoUpgrade` and `Pinned` are two Versioning Behaviors that can be specified on a workflow implementation using `@WorkflowVersioningBehavior`.  `Pinned` workflows are typically short lived, and are never affected by new versions, i.e., they do not need to use the patch API for compatibility. `AutoUpgrade` workflows are mostly long running, but they need to use patching to safely transition to new versions. The choice of `Pinned` vs `AutoUpgrade` ultimately depends on your willingness to keep old worker fleets running vs the complexity of patching.
+
+To manage Worker Deployments please use the Temporal CLI, or the `WorkflowServiceStubs`.
+
+# What's Changed
+
+2025-03-10 - 73cb1e96 - Fix API key auth (#2438)
+2025-03-10 - ff949711 - Release v1.28.1 (#2439)
+2025-03-11 - 02711928 - Add OnConflictOptions Support (#2415)
+2025-03-11 - 334e1294 - Add support for metadata to test server (#2441)
+2025-03-13 - f7b8ded7 - Unblock UseExisting conflict policy for Nexux WorkflowRunOperation (#2440)
+2025-03-14 - 23771149 - Fix workflow ID reuse policy and conflict policy handling (#2446)
+2025-03-17 - 48b72239 - Fix spring boot api key enable https (#2445)
+2025-03-17 - d430114f - Add Summary to Nexus Operations (#2444)
+2025-03-19 - 59bbabbb - Make sure the Schedule Client has the namespace header injected (#2452)
+2025-03-20 - 6c4c1835 - Remove experimental tag from Nexus (#2454)
+2025-03-24 - ead142ea - :boom: [Breaking] Asyncify slot suppliers (#2433)
+2025-03-25 - 93f124f4 - Priorities for Workflows/Activities (#2453)
+2025-03-26 - ad4a4262 - Ensure heartbeat details aren't cleared (#2460)
+2025-03-31 - c9a1502e - Add support for start delay to the time skipping test server (#2462)
+2025-04-02 - 75f5d1af - Update Gradle validation action (#2468)
+2025-04-02 - b3b78064 - Worker Versioning Annotations & Options (#2463)
+2025-04-07 - e3921b63 - Add support for workflow init in Springboot (#2470)
+2025-04-15 - 78a766f3 - Align root workflow execution with real server (#2477)
+2025-04-15 - 8808c407 - Add support for activity pause (#2476)
+2025-04-15 - b6ae9b54 - De-flake asserting slot metrics (#2478)

temporal-sdk/src/main/java/io/temporal/client/ActivityPausedException.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2022 Temporal Technologies, Inc. All Rights Reserved.
+ *
+ * Copyright (C) 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Modifications copyright (C) 2017 Uber Technologies, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this material except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.temporal.client;
+
+import io.temporal.activity.ActivityInfo;
+
+/***
+ * Indicates that the activity was paused by the user.
+ *
+ * <p>Catching this exception directly is discouraged and catching the parent class {@link ActivityCompletionException} is recommended instead.<br>
+ */
+public final class ActivityPausedException extends ActivityCompletionException {
+  public ActivityPausedException(ActivityInfo info) {
+    super(info);
+  }
+
+  public ActivityPausedException() {
+    super();
+  }
+}

temporal-sdk/src/main/java/io/temporal/client/ActivityWorkerShutdownException.java

@@ -26,7 +26,7 @@
 
 /**
  * Indicates that {@link WorkerFactory#shutdown()} or {@link WorkerFactory#shutdownNow()} was
- * called. It is OK to ignore the exception to let activity to complete. It assumes that {@link
+ * called. It is OK to ignore the exception to let the activity complete. It assumes that {@link
  * WorkerFactory#awaitTermination(long, TimeUnit)} is called with a timeout larger than the activity
  * execution time.
  */

temporal-sdk/src/main/java/io/temporal/internal/activity/HeartbeatContextImpl.java

@@ -216,6 +216,8 @@ private void sendHeartbeatRequest(Object details) {
               metricsScope);
       if (status.getCancelRequested()) {
         lastException = new ActivityCanceledException(info);
+      } else if (status.getActivityPaused()) {
+        lastException = new ActivityPausedException(info);
       } else {
         lastException = null;
       }

temporal-sdk/src/main/java/io/temporal/internal/nexus/OperationTokenUtil.java

@@ -37,17 +37,15 @@ public class OperationTokenUtil {
   /**
    * Load a workflow run operation token from an operation token.
    *
-   * @throws FallbackToWorkflowIdException if the operation token is not a workflow run token
    * @throws IllegalArgumentException if the operation token is invalid
    */
-  public static WorkflowRunOperationToken loadWorkflowRunOperationToken(String operationToken)
-      throws FallbackToWorkflowIdException {
+  public static WorkflowRunOperationToken loadWorkflowRunOperationToken(String operationToken) {
     WorkflowRunOperationToken token;
     try {
       JavaType reference = mapper.getTypeFactory().constructType(WorkflowRunOperationToken.class);
       token = mapper.readValue(decoder.decode(operationToken), reference);
     } catch (Exception e) {
-      throw new FallbackToWorkflowIdException("Failed to parse operation token: " + e.getMessage());
+      throw new IllegalArgumentException("Failed to parse operation token: " + e.getMessage());
     }
     if (!token.getType().equals(OperationTokenType.WORKFLOW_RUN)) {
       throw new IllegalArgumentException(
@@ -68,16 +66,7 @@ public static WorkflowRunOperationToken loadWorkflowRunOperationToken(String ope
    * @throws IllegalArgumentException if the operation token is invalid
    */
   public static String loadWorkflowIdFromOperationToken(String operationToken) {
-    try {
-      WorkflowRunOperationToken token = loadWorkflowRunOperationToken(operationToken);
-      return token.getWorkflowId();
-    } catch (OperationTokenUtil.FallbackToWorkflowIdException e) {
-      // Previous versions of the SDK simply used the workflow ID as the operation token
-      // This fallback is provided for backwards compatibility for those cases.
-      // This fallback will be removed in a future release.
-      // See: https://github.com/temporalio/sdk-java/issues/2423
-      return operationToken;
-    }
+    return loadWorkflowRunOperationToken(operationToken).getWorkflowId();
   }
 
   /** Generate a workflow run operation token from a workflow ID and namespace. */
@@ -87,11 +76,5 @@ public static String generateWorkflowRunOperationToken(String workflowId, String
     return encoder.encodeToString(json.getBytes());
   }
 
-  public static class FallbackToWorkflowIdException extends RuntimeException {
-    public FallbackToWorkflowIdException(String message) {
-      super(message);
-    }
-  }
-
   private OperationTokenUtil() {}
 }