[incubator-gobblin] branch master updated: [GOBBLIN-1269] add metrics field in JobStatus schema

[suvasude]

This is an automated email from the ASF dual-hosted git repository.

suvasude pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-gobblin.git


The following commit(s) were added to refs/heads/master by this push:
     new 39690d2  [GOBBLIN-1269] add metrics field in JobStatus schema
39690d2 is described below

commit 39690d27c1d94100c0d924f2e6a405164a4473e1
Author: Arjun <ab...@linkedin.com>
AuthorDate: Tue Sep 22 07:53:00 2020 -0700

    [GOBBLIN-1269] add metrics field in JobStatus schema
    
    Closes #3109 from arjun4084346/jobStatusSchema
---
 .../src/main/pegasus/org/apache/gobblin/service/JobStatus.pdl       | 5 +++++
 .../main/java/org/apache/gobblin/service/FlowExecutionResource.java | 6 +++++-
 .../main/java/org/apache/gobblin/service/monitoring/JobStatus.java  | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git 
a/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-api/src/main/pegasus/org/apache/gobblin/service/JobStatus.pdl
 
b/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-api/src/main/pegasus/org/apache/gobblin/service/JobStatus.pdl
index f063dae..615f6cf 100644
--- 
a/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-api/src/main/pegasus/org/apache/gobblin/service/JobStatus.pdl
+++ 
b/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-api/src/main/pegasus/org/apache/gobblin/service/JobStatus.pdl
@@ -31,6 +31,11 @@ record JobStatus {
   message: string
 
   /**
+   * metrics information
+   */
+  metrics: optional string
+
+  /**
    * Statistics from the job execution. The values may be updated during the 
run of a job.
    */
   executionStatistics: JobStatistics
diff --git 
a/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/FlowExecutionResource.java
 
b/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/FlowExecutionResource.java
index afd55a2..5a738c6 100644
--- 
a/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/FlowExecutionResource.java
+++ 
b/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/FlowExecutionResource.java
@@ -22,10 +22,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Strings;
 import com.google.inject.Inject;
 import com.linkedin.data.template.SetMode;
 import com.linkedin.restli.common.ComplexResourceKey;
@@ -170,6 +170,10 @@ public class FlowExecutionResource extends 
ComplexKeyResourceTemplate<FlowStatus
           .setJobState(new 
JobState().setLowWatermark(queriedJobStatus.getLowWatermark()).
               setHighWatermark(queriedJobStatus.getHighWatermark()));
 
+      if (!Strings.isNullOrEmpty(queriedJobStatus.getMetrics())) {
+        jobStatus.setMetrics(queriedJobStatus.getMetrics());
+      }
+
       jobStatusArray.add(jobStatus);
     }
 
diff --git 
a/gobblin-runtime/src/main/java/org/apache/gobblin/service/monitoring/JobStatus.java
 
b/gobblin-runtime/src/main/java/org/apache/gobblin/service/monitoring/JobStatus.java
index a436ce0..e1ebb64 100644
--- 
a/gobblin-runtime/src/main/java/org/apache/gobblin/service/monitoring/JobStatus.java
+++ 
b/gobblin-runtime/src/main/java/org/apache/gobblin/service/monitoring/JobStatus.java
@@ -40,7 +40,8 @@ public class JobStatus {
   private final long startTime;
   private final long endTime;
   @Setter
-  private String message;
+  private String metrics;
+  private final String message;
   private final long processedCount;
   private final String lowWatermark;
   private final String highWatermark;