[gobblin] branch master updated: [GOBBLIN-1829] Fixes bug where the wrong workunit event was being tracked for keepin… (#3691)

[wl...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new b5d255821 [GOBBLIN-1829] Fixes bug where the wrong workunit event was being tracked for keepin… (#3691)
b5d255821 is described below

commit b5d25582154cfefe4c2ab228f1b1926470ff5e5f
Author: William Lo <lo...@gmail.com>
AuthorDate: Wed May 3 16:23:26 2023 -0400

    [GOBBLIN-1829] Fixes bug where the wrong workunit event was being tracked for keepin… (#3691)
    
    * Fixes bug where the wrong workunit event was being tracked for keeping track of work discovery time
    
    * Fix tests
---
 .../java/org/apache/gobblin/runtime/KafkaAvroJobStatusMonitorTest.java | 2 +-
 .../apache/gobblin/service/monitoring/KafkaAvroJobStatusMonitor.java   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gobblin-modules/gobblin-kafka-09/src/test/java/org/apache/gobblin/runtime/KafkaAvroJobStatusMonitorTest.java b/gobblin-modules/gobblin-kafka-09/src/test/java/org/apache/gobblin/runtime/KafkaAvroJobStatusMonitorTest.java
index 5c78989a5..e63969b86 100644
--- a/gobblin-modules/gobblin-kafka-09/src/test/java/org/apache/gobblin/runtime/KafkaAvroJobStatusMonitorTest.java
+++ b/gobblin-modules/gobblin-kafka-09/src/test/java/org/apache/gobblin/runtime/KafkaAvroJobStatusMonitorTest.java
@@ -689,7 +689,7 @@ public class KafkaAvroJobStatusMonitorTest {
     Map<String, String> metadata = Maps.newHashMap();
     metadata.put(TimingEvent.METADATA_START_TIME, "2");
     metadata.put(TimingEvent.METADATA_END_TIME, "3");
-    return createGTE(TimingEvent.RunJobTimings.WORK_UNITS_PREPARATION, metadata);
+    return createGTE(TimingEvent.LauncherTimings.WORK_UNITS_CREATION, metadata);
   }
 
 
diff --git a/gobblin-service/src/main/java/org/apache/gobblin/service/monitoring/KafkaAvroJobStatusMonitor.java b/gobblin-service/src/main/java/org/apache/gobblin/service/monitoring/KafkaAvroJobStatusMonitor.java
index 56f37c293..c152970cb 100644
--- a/gobblin-service/src/main/java/org/apache/gobblin/service/monitoring/KafkaAvroJobStatusMonitor.java
+++ b/gobblin-service/src/main/java/org/apache/gobblin/service/monitoring/KafkaAvroJobStatusMonitor.java
@@ -127,13 +127,14 @@ public class KafkaAvroJobStatusMonitor extends KafkaJobStatusMonitor {
       case TimingEvent.FlowTimings.FLOW_COMPILED:
         properties.put(JobStatusRetriever.EVENT_NAME_FIELD, ExecutionStatus.COMPILED.name());
         break;
-      case TimingEvent.LauncherTimings.WORK_UNITS_PREPARATION:
+      case TimingEvent.LauncherTimings.WORK_UNITS_CREATION:
         properties.put(TimingEvent.WORKUNIT_PLAN_START_TIME, properties.getProperty(TimingEvent.METADATA_START_TIME));
         properties.put(TimingEvent.WORKUNIT_PLAN_END_TIME, properties.getProperty(TimingEvent.METADATA_END_TIME));
         break;
       case TimingEvent.LauncherTimings.JOB_START:
       case TimingEvent.FlowTimings.FLOW_RUNNING:
       case TimingEvent.LauncherTimings.JOB_SUMMARY:
+      case TimingEvent.LauncherTimings.WORK_UNITS_PREPARATION:
         properties.put(JobStatusRetriever.EVENT_NAME_FIELD, ExecutionStatus.RUNNING.name());
         break;
       case TimingEvent.LauncherTimings.JOB_PENDING: