diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterWatcherNoClusterWatcheeSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterWatcherNoClusterWatcheeSpec.scala index 14e16199fd..3854c00b18 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterWatcherNoClusterWatcheeSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterWatcherNoClusterWatcheeSpec.scala @@ -32,7 +32,6 @@ class ClusterWatcherNoClusterWatcheeConfig(val useUnsafe: Boolean, artery: Boole akka.remote.use-unsafe-remote-features-outside-cluster = $useUnsafe akka.remote.log-remote-lifecycle-events = off akka.remote.artery.enabled = $artery - akka.remote.artery.advanced.flight-recorder.enabled = off akka.log-dead-letters = off akka.loggers =["akka.testkit.TestEventListener"] akka.actor.allow-java-serialization = on diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala index 57fb4693cc..1135472e80 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala @@ -4,7 +4,6 @@ package akka.cluster -import java.util.UUID import java.util.concurrent.ConcurrentHashMap import akka.actor.{ Actor, ActorRef, ActorSystem, Address, Deploy, PoisonPill, Props, RootActorPath } @@ -60,10 +59,6 @@ object MultiNodeClusterSpec { akka.log-dead-letters-during-shutdown = off akka.remote { log-remote-lifecycle-events = off - artery.advanced.flight-recorder { - enabled=on - destination=target/flight-recorder-${UUID.randomUUID().toString}.afr - } } akka.loggers = ["akka.testkit.TestEventListener"] akka.test { diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RemoteFeaturesWithClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/RemoteFeaturesWithClusterSpec.scala index 73f21f3a55..907c0bfe3e 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RemoteFeaturesWithClusterSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/RemoteFeaturesWithClusterSpec.scala @@ -29,7 +29,6 @@ class ClusterRemoteFeaturesConfig(artery: Boolean) extends MultiNodeConfig { akka.remote.log-remote-lifecycle-events = off akka.remote.artery.enabled = $artery akka.remote.artery.canonical.port = 0 - akka.remote.artery.advanced.flight-recorder.enabled = off akka.log-dead-letters-during-shutdown = off """).withFallback(MultiNodeClusterSpec.clusterConfig) diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteFeaturesSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteFeaturesSpec.scala index a2143d0195..7ec34b395a 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteFeaturesSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteFeaturesSpec.scala @@ -43,7 +43,6 @@ class RemotingFeaturesConfig(val useUnsafe: Boolean, artery: Boolean) extends Mu akka.remote.use-unsafe-remote-features-outside-cluster = $useUnsafe akka.remote.log-remote-lifecycle-events = off akka.remote.artery.enabled = $artery - akka.remote.artery.advanced.flight-recorder.enabled = off """).withFallback(RemotingMultiNodeSpec.commonConfig) commonConfig(debugConfig(on = false).withFallback(baseConfig)) diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemotingMultiNodeSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemotingMultiNodeSpec.scala index e73b12e6ec..8ce347325a 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemotingMultiNodeSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemotingMultiNodeSpec.scala @@ -4,8 +4,6 @@ package akka.remote -import java.util.UUID - import akka.remote.artery.ArterySpecSupport import akka.remote.testkit.{ MultiNodeConfig, MultiNodeSpec, STMultiNodeSpec } import akka.testkit.{ DefaultTimeout, ImplicitSender } @@ -17,10 +15,6 @@ object RemotingMultiNodeSpec { def commonConfig = ConfigFactory.parseString(s""" akka.actor.warn-about-java-serializer-usage = off - akka.remote.artery.advanced.flight-recorder { - enabled=on - destination=target/flight-recorder-${UUID.randomUUID().toString}.afr - } """).withFallback(ArterySpecSupport.tlsConfig) // TLS only used if transport=tls-tcp } diff --git a/akka-remote/src/test/scala/akka/remote/RemoteFeaturesSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteFeaturesSpec.scala index c646d406cf..a818e18e3b 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteFeaturesSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteFeaturesSpec.scala @@ -35,7 +35,6 @@ object RemoteFeaturesSpec { akka.remote.use-unsafe-remote-features-outside-cluster = $useUnsafe akka.remote.artery.enabled = on akka.remote.artery.canonical.port = 0 - akka.remote.artery.advanced.flight-recorder.enabled = off akka.log-dead-letters-during-shutdown = off """