Pass otel collector endpoint env var to orchestrator (#5711)

Co-authored-by: Kostiantyn Nemchenko <kostiantyn.nemchenko@gmail.com> Co-authored-by: perangel <perangel@gmail.com>
airbytehq · Apr 17, 2023 · 93cd829 · 93cd829
1 parent a4434a0
commit 93cd829
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/...ommons-temporal/src/main/java/io/airbyte/commons/temporal/sync/OrchestratorConstants.java b/...ommons-temporal/src/main/java/io/airbyte/commons/temporal/sync/OrchestratorConstants.java
@@ -53,6 +53,7 @@ public class OrchestratorConstants {
           EnvConfigs.DD_AGENT_HOST,
           EnvConfigs.DD_DOGSTATSD_PORT,
           EnvConfigs.METRIC_CLIENT,
+          EnvConfigs.OTEL_COLLECTOR_ENDPOINT,
           LOG_LEVEL,
           LogClientSingleton.GCS_LOG_BUCKET,
           LogClientSingleton.GOOGLE_APPLICATION_CREDENTIALS,

diff --git a/...e-commons-worker/src/main/java/io/airbyte/workers/process/AirbyteIntegrationLauncher.java b/...e-commons-worker/src/main/java/io/airbyte/workers/process/AirbyteIntegrationLauncher.java
@@ -241,6 +241,7 @@ private Map<String, String> getWorkerMetadata() {
             .put(EnvConfigs.SOCAT_KUBE_CPU_REQUEST, configs.getSocatSidecarKubeCpuRequest())
             .put(EnvConfigs.LAUNCHDARKLY_KEY, configs.getLaunchDarklyKey())
             .put(EnvConfigs.FEATURE_FLAG_CLIENT, configs.getFeatureFlagClient())
+            .put(EnvConfigs.OTEL_COLLECTOR_ENDPOINT, configs.getOtelCollectorEndpoint())
             .build());
   }
 

diff --git a/...mmons-worker/src/test/java/io/airbyte/workers/process/AirbyteIntegrationLauncherTest.java b/...mmons-worker/src/test/java/io/airbyte/workers/process/AirbyteIntegrationLauncherTest.java
@@ -70,6 +70,7 @@ class AirbyteIntegrationLauncherTest {
               .put(EnvConfigs.SOCAT_KUBE_CPU_REQUEST, CONFIGS.getSocatSidecarKubeCpuRequest())
               .put(EnvConfigs.LAUNCHDARKLY_KEY, CONFIGS.getLaunchDarklyKey())
               .put(EnvConfigs.FEATURE_FLAG_CLIENT, CONFIGS.getFeatureFlagClient())
+              .put(EnvConfigs.OTEL_COLLECTOR_ENDPOINT, CONFIGS.getOtelCollectorEndpoint())
               .build());
 
   private WorkerConfigs workerConfigs;

diff --git a/airbyte-config/config-models/src/main/java/io/airbyte/config/EnvConfigs.java b/airbyte-config/config-models/src/main/java/io/airbyte/config/EnvConfigs.java
@@ -170,7 +170,7 @@ public class EnvConfigs implements Configs {
   private static final String MAX_DAYS_OF_ONLY_FAILED_JOBS_BEFORE_CONNECTION_DISABLE = "MAX_DAYS_OF_ONLY_FAILED_JOBS_BEFORE_CONNECTION_DISABLE";
 
   public static final String METRIC_CLIENT = "METRIC_CLIENT";
-  private static final String OTEL_COLLECTOR_ENDPOINT = "OTEL_COLLECTOR_ENDPOINT";
+  public static final String OTEL_COLLECTOR_ENDPOINT = "OTEL_COLLECTOR_ENDPOINT";
 
   public static final String REMOTE_CONNECTOR_CATALOG_URL = "REMOTE_CONNECTOR_CATALOG_URL";
 

diff --git a/...rkers/src/main/java/io/airbyte/workers/config/ContainerOrchestratorConfigBeanFactory.java b/...rkers/src/main/java/io/airbyte/workers/config/ContainerOrchestratorConfigBeanFactory.java
@@ -111,6 +111,7 @@ public ContainerOrchestratorConfig kubernetesContainerOrchestratorConfig(
     final Configs configs = new EnvConfigs();
     environmentVariables.put(EnvConfigs.FEATURE_FLAG_CLIENT, configs.getFeatureFlagClient());
     environmentVariables.put(EnvConfigs.LAUNCHDARKLY_KEY, configs.getLaunchDarklyKey());
+    environmentVariables.put(EnvConfigs.OTEL_COLLECTOR_ENDPOINT, configs.getOtelCollectorEndpoint());
     environmentVariables.put(EnvConfigs.SOCAT_KUBE_CPU_LIMIT, configs.getSocatSidecarKubeCpuLimit());
     environmentVariables.put(EnvConfigs.SOCAT_KUBE_CPU_REQUEST, configs.getSocatSidecarKubeCpuRequest());