From 5d2aa639b99faa3b6cdab9efc110128b5d414f4f Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Sat, 4 Feb 2023 10:20:55 +0100
Subject: [PATCH 01/11] WIP

---
 README.sh          | 6 +++---
 counter            | 2 +-
 docker-compose.yml | 6 +++---
 recorder           | 2 +-
 splitter           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.sh b/README.sh
index ba50a69..25e36da 100755
--- a/README.sh
+++ b/README.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 FORTUNE=juplo/wordcount--fortune:1.0.0
-RECORDER=juplo/wordcount--recorder:1.0.1
+RECORDER=juplo/wordcount--recorder:1.1.0
 USERS=juplo/wordcount--users:1.0.4
-SPLITTER=juplo/wordcount--splitter:1.0.0
-COUNTER=juplo/wordcount--counter:1.1.0
+SPLITTER=juplo/wordcount--splitter:1.1.4
+COUNTER=juplo/wordcount--counter:1.2.4
 TOP10=juplo/wordcount--top10:1.0.1
 QUERY=juplo/wordcount--query:1.0.4
 
diff --git a/counter b/counter
index fe04994..dd4d5dd 160000
--- a/counter
+++ b/counter
@@ -1 +1 @@
-Subproject commit fe049944648d9675ffe66b586b6bf860fbac696f
+Subproject commit dd4d5ddb60f7ca495d65d49f93eb4c07e0d03e22
diff --git a/docker-compose.yml b/docker-compose.yml
index c02465a..1c5bfc4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,7 +40,7 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
 
   recorder:
-    image: juplo/wordcount--recorder:1.0.1
+    image: juplo/wordcount--recorder:1.1.0
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.recorder.rule=Host(`recorder.localhost`)"
@@ -62,7 +62,7 @@ services:
       - kafka
 
   splitter:
-    image: juplo/wordcount--splitter:1.0.0
+    image: juplo/wordcount--splitter:1.1.4
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.splitter.rule=Host(`splitter.localhost`)"
@@ -73,7 +73,7 @@ services:
       - kafka
 
   counter:
-    image: juplo/wordcount--counter:1.1.0
+    image: juplo/wordcount--counter:1.2.4
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.counter.rule=Host(`counter.localhost`)"
diff --git a/recorder b/recorder
index c5700c2..22615ba 160000
--- a/recorder
+++ b/recorder
@@ -1 +1 @@
-Subproject commit c5700c2117f6c445278f272572c8b5732bf53bbf
+Subproject commit 22615ba45bd7697e041eb10f88166cd2074de305
diff --git a/splitter b/splitter
index 3bc3ef7..68216b7 160000
--- a/splitter
+++ b/splitter
@@ -1 +1 @@
-Subproject commit 3bc3ef7ceb76e7643e1e373293cfdc78f870838a
+Subproject commit 68216b7c8922266da1739b7bac85257f067535ce
-- 
2.20.1


From 49db2bc52f9881c0177cd0ab1e93a15c062c1974 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Sun, 5 May 2024 09:54:47 +0200
Subject: [PATCH 02/11] Updated Confluent-Kafka to `7.5.1` and switched the
 cluster to KRAFT

---
 docker-compose.yml | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1c5bfc4..e998a20 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,29 +1,27 @@
 version: '3.2'
 services:
-  zookeeper:
-    image: confluentinc/cp-zookeeper:6.2.0
-    environment:
-      ZOOKEEPER_CLIENT_PORT: 2181
-    ports:
-      - 2181:2181
 
   kafka:
-    image: confluentinc/cp-kafka:6.2.0
+    image: confluentinc/cp-kafka:7.5.1
     environment:
