Fix metrics

Author: longquanzheng

build.gradle

@@ -35,7 +35,7 @@ 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'

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/hello/HelloMetric.java

@@ -17,11 +17,13 @@
 
 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.IWorkflowService;
+import com.uber.cadence.serviceclient.WorkflowServiceTChannel;
 import com.uber.cadence.worker.Worker;
+import com.uber.cadence.worker.WorkerFactory;
 import com.uber.cadence.worker.WorkerOptions;
 import com.uber.cadence.workflow.Workflow;
 import com.uber.cadence.workflow.WorkflowMethod;
@@ -91,21 +93,21 @@ public String composeGreeting(String greeting, String name) {
   }
 
   public static void main(String[] args) throws IOException {
+    final ClientOptions clientOptions =
+        ClientOptions.newBuilder().setMetricsScope(createMetricScope()).build();
+    //    final ClientOptions clientOptions = ClientOptions.newBuilder().build();
+    IWorkflowService service = new WorkflowServiceTChannel(clientOptions);
+    final WorkflowClient workflowClient = WorkflowClient.newInstance(service);
     // Start a worker that hosts both workflow and activity implementations.
-    Worker.Factory factory = new Worker.Factory(DOMAIN);
-    PrometheusReporter.builder().registry(CollectorRegistry.defaultRegistry).build();
-    final WorkerOptions workerOptions =
-        new WorkerOptions.Builder().setMetricsScope(createMetricScope()).build();
-    Worker worker = factory.newWorker(TASK_LIST, workerOptions);
+    WorkerFactory factory = WorkerFactory.newInstance(workflowClient);
+    Worker worker = factory.newWorker(TASK_LIST, WorkerOptions.defaultInstance());
     // Workflows are stateful. So you need a type to create instances.
     worker.registerWorkflowImplementationTypes(GreetingWorkflowImpl.class);
     // Activities are stateless and thread safe. So a shared instance is used.
     worker.registerActivitiesImplementations(new GreetingActivitiesImpl());
     // 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.
@@ -117,7 +119,9 @@ private static Scope createMetricScope() throws IOException {
     CollectorRegistry registry = CollectorRegistry.defaultRegistry;
     HTTPServer httpServer = new HTTPServer(new InetSocketAddress(9098), registry);
     PrometheusReporter reporter = PrometheusReporter.builder().registry(registry).build();
-    Scope scope = new RootScopeBuilder().reporter(reporter).reportEvery(Duration.ofSeconds(1));
+    // Make sure to set separator to "_" for Prometheus. Default is "." and doesn't work.
+    Scope scope =
+        new RootScopeBuilder().separator("_").reporter(reporter).reportEvery(Duration.ofSeconds(1));
     return new PrometheusScope(scope);
   }
 }