From 36fef1b10985fb56bddab181ea56721a1d037005 Mon Sep 17 00:00:00 2001
From: Yuri Shkuro <github@ysh.us>
Date: Tue, 2 Aug 2022 23:01:51 -0400
Subject: [PATCH] Replace Elasticsearch in crossdock CI with remote memstore

Signed-off-by: Yuri Shkuro <github@ysh.us>
---
 .github/workflows/ci-crossdock.yml  | 13 ++++-------
 crossdock/docker-compose.yml        |  2 +-
 crossdock/jaeger-docker-compose.yml | 36 ++++++++++++++++-------------
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci-crossdock.yml b/.github/workflows/ci-crossdock.yml
index 6f620d90466..e98be85f546 100644
--- a/.github/workflows/ci-crossdock.yml
+++ b/.github/workflows/ci-crossdock.yml
@@ -10,12 +10,7 @@ on:
 jobs:
   crossdock:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        steps:
-        - name: crossdock
-          cmd: bash scripts/build-crossdock.sh
-    name: ${{ matrix.steps.name }}
+
     steps:
     - uses: actions/checkout@v3
       with:
@@ -34,11 +29,11 @@ jobs:
 
     - name: Install tools
       run: make install-ci
-    
+
     - uses: docker/setup-qemu-action@v2
 
-    - name: Build, test, and publish ${{ matrix.steps.name }} image
-      run: ${{ matrix.steps.cmd }}
+    - name: Build, test, and publish crossdock image
+      run: bash scripts/build-crossdock.sh
       env:
         DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
         QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
diff --git a/crossdock/docker-compose.yml b/crossdock/docker-compose.yml
index 667fa95de4d..4bcfd782ef6 100644
--- a/crossdock/docker-compose.yml
+++ b/crossdock/docker-compose.yml
@@ -40,7 +40,7 @@ services:
         ports:
             - "8080-8082"
         depends_on:
-#        UDP sender needs to know agent's address
+            # UDP sender needs to know agent's address
             - jaeger-agent
 
     python:
diff --git a/crossdock/jaeger-docker-compose.yml b/crossdock/jaeger-docker-compose.yml
index 84218978456..fefc3714864 100644
--- a/crossdock/jaeger-docker-compose.yml
+++ b/crossdock/jaeger-docker-compose.yml
@@ -1,33 +1,46 @@
 version: '2'
 
 services:
+    jaeger-remote-storage:
+      image: jaegertracing/jaeger-remote-storage
+      command:
+        - "--log-level=debug"
+      environment:
+        - SPAN_STORAGE_TYPE=memory
+      ports:
+        - "17271:17271"
+
     jaeger-collector:
       image: jaegertracing/jaeger-collector
-      command: ["--es.num-shards=1", "--es.num-replicas=0", "--es.server-urls=http://elasticsearch:9200", "--collector.zipkin.host-port=:9411"]
+      command:
+        - "--grpc-storage.server=jaeger-remote-storage:17271"
+        - "--collector.zipkin.host-port=:9411"
+        - "--log-level=debug"
       ports:
         - "14269"
         - "14268:14268"
         - "14250"
         - "9411:9411"
       environment:
-        - SPAN_STORAGE_TYPE=elasticsearch
+        - SPAN_STORAGE_TYPE=grpc-plugin
         - LOG_LEVEL=debug
       restart: on-failure
       depends_on:
-        - elasticsearch
+        - jaeger-remote-storage
 
     jaeger-query:
       image: jaegertracing/jaeger-query
-      command: ["--es.num-shards=1", "--es.num-replicas=0", "--es.server-urls=http://elasticsearch:9200"]
+      command:
+        - "--grpc-storage.server=jaeger-remote-storage:17271"
+        - "--log-level=debug"
       ports:
         - "16686:16686"
         - "16687"
       environment:
-        - SPAN_STORAGE_TYPE=elasticsearch
-        - LOG_LEVEL=debug
+        - SPAN_STORAGE_TYPE=grpc-plugin
       restart: on-failure
       depends_on:
-        - elasticsearch
+        - jaeger-remote-storage
 
     jaeger-agent:
       image: jaegertracing/jaeger-agent
@@ -42,12 +55,3 @@ services:
       restart: on-failure
       depends_on:
         - jaeger-collector
-
-    elasticsearch:
-      image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.3
-      environment:
-        - discovery.type=single-node
-      ports:
-        - "9200:9200/tcp"
-
-