Rename Reset to Clear for JobTracking (#12426)

airbytehq · May 10, 2024 · 64e3c8e · 64e3c8e
1 parent d67a6fc
commit 64e3c8e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/airbyte-api/src/main/openapi/config.yaml b/airbyte-api/src/main/openapi/config.yaml
@@ -9367,6 +9367,7 @@ components:
         - sync
         - reset_connection
         - refresh
+        - clear
     JobCreate:
       type: object
       required:

diff --git a/airbyte-config/config-models/src/main/resources/types/JobConfig.yaml b/airbyte-config/config-models/src/main/resources/types/JobConfig.yaml
@@ -18,6 +18,7 @@ properties:
       - sync
       - resetConnection
       - refresh
+      - clear
   checkConnection:
     "$ref": JobCheckConnectionConfig.yaml
   discoverCatalog:

diff --git a/...sistence/job-persistence/src/main/java/io/airbyte/persistence/job/tracker/JobTracker.java b/...sistence/job-persistence/src/main/java/io/airbyte/persistence/job/tracker/JobTracker.java
@@ -524,7 +524,12 @@ Map<String, Object> generateJobMetadata(final String jobId,
                                           final Optional<Job> previousJob) {
     final Map<String, Object> metadata = new HashMap<>();
     if (configType != null) {
-      metadata.put("job_type", configType);
+      // This is a cosmetic fix for our job tracking.
+      // https://github.com/airbytehq/airbyte-internal-issues/issues/7671 tracks the more complete
+      // refactoring. Once that is done, this should no longer be needed as we can directly log
+      // configType.
+      final var eventConfigType = configType == ConfigType.RESET_CONNECTION ? ConfigType.CLEAR : configType;
+      metadata.put("job_type", eventConfigType);
     }
     metadata.put("job_id", jobId);
     metadata.put("attempt_id", attempt);

diff --git a/...ence/job-persistence/src/test/java/io/airbyte/persistence/job/tracker/JobTrackerTest.java b/...ence/job-persistence/src/test/java/io/airbyte/persistence/job/tracker/JobTrackerTest.java
@@ -776,7 +776,7 @@ private Job getJobWithFailuresMock(final ConfigType configType, final long jobId
 
   private ImmutableMap<String, Object> getJobMetadata(final ConfigType configType, final long jobId) {
     return ImmutableMap.<String, Object>builder()
-        .put(JOB_TYPE, configType)
+        .put(JOB_TYPE, configType != ConfigType.RESET_CONNECTION ? configType : ConfigType.CLEAR)
         .put(JOB_ID_KEY, String.valueOf(jobId))
         .put(ATTEMPT_ID, 700)
         .put("connection_id", CONNECTION_ID)