From cad8becf6fe71834b91b4a437d96f3219e4d3c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Vonheiden?= <bjoern.vonheiden@hotmail.de>
Date: Tue, 9 Jun 2020 12:14:50 +0200
Subject: [PATCH] fix not setting application name in the use case applications
---
.../uc2/application/AggregationService.java | 2 ++
.../uc2/application/ConfigurationKeys.java | 3 +++
.../resources/META-INF/application.properties | 3 +++
.../uc3/application/ConfigurationKeys.java | 22 +++++++++++--------
.../uc3/application/HistoryService.java | 2 ++
.../resources/META-INF/application.properties | 3 +++
.../uc4/application/ConfigurationKeys.java | 4 ++++
.../uc4/application/HistoryService.java | 2 ++
.../resources/META-INF/application.properties | 3 +++
9 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/uc2-application/src/main/java/theodolite/uc2/application/AggregationService.java b/uc2-application/src/main/java/theodolite/uc2/application/AggregationService.java
index 2f37bf757..06a6d9ccb 100644
--- a/uc2-application/src/main/java/theodolite/uc2/application/AggregationService.java
+++ b/uc2-application/src/main/java/theodolite/uc2/application/AggregationService.java
@@ -46,6 +46,8 @@ public class AggregationService {
// Configuration of the stream application
final KafkaStreams kafkaStreams = uc2KafkaStreamsBuilder
+ .applicationName(this.config.getString(ConfigurationKeys.APPLICATION_NAME))
+ .applicationVersion(this.config.getString(ConfigurationKeys.APPLICATION_VERSION))
.bootstrapServers(this.config.getString(ConfigurationKeys.KAFKA_BOOTSTRAP_SERVERS))
.numThreads(this.config.getInt(ConfigurationKeys.NUM_THREADS))
.commitIntervalMs(this.config.getInt(ConfigurationKeys.COMMIT_INTERVAL_MS))
diff --git a/uc2-application/src/main/java/theodolite/uc2/application/ConfigurationKeys.java b/uc2-application/src/main/java/theodolite/uc2/application/ConfigurationKeys.java
index b57f5c38e..78d72af1d 100644
--- a/uc2-application/src/main/java/theodolite/uc2/application/ConfigurationKeys.java
+++ b/uc2-application/src/main/java/theodolite/uc2/application/ConfigurationKeys.java
@@ -4,6 +4,9 @@ package theodolite.uc2.application;
* Keys to access configuration parameters.
*/
public final class ConfigurationKeys {
+ public static final String APPLICATION_NAME = "application.name";
+
+ public static final String APPLICATION_VERSION = "application.version";
public static final String CONFIGURATION_KAFKA_TOPIC = "configuration.kafka.topic";
diff --git a/uc2-application/src/main/resources/META-INF/application.properties b/uc2-application/src/main/resources/META-INF/application.properties
index 3aa519c50..80e88e927 100644
--- a/uc2-application/src/main/resources/META-INF/application.properties
+++ b/uc2-application/src/main/resources/META-INF/application.properties
@@ -1,3 +1,6 @@
+application.name="uc2-application"
+application.version="0.0.1"
+
configuration.host=localhost
configuration.port=8082
configuration.kafka.topic=configuration
diff --git a/uc3-application/src/main/java/theodolite/uc3/application/ConfigurationKeys.java b/uc3-application/src/main/java/theodolite/uc3/application/ConfigurationKeys.java
index d95d245e0..ab6f08c01 100644
--- a/uc3-application/src/main/java/theodolite/uc3/application/ConfigurationKeys.java
+++ b/uc3-application/src/main/java/theodolite/uc3/application/ConfigurationKeys.java
@@ -5,21 +5,25 @@ package theodolite.uc3.application;
*/
public final class ConfigurationKeys {
- public static final String KAFKA_BOOTSTRAP_SERVERS = "kafka.bootstrap.servers";
+ public static final String APPLICATION_NAME = "application.name";
- public static final String KAFKA_OUTPUT_TOPIC = "kafka.output.topic";
+ public static final String APPLICATION_VERSION = "application.version";
- public static final String KAFKA_INPUT_TOPIC = "kafka.input.topic";
+ public static final String KAFKA_BOOTSTRAP_SERVERS = "kafka.bootstrap.servers";
- public static final String NUM_THREADS = "num.threads";
+ public static final String KAFKA_OUTPUT_TOPIC = "kafka.output.topic";
- public static final String COMMIT_INTERVAL_MS = "commit.interval.ms";
+ public static final String KAFKA_INPUT_TOPIC = "kafka.input.topic";
- public static final String CACHE_MAX_BYTES_BUFFERING = "cache.max.bytes.buffering";
+ public static final String NUM_THREADS = "num.threads";
- public static final String KAFKA_WINDOW_DURATION_MINUTES = "kafka.window.duration.minutes";
+ public static final String COMMIT_INTERVAL_MS = "commit.interval.ms";
- private ConfigurationKeys() {
- }
+ public static final String CACHE_MAX_BYTES_BUFFERING = "cache.max.bytes.buffering";
+
+ public static final String KAFKA_WINDOW_DURATION_MINUTES = "kafka.window.duration.minutes";
+
+ private ConfigurationKeys() {
+ }
}
diff --git a/uc3-application/src/main/java/theodolite/uc3/application/HistoryService.java b/uc3-application/src/main/java/theodolite/uc3/application/HistoryService.java
index 916d64f01..18aae8c34 100644
--- a/uc3-application/src/main/java/theodolite/uc3/application/HistoryService.java
+++ b/uc3-application/src/main/java/theodolite/uc3/application/HistoryService.java
@@ -42,6 +42,8 @@ public class HistoryService {
// Configuration of the stream application
final KafkaStreams kafkaStreams = uc3KafkaStreamsBuilder
+ .applicationName(this.config.getString(ConfigurationKeys.APPLICATION_NAME))
+ .applicationVersion(this.config.getString(ConfigurationKeys.APPLICATION_VERSION))
.bootstrapServers(this.config.getString(ConfigurationKeys.KAFKA_BOOTSTRAP_SERVERS))
.numThreads(this.config.getInt(ConfigurationKeys.NUM_THREADS))
.commitIntervalMs(this.config.getInt(ConfigurationKeys.COMMIT_INTERVAL_MS))
diff --git a/uc3-application/src/main/resources/META-INF/application.properties b/uc3-application/src/main/resources/META-INF/application.properties
index ef279332f..1383f35f8 100644
--- a/uc3-application/src/main/resources/META-INF/application.properties
+++ b/uc3-application/src/main/resources/META-INF/application.properties
@@ -1,3 +1,6 @@
+application.name="uc3-application"
+application.version="0.0.1"
+
kafka.bootstrap.servers=localhost:9092
kafka.input.topic=input
kafka.output.topic=output
diff --git a/uc4-application/src/main/java/theodolite/uc4/application/ConfigurationKeys.java b/uc4-application/src/main/java/theodolite/uc4/application/ConfigurationKeys.java
index aa74e1552..bc5fee1f2 100644
--- a/uc4-application/src/main/java/theodolite/uc4/application/ConfigurationKeys.java
+++ b/uc4-application/src/main/java/theodolite/uc4/application/ConfigurationKeys.java
@@ -5,6 +5,10 @@ package theodolite.uc4.application;
*/
public final class ConfigurationKeys {
+ public static final String APPLICATION_NAME = "application.name";
+
+ public static final String APPLICATION_VERSION = "application.version";
+
public static final String KAFKA_BOOTSTRAP_SERVERS = "kafka.bootstrap.servers";
public static final String KAFKA_INPUT_TOPIC = "kafka.input.topic";
diff --git a/uc4-application/src/main/java/theodolite/uc4/application/HistoryService.java b/uc4-application/src/main/java/theodolite/uc4/application/HistoryService.java
index 4d686d8f7..3e3073fde 100644
--- a/uc4-application/src/main/java/theodolite/uc4/application/HistoryService.java
+++ b/uc4-application/src/main/java/theodolite/uc4/application/HistoryService.java
@@ -42,6 +42,8 @@ public class HistoryService {
// Configuration of the stream application
final KafkaStreams kafkaStreams = uc4KafkaStreamsBuilder
+ .applicationName(this.config.getString(ConfigurationKeys.APPLICATION_NAME))
+ .applicationVersion(this.config.getString(ConfigurationKeys.APPLICATION_VERSION))
.bootstrapServers(this.config.getString(ConfigurationKeys.KAFKA_BOOTSTRAP_SERVERS))
.numThreads(this.config.getInt(ConfigurationKeys.NUM_THREADS))
.commitIntervalMs(this.config.getInt(ConfigurationKeys.COMMIT_INTERVAL_MS))
diff --git a/uc4-application/src/main/resources/META-INF/application.properties b/uc4-application/src/main/resources/META-INF/application.properties
index da99d5a62..94e77fc5a 100644
--- a/uc4-application/src/main/resources/META-INF/application.properties
+++ b/uc4-application/src/main/resources/META-INF/application.properties
@@ -1,3 +1,6 @@
+application.name="uc4-application"
+application.version="0.0.1"
+
kafka.bootstrap.servers=localhost:9092
kafka.input.topic=input
kafka.output.topic=output
--
GitLab