From 32614d5ba58bd87152b8a3711c054b91976b060a Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Thu, 31 Aug 2023 20:11:56 +0300 Subject: [PATCH] Modify finatra test so it would not call system exit (#9361) --- .../instrumentation/finatra/FinatraServerLatestTest.scala | 2 +- .../javaagent/instrumentation/finatra/FinatraServerTest.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala b/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala index dcc7715323..d7c1458222 100644 --- a/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala +++ b/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala @@ -39,7 +39,7 @@ class FinatraServerLatestTest extends AbstractHttpServerTest[HttpServer] { implicit val ec: ExecutionContext = ExecutionContext.fromExecutor(startupThread) Future { - testServer.main(Array("-admin.port=:0", "-http.port=:" + port)) + testServer.nonExitingMain(Array("-admin.port=:0", "-http.port=:" + port)) } testServer.awaitReady() } diff --git a/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala b/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala index 2679d67b08..8eee6af309 100644 --- a/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala +++ b/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala @@ -39,7 +39,7 @@ class FinatraServerTest extends AbstractHttpServerTest[HttpServer] { implicit val ec: ExecutionContext = ExecutionContext.fromExecutor(startupThread) Future { - testServer.main(Array("-admin.port=:0", "-http.port=:" + port)) + testServer.nonExitingMain(Array("-admin.port=:0", "-http.port=:" + port)) } testServer.awaitReady() }