Try MT prefix on app id and client id.

kissaten · Nov 21, 2017 · 26999b5 · 26999b5
1 parent deaa798
commit 26999b5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/streams-aggregator/build.gradle b/streams-aggregator/build.gradle
@@ -12,4 +12,4 @@ run.doFirst {
   environment "ADDON_SUFFIX", ""
   environment "HEROKU_KAFKA_URL", "kafka://localhost:9092"
   environment "HEROKU_POSTGRESQL_URL", "postgres://localhost:5432/kafka_streams_dev"
-}
+}
diff --git a/streams-aggregator/src/main/java/io/jeffchao/streams/aggregator/AggregatorConfig.java b/streams-aggregator/src/main/java/io/jeffchao/streams/aggregator/AggregatorConfig.java
@@ -32,6 +32,8 @@ class AggregatorConfig extends Properties {
   private static final String ADDON_SUFFIX = Optional.ofNullable(
       System.getenv("ADDON_SUFFIX")).orElse("");
   private static final String HEROKU_KAFKA = String.format("HEROKU_KAFKA%s", ADDON_SUFFIX);
+  private static final String HEROKU_KAFKA_PREFIX = Optional.ofNullable(
+      System.getenv(String.format("%s_PREFIX", HEROKU_KAFKA))).orElse("");
   private static final String HEROKU_KAFKA_URL = String.format("%s_URL", HEROKU_KAFKA);
   private static final String HEROKU_KAFKA_TRUSTED_CERT =
       String.format("%s_TRUSTED_CERT", HEROKU_KAFKA);
@@ -106,8 +108,10 @@ private Properties buildHerokuKafkaConfigVars() throws URISyntaxException, Certi
 
   private Properties buildKafkaStreamsDefaults() {
     Properties properties = new Properties();
-    properties.put(StreamsConfig.APPLICATION_ID_CONFIG, "aggregator-app");
-    properties.put(StreamsConfig.CLIENT_ID_CONFIG, "aggregator-client");
+    properties.put(StreamsConfig.APPLICATION_ID_CONFIG,
+        String.format("%saggregator-app", HEROKU_KAFKA_PREFIX));
+    properties.put(StreamsConfig.CLIENT_ID_CONFIG,
+        String.format("%saggregator-client", HEROKU_KAFKA_PREFIX));
     properties.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
     properties.put(
         StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG,

diff --git a/...nomaly-checker/src/main/java/io/jeffchao/streams/anomalychecker/AnomalyCheckerConfig.java b/...nomaly-checker/src/main/java/io/jeffchao/streams/anomalychecker/AnomalyCheckerConfig.java
@@ -32,6 +32,8 @@ class AnomalyCheckerConfig extends Properties {
   private static final String ADDON_SUFFIX = Optional.ofNullable(
       System.getenv("ADDON_SUFFIX")).orElse("");
   private static final String HEROKU_KAFKA = String.format("HEROKU_KAFKA%s", ADDON_SUFFIX);
+  private static final String HEROKU_KAFKA_PREFIX = Optional.ofNullable(
+      System.getenv(String.format("%s_PREFIX", HEROKU_KAFKA))).orElse("");
   private static final String HEROKU_KAFKA_URL = String.format("%s_URL", HEROKU_KAFKA);
   private static final String HEROKU_KAFKA_TRUSTED_CERT =
       String.format("%s_TRUSTED_CERT", HEROKU_KAFKA);
@@ -106,8 +108,10 @@ private Properties buildHerokuKafkaConfigVars() throws URISyntaxException, Certi
 
   private Properties buildKafkaStreamsDefaults() {
     Properties properties = new Properties();
-    properties.put(StreamsConfig.APPLICATION_ID_CONFIG, "anomaly-checker-app");
-    properties.put(StreamsConfig.CLIENT_ID_CONFIG, "anomaly-checker-client");
+    properties.put(StreamsConfig.APPLICATION_ID_CONFIG,
+        String.format("%sanomaly-checker-app", HEROKU_KAFKA_PREFIX));
+    properties.put(StreamsConfig.CLIENT_ID_CONFIG,
+        String.format("%sanomaly-checker-client", HEROKU_KAFKA_PREFIX));
     properties.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
     properties.put(
         StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG,

diff --git a/...s-text-processor/src/main/java/io/jeffchao/streams/textprocessor/TextProcessorConfig.java b/...s-text-processor/src/main/java/io/jeffchao/streams/textprocessor/TextProcessorConfig.java
@@ -32,6 +32,8 @@ class TextProcessorConfig extends Properties {
   private static final String ADDON_SUFFIX = Optional.ofNullable(
       System.getenv("ADDON_SUFFIX")).orElse("");
   private static final String HEROKU_KAFKA = String.format("HEROKU_KAFKA%s", ADDON_SUFFIX);
+  private static final String HEROKU_KAFKA_PREFIX = Optional.ofNullable(
+      System.getenv(String.format("%s_PREFIX", HEROKU_KAFKA))).orElse("");
   private static final String HEROKU_KAFKA_URL = String.format("%s_URL", HEROKU_KAFKA);
   private static final String HEROKU_KAFKA_TRUSTED_CERT =
       String.format("%s_TRUSTED_CERT", HEROKU_KAFKA);
@@ -106,8 +108,10 @@ private Properties buildHerokuKafkaConfigVars() throws URISyntaxException, Certi
 
   private Properties buildKafkaStreamsDefaults() {
     Properties properties = new Properties();
-    properties.put(StreamsConfig.APPLICATION_ID_CONFIG, "text-processor-app");
-    properties.put(StreamsConfig.CLIENT_ID_CONFIG, "text-processor-client");
+    properties.put(StreamsConfig.APPLICATION_ID_CONFIG,
+        String.format("%stext-processor-app", HEROKU_KAFKA_PREFIX));
+    properties.put(StreamsConfig.CLIENT_ID_CONFIG,
+        String.format("%stext-processor-client", HEROKU_KAFKA_PREFIX));
     properties.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
     properties.put(
         StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG,