Merging from upstream

Author: sdwr98

.buildkite/pipeline.yml

@@ -9,6 +9,11 @@ steps:
       queue: "workers"
       docker: "*"
     command: "./gradlew --no-daemon test"
+    timeout_in_minutes: 15
+    retry:
+      automatic:
+        - exit_status: "*"
+          limit: 3
     plugins:
       - docker-compose#v3.0.0:
           run: unit-test-test-service
@@ -19,6 +24,11 @@ steps:
       queue: "workers"
       docker: "*"
     command: "./gradlew --no-daemon test"
+    timeout_in_minutes: 15
+    retry:
+      automatic:
+        - exit_status: "*"
+          limit: 3
     plugins:
       - docker-compose#v3.0.0:
           run: unit-test-docker-sticky-on
@@ -29,6 +39,11 @@ steps:
       queue: "workers"
       docker: "*"
     command: "./gradlew --no-daemon test"
+    timeout_in_minutes: 15
+    retry:
+      automatic:
+        - exit_status: "*"
+          limit: 3
     plugins:
       - docker-compose#v3.0.0:
           run: unit-test-docker-sticky-off

CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## 2.7.8
+- Fix get raw history 
+- Improve signal processing error and log 
+- Fix replay error when querying workflow that contains activity retry 
+
+## 2.7.6
+- Fix getVersion override when added new version 
+- Add async signal to untypedstub 
+- Fix RetryOptions.addDoNotRetry
+- Add missing metrics from go client
+- Fix a bug in setting retry expiration while getting history
+- Fix start async return 
+
+## 2.7.5
+- Added supports contextPropagators for localActivity
+
+## v2.7.4
+- Fix prometheus reporting issue 
+- Fix Promise.allOf should not block on empty input
+- Misc: Added project directory to sourceItems path
+- Add async start to untype stub
+
+## v2.7.3
+- Add wf type tag in decider metrics scope
+- Fix WorkflowStub.fromTyped method
+- Added missing fields to local activity task
+- Honor user timeout for get workflow result
+
+## v2.7.2
+- Fix leak in Async GetWorkflowExecutionHistory
+- Fix context timeout in execute workflow
+
 ## v2.7.1
 - Fix a bug in build.gradle that prevented javadoc and sources from being published
 

README.md

@@ -31,12 +31,12 @@ Add *cadence-client* as a dependency to your *pom.xml*:
     <dependency>
       <groupId>com.uber.cadence</groupId>
       <artifactId>cadence-client</artifactId>
-      <version>2.7.1</version>
+      <version>2.7.8</version>
     </dependency>
 
 or to *build.gradle*:
 
-    compile group: 'com.uber.cadence', name: 'cadence-client', version: '2.7.1'
+    compile group: 'com.uber.cadence', name: 'cadence-client', version: '2.7.8'
 
 ## Documentation
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
 }
 
 plugins {
-    id 'net.minecrell.licenser' version '0.4.1'
+    id "com.github.hierynomus.license" version"0.15.0"
     id 'com.github.sherter.google-java-format' version '0.8'
     id 'net.ltgt.errorprone' version  '1.1.1'
     id 'java-library'
@@ -37,7 +37,7 @@ googleJavaFormat {
 }
 
 group = 'com.uber.cadence'
-version = '2.7.1'
+version = '2.7.8'
 
 description = '''Uber Cadence Java Client'''
 
@@ -69,7 +69,9 @@ dependencies {
 
 license {
     header rootProject.file('license-header.txt')
+    skipExistingHeaders true
     exclude 'com/uber/cadence/*.java' // generated code
+    excludes(["**/*.json"])
 }
 
 task initDlsSubmodule(type: Exec) {
@@ -215,7 +217,7 @@ task registerDomain(type:JavaExec) {
 
 test {
     dependsOn 'registerDomain'
-    dependsOn 'checkLicenseMain'
+    dependsOn 'licenseMain'
     testLogging {
         events 'passed', 'skipped', 'failed'
         exceptionFormat 'full'

docker/buildkite/docker-compose.yaml

@@ -7,10 +7,6 @@ services:
       driver: none
     ports:
       - "9042:9042"
-    networks:
-      services-network:
-        aliases:
-          - cassandra
 
   statsd:
     image: hopsoft/graphite-statsd
@@ -21,13 +17,9 @@ services:
       - "2003:2003"
       - "8125:8125"
       - "8126:8126"
-    networks:
-      services-network:
-        aliases:
-          - statsd
 
   cadence:
-    image: ubercadence/server:master-auto-setup
+    image: ubercadence/server:latestRelease-auto-setup
     logging:
       driver: none
     ports:
@@ -41,10 +33,6 @@ services:
     depends_on:
       - cassandra
       - statsd
-    networks:
-      services-network:
-        aliases:
-          - cadence
 
   unit-test-docker-sticky-off:
     build:
@@ -60,10 +48,6 @@ services:
       - cadence
     volumes:
       - "../../:/cadence-java-client"
-    networks:
-      services-network:
-        aliases:
-          - unit-test-docker-sticky-off
 
   unit-test-docker-sticky-on:
     build:
@@ -79,10 +63,6 @@ services:
       - cadence
     volumes:
       - "../../:/cadence-java-client"
-    networks:
-      services-network:
-        aliases:
-          - unit-test-docker-sticky-on
 
   unit-test-test-service:
     build:
@@ -93,13 +73,4 @@ services:
       - "USER=unittest"
       - "USE_DOCKER_SERVICE=false"
     volumes:
-      - "../../:/cadence-java-client"
-    networks:
-      services-network:
-        aliases:
-          - unit-test-test-service
-
-networks:
-  services-network:
-    name: services-network
-    driver: bridge
+      - "../../:/cadence-java-client"

src/main/idls

@@ -21,10 +21,10 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * Indicates that {@link com.uber.cadence.worker.Worker.Factory#shutdown()} or {@link
- * com.uber.cadence.worker.Worker.Factory#shutdownNow()} was called. It is OK to ignore the
- * exception to let activity to complete. It assumes that {@link
- * com.uber.cadence.worker.Worker.Factory#awaitTermination(long, TimeUnit)} is called with a timeout
+ * Indicates that {@link com.uber.cadence.worker.WorkerFactory#shutdown()} or {@link
+ * com.uber.cadence.worker.WorkerFactory#shutdownNow()} was called. It is OK to ignore the exception
+ * to let activity to complete. It assumes that {@link
+ * com.uber.cadence.worker.WorkerFactory#awaitTermination(long, TimeUnit)} is called with a timeout
  * larger than the activity execution time.
  */
 public final class ActivityWorkerShutdownException extends ActivityCompletionException {

src/main/java/com/uber/cadence/client/ActivityWorkerShutdownException.java

@@ -107,77 +107,29 @@ public interface WorkflowClient {
   /** Replays workflow to the current state and returns empty result or error if replay failed. */
   String QUERY_TYPE_REPLAY_ONLY = "__replay_only";
 
-  /**
-   * Creates worker that connects to the local instance of the Cadence Service that listens on a
-   * default port (7933).
-   *
-   * @param domain domain that worker uses to poll.
-   */
-  static WorkflowClient newInstance(String domain) {
-    return WorkflowClientInternal.newInstance(domain);
-  }
-
-  /**
-   * Creates worker that connects to the local instance of the Cadence Service that listens on a
-   * default port (7933).
-   *
-   * @param domain domain that worker uses to poll.
-   * @param options Options (like {@link com.uber.cadence.converter.DataConverter}er override) for
-   *     configuring client.
-   */
-  static WorkflowClient newInstance(String domain, WorkflowClientOptions options) {
-    return WorkflowClientInternal.newInstance(domain, options);
-  }
-
-  /**
-   * Creates client that connects to an instance of the Cadence Service.
-   *
-   * @param host of the Cadence Service endpoint
-   * @param port of the Cadence Service endpoint
-   * @param domain domain that worker uses to poll.
-   */
-  static WorkflowClient newInstance(String host, int port, String domain) {
-    return WorkflowClientInternal.newInstance(host, port, domain);
-  }
-
-  /**
-   * Creates client that connects to an instance of the Cadence Service.
-   *
-   * @param host of the Cadence Service endpoint
-   * @param port of the Cadence Service endpoint
-   * @param domain domain that worker uses to poll.
-   * @param options Options (like {@link com.uber.cadence.converter.DataConverter}er override) for
-   *     configuring client.
-   */
-  static WorkflowClient newInstance(
-      String host, int port, String domain, WorkflowClientOptions options) {
-    return WorkflowClientInternal.newInstance(host, port, domain, options);
-  }
-
   /**
    * Creates client that connects to an instance of the Cadence Service.
    *
    * @param service client to the Cadence Service endpoint.
-   * @param domain domain that worker uses to poll.
    */
-  static WorkflowClient newInstance(IWorkflowService service, String domain) {
-    return WorkflowClientInternal.newInstance(service, domain);
+  static WorkflowClient newInstance(IWorkflowService service) {
+    return WorkflowClientInternal.newInstance(service, WorkflowClientOptions.defaultInstance());
   }
 
   /**
    * Creates client that connects to an instance of the Cadence Service.
    *
    * @param service client to the Cadence Service endpoint.
-   * @param domain domain that worker uses to poll.
    * @param options Options (like {@link com.uber.cadence.converter.DataConverter}er override) for
    *     configuring client.
    */
-  static WorkflowClient newInstance(
-      IWorkflowService service, String domain, WorkflowClientOptions options) {
-    return WorkflowClientInternal.newInstance(service, domain, options);
+  static WorkflowClient newInstance(IWorkflowService service, WorkflowClientOptions options) {
+    return WorkflowClientInternal.newInstance(service, options);
   }
 
-  String getDomain();
+  WorkflowClientOptions getOptions();
+
+  IWorkflowService getService();
 
   /**
    * Creates workflow client stub that can be used to start a single workflow execution. The first
@@ -728,7 +680,4 @@ static <A1, A2, A3, A4, A5, A6, R> CompletableFuture<R> execute(
       A6 arg6) {
     return WorkflowClientInternal.execute(workflow, arg1, arg2, arg3, arg4, arg5, arg6);
   }
-
-  /** Closes the workflow client and the underlying IWorkflowService when this method is called. */
-  void close();
 }