From dbea5d2cb40231141a04fbef742ec89d429331a7 Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Tue, 9 Apr 2019 17:48:22 +0200
Subject: [PATCH] Update woken-messages to 3.0.3, remove old akka conf
---
pom.xml | 4 +--
src/main/resources/akka-artery-remoting.conf | 25 -----------------
src/main/resources/akka-netty-remoting.conf | 28 --------------------
src/main/resources/akka-remoting.conf | 7 -----
src/main/resources/akka.conf | 4 +++
src/main/resources/kamon.conf | 12 ++++++++-
src/main/resources/log4j2.xml | 10 +++----
src/main/resources/reference.conf | 2 ++
tests/docker-compose.yml | 4 +--
9 files changed, 26 insertions(+), 70 deletions(-)
delete mode 100644 src/main/resources/akka-artery-remoting.conf
delete mode 100644 src/main/resources/akka-netty-remoting.conf
delete mode 100644 src/main/resources/akka-remoting.conf
diff --git a/pom.xml b/pom.xml
index c164c7e3d..40b573715 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,9 +47,9 @@
<spring-data-jpa.version>1.10.11.RELEASE</spring-data-jpa.version>
<spring-boot-starter-actuator.version>1.4.7.RELEASE</spring-boot-starter-actuator.version>
<aspectjweaver.version>1.8.9</aspectjweaver.version>
- <woken-messages.version>3.0.2</woken-messages.version>
+ <woken-messages.version>3.0.3</woken-messages.version>
<javax-inject.version>1</javax-inject.version>
- <akka.version>2.5.21</akka.version>
+ <akka.version>2.5.22</akka.version>
<spring-context.version>4.3.4.RELEASE</spring-context.version>
<protobuf-java.version>3.1.0</protobuf-java.version>
diff --git a/src/main/resources/akka-artery-remoting.conf b/src/main/resources/akka-artery-remoting.conf
deleted file mode 100644
index c89f41b64..000000000
--- a/src/main/resources/akka-artery-remoting.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-akka {
-
- remote {
-
- netty.tcp {
- enabled = off
- }
-
- artery {
- enabled = on
- transport = tcp
-
- canonical.hostname = ${clustering.ip} # external (logical) hostname
- canonical.port = ${clustering.port} # external (logical) port
-
- bind.hostname = 0.0.0.0 # internal (bind) hostname
- bind.port = ${clustering.port} # internal (bind) port
-
- }
- }
-}
-
-remoting {
- protocol = "akka"
-}
diff --git a/src/main/resources/akka-netty-remoting.conf b/src/main/resources/akka-netty-remoting.conf
deleted file mode 100644
index 2c830d0dc..000000000
--- a/src/main/resources/akka-netty-remoting.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-akka {
-
- remote {
- maximum-payload-bytes = 30000000 bytes
-
- netty.tcp {
- hostname = ${clustering.ip} # external (logical) hostname
- port = ${clustering.port} # external (logical) port
-
- bind-hostname = 0.0.0.0 # internal (bind) hostname
- bind-port = ${clustering.port} # internal (bind) port
-
- message-frame-size = 30000000b
- send-buffer-size = 30000000b
- receive-buffer-size = 30000000b
- maximum-frame-size = 30000000b
- }
-
- artery {
- enabled = off
-
- }
- }
-}
-
-remoting {
- protocol = "akka.tcp"
-}
diff --git a/src/main/resources/akka-remoting.conf b/src/main/resources/akka-remoting.conf
deleted file mode 100644
index 18f2189d4..000000000
--- a/src/main/resources/akka-remoting.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-remoting {
-
- implementation = "netty"
- # Alternative option is 'artery'
- implementation = ${?AKKA_REMOTING}
-
-}
diff --git a/src/main/resources/akka.conf b/src/main/resources/akka.conf
index b169e7b9c..84b0e54ec 100644
--- a/src/main/resources/akka.conf
+++ b/src/main/resources/akka.conf
@@ -13,6 +13,8 @@ akka {
log-dead-letters = 10
log-dead-letters-during-shutdown = off
+ coordinated-shutdown.terminate-actor-system = on
+
actor {
# provider = "cluster"
@@ -37,6 +39,8 @@ akka {
${remoting.protocol}"://"${clustering.cluster.name}"@"${clustering.seed-ip}":"${clustering.seed-port}
]
+ shutdown-after-unsuccessful-join-seed-nodes = 20s
+
roles = ["portal"]
}
diff --git a/src/main/resources/kamon.conf b/src/main/resources/kamon.conf
index 00b068b21..face394cb 100644
--- a/src/main/resources/kamon.conf
+++ b/src/main/resources/kamon.conf
@@ -3,7 +3,8 @@ kamon {
enabled = ${?KAMON_ENABLED}
environment {
- service = "woken"
+ service = "portal-backend"
+ service = ${?KAMON_SERVICE_NAME}
}
zipkin = {
@@ -35,6 +36,14 @@ kamon {
"akka.traced-actor" {
includes = ["**"]
+ excludes = [
+ ${clustering.cluster.name}"/system/IO**",
+ ${clustering.cluster.name}"/user/Stream**",
+ ${clustering.cluster.name}"/system/transports**",
+ ${clustering.cluster.name}"/system/cluster**",
+ ${clustering.cluster.name}"/system/remote**",
+ ${clustering.cluster.name}"/system/endpointmanager/**",
+ ${clustering.cluster.name}"/system/sharding/UserActor/**"]
}
}
@@ -49,6 +58,7 @@ kamon {
trace {
join-remote-parents-with-same-span-id = yes
+ sampler = "always"
}
system-metrics {
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 659940446..7ef03b5a8 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -3,17 +3,17 @@
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout
- pattern="%d{HH:mm:ss.SSS} %highlight{%level}{FATAL=bg_red, ERROR=red, WARN=yellow, INFO=green, DEBUG=blue} %logger{36} - %msg%n"/>
+ pattern="%d{HH:mm:ss.SSS} %highlight{%level}{FATAL=bg_red, ERROR=red, WARN=yellow, INFO=green, DEBUG=blue} %logger{36} - %.1000msg%n"/>
</Console>
</Appenders>
<Loggers>
- <Root level="DEBUG">
+ <Root level="${env:LOG_LEVEL:-INFO}">
<AppenderRef ref="Console"/>
</Root>
<Logger name="akka.actor.LocalActorRefProvider(akka://woken)" level="INFO">
<AppenderRef ref="Console"/>
</Logger>
- <Logger name="akka.cluster" level="${sys:AKKA_CLUSTER_LOG_LEVEL:-INFO}">
+ <Logger name="akka.cluster" level="${env:AKKA_CLUSTER_LOG_LEVEL:-INFO}">
<AppenderRef ref="Console"/>
</Logger>
<Logger name="akka.io" level="INFO">
@@ -22,10 +22,10 @@
<Logger name="akka.http.impl" level="INFO">
<AppenderRef ref="Console"/>
</Logger>
- <Logger name="akka.remote.artery.compress" level="${sys:AKKA_CLUSTER_LOG_LEVEL:-INFO}">
+ <Logger name="akka.remote.artery.compress" level="${env:AKKA_CLUSTER_LOG_LEVEL:-INFO}">
<AppenderRef ref="Console"/>
</Logger>
- <Logger name="akka.remote.artery.tcp" level="${sys:AKKA_CLUSTER_LOG_LEVEL:-INFO}">
+ <Logger name="akka.remote.artery.tcp" level="${env:AKKA_CLUSTER_LOG_LEVEL:-INFO}">
<AppenderRef ref="Console"/>
</Logger>
<Logger name="akka.stream.impl" level="INFO">
diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf
index 5c485b2d8..0cbb380df 100644
--- a/src/main/resources/reference.conf
+++ b/src/main/resources/reference.conf
@@ -1,6 +1,8 @@
app {
+ # Name of the application
name = "Portal backend"
+ # Type of the application
type = "Spring"
clusterSystemName = ${clustering.cluster.name}
}
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index 8cb6304c9..9b2d69067 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -43,7 +43,7 @@ services:
- db
meta_db_setup:
- image: "hbpmip/sample-meta-db-setup:0.6.0"
+ image: "hbpmip/sample-meta-db-setup:0.7.1"
container_name: "meta-db-setup"
restart: "no"
networks:
@@ -59,7 +59,7 @@ services:
- db
sample_db_setup:
- image: "hbpmip/sample-data-db-setup:0.6.2"
+ image: "hbpmip/sample-data-db-setup:0.7.0"
container_name: "data-db-setup"
restart: "no"
networks:
--
GitLab