Merge branch 'main' into vertical-scaling

theodolite-benchmarks/uc1-beam-samza/Dockerfile

@@ -6,5 +6,10 @@ ENV ENABLE_METRICS=true
 ADD build/distributions/uc1-beam-samza.tar /
 ADD samza-standalone.properties /
 
-CMD /uc1-beam-samza/bin/uc1-beam-samza --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=$ENABLE_METRICS --configOverride="{\"job.coordinator.zk.connect\":\"$SAMZA_JOB_COORDINATOR_ZK_CONNECT\"}"
-
+CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
+    /uc1-beam-samza/bin/uc1-beam-samza \
+    --configFilePath=samza-standalone.properties \
+    --samzaExecutionEnvironment=STANDALONE \
+    --maxSourceParallelism=$MAX_SOURCE_PARALLELISM \
+    --enableMetrics=$ENABLE_METRICS \
+    --configOverride="{\"job.coordinator.zk.connect\":\"$SAMZA_JOB_COORDINATOR_ZK_CONNECT\"}"

theodolite-benchmarks/uc1-beam-samza/samza-standalone.properties

@@ -15,3 +15,7 @@ systems.kafka.samza.factory=org.apache.samza.system.kafka.KafkaSystemFactory
 systems.kafka.consumer.bootstrap.servers=localhost:9092
 systems.kafka.producer.bootstrap.servers=localhost:9092
 systems.kafka.default.stream.replication.factor=1
+
+# Configure JMX metrics exporter
+metrics.reporter.jmx.class=org.apache.samza.metrics.reporter.JmxReporterFactory
+metrics.reporters=jmx

theodolite-benchmarks/uc2-beam-samza/Dockerfile

@@ -6,4 +6,11 @@ ENV ENABLE_METRICS=true
 ADD build/distributions/uc2-beam-samza.tar /
 ADD samza-standalone.properties /
 
-CMD /uc2-beam-samza/bin/uc2-beam-samza --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=$ENABLE_METRICS --configOverride="{\"job.coordinator.zk.connect\":\"$SAMZA_JOB_COORDINATOR_ZK_CONNECT\"}"
+CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
+    /uc2-beam-samza/bin/uc2-beam-samza \
+    --configFilePath=samza-standalone.properties \
+    --samzaExecutionEnvironment=STANDALONE \
+    --maxSourceParallelism=$MAX_SOURCE_PARALLELISM \
+    --enableMetrics=$ENABLE_METRICS \
+    --configOverride="{\"job.coordinator.zk.connect\":\"$SAMZA_JOB_COORDINATOR_ZK_CONNECT\"}"
+

theodolite-benchmarks/uc2-beam-samza/samza-standalone.properties

@@ -15,3 +15,7 @@ systems.kafka.samza.factory=org.apache.samza.system.kafka.KafkaSystemFactory
 systems.kafka.consumer.bootstrap.servers=localhost:9092
 systems.kafka.producer.bootstrap.servers=localhost:9092
 systems.kafka.default.stream.replication.factor=1
+
+# Configure JMX metrics exporter
+metrics.reporter.jmx.class=org.apache.samza.metrics.reporter.JmxReporterFactory
+metrics.reporters=jmx

theodolite-benchmarks/uc3-beam-samza/Dockerfile

@@ -6,4 +6,11 @@ ENV ENABLE_METRICS=true
 ADD build/distributions/uc3-beam-samza.tar /
 ADD samza-standalone.properties /
 
-CMD /uc3-beam-samza/bin/uc3-beam-samza --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=$ENABLE_METRICS --configOverride="{\"job.coordinator.zk.connect\":\"$SAMZA_JOB_COORDINATOR_ZK_CONNECT\"}"
+
+CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
+    /uc3-beam-samza/bin/uc3-beam-samza \
+    --configFilePath=samza-standalone.properties \
+    --samzaExecutionEnvironment=STANDALONE \
+    --maxSourceParallelism=$MAX_SOURCE_PARALLELISM \
+    --enableMetrics=$ENABLE_METRICS \
+    --configOverride="{\"job.coordinator.zk.connect\":\"$SAMZA_JOB_COORDINATOR_ZK_CONNECT\"}"

theodolite-benchmarks/uc3-beam-samza/samza-standalone.properties

@@ -15,3 +15,7 @@ systems.kafka.samza.factory=org.apache.samza.system.kafka.KafkaSystemFactory
 systems.kafka.consumer.bootstrap.servers=localhost:9092
 systems.kafka.producer.bootstrap.servers=localhost:9092
 systems.kafka.default.stream.replication.factor=1
+
+# Configure JMX metrics exporter
+metrics.reporter.jmx.class=org.apache.samza.metrics.reporter.JmxReporterFactory
+metrics.reporters=jmx

theodolite-benchmarks/uc4-beam-samza/Dockerfile

@@ -6,4 +6,10 @@ ENV ENABLE_METRICS=true
 ADD build/distributions/uc4-beam-samza.tar /
 ADD samza-standalone.properties /
 
-CMD /uc4-beam-samza/bin/uc4-beam-samza --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=$ENABLE_METRICS --configOverride="{\"job.coordinator.zk.connect\":\"$SAMZA_JOB_COORDINATOR_ZK_CONNECT\"}"
+CMD JAVA_OPTS="$JAVA_OPTS -Dorg.slf4j.simpleLogger.defaultLogLevel=$LOG_LEVEL" \
+    /uc4-beam-samza/bin/uc4-beam-samza \
+    --configFilePath=samza-standalone.properties \
+    --samzaExecutionEnvironment=STANDALONE \
+    --maxSourceParallelism=$MAX_SOURCE_PARALLELISM \
+    --enableMetrics=$ENABLE_METRICS \
+    --configOverride="{\"job.coordinator.zk.connect\":\"$SAMZA_JOB_COORDINATOR_ZK_CONNECT\"}"

theodolite-benchmarks/uc4-beam-samza/samza-standalone.properties

@@ -16,6 +16,10 @@ systems.kafka.consumer.bootstrap.servers=localhost:9092
 systems.kafka.producer.bootstrap.servers=localhost:9092
 systems.kafka.default.stream.replication.factor=1
 
+# Configure JMX metrics exporter
+metrics.reporter.jmx.class=org.apache.samza.metrics.reporter.JmxReporterFactory
+metrics.reporters=jmx
+
 # Configure serialization and stores
 serializers.registry.string.class=org.apache.samza.serializers.StringSerdeFactory
 stores.my-store.factory=org.apache.samza.storage.kv.RocksDbKeyValueStorageEngineFactory