diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/Application.java b/airbyte-workers/src/main/java/io/airbyte/workers/Application.java new file mode 100644 index 000000000000..65573d0a111f --- /dev/null +++ b/airbyte-workers/src/main/java/io/airbyte/workers/Application.java @@ -0,0 +1,15 @@ +/* + * Copyright (c) 2021 Airbyte, Inc., all rights reserved. + */ + +package io.airbyte.workers; + +public interface Application { + + default String getApplicationName() { + // This value should only be used in the U-Test, it is an empty string instead of airbyte-test in + // order to avoid displaying airbyte-test in prod + return ""; + } + +} diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DbtTransformationRunner.java b/airbyte-workers/src/main/java/io/airbyte/workers/DbtTransformationRunner.java index 6e09ef9bceb4..ec35dccdae76 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DbtTransformationRunner.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/DbtTransformationRunner.java @@ -48,7 +48,7 @@ public void start() throws Exception { * transform-config scripts (to translate Airbyte Catalogs into Dbt profiles file). Thus, we depend * on the NormalizationRunner to configure the dbt project with the appropriate destination settings * and pull the custom git repository into the workspace. - * + *

* Once the workspace folder/files is setup to run, we invoke the custom transformation command as * provided by the user to execute whatever extra transformation has been implemented. */ diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DbtTransformationWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/DbtTransformationWorker.java index 1e8f4b697ede..0a7e1da44889 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DbtTransformationWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/DbtTransformationWorker.java @@ -13,7 +13,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DbtTransformationWorker implements Worker { +public class DbtTransformationWorker implements Worker, Application { private static final Logger LOGGER = LoggerFactory.getLogger(DbtTransformationWorker.class); @@ -77,4 +77,9 @@ public void cancel() { } } + @Override + public String getApplicationName() { + return "normalization-worker"; + } + } diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultCheckConnectionWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/DefaultCheckConnectionWorker.java index c4e32d16079f..5a1abf740292 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultCheckConnectionWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/DefaultCheckConnectionWorker.java @@ -86,4 +86,9 @@ public void cancel() { WorkerUtils.cancelProcess(process); } + @Override + public String getApplicationName() { + return "check-connection-worker"; + } + } diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultDiscoverCatalogWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/DefaultDiscoverCatalogWorker.java index bf3dd1a371b4..9790a634ae51 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultDiscoverCatalogWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/DefaultDiscoverCatalogWorker.java @@ -81,4 +81,9 @@ public void cancel() { WorkerUtils.cancelProcess(process); } + @Override + public String getApplicationName() { + return "discover-worker"; + } + } diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultGetSpecWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/DefaultGetSpecWorker.java index 82265aa9370c..aa6951d7784f 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultGetSpecWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/DefaultGetSpecWorker.java @@ -81,4 +81,9 @@ public void cancel() { WorkerUtils.cancelProcess(process); } + @Override + public String getApplicationName() { + return "get-spec-worker"; + } + } diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultNormalizationWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/DefaultNormalizationWorker.java index 2ce6c078f0fa..5b6024b61825 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultNormalizationWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/DefaultNormalizationWorker.java @@ -82,4 +82,9 @@ public void cancel() { } } + @Override + public String getApplicationName() { + return "normalization-worker"; + } + } diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultReplicationWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/DefaultReplicationWorker.java index 280cb30f9875..73b8678b0720 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/DefaultReplicationWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/DefaultReplicationWorker.java @@ -271,4 +271,9 @@ public void cancel() { } + @Override + public String getApplicationName() { + return "sync-worker"; + } + } diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/EchoWorker.java b/airbyte-workers/src/main/java/io/airbyte/workers/EchoWorker.java index e968e70ff095..32ebd42e6522 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/EchoWorker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/EchoWorker.java @@ -25,4 +25,9 @@ public void cancel() { // no-op } + @Override + public String getApplicationName() { + return "airbyte-echo-worker"; + } + } diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/Worker.java b/airbyte-workers/src/main/java/io/airbyte/workers/Worker.java index ffa64ac35399..a2fb2c3f8269 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/Worker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/Worker.java @@ -6,7 +6,7 @@ import java.nio.file.Path; -public interface Worker { +public interface Worker extends Application { /** * Blocking call to run the worker's workflow. Once this is complete, getStatus should return either diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/MessageTracker.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/MessageTracker.java index d48679339994..10f480c42182 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/MessageTracker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/MessageTracker.java @@ -5,10 +5,11 @@ package io.airbyte.workers.protocols; import io.airbyte.config.State; +import io.airbyte.workers.Application; import java.util.Optional; import java.util.function.Consumer; -public interface MessageTracker extends Consumer { +public interface MessageTracker extends Consumer, Application { @Override void accept(T message); diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteMessageTracker.java b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteMessageTracker.java index 34e12a068b32..9d3c58d66a74 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteMessageTracker.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/protocols/airbyte/AirbyteMessageTracker.java @@ -52,4 +52,9 @@ public Optional getOutputState() { return Optional.ofNullable(outputState.get()); } + @Override + public String getApplicationName() { + return "airbyte-message-tracker"; + } + }