fix(job-logs-collector): Fix routing to otel-router (#2599)

vector can't actually convert to otel log format

Author: wj-e2b

iac/modules/job-logs-collector/configs/vector.toml

@@ -113,22 +113,18 @@ category = "{{ category }}"
 
 %{ if enable_otel_router_logs }
 [sinks.otel_router_non_internal]
-type = "opentelemetry"
+type = "http"
 inputs = [ "remove_internal" ]
+uri = "http://127.0.0.1:${otel_router_http_port}/logs"
+method = "post"
 healthcheck.enabled = false
 buffer.type = "memory"
 buffer.max_events = 500
 buffer.when_full = "drop_newest"
+encoding.codec = "json"
+framing.method = "newline_delimited"
 
-[sinks.otel_router_non_internal.protocol]
-type = "http"
-uri = "http://otel-router.service.consul:4318/v1/logs"
-method = "post"
-
-[sinks.otel_router_non_internal.protocol.encoding]
-codec = "otlp"
-
-[sinks.otel_router_non_internal.protocol.request]
+[sinks.otel_router_non_internal.request]
 retry_attempts = 0
 timeout_secs = 2
 %{ endif }

iac/modules/job-logs-collector/main.tf

@@ -11,6 +11,7 @@ locals {
       grafana_api_key       = var.grafana_api_key
 
       enable_otel_router_logs = var.enable_otel_router_logs
+      otel_router_http_port   = var.otel_router_http_port
     },
   )
 

iac/modules/job-logs-collector/variables.tf

@@ -33,6 +33,12 @@ variable "enable_otel_router_logs" {
   description = "Enable teeing non-internal customer logs from Vector to otel-router."
 }
 
+variable "otel_router_http_port" {
+  type        = number
+  default     = 4321
+  description = "Local otel-router Vector-compatible logs port used by Vector when otel-router log teeing is enabled."
+}
+
 variable "vector_config_override" {
   type        = string
   default     = ""

iac/provider-aws/Makefile

@@ -43,6 +43,8 @@ tf_vars := AWS_PROFILE=$(AWS_PROFILE) AWS_REGION=$(AWS_REGION) \
 	$(call tfvar, BUILD_SERVER_NESTED_VIRTUALIZATION) \
 	$(call tfvar, AWS_ACCOUNT_ID) \
 	$(call tfvar, AWS_REGION) \
+	$(call tfvar, ENABLE_OTEL_ROUTER_LOGS) \
+	$(call tfvar, OTEL_ROUTER_HTTP_PORT) \
 	$(call tfvar, DB_MAX_OPEN_CONNECTIONS) \
 	$(call tfvar, DB_MIN_IDLE_CONNECTIONS) \
 	$(call tfvar, AUTH_DB_MAX_OPEN_CONNECTIONS) \

iac/provider-aws/main.tf

@@ -231,6 +231,7 @@ module "nomad" {
   launch_darkly_api_key = module.init.launch_darkly_api_key
 
   enable_otel_router_logs = var.enable_otel_router_logs
+  otel_router_http_port   = var.otel_router_http_port
 
   db_max_open_connections      = var.db_max_open_connections
   db_min_idle_connections      = var.db_min_idle_connections

iac/provider-aws/nomad/main.tf

@@ -272,6 +272,7 @@ module "logs_collector" {
   loki_endpoint = "http://loki.service.consul:${var.loki_port}"
 
   enable_otel_router_logs = var.enable_otel_router_logs
+  otel_router_http_port   = var.otel_router_http_port
 
   vector_health_port = var.logs_health_proxy_port
   vector_api_port    = var.logs_proxy_port

iac/provider-aws/nomad/variables.tf

@@ -303,6 +303,12 @@ variable "enable_otel_router_logs" {
   description = "Enable teeing non-internal customer logs from Vector to otel-router."
 }
 
+variable "otel_router_http_port" {
+  type        = number
+  default     = 4321
+  description = "Local otel-router Vector-compatible logs port used by Vector when otel-router log teeing is enabled."
+}
+
 # Feature flags
 variable "launch_darkly_api_key" {
   type      = string

iac/provider-aws/variables.tf

@@ -198,3 +198,9 @@ variable "enable_otel_router_logs" {
   default     = false
   description = "Enable teeing non-internal customer logs from Vector to otel-router."
 }
+
+variable "otel_router_http_port" {
+  type        = number
+  default     = 4321
+  description = "Local otel-router Vector-compatible logs port used by Vector when otel-router log teeing is enabled."
+}

iac/provider-gcp/Makefile

@@ -59,6 +59,8 @@ tf_vars := \
 	$(call tfvar, LOKI_RESOURCES_MEMORY_MB) \
 	$(call tfvar, OTEL_COLLECTOR_RESOURCES_CPU_COUNT) \
 	$(call tfvar, OTEL_COLLECTOR_RESOURCES_MEMORY_MB) \
+	$(call tfvar, ENABLE_OTEL_ROUTER_LOGS) \
+	$(call tfvar, OTEL_ROUTER_HTTP_PORT) \
 	$(call tfvar, TEMPLATE_BUCKET_NAME) \
 	$(call tfvar, TEMPLATE_BUCKET_LOCATION) \
 	$(call tfvar, ENVD_TIMEOUT) \

iac/provider-gcp/main.tf

@@ -286,6 +286,7 @@ module "nomad" {
   otel_collector_resources_memory_mb = var.otel_collector_resources_memory_mb
   otel_collector_resources_cpu_count = var.otel_collector_resources_cpu_count
   enable_otel_router_logs            = var.enable_otel_router_logs
+  otel_router_http_port              = var.otel_router_http_port
 
   # Dashboard API
   dashboard_api_count                          = var.dashboard_api_count