diff --git a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/AbstractBeamService.java b/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/AbstractBeamService.java
index d2b37e54c4bbb0628061042ebd0c1f57f972eac2..03c5ca1daa7ffab71a4d08c04f677d7412e3a2be 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/AbstractBeamService.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/AbstractBeamService.java
@@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory;
import titan.ccp.common.configuration.ServiceConfigurations;
/**
- * Abstraction of a beam microservice.
+ * Abstraction of a Beam microservice.
* Encapsulates the corresponding {@link PipelineOptions} and the beam Runner.
*/
public class AbstractBeamService {
diff --git a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.samza.gradle b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.samza.gradle
index d3bd08f6f0915b3682126dd2c51ed80c3d0c2a99..73e916ccc867b9b3316776192f0dab56fa0710f0 100644
--- a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.samza.gradle
+++ b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.samza.gradle
@@ -3,5 +3,7 @@ plugins {
}
dependencies {
- compile group: 'org.apache.beam', name: 'beam-runners-samza', version: '2.22.0'
+ implementation('org.apache.beam:beam-runners-samza:2.22.0') {
+ exclude group: 'org.apache.samza', module: 'samza-yarn_2.11'
+ }
}
\ No newline at end of file
diff --git a/theodolite-benchmarks/docker-test/uc1-beam-samza/docker-compose.yml b/theodolite-benchmarks/docker-test/uc1-beam-samza/docker-compose.yml
index 10f8918ca4469a81c6152515f258e7f3f2e36efe..f1bd85972b2fcef692bc0d9e737b5dff9d92a14c 100644
--- a/theodolite-benchmarks/docker-test/uc1-beam-samza/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc1-beam-samza/docker-compose.yml
@@ -4,6 +4,8 @@ services:
image: confluentinc/cp-zookeeper
expose:
- "2181"
+ #ports:
+ # - 2181:2181
environment:
ZOOKEEPER_CLIENT_PORT: 2181
kafka:
diff --git a/theodolite-benchmarks/docker-test/uc2-beam-samza/docker-compose.yml b/theodolite-benchmarks/docker-test/uc2-beam-samza/docker-compose.yml
index 50b9b1f7ce83216205437c5918033c192018f428..0443ac77dcb8533cec028aae231f73c6d8afd978 100644
--- a/theodolite-benchmarks/docker-test/uc2-beam-samza/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc2-beam-samza/docker-compose.yml
@@ -4,6 +4,8 @@ services:
image: confluentinc/cp-zookeeper
expose:
- "2181"
+ #ports:
+ # - 2181:2181
environment:
ZOOKEEPER_CLIENT_PORT: 2181
kafka:
diff --git a/theodolite-benchmarks/docker-test/uc3-beam-samza/docker-compose.yml b/theodolite-benchmarks/docker-test/uc3-beam-samza/docker-compose.yml
index b1394e5e9a88e93f99e482fc0749d8340332c002..b1808105fa9ee864a60f97a24eb7a56eb6ccec2d 100644
--- a/theodolite-benchmarks/docker-test/uc3-beam-samza/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc3-beam-samza/docker-compose.yml
@@ -4,6 +4,8 @@ services:
image: confluentinc/cp-zookeeper
expose:
- "2181"
+ #ports:
+ # - 2181:2181
environment:
ZOOKEEPER_CLIENT_PORT: 2181
kafka:
diff --git a/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml b/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml
index ea818275cd2b16f92688b5a4181ecc138b321050..257e5d4979390f7a992fd879caad4d68ecf25593 100644
--- a/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc4-beam-samza/docker-compose.yml
@@ -4,6 +4,8 @@ services:
image: confluentinc/cp-zookeeper
expose:
- "2181"
+ #ports:
+ # - 2181:2181
environment:
ZOOKEEPER_CLIENT_PORT: 2181
kafka:
diff --git a/theodolite-benchmarks/uc1-beam-samza/Dockerfile b/theodolite-benchmarks/uc1-beam-samza/Dockerfile
index d4e92d98b2ede48cfeaf875690dc18ea5630b8bc..4a0a53b92e5f4d8471b9cf55f73b1803dceffa6c 100644
--- a/theodolite-benchmarks/uc1-beam-samza/Dockerfile
+++ b/theodolite-benchmarks/uc1-beam-samza/Dockerfile
@@ -5,5 +5,5 @@ ENV MAX_SOURCE_PARALLELISM=1024
ADD build/distributions/uc1-beam-samza.tar /
ADD samza-standalone.properties /
-CMD /uc1-beam-samza/bin/uc1-beam-samza --configFactory=org.apache.samza.config.factories.PropertiesConfigFactory --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=false --jobInstance=$HOSTNAME
+CMD /uc1-beam-samza/bin/uc1-beam-samza --configFactory=org.apache.samza.config.factories.PropertiesConfigFactory --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=false
diff --git a/theodolite-benchmarks/uc1-beam-samza/samza-standalone.properties b/theodolite-benchmarks/uc1-beam-samza/samza-standalone.properties
index dbee6146ee63b719c94463da89833f8d8a3f7f80..02411017e86e274f6057688a7c351567603c0f80 100644
--- a/theodolite-benchmarks/uc1-beam-samza/samza-standalone.properties
+++ b/theodolite-benchmarks/uc1-beam-samza/samza-standalone.properties
@@ -1,20 +1,17 @@
-# runner
-app.runner.class=org.apache.samza.runtime.LocalApplicationRunner
-
+# Set EnvironmentRewriter
job.config.rewriters=env-config
job.config.rewriter.env-config.class=org.apache.samza.config.EnvironmentConfigRewriter
-# zk
+# Configure ZooKeeper for coordination
job.coordinator.factory=org.apache.samza.zk.ZkJobCoordinatorFactory
-#job.coordinator.zk.connect=my-confluent-cp-zookeeper:2181
-job.coordinator.zk.connect=zookeeper:2181
+job.coordinator.zk.connect=localhost:2181
+
+# Use GroupByContainerIds
task.name.grouper.factory=org.apache.samza.container.grouper.task.GroupByContainerIdsFactory
-# default system
+# Configure Kafka as "system"
job.default.system=kafka
systems.kafka.samza.factory=org.apache.samza.system.kafka.KafkaSystemFactory
-systems.kafka.consumer.zookeeper.connect=zookeeper:2181
-#systems.kafka.consumer.zookeeper.connect=my-confluent-cp-zookeeper:2181
-systems.kafka.producer.bootstrap.servers=kafka:9092
-#systems.kafka.producer.bootstrap.servers=my-confluent-cp-kafka:9092
+systems.kafka.consumer.bootstrap.servers=localhost:9092
+systems.kafka.producer.bootstrap.servers=localhost:9092
systems.kafka.default.stream.replication.factor=1
diff --git a/theodolite-benchmarks/uc1-beam-samza/src/main/java/application/Uc1BeamSamza.java b/theodolite-benchmarks/uc1-beam-samza/src/main/java/application/Uc1BeamSamza.java
index f3b12945144bac57a5c55b3bd9b1f754b833eb7c..aaef5c2d6968c4b89059537277a2582ecca70451 100644
--- a/theodolite-benchmarks/uc1-beam-samza/src/main/java/application/Uc1BeamSamza.java
+++ b/theodolite-benchmarks/uc1-beam-samza/src/main/java/application/Uc1BeamSamza.java
@@ -6,10 +6,10 @@ import theodolite.commons.beam.AbstractBeamService;
/**
* Implementation of the use case Database Storage using Apache Beam with the Samza Runner. To
* execute locally in standalone start Kafka, Zookeeper, the schema-registry and the workload
- * generator using the delayed_startup.sh script. Add
+ * generator. Add
* --configFactory=org.apache.samza.config.factories.PropertiesConfigFactory
- * --configFilePath=${workspace_loc:uc1-application-samza}/config/standalone_local.properties
- * --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=1024 --as program arguments. To
+ * --configFilePath=samza-standalone.properties
+ * --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=1024 as program arguments. To
* persist logs add ${workspace_loc:/uc4-application-samza/eclipseConsoleLogs.log} as Output File
* under Standard Input Output in Common in the Run Configuration Start via Eclipse Run.
*/
diff --git a/theodolite-benchmarks/uc2-beam-samza/Dockerfile b/theodolite-benchmarks/uc2-beam-samza/Dockerfile
index 7eec09b63f45c76aeabe8a75e8ce91812dedc022..bcbe773498cc3a36db96244a2f5796f943a6e81f 100644
--- a/theodolite-benchmarks/uc2-beam-samza/Dockerfile
+++ b/theodolite-benchmarks/uc2-beam-samza/Dockerfile
@@ -5,4 +5,4 @@ ENV MAX_SOURCE_PARALLELISM=1024
ADD build/distributions/uc2-beam-samza.tar /
ADD samza-standalone.properties /
-CMD /uc2-beam-samza/bin/uc2-beam-samza --configFactory=org.apache.samza.config.factories.PropertiesConfigFactory --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=false --jobInstance=$HOSTNAME
+CMD /uc2-beam-samza/bin/uc2-beam-samza --configFactory=org.apache.samza.config.factories.PropertiesConfigFactory --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=false
diff --git a/theodolite-benchmarks/uc2-beam-samza/samza-standalone.properties b/theodolite-benchmarks/uc2-beam-samza/samza-standalone.properties
index dbee6146ee63b719c94463da89833f8d8a3f7f80..02411017e86e274f6057688a7c351567603c0f80 100644
--- a/theodolite-benchmarks/uc2-beam-samza/samza-standalone.properties
+++ b/theodolite-benchmarks/uc2-beam-samza/samza-standalone.properties
@@ -1,20 +1,17 @@
-# runner
-app.runner.class=org.apache.samza.runtime.LocalApplicationRunner
-
+# Set EnvironmentRewriter
job.config.rewriters=env-config
job.config.rewriter.env-config.class=org.apache.samza.config.EnvironmentConfigRewriter
-# zk
+# Configure ZooKeeper for coordination
job.coordinator.factory=org.apache.samza.zk.ZkJobCoordinatorFactory
-#job.coordinator.zk.connect=my-confluent-cp-zookeeper:2181
-job.coordinator.zk.connect=zookeeper:2181
+job.coordinator.zk.connect=localhost:2181
+
+# Use GroupByContainerIds
task.name.grouper.factory=org.apache.samza.container.grouper.task.GroupByContainerIdsFactory
-# default system
+# Configure Kafka as "system"
job.default.system=kafka
systems.kafka.samza.factory=org.apache.samza.system.kafka.KafkaSystemFactory
-systems.kafka.consumer.zookeeper.connect=zookeeper:2181
-#systems.kafka.consumer.zookeeper.connect=my-confluent-cp-zookeeper:2181
-systems.kafka.producer.bootstrap.servers=kafka:9092
-#systems.kafka.producer.bootstrap.servers=my-confluent-cp-kafka:9092
+systems.kafka.consumer.bootstrap.servers=localhost:9092
+systems.kafka.producer.bootstrap.servers=localhost:9092
systems.kafka.default.stream.replication.factor=1
diff --git a/theodolite-benchmarks/uc3-beam-samza/Dockerfile b/theodolite-benchmarks/uc3-beam-samza/Dockerfile
index aacc994b4c83929ee3d31dbd5272438c30e70700..0d6c06ff14171a878e577e6f34efb28b8e475ff5 100644
--- a/theodolite-benchmarks/uc3-beam-samza/Dockerfile
+++ b/theodolite-benchmarks/uc3-beam-samza/Dockerfile
@@ -5,4 +5,4 @@ ENV MAX_SOURCE_PARALLELISM=1024
ADD build/distributions/uc3-beam-samza.tar /
ADD samza-standalone.properties /
-CMD /uc3-beam-samza/bin/uc3-beam-samza --configFactory=org.apache.samza.config.factories.PropertiesConfigFactory --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=false --jobInstance=$HOSTNAME
+CMD /uc3-beam-samza/bin/uc3-beam-samza --configFactory=org.apache.samza.config.factories.PropertiesConfigFactory --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=false
diff --git a/theodolite-benchmarks/uc3-beam-samza/samza-standalone.properties b/theodolite-benchmarks/uc3-beam-samza/samza-standalone.properties
index dbee6146ee63b719c94463da89833f8d8a3f7f80..02411017e86e274f6057688a7c351567603c0f80 100644
--- a/theodolite-benchmarks/uc3-beam-samza/samza-standalone.properties
+++ b/theodolite-benchmarks/uc3-beam-samza/samza-standalone.properties
@@ -1,20 +1,17 @@
-# runner
-app.runner.class=org.apache.samza.runtime.LocalApplicationRunner
-
+# Set EnvironmentRewriter
job.config.rewriters=env-config
job.config.rewriter.env-config.class=org.apache.samza.config.EnvironmentConfigRewriter
-# zk
+# Configure ZooKeeper for coordination
job.coordinator.factory=org.apache.samza.zk.ZkJobCoordinatorFactory
-#job.coordinator.zk.connect=my-confluent-cp-zookeeper:2181
-job.coordinator.zk.connect=zookeeper:2181
+job.coordinator.zk.connect=localhost:2181
+
+# Use GroupByContainerIds
task.name.grouper.factory=org.apache.samza.container.grouper.task.GroupByContainerIdsFactory
-# default system
+# Configure Kafka as "system"
job.default.system=kafka
systems.kafka.samza.factory=org.apache.samza.system.kafka.KafkaSystemFactory
-systems.kafka.consumer.zookeeper.connect=zookeeper:2181
-#systems.kafka.consumer.zookeeper.connect=my-confluent-cp-zookeeper:2181
-systems.kafka.producer.bootstrap.servers=kafka:9092
-#systems.kafka.producer.bootstrap.servers=my-confluent-cp-kafka:9092
+systems.kafka.consumer.bootstrap.servers=localhost:9092
+systems.kafka.producer.bootstrap.servers=localhost:9092
systems.kafka.default.stream.replication.factor=1
diff --git a/theodolite-benchmarks/uc4-beam-samza/Dockerfile b/theodolite-benchmarks/uc4-beam-samza/Dockerfile
index 8acab2b0a63b517562823ece132caf74501ab34c..2a0c81f89b6732c3bb339ef9b8cbd84b568eeffd 100644
--- a/theodolite-benchmarks/uc4-beam-samza/Dockerfile
+++ b/theodolite-benchmarks/uc4-beam-samza/Dockerfile
@@ -5,4 +5,4 @@ ENV MAX_SOURCE_PARALLELISM=1024
ADD build/distributions/uc4-beam-samza.tar /
ADD samza-standalone.properties /
-CMD /uc4-beam-samza/bin/uc4-beam-samza --configFactory=org.apache.samza.config.factories.PropertiesConfigFactory --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=false --jobInstance=$HOSTNAME
+CMD /uc4-beam-samza/bin/uc4-beam-samza --configFactory=org.apache.samza.config.factories.PropertiesConfigFactory --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=false
diff --git a/theodolite-benchmarks/uc4-beam-samza/samza-standalone.properties b/theodolite-benchmarks/uc4-beam-samza/samza-standalone.properties
index 6f7438df50e31b2f293fdf1d6a0f27ad4c215929..812a9784c25ea84922b8a0f96f17b0377cedf925 100644
--- a/theodolite-benchmarks/uc4-beam-samza/samza-standalone.properties
+++ b/theodolite-benchmarks/uc4-beam-samza/samza-standalone.properties
@@ -1,25 +1,22 @@
-# runner
-app.runner.class=org.apache.samza.runtime.LocalApplicationRunner
-
+# Set EnvironmentRewriter
job.config.rewriters=env-config
job.config.rewriter.env-config.class=org.apache.samza.config.EnvironmentConfigRewriter
-# zk
+# Configure ZooKeeper for coordination
job.coordinator.factory=org.apache.samza.zk.ZkJobCoordinatorFactory
-#job.coordinator.zk.connect=my-confluent-cp-zookeeper:2181
-job.coordinator.zk.connect=zookeeper:2181
+job.coordinator.zk.connect=localhost:2181
+
+# Use GroupByContainerIds
task.name.grouper.factory=org.apache.samza.container.grouper.task.GroupByContainerIdsFactory
-# default system
+# Configure Kafka as "system"
job.default.system=kafka
systems.kafka.samza.factory=org.apache.samza.system.kafka.KafkaSystemFactory
-systems.kafka.consumer.zookeeper.connect=zookeeper:2181
-#systems.kafka.consumer.zookeeper.connect=my-confluent-cp-zookeeper:2181
-systems.kafka.producer.bootstrap.servers=kafka:9092
-#systems.kafka.producer.bootstrap.servers=my-confluent-cp-kafka:9092
+systems.kafka.consumer.bootstrap.servers=localhost:9092
+systems.kafka.producer.bootstrap.servers=localhost:9092
systems.kafka.default.stream.replication.factor=1
-
+# Configure serialization and stores
serializers.registry.string.class=org.apache.samza.serializers.StringSerdeFactory
stores.my-store.factory=org.apache.samza.storage.kv.RocksDbKeyValueStorageEngineFactory
stores.my-store.key.serde=string