Fix v89

Author: justgithubaccount

apps/chat/app/logger.py

@@ -4,8 +4,9 @@
 import structlog
 from opentelemetry.trace import get_current_span
 
-
-logging.basicConfig(stream=sys.stdout, format="%(message)s", level=logging.INFO)
+logging.basicConfig(
+    format="%(message)s", stream=sys.stdout, level=logging.INFO
+)
 
 def add_trace_context(_, __, event_dict):
     span = get_current_span()
@@ -25,12 +26,5 @@ def add_trace_context(_, __, event_dict):
     logger_factory=structlog.stdlib.LoggerFactory(),
 )
 
-
-def with_context(**kwargs):
-    """Return a logger pre-bound with contextual information."""
-    return structlog.get_logger("chat").bind(**kwargs)
-
-
 def enrich_context(event: str, **kwargs):
-    """Return logger enriched with an event name and extra fields."""
     return structlog.get_logger("chat").bind(event=event, **kwargs)

apps/chat/app/observability/tracing.py

@@ -2,13 +2,20 @@
 from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider
-from opentelemetry.sdk.trace.export import BatchSpanProcessor, ConsoleSpanExporter
-
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
 
 def setup_tracing(app) -> None:
     resource = Resource(attributes={"service.name": "chat-api"})
     provider = TracerProvider(resource=resource)
-    processor = BatchSpanProcessor(ConsoleSpanExporter())
+
+    otlp_exporter = OTLPSpanExporter(
+        endpoint="http://localhost:4318/v1/traces",
+        insecure=True,
+    )
+    processor = BatchSpanProcessor(otlp_exporter)
+
     provider.add_span_processor(processor)
     trace.set_tracer_provider(provider)
+
     FastAPIInstrumentor().instrument_app(app, tracer_provider=provider)

manifests/chat-api-deployment.yaml

@@ -33,6 +33,17 @@ spec:
           image: ghcr.io/justgithubaccount/chat-api:latest
           ports:
             - containerPort: 8000
+          env:
+            - name: OTEL_EXPORTER_OTLP_ENDPOINT
+              value: http://localhost:4318
+            - name: OTEL_EXPORTER_OTLP_PROTOCOL
+              value: http/protobuf
+            - name: OTEL_TRACES_EXPORTER
+              value: otlp
+            - name: OTEL_LOGS_EXPORTER
+              value: otlp
+            - name: OTEL_SERVICE_NAME
+              value: chat-api
           envFrom:
             - secretRef:
                 name: chat-api-secrets
@@ -53,9 +64,7 @@ spec:
               mountPath: /var/log/chat
           command: ["/bin/sh", "-c"]
           args:
-            - |
-              uvicorn app.main:app --host 0.0.0.0 --port 8000 \
-              | tee /var/log/chat/app.log
+            - uvicorn app.main:app --host 0.0.0.0 --port 8000
 
           # resources:
           #   requests:

manifests/chat-api-vector-configmap.yaml

@@ -5,21 +5,22 @@ metadata:
   namespace: chat-api
 data:
   vector.toml: |
-    [sources.file_logs]
-    type = "file"
-    include = ["/var/log/chat/*.log"]
-
-    [transforms.parse]
-    type = "remap"
-    inputs = ["file_logs"]
-    source = '''
-    . = parse_json!(.message)
-    '''
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: chat-api-vector-config
+  namespace: chat-api
+data:
+  vector.toml: |
+    [sources.otel]
+    type = "opentelemetry"
+    address = "0.0.0.0:4318"
 
     [sinks.loki]
     type = "loki"
-    inputs = ["parse"]
+    inputs = ["otel"]
     endpoint = "http://loki.observability.svc.cluster.local:3100"
     encoding.codec = "json"
     labels.app = "chat-api"
     labels.env = "public"
+