diff --git a/docker-compose.workloads.yaml b/docker-compose.workloads.yaml index f35e69bbaa3..5a43bd66e88 100644 --- a/docker-compose.workloads.yaml +++ b/docker-compose.workloads.yaml @@ -45,6 +45,10 @@ services: - WORKSPACE_ROOT=${WORKSPACE_ROOT} # Is local root (and the storage bucket env vars) necessary? - LOCAL_ROOT=${LOCAL_ROOT} + - DD_LOGS_INJECTION=${DD_LOGS_INJECTION} + - JAVA_OPTS=${JAVA_OPTS} + - CONTAINER_ORCHESTRATOR_JAVA_OPTS=${CONTAINER_ORCHESTRATOR_JAVA_OPTS} + - DD_TRACE_AGENT_PORT=${DD_TRACE_AGENT_PORT} ports: - "8007" configs: @@ -108,6 +112,10 @@ services: - WORKLOAD_API_HOST=${WORKLOAD_API_URL} - WORKSPACE_DOCKER_MOUNT=${WORKSPACE_DOCKER_MOUNT} - WORKSPACE_ROOT=${WORKSPACE_ROOT} + - DD_LOGS_INJECTION=${DD_LOGS_INJECTION} + - JAVA_OPTS=${JAVA_OPTS} + - CONTAINER_ORCHESTRATOR_JAVA_OPTS=${CONTAINER_ORCHESTRATOR_JAVA_OPTS} + - DD_TRACE_AGENT_PORT=${DD_TRACE_AGENT_PORT} configs: - flags volumes: diff --git a/docker-compose.yaml b/docker-compose.yaml index 8efbfb9394e..2baf31c1050 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -41,6 +41,12 @@ services: - DATABASE_USER=${DATABASE_USER} - LOCAL_CONNECTOR_CATALOG_PATH=${LOCAL_CONNECTOR_CATALOG_PATH} - LOG_LEVEL=${LOG_LEVEL} + - DD_LOGS_INJECTION=${DD_LOGS_INJECTION} + - JAVA_OPTS=${JAVA_OPTS} + - CONTAINER_ORCHESTRATOR_JAVA_OPTS=${CONTAINER_ORCHESTRATOR_JAVA_OPTS} + - DD_DOGSTATSD_PORT=${DD_DOGSTATSD_PORT} + - DD_TRACE_AGENT_PORT=${DD_TRACE_AGENT_PORT} + - DD_AGENT_HOST=${DD_AGENT_HOST} networks: - airbyte_internal depends_on: @@ -60,6 +66,12 @@ services: - DATABASE_USER=${DATABASE_USER} - POSTGRES_PASSWORD=${DATABASE_PASSWORD} - POSTGRES_USER=${DATABASE_USER} + - DD_LOGS_INJECTION=${DD_LOGS_INJECTION} + - JAVA_OPTS=${JAVA_OPTS} + - CONTAINER_ORCHESTRATOR_JAVA_OPTS=${CONTAINER_ORCHESTRATOR_JAVA_OPTS} + - DD_DOGSTATSD_PORT=${DD_DOGSTATSD_PORT} + - DD_TRACE_AGENT_PORT=${DD_TRACE_AGENT_PORT} + - DD_AGENT_HOST=${DD_AGENT_HOST} volumes: - db:/var/lib/postgresql/data networks: @@ -142,6 +154,10 @@ services: - WORKLOAD_API_HOST=${WORKLOAD_API_URL} - WORKSPACE_DOCKER_MOUNT=${WORKSPACE_DOCKER_MOUNT} - WORKSPACE_ROOT=${WORKSPACE_ROOT} + - DD_LOGS_INJECTION=${DD_LOGS_INJECTION} + - JAVA_OPTS=${JAVA_OPTS} + - CONTAINER_ORCHESTRATOR_JAVA_OPTS=${CONTAINER_ORCHESTRATOR_JAVA_OPTS} + - DD_TRACE_AGENT_PORT=${DD_TRACE_AGENT_PORT} configs: - flags volumes: @@ -210,6 +226,11 @@ services: - WORKER_ENVIRONMENT=${WORKER_ENVIRONMENT} - WORKSPACE_ROOT=${WORKSPACE_ROOT} - CONNECTOR_BUILDER_SERVER_API_HOST=${CONNECTOR_BUILDER_SERVER_API_HOST} + - DD_LOGS_INJECTION=${DD_LOGS_INJECTION} + - JAVA_OPTS=${JAVA_OPTS} + - CONTAINER_ORCHESTRATOR_JAVA_OPTS=${CONTAINER_ORCHESTRATOR_JAVA_OPTS} + - DD_TRACE_AGENT_PORT=${DD_TRACE_AGENT_PORT} + - DD_AGENT_HOST=${DD_AGENT_HOST} ports: - "8001" configs: @@ -251,6 +272,12 @@ services: - POSTGRES_PWD=${DATABASE_PASSWORD} - POSTGRES_SEEDS=${DATABASE_HOST} - POSTGRES_USER=${DATABASE_USER} + - DD_LOGS_INJECTION=${DD_LOGS_INJECTION} + - JAVA_OPTS=${JAVA_OPTS} + - CONTAINER_ORCHESTRATOR_JAVA_OPTS=${CONTAINER_ORCHESTRATOR_JAVA_OPTS} + - DD_DOGSTATSD_PORT=${DD_DOGSTATSD_PORT} + - DD_TRACE_AGENT_PORT=${DD_TRACE_AGENT_PORT} + - DD_AGENT_HOST=${DD_AGENT_HOST} volumes: - ./temporal/dynamicconfig:/etc/temporal/config/dynamicconfig networks: @@ -285,6 +312,10 @@ services: - TRACKING_STRATEGY=${TRACKING_STRATEGY} - UPDATE_DEFINITIONS_CRON_ENABLED=${UPDATE_DEFINITIONS_CRON_ENABLED} - WORKSPACE_ROOT=${WORKSPACE_ROOT} + - DD_LOGS_INJECTION=${DD_LOGS_INJECTION} + - JAVA_OPTS=${JAVA_OPTS} + - CONTAINER_ORCHESTRATOR_JAVA_OPTS=${CONTAINER_ORCHESTRATOR_JAVA_OPTS} + - DD_TRACE_AGENT_PORT=${DD_TRACE_AGENT_PORT} configs: - flags volumes: @@ -313,6 +344,12 @@ services: - STATSD_HOST=${STATSD_HOST} - STATSD_PORT=${STATSD_PORT} - TRACKING_STRATEGY=${TRACKING_STRATEGY} + - DD_LOGS_INJECTION=${DD_LOGS_INJECTION} + - JAVA_OPTS=${JAVA_OPTS} + - CONTAINER_ORCHESTRATOR_JAVA_OPTS=${CONTAINER_ORCHESTRATOR_JAVA_OPTS} + - DD_DOGSTATSD_PORT=${DD_DOGSTATSD_PORT} + - DD_TRACE_AGENT_PORT=${DD_TRACE_AGENT_PORT} + - DD_AGENT_HOST=${DD_AGENT_HOST} networks: - airbyte_internal depends_on: @@ -337,6 +374,12 @@ services: - STATSD_HOST=${STATSD_HOST} - STATSD_PORT=${STATSD_PORT} - TRACKING_STRATEGY=${TRACKING_STRATEGY} + - DD_LOGS_INJECTION=${DD_LOGS_INJECTION} + - JAVA_OPTS=${JAVA_OPTS} + - CONTAINER_ORCHESTRATOR_JAVA_OPTS=${CONTAINER_ORCHESTRATOR_JAVA_OPTS} + - DD_DOGSTATSD_PORT=${DD_DOGSTATSD_PORT} + - DD_TRACE_AGENT_PORT=${DD_TRACE_AGENT_PORT} + - DD_AGENT_HOST=${DD_AGENT_HOST} networks: - airbyte_internal depends_on: @@ -355,6 +398,12 @@ services: - BASIC_AUTH_USERNAME=${BASIC_AUTH_USERNAME} - BASIC_AUTH_PASSWORD=${BASIC_AUTH_PASSWORD} - BASIC_AUTH_PROXY_TIMEOUT=${BASIC_AUTH_PROXY_TIMEOUT} + - DD_LOGS_INJECTION=${DD_LOGS_INJECTION} + - JAVA_OPTS=${JAVA_OPTS} + - CONTAINER_ORCHESTRATOR_JAVA_OPTS=${CONTAINER_ORCHESTRATOR_JAVA_OPTS} + - DD_DOGSTATSD_PORT=${DD_DOGSTATSD_PORT} + - DD_TRACE_AGENT_PORT=${DD_TRACE_AGENT_PORT} + - DD_AGENT_HOST=${DD_AGENT_HOST} networks: - airbyte_internal - airbyte_public