-      KAFKA_BROKER_ID: 1
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-      KAFKA_LISTENERS: DOCKER://:9092, LOCALHOST://:9082
+      KAFKA_NODE_ID: 1
+      KAFKA_LISTENERS: CONTROLLER://:9072, DOCKER://:9092, LOCALHOST://:9082
       KAFKA_ADVERTISED_LISTENERS: DOCKER://kafka:9092, LOCALHOST://localhost:9082
       KAFKA_INTER_BROKER_LISTENER_NAME: DOCKER
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: DOCKER:PLAINTEXT, LOCALHOST:PLAINTEXT
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT, DOCKER:PLAINTEXT, LOCALHOST:PLAINTEXT
+      KAFKA_PROCESS_ROLES: broker, controller
+      KAFKA_CONTROLLER_QUORUM_VOTERS: 1@kafka:9072
+      KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
+      CLUSTER_ID: MkU3OEVBNTcwNTJENDM2Qk
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
       KAFKA_AUTO_CREATE_TOPICS_ENABLE: "false"
     ports:
       - 9092:9082
       - 9082:9082
-    depends_on:
-      - zookeeper
-
+    stop_grace_period: 120s
 
   traefik:
     image: "traefik:v2.5"
-- 
2.20.1


From 7a06afb6b253e7d26ea4d9272231b52e19d2c755 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Sun, 5 May 2024 09:58:42 +0200
Subject: [PATCH 03/11] Switched `README.sh` to the build-in version of Docker
 Compose

---
 README.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.sh b/README.sh
index 25e36da..7c50daf 100755
--- a/README.sh
+++ b/README.sh
@@ -10,7 +10,7 @@ QUERY=juplo/wordcount--query:1.0.4
 
 if [ "$1" = "cleanup" ]
 then
-  docker-compose down -v --remove-orphans
+  docker compose down -v --remove-orphans
   docker image rm $FORTUNE
   docker image rm $RECORDER
   docker image rm $USERS
@@ -33,7 +33,7 @@ if [[
 ]]
 then
   mvn clean package || exit
-  docker-compose rm -svf recorder users splitter counter top10 query
+  docker compose rm -svf recorder users splitter counter top10 query
   ( cd fortune; ./README.sh $FORTUNE; )
   mvn -f recorder/pom.xml docker:build
   mvn -f users/pom.xml docker:build
@@ -53,20 +53,20 @@ else
 fi
 
 
-docker-compose up -d zookeeper kafka cli traefik
+docker compose up -d zookeeper kafka cli traefik
 
 echo "Waiting for the Kafka-Cluster to become ready..."
-docker-compose exec cli cub kafka-ready -b kafka:9092 1 60 > /dev/null 2>&1 || exit 1
-docker-compose exec cli zookeeper-shell zookeeper:2181 ls /brokers/ids
+docker compose exec cli cub kafka-ready -b kafka:9092 1 60 > /dev/null 2>&1 || exit 1
+docker compose exec cli zookeeper-shell zookeeper:2181 ls /brokers/ids
 
-docker-compose up -d users
+docker compose up -d users
 while [ "$(http users.localhost/actuator/health 2> /dev/null | jq -r .status 2> /dev/null)" != "UP" ]; do echo "Waiting for service users..."; sleep 1; done
 http -v post users.localhost username=bart firstName=Bart lastName=Simpson sex=MALE
 http -v post users.localhost username=nerd firstName=Jane lastName=Doe sex=FEMALE
 http -v post users.localhost username=riddler firstName=Rumpel lastName=Stilzchen sex=MALE
 
 echo "Starting all instances..."
-docker-compose up -d
+docker compose up -d
 
 while [ "$(http query.localhost/actuator/health 2>/dev/null | jq -r .status 2> /dev/null)" != "UP" ]; do echo "Waiting for service query..."; sleep 1; done
 http -v query.localhost/bart
@@ -85,7 +85,7 @@ http -v query.localhost/bart
 http -v query.localhost/nerd
 http -v query.localhost/riddler
 
-// docker-compose up -d --scale query=5 query
+// docker compose up -d --scale query=5 query
 http -v --follow query.localhost/bart
 sleep 1
 http -v --follow query.localhost/bart
-- 
2.20.1


From 62c510b0fd1366bb28c0172f90ade96441e01c1b Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Sun, 5 May 2024 11:21:12 +0200
Subject: [PATCH 04/11] WIP

---
 README.sh | 12 ++++++------
 counter   |  2 +-
 query     |  2 +-
 recorder  |  2 +-
 splitter  |  2 +-
 top10     |  2 +-
 users     |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.sh b/README.sh
index 7c50daf..a869297 100755
--- a/README.sh
+++ b/README.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 FORTUNE=juplo/wordcount--fortune:1.0.0
-RECORDER=juplo/wordcount--recorder:1.1.0
-USERS=juplo/wordcount--users:1.0.4
-SPLITTER=juplo/wordcount--splitter:1.1.4
-COUNTER=juplo/wordcount--counter:1.2.4
-TOP10=juplo/wordcount--top10:1.0.1
-QUERY=juplo/wordcount--query:1.0.4
+RECORDER=juplo/wordcount--recorder:1.1.1
+USERS=juplo/wordcount--users:1.0.5
+SPLITTER=juplo/wordcount--splitter:1.1.5
+COUNTER=juplo/wordcount--counter:1.2.5
+TOP10=juplo/wordcount--top10:1.0.2
+QUERY=juplo/wordcount--query:1.0.5
 
 if [ "$1" = "cleanup" ]
 then
diff --git a/counter b/counter
index dd4d5dd..0434a30 160000
--- a/counter
+++ b/counter
@@ -1 +1 @@
-Subproject commit dd4d5ddb60f7ca495d65d49f93eb4c07e0d03e22
+Subproject commit 0434a3094d042528a8935df8653bc03936a0c75f
diff --git a/query b/query
index 251cf79..99ed5d0 160000
--- a/query
+++ b/query
@@ -1 +1 @@
-Subproject commit 251cf79927d4c1c941467c8fee0349c1a7eb4b93
+Subproject commit 99ed5d04aa6d0bd08470d98586c7c4a635149297
diff --git a/recorder b/recorder
index 22615ba..8a6bc84 160000
--- a/recorder
+++ b/recorder
@@ -1 +1 @@
-Subproject commit 22615ba45bd7697e041eb10f88166cd2074de305
+Subproject commit 8a6bc845f76c581d16f5ca8a110417b8a78e592a
diff --git a/splitter b/splitter
index 68216b7..d1dd268 160000
--- a/splitter
+++ b/splitter
@@ -1 +1 @@
-Subproject commit 68216b7c8922266da1739b7bac85257f067535ce
+Subproject commit d1dd26857ac8d841bf8a388b5d98926d888e4af4
diff --git a/top10 b/top10
index b3c3b1c..92adf68 160000
--- a/top10
+++ b/top10
@@ -1 +1 @@
-Subproject commit b3c3b1c1ab19d197d323d7c69e03d9bd09147690
+Subproject commit 92adf689d7ff31f4780c81f04e771a559dde7257
diff --git a/users b/users
index 58563cd..eef8423 160000
--- a/users
+++ b/users
@@ -1 +1 @@
-Subproject commit 58563cdc022363375c00ac580672f7daa22f6453
+Subproject commit eef8423e88098627901a0bab19c4c41c4d321cea
-- 
2.20.1


From b337fd7b7941a515b1827ce4dd4affefbb26a8d5 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Sun, 5 May 2024 11:39:10 +0200
Subject: [PATCH 05/11] WIP:Updated Confluent-Kafka to `7.5.1` and switched the
 cluster to KRAFT

---
 README.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.sh b/README.sh
index a869297..8e6f555 100755
--- a/README.sh
+++ b/README.sh
@@ -53,11 +53,10 @@ else
 fi
 
 
-docker compose up -d zookeeper kafka cli traefik
+docker compose up -d kafka cli traefik
 
 echo "Waiting for the Kafka-Cluster to become ready..."
 docker compose exec cli cub kafka-ready -b kafka:9092 1 60 > /dev/null 2>&1 || exit 1
-docker compose exec cli zookeeper-shell zookeeper:2181 ls /brokers/ids
 
 docker compose up -d users
 while [ "$(http users.localhost/actuator/health 2> /dev/null | jq -r .status 2> /dev/null)" != "UP" ]; do echo "Waiting for service users..."; sleep 1; done
-- 
2.20.1


From 1768064b5f2e46626761afcabc146f326ffd821a Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Sun, 5 May 2024 11:43:09 +0200
Subject: [PATCH 06/11] WIP: Switched `README.sh` to the build-in version of
 Docker Compose

---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e998a20..710596e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.2'
 services:
 
   kafka:
-- 
2.20.1


From fba36266fba01e51b0dcc058555cda5fdf892e7f Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Sun, 5 May 2024 11:49:49 +0200
Subject: [PATCH 07/11] WIP

---
 docker-compose.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 710596e..7812f79 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -48,7 +48,7 @@ services:
       - kafka
 
   users:
-    image: juplo/wordcount--users:1.0.4
+    image: juplo/wordcount--users:1.0.5
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.users.rule=Host(`users.localhost`)"
@@ -59,7 +59,7 @@ services:
       - kafka
 
   splitter:
-    image: juplo/wordcount--splitter:1.1.4
+    image: juplo/wordcount--splitter:1.1.5
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.splitter.rule=Host(`splitter.localhost`)"
@@ -70,7 +70,7 @@ services:
       - kafka
 
   counter:
-    image: juplo/wordcount--counter:1.2.4
+    image: juplo/wordcount--counter:1.2.5
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.counter.rule=Host(`counter.localhost`)"
@@ -81,7 +81,7 @@ services:
       - kafka
 
   top10:
-    image: juplo/wordcount--top10:1.0.1
+    image: juplo/wordcount--top10:1.0.2
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.top10.rule=Host(`top10.localhost`)"
@@ -92,7 +92,7 @@ services:
       - kafka
 
   query:
-    image: juplo/wordcount--query:1.0.4
+    image: juplo/wordcount--query:1.0.5
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.query.rule=Host(`query.localhost`)"
-- 
2.20.1


From 9a2d2d26b1498fddb50df339592b2dd0d010a121 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Sun, 5 May 2024 11:51:12 +0200
Subject: [PATCH 08/11] WIP

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7812f79..301e12d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,7 +37,7 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
 
   recorder:
-    image: juplo/wordcount--recorder:1.1.0
+    image: juplo/wordcount--recorder:1.1.1
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.recorder.rule=Host(`recorder.localhost`)"
-- 
2.20.1


From 3e55808aed1b7bf622adbf156959622a68a8890f Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Sun, 5 May 2024 12:54:16 +0200
Subject: [PATCH 09/11] WIP

---
 counter  | 2 +-
 query    | 2 +-
 recorder | 2 +-
 splitter | 2 +-
 top10    | 2 +-
 users    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/counter b/counter
index 0434a30..f91e400 160000
--- a/counter
+++ b/counter
@@ -1 +1 @@
-Subproject commit 0434a3094d042528a8935df8653bc03936a0c75f
+Subproject commit f91e400b1077c381891d2a0ea618f491d0ba7da0
diff --git a/query b/query
index 99ed5d0..3e27e5d 160000
--- a/query
+++ b/query
@@ -1 +1 @@
-Subproject commit 99ed5d04aa6d0bd08470d98586c7c4a635149297
+Subproject commit 3e27e5d91b4920ffd3cd061595329b5499c3389f
diff --git a/recorder b/recorder
index 8a6bc84..95c8f46 160000
--- a/recorder
+++ b/recorder
@@ -1 +1 @@
-Subproject commit 8a6bc845f76c581d16f5ca8a110417b8a78e592a
+Subproject commit 95c8f4618fdbc28df31efb8312f413d8e5a55077
diff --git a/splitter b/splitter
index d1dd268..36bd7f7 160000
--- a/splitter
+++ b/splitter
@@ -1 +1 @@
-Subproject commit d1dd26857ac8d841bf8a388b5d98926d888e4af4
+Subproject commit 36bd7f7a03be33a05f371ebb9dc7b398678a08dc
diff --git a/top10 b/top10
index 92adf68..59be0df 160000
--- a/top10
+++ b/top10
@@ -1 +1 @@
-Subproject commit 92adf689d7ff31f4780c81f04e771a559dde7257
+Subproject commit 59be0dff127b0208092be233bd44761a23e7cf39
diff --git a/users b/users
index eef8423..aa0d1c4 160000
--- a/users
+++ b/users
@@ -1 +1 @@
-Subproject commit eef8423e88098627901a0bab19c4c41c4d321cea
+Subproject commit aa0d1c4c8e47b2fffc5fa0ca2cae83f64ed8dd4e
-- 
2.20.1


From 6d4eb5c1310079d76f0e99ecaf378c840762a7ec Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Thu, 9 May 2024 09:25:13 +0200
Subject: [PATCH 10/11] WIP

---
 README.sh | 2 +-
 recorder  | 2 +-
 top10     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.sh b/README.sh
index 8e6f555..f83dd77 100755
--- a/README.sh
+++ b/README.sh
@@ -84,7 +84,7 @@ http -v query.localhost/bart
 http -v query.localhost/nerd
 http -v query.localhost/riddler
 
-// docker compose up -d --scale query=5 query
+# docker compose up -d --scale query=5 query
 http -v --follow query.localhost/bart
 sleep 1
 http -v --follow query.localhost/bart
diff --git a/recorder b/recorder
index 95c8f46..7a5943c 160000
--- a/recorder
+++ b/recorder
@@ -1 +1 @@
-Subproject commit 95c8f4618fdbc28df31efb8312f413d8e5a55077
+Subproject commit 7a5943ce46684c9b469f38780d95955a9795044c
diff --git a/top10 b/top10
index 59be0df..1bfbd6c 160000
--- a/top10
+++ b/top10
@@ -1 +1 @@
-Subproject commit 59be0dff127b0208092be233bd44761a23e7cf39
+Subproject commit 1bfbd6c6fe3c35e0cd5470db632faf1a655487af
-- 
2.20.1


From c800bb3bcc13650ee97ec2a88813cfd65779c2c8 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Tue, 14 May 2024 22:44:21 +0200
Subject: [PATCH 11/11] WIP

---
 README.sh          | 2 +-
 counter            | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.sh b/README.sh
index f83dd77..c7e8086 100755
--- a/README.sh
+++ b/README.sh
@@ -4,7 +4,7 @@ FORTUNE=juplo/wordcount--fortune:1.0.0
 RECORDER=juplo/wordcount--recorder:1.1.1
 USERS=juplo/wordcount--users:1.0.5
 SPLITTER=juplo/wordcount--splitter:1.1.5
-COUNTER=juplo/wordcount--counter:1.2.5
+COUNTER=juplo/wordcount--counter:1.2.14
 TOP10=juplo/wordcount--top10:1.0.2
 QUERY=juplo/wordcount--query:1.0.5
 
diff --git a/counter b/counter
index f91e400..1b1ac5b 160000
--- a/counter
+++ b/counter
@@ -1 +1 @@
-Subproject commit f91e400b1077c381891d2a0ea618f491d0ba7da0
+Subproject commit 1b1ac5bca62f07dae4188a5797a36b0fbe72058d
diff --git a/docker-compose.yml b/docker-compose.yml
index 301e12d..0252da4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -70,7 +70,7 @@ services:
       - kafka
 
   counter:
-    image: juplo/wordcount--counter:1.2.5
+    image: juplo/wordcount--counter:1.2.14
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.counter.rule=Host(`counter.localhost`)"
-- 
2.20.1