Add support to generate OTEL logs in generate script

docker-compose.dev.yaml

@@ -18,7 +18,7 @@ services:
     extra_hosts:
       - 'host.docker.internal:host-gateway'
   loki:
-    image: grafana/loki:3.2.0
+    image: grafana/loki:3.3.2
     environment:
       LOG_CLUSTER_DEPTH: '8'
       LOG_SIM_TH: '0.3'

docker-compose.local.yaml

@@ -22,7 +22,7 @@ services:
     extra_hosts:
       - 'host.docker.internal:host-gateway'
   loki:
-    image: grafana/loki:3.3.0
+    image: grafana/loki:3.3.2
     environment:
       LOG_CLUSTER_DEPTH: '8'
       LOG_SIM_TH: '0.3'

docker-compose.yaml

@@ -16,7 +16,7 @@ services:
     extra_hosts:
       - 'host.docker.internal:host-gateway'
   loki:
-    image: grafana/loki:3.2.0
+    image: grafana/loki:3.3.2
     environment:
       LOG_CLUSTER_DEPTH: '8'
       LOG_SIM_TH: '0.3'

generator/Dockerfile

@@ -1,14 +1,39 @@
+# Start with the OTEL collector stage
+FROM otel/opentelemetry-collector-contrib:latest AS collector
 
+# Final stage
 FROM golang:1.22
 
+# Copy the collector binary from the collector stage
+COPY --from=collector /otelcol-contrib /otelcol-contrib
+
 WORKDIR /go/src/app
 
+# Copy and build the log generator
 COPY go.mod go.sum ./
 COPY *.go ./
 COPY flog/ flog/
+COPY log/ log/
 
 RUN go mod download
-
 RUN CGO_ENABLED=0 GOOS=linux go build -o /generator
 
-ENTRYPOINT ["/generator"]
+# Copy the OTEL collector config
+COPY otel-config.yaml /etc/otel/config.yaml
+
+# Create a startup script
+COPY <<EOF /start.sh
+#!/bin/sh
+# Start the OTEL collector in the background
+/otelcol-contrib --config /etc/otel/config.yaml &
+
+# Wait a bit for collector to start
+sleep 2
+
+# Start the log generator
+/generator \$@
+EOF
+
+RUN chmod +x /start.sh
+
+ENTRYPOINT ["/start.sh"]