use envoy to publish traces (#270)

arch/Dockerfile

@@ -13,7 +13,7 @@ FROM envoyproxy/envoy:v1.32-latest as envoy
 #Build config generator, so that we have a single build image for both Rust and Python
 FROM python:3.12-slim as arch
 
-RUN apt-get update && apt-get install -y gettext-base curl supervisor && apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y gettext-base curl && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /arch/target/wasm32-wasip1/release/prompt_gateway.wasm /etc/envoy/proxy-wasm-plugins/prompt_gateway.wasm
 COPY --from=builder /arch/target/wasm32-wasip1/release/llm_gateway.wasm /etc/envoy/proxy-wasm-plugins/llm_gateway.wasm
@@ -24,10 +24,8 @@ RUN pip install -r requirements.txt
 COPY arch/tools/cli/config_generator.py .
 COPY arch/envoy.template.yaml .
 COPY arch/arch_config_schema.yaml .
-COPY arch/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY arch/stream_traces.py .
 
 RUN pip install requests
 RUN touch /var/log/envoy.log
 
-ENTRYPOINT ["supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+ENTRYPOINT ["sh","-c", "python config_generator.py && envsubst < /etc/envoy/envoy.yaml > /etc/envoy.env_sub.yaml && envoy -c /etc/envoy.env_sub.yaml --component-log-level wasm:debug 2>&1 | tee /var/log/envoy.log"]

arch/envoy.template.yaml

@@ -575,10 +575,6 @@ static_resources:
       dns_lookup_family: V4_ONLY
       lb_policy: ROUND_ROBIN
       typed_extension_protocol_options:
-        envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
-          "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
-          explicit_http_config:
-            http2_protocol_options: {}
       load_assignment:
         cluster_name: opentelemetry_collector_http
         endpoints:

arch/stream_traces.py

@@ -1,37 +0,0 @@
-import os
-import sys
-import time
-import requests
-import logging
-
-logging.basicConfig(
-    level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s"
-)
-
-
-otel_tracing_endpoint = os.getenv(
-    "OTEL_TRACING_HTTP_ENDPOINT", "http://localhost:4318/v1/traces"
-)
-envoy_log_path = os.getenv("ENVOY_LOG_PATH", "/var/log/envoy.log")
-
-logging.info(f"Using otel-tracing host: {otel_tracing_endpoint}")
-logging.info(f"Using envoy log path: {envoy_log_path}")
-
-
-def process_log_line(line):
-    try:
-        response = requests.post(
-            url=otel_tracing_endpoint,
-            data=line,
-            headers={"Content-Type": "application/json"},
-        )
-        logging.info(f"Sent trace to otel-tracing: {response.status_code}")
-    except Exception as e:
-        logging.error(f"Failed to send trace to otel-tracing: {e}")
-
-
-for line in sys.stdin:
-    if line:
-        tokens = line.split("gateway: upstream_llm trace details: ")
-        if len(tokens) > 1:
-            process_log_line(tokens[1])

arch/supervisord.conf

@@ -1,25 +0,0 @@
-[supervisord]
-nodaemon=true
-
-[program:trace_streamer]
-command=sh -c "tail -F /var/log/envoy.log | python stream_traces.py"
-autostart=true
-autorestart=false
-startretries=3
-priority=1
-stdout_logfile=/dev/stdout
-stderr_logfile=/dev/stderr
-stdout_logfile_maxbytes = 0
-stderr_logfile_maxbytes = 0
-
-
-[program:envoy]
-command=sh -c "python config_generator.py && envsubst < /etc/envoy/envoy.yaml > /etc/envoy.env_sub.yaml && envoy -c /etc/envoy.env_sub.yaml --component-log-level wasm:debug 2>&1 | tee /var/log/envoy.log"
-autostart=true
-autorestart=true
-startretries=3
-priority=2
-stdout_logfile=/dev/stdout
-stderr_logfile=/dev/stderr
-stdout_logfile_maxbytes = 0
-stderr_logfile_maxbytes = 0