Merge pull request #44 from longquanzheng/metric

Author: longquanzheng

build.gradle

@@ -35,9 +35,13 @@ repositories {
 dependencies {
     errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
     errorprone("com.google.errorprone:error_prone_core:2.3.1")
-    compile group: 'com.uber.cadence', name: 'cadence-client', version: '2.7.8'
+    compile group: 'com.uber.cadence', name: 'cadence-client', version: '3.0.0'
     compile group: 'commons-configuration', name: 'commons-configuration', version: '1.9'
     compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
+    compile group: 'com.uber.m3', name: 'tally-core', version: '0.10.0'
+    compile group: 'com.uber.m3', name: 'tally-prometheus', version: '0.10.0'
+    compile group: 'io.prometheus', name: 'simpleclient', version: '0.10.0'
+    compile group: 'io.prometheus', name: 'simpleclient_httpserver', version: '0.10.0'
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
     testCompile group: 'org.powermock', name: 'powermock-api-mockito', version: '1.7.3'

src/main/java/com/uber/cadence/samples/bookingsaga/TripBookingSaga.java

@@ -17,20 +17,24 @@
 
 package com.uber.cadence.samples.bookingsaga;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 import com.uber.cadence.client.WorkflowClient;
 import com.uber.cadence.client.WorkflowException;
+import com.uber.cadence.serviceclient.ClientOptions;
+import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
 import com.uber.cadence.worker.Worker;
+import com.uber.cadence.worker.WorkerFactory;
 
 public class TripBookingSaga {
 
   static final String TASK_LIST = "TripBooking";
 
   @SuppressWarnings("CatchAndPrintStackTrace")
   public static void main(String[] args) {
+    // Get a new client
+    WorkflowClient workflowClient =
+        WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
     // Get worker to poll the common task list.
-    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
     final Worker workerForCommonTaskList = factory.newWorker(TASK_LIST);
     workerForCommonTaskList.registerWorkflowImplementationTypes(TripBookingWorkflowImpl.class);
     TripBookingActivities tripBookingActivities = new TripBookingActivitiesImpl();
@@ -40,8 +44,6 @@ public static void main(String[] args) {
     factory.start();
     System.out.println("Worker started for task list: " + TASK_LIST);
 
-    WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
-
     // now we can start running instances of our saga - its state will be persisted
     TripBookingWorkflow trip1 = workflowClient.newWorkflowStub(TripBookingWorkflow.class);
     try {

src/main/java/com/uber/cadence/samples/common/QueryWorkflowExecution.java

@@ -17,11 +17,10 @@
 
 package com.uber.cadence.samples.common;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 import com.uber.cadence.WorkflowExecution;
 import com.uber.cadence.client.WorkflowClient;
 import com.uber.cadence.client.WorkflowStub;
+import com.uber.cadence.serviceclient.ClientOptions;
 import com.uber.cadence.serviceclient.IWorkflowService;
 import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
 import java.util.Optional;
@@ -42,7 +41,7 @@ public static void main(String[] args) throws Exception {
               + " <queryType> <workflowId> [<runId>]");
       System.exit(1);
     }
-    IWorkflowService cadenceService = new WorkflowServiceTChannel();
+    IWorkflowService cadenceService = new WorkflowServiceTChannel(ClientOptions.defaultInstance());
 
     String queryType = args[0];
 
@@ -53,7 +52,7 @@ public static void main(String[] args) throws Exception {
       String runId = args[1];
       workflowExecution.setRunId(runId);
     }
-    WorkflowClient client = WorkflowClient.newInstance(cadenceService, DOMAIN);
+    WorkflowClient client = WorkflowClient.newInstance(cadenceService);
     WorkflowStub workflow = client.newUntypedWorkflowStub(workflowExecution, Optional.empty());
     String result = workflow.query(queryType, String.class);
 

src/main/java/com/uber/cadence/samples/common/RegisterDomain.java

@@ -21,6 +21,7 @@
 
 import com.uber.cadence.DomainAlreadyExistsError;
 import com.uber.cadence.RegisterDomainRequest;
+import com.uber.cadence.serviceclient.ClientOptions;
 import com.uber.cadence.serviceclient.IWorkflowService;
 import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
 import java.io.IOException;
@@ -34,7 +35,7 @@
 public class RegisterDomain {
 
   public static void main(String[] args) throws TException, IOException {
-    IWorkflowService cadenceService = new WorkflowServiceTChannel();
+    IWorkflowService cadenceService = new WorkflowServiceTChannel(ClientOptions.defaultInstance());
     RegisterDomainRequest request = new RegisterDomainRequest();
     request.setDescription("Java Samples");
     request.setEmitMetric(false);

src/main/java/com/uber/cadence/samples/common/WorkflowExecutionHistoryPrinter.java

@@ -21,6 +21,7 @@
 
 import com.uber.cadence.WorkflowExecution;
 import com.uber.cadence.internal.common.WorkflowExecutionUtils;
+import com.uber.cadence.serviceclient.ClientOptions;
 import com.uber.cadence.serviceclient.IWorkflowService;
 import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
 
@@ -39,7 +40,7 @@ public static void main(String[] args) throws Exception {
               + " <workflowId> <runId>");
       System.exit(1);
     }
-    IWorkflowService cadenceService = new WorkflowServiceTChannel();
+    IWorkflowService cadenceService = new WorkflowServiceTChannel(ClientOptions.defaultInstance());
     WorkflowExecution workflowExecution = new WorkflowExecution();
     String workflowId = args[0];
     workflowExecution.setWorkflowId(workflowId);

src/main/java/com/uber/cadence/samples/fileprocessing/FileProcessingStarter.java

@@ -17,16 +17,18 @@
 
 package com.uber.cadence.samples.fileprocessing;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 import com.uber.cadence.client.WorkflowClient;
+import com.uber.cadence.serviceclient.ClientOptions;
+import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
 import java.net.URL;
 
 /** Starts a file processing sample workflow. */
 public class FileProcessingStarter {
 
   public static void main(String[] args) throws Exception {
-    WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
+    // Get a new client
+    WorkflowClient workflowClient =
+        WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
     FileProcessingWorkflow workflow = workflowClient.newWorkflowStub(FileProcessingWorkflow.class);
 
     System.out.println("Executing FileProcessingWorkflow");

src/main/java/com/uber/cadence/samples/fileprocessing/FileProcessingWorker.java

@@ -17,9 +17,11 @@
 
 package com.uber.cadence.samples.fileprocessing;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
+import com.uber.cadence.client.WorkflowClient;
+import com.uber.cadence.serviceclient.ClientOptions;
+import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
 import com.uber.cadence.worker.Worker;
+import com.uber.cadence.worker.WorkerFactory;
 import java.lang.management.ManagementFactory;
 
 /**
@@ -37,8 +39,11 @@ public static void main(String[] args) {
 
     String hostSpecifiTaskList = ManagementFactory.getRuntimeMXBean().getName();
 
+    // Get a new client
+    WorkflowClient workflowClient =
+        WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
     // Get worker to poll the common task list.
-    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
     final Worker workerForCommonTaskList = factory.newWorker(TASK_LIST);
     workerForCommonTaskList.registerWorkflowImplementationTypes(FileProcessingWorkflowImpl.class);
     StoreActivitiesImpl storeActivityImpl = new StoreActivitiesImpl(hostSpecifiTaskList);

src/main/java/com/uber/cadence/samples/hello/HelloActivity.java

@@ -17,14 +17,12 @@
 
 package com.uber.cadence.samples.hello;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
-import com.google.common.base.Strings;
 import com.uber.cadence.activity.ActivityMethod;
 import com.uber.cadence.client.WorkflowClient;
-import com.uber.cadence.serviceclient.IWorkflowService;
+import com.uber.cadence.serviceclient.ClientOptions;
 import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
 import com.uber.cadence.worker.Worker;
+import com.uber.cadence.worker.WorkerFactory;
 import com.uber.cadence.workflow.Workflow;
 import com.uber.cadence.workflow.WorkflowMethod;
 
@@ -75,19 +73,13 @@ public String composeGreeting(String greeting, String name) {
   }
 
   public static void main(String[] args) {
-    // Start a worker that hosts both workflow and activity implementations.
-    final WorkflowServiceTChannel.ClientOptions.Builder builder =
-            new WorkflowServiceTChannel.ClientOptions.Builder();
-    // Use 5 seconds as RPC timeout
-    builder.setRpcTimeout(5 * 1000);
-    IWorkflowService wfService =
-            new WorkflowServiceTChannel(
-                    Strings.isNullOrEmpty(System.getenv("CADENCE_SEEDS"))
-                            ? "127.0.0.1"
-                            : System.getenv("CADENCE_SEEDS"),
-                    7933,
-                    builder.build());
-    Worker.Factory factory = new Worker.Factory(wfService, DOMAIN);
+    // Get a new client
+    // NOTE: to set a different options, you can do like this:
+    // ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
+    WorkflowClient workflowClient =
+        WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
+    // Get worker to poll the task list.
+    WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
     Worker worker = factory.newWorker(TASK_LIST);
     // Workflows are stateful. So you need a type to create instances.
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
@@ -96,8 +88,6 @@ public static void main(String[] args) {
     // Start listening to the workflow and activity task lists.
     factory.start();
 
-    // Start a workflow execution. Usually this is done from another program.
-    WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
     // Get a workflow stub using the same task list the worker uses.
     GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class);
     // Execute a workflow waiting for it to complete.

src/main/java/com/uber/cadence/samples/hello/HelloActivityRetry.java

@@ -17,13 +17,14 @@
 
 package com.uber.cadence.samples.hello;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 import com.uber.cadence.activity.ActivityOptions;
 import com.uber.cadence.client.WorkflowClient;
 import com.uber.cadence.client.WorkflowOptions;
 import com.uber.cadence.common.RetryOptions;
+import com.uber.cadence.serviceclient.ClientOptions;
+import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
 import com.uber.cadence.worker.Worker;
+import com.uber.cadence.worker.WorkerFactory;
 import com.uber.cadence.workflow.Functions;
 import com.uber.cadence.workflow.Workflow;
 import com.uber.cadence.workflow.WorkflowMethod;
@@ -99,8 +100,13 @@ public synchronized String composeGreeting(String greeting, String name) {
   }
 
   public static void main(String[] args) {
-    // Start a worker that hosts both workflow and activity implementations.
-    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    // Get a new client
+    // NOTE: to set a different options, you can do like this:
+    // ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
+    WorkflowClient workflowClient =
+        WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
+    // Get worker to poll the task list.
+    WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
     Worker worker = factory.newWorker(TASK_LIST);
     // Workflows are stateful. So you need a type to create instances.
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
@@ -109,8 +115,6 @@ public static void main(String[] args) {
     // Start listening to the workflow and activity task lists.
     factory.start();
 
-    // Start a workflow execution. Usually this is done from another program.
-    WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
     // Get a workflow stub using the same task list the worker uses.
     WorkflowOptions workflowOptions =
         new WorkflowOptions.Builder()

src/main/java/com/uber/cadence/samples/hello/HelloAsync.java

@@ -17,11 +17,12 @@
 
 package com.uber.cadence.samples.hello;
 
-import static com.uber.cadence.samples.common.SampleConstants.DOMAIN;
-
 import com.uber.cadence.activity.ActivityMethod;
 import com.uber.cadence.client.WorkflowClient;
+import com.uber.cadence.serviceclient.ClientOptions;
+import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
 import com.uber.cadence.worker.Worker;
+import com.uber.cadence.worker.WorkerFactory;
 import com.uber.cadence.workflow.Async;
 import com.uber.cadence.workflow.Functions.Func;
 import com.uber.cadence.workflow.Promise;
@@ -79,8 +80,13 @@ public String composeGreeting(String greeting, String name) {
   }
 
   public static void main(String[] args) {
-    // Start a worker that hosts both workflow and activity implementations.
-    Worker.Factory factory = new Worker.Factory(DOMAIN);
+    // Get a new client
+    // NOTE: to set a different options, you can do like this:
+    // ClientOptions.newBuilder().setRpcTimeout(5 * 1000).build();
+    WorkflowClient workflowClient =
+        WorkflowClient.newInstance(new WorkflowServiceTChannel(ClientOptions.defaultInstance()));
+    // Get worker to poll the task list.
+    WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
     Worker worker = factory.newWorker(TASK_LIST);
     // Workflows are stateful. So you need a type to create instances.
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
@@ -89,8 +95,6 @@ public static void main(String[] args) {
     // Start listening to the workflow and activity task lists.
     factory.start();
 
-    // Start a workflow execution. Usually this is done from another program.
-    WorkflowClient workflowClient = WorkflowClient.newInstance(DOMAIN);
     // Get a workflow stub using the same task list the worker uses.
     GreetingWorkflow workflow = workflowClient.newWorkflowStub(GreetingWorkflow.class);
     // Execute a workflow waiting for it to complete.