diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala index 55ae4e0562..f2e0042b10 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/BenchmarkFileReporter.scala @@ -19,6 +19,7 @@ import scala.util.Try * results can be understood later. */ trait BenchmarkFileReporter { + def testName: String def reportResults(result: String): Unit def close(): Unit } @@ -31,8 +32,10 @@ object BenchmarkFileReporter { val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss") - def apply(testName: String, system: ActorSystem): BenchmarkFileReporter = + def apply(test: String, system: ActorSystem): BenchmarkFileReporter = new BenchmarkFileReporter { + override val testName = test + val gitCommit = { import sys.process._ Try("git describe".!!.trim).getOrElse("[unknown]") diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala index 6e930c5fdb..7ee9d93b07 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanOutThrougputSpec.scala @@ -175,6 +175,7 @@ abstract class FanOutThroughputSpec extends RemotingMultiNodeSpec(FanOutThroughp } "Max throughput of fan-out" must { + pending // FIXME until issue #23198 has been solved val reporter = BenchmarkFileReporter("FanOutThroughputSpec", system) for (s ← scenarios) { s"be great for ${s.testName}, burstSize = ${s.burstSize}, payloadSize = ${s.payloadSize}" in test(s, reporter) diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala index abe21fe882..340e0c01de 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/LatencySpec.scala @@ -133,7 +133,7 @@ object LatencySpec extends MultiNodeConfig { def percentile(p: Double): Double = histogram.getValueAtPercentile(p) / 1000.0 val throughput = 1000.0 * histogram.getTotalCount / math.max(1, totalDurationNanos.nanos.toMillis) - reporter.reportResults(s"=== Latency $testName: RTT " + + reporter.reportResults(s"=== ${reporter.testName} $testName: RTT " + f"50%%ile: ${percentile(50.0)}%.0f µs, " + f"90%%ile: ${percentile(90.0)}%.0f µs, " + f"99%%ile: ${percentile(99.0)}%.0f µs, " + diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala index 1978ff9a37..64f0e11b0d 100644 --- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala +++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/MaxThroughputSpec.scala @@ -36,7 +36,7 @@ object MaxThroughputSpec extends MultiNodeConfig { akka.test.MaxThroughputSpec.actor-selection = off akka { loglevel = INFO - log-dead-letters = 10000 + log-dead-letters = 100 # avoid TestEventListener loggers = ["akka.event.Logging$$DefaultLogger"] testconductor.barrier-timeout = ${barrierTimeout.toSeconds}s @@ -237,7 +237,7 @@ object MaxThroughputSpec extends MultiNodeConfig { val throughput = (totalReceived * 1000.0 / took) reporter.reportResults( - s"=== MaxThroughput ${self.path.name}: " + + s"=== ${reporter.testName} ${self.path.name}: " + f"throughput ${throughput * testSettings.senderReceiverPairs}%,.0f msg/s, " + f"${throughput * payloadSize * testSettings.senderReceiverPairs}%,.0f bytes/s (payload), " + f"${throughput * totalSize(context.system) * testSettings.senderReceiverPairs}%,.0f bytes/s (total" +