Merge remote-tracking branch 'origin/develop' into feat/gor

Release/v0.43.x

deploy/docker/clickhouse-setup/docker-compose.yaml

@@ -164,16 +164,17 @@ services:
   # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`
 
   query-service:
-    image: signoz/query-service:${DOCKER_TAG:-0.43.0}
+    image: signoz/query-service:custom
     container_name: signoz-query-service
+    pull_policy: never
     command:
       [
         "-config=/root/config/prometheus.yml",
         # "--prefer-delta=true"
       ]
-    # ports:
+    ports:
     #   - "6060:6060"     # pprof port
-    #   - "8080:8080"     # query-service port
+      - "8080:8080"     # query-service port
     volumes:
       - ./prometheus.yml:/root/config/prometheus.yml
       - ../dashboards:/root/config/dashboards

ee/query-service/Dockerfile

@@ -1,5 +1,13 @@
+FROM alpine:3.16 as builder
+
+
+RUN apk add --no-cache ca-certificates openssl
+RUN wget https://github.com/buger/goreplay/releases/download/1.3.3/gor_1.3.3_x64.tar.gz -O gor.tar.gz
+RUN tar xzf gor.tar.gz
+
+
 # use a minimal alpine image
-FROM alpine:3.18.6
+FROM ubuntu:latest
 
 # Add Maintainer Info
 LABEL maintainer="signoz"
@@ -8,24 +16,32 @@ LABEL maintainer="signoz"
 ARG TARGETOS TARGETARCH
 
 # add ca-certificates in case you need them
-RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
+# RUN apt update && apt add ca-certificates && rm -rf /var/cache/apk/*
+
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=builder /gor /root/gor
 
 # set working directory
 WORKDIR /root
 
 # copy the query-service binary
 COPY ee/query-service/bin/query-service-${TARGETOS}-${TARGETARCH} /root/query-service
+COPY ee/query-service/start.sh /root/start.sh
 
 # copy prometheus YAML config
 COPY pkg/query-service/config/prometheus.yml /root/config/prometheus.yml
 COPY pkg/query-service/templates /root/templates
 
 # Make query-service executable for non-root users
-RUN chmod 755 /root /root/query-service
+RUN chmod 755 /root /root/query-service /root/start.sh /root/gor
 
 # run the binary
-ENTRYPOINT ["./query-service"]
+ENTRYPOINT ["/bin/bash", "./start.sh"]
 
-CMD ["-config", "/root/config/prometheus.yml"]
+# ENTRYPOINT ["./query-service"]
+
+# CMD ["-config", "/root/config/prometheus.yml"]
+
+# CMD ["-config", "/root/config/prometheus.yml"]
 
 EXPOSE 8080

ee/query-service/start.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+
+OUTPUT_PATH="${GOR_OUTPUT_PATH:-./goreplay/}"
+mkdir -p ${OUTPUT_PATH}
+
+# turn on bash's job control
+set -m
+
+# Start the primary process and put it in the background
+./query-service "$@" &
+
+echo "Starting GOR"
+# # Start the helper process
+./gor --input-raw=:8080 --input-raw-engine "raw_socket" --output-file=${OUTPUT_PATH}%Y%m%d-%H.log --http-disallow-url .*\/health
+echo "GOR started"
+
+# the my_helper_process might need to know how to wait on the
+# primary process to start before it does its work and returns
+
+# now we bring the primary process back into the foreground
+# and leave it there
+fg %1