open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modify finatra test so it would not call system exit (#9361)

This commit is contained in:
Lauri Tulmin 2023-08-31 20:11:56 +03:00 committed by GitHub
parent 4f1becf9c4
commit 32614d5ba5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala
View File

@ -39,7 +39,7 @@ class FinatraServerLatestTest extends AbstractHttpServerTest[HttpServer] {
implicit val ec: ExecutionContext = implicit val ec: ExecutionContext =
ExecutionContext.fromExecutor(startupThread) ExecutionContext.fromExecutor(startupThread)
Future { Future {
testServer.main(Array("-admin.port=:0", "-http.port=:" + port)) testServer.nonExitingMain(Array("-admin.port=:0", "-http.port=:" + port))
} }
testServer.awaitReady() testServer.awaitReady()
} }

2
instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala
View File

@ -39,7 +39,7 @@ class FinatraServerTest extends AbstractHttpServerTest[HttpServer] {
implicit val ec: ExecutionContext = implicit val ec: ExecutionContext =
ExecutionContext.fromExecutor(startupThread) ExecutionContext.fromExecutor(startupThread)
Future { Future {
testServer.main(Array("-admin.port=:0", "-http.port=:" + port)) testServer.nonExitingMain(Array("-admin.port=:0", "-http.port=:" + port))
} }
testServer.awaitReady() testServer.awaitReady()
} }