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

make pekko test code more scala 3 friendly (#12384)

This commit is contained in:
PJ Fanning 2024-10-02 21:50:34 +01:00 committed by GitHub
parent 060c6c124d
commit be153f0764
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpClientInstrumentationTest.scala
View File

@ -43,8 +43,7 @@ class PekkoHttpClientInstrumentationTest
HttpClientInstrumentationExtension.forAgent() HttpClientInstrumentationExtension.forAgent()
val system: ActorSystem = ActorSystem.create() val system: ActorSystem = ActorSystem.create()
implicit val materializer: ActorMaterializer = val materializer: ActorMaterializer = ActorMaterializer.create(system)
ActorMaterializer.create(system)
override def buildRequest( override def buildRequest(
method: String, method: String,

2
instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpServerRouteTest.scala
View File

@ -25,7 +25,6 @@ import org.apache.pekko.http.scaladsl.server.Directives.{
pathPrefix, pathPrefix,
pathSingleSlash pathSingleSlash
} }
import org.apache.pekko.stream.ActorMaterializer
import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.extension.RegisterExtension import org.junit.jupiter.api.extension.RegisterExtension
import org.junit.jupiter.api.{AfterAll, Test, TestInstance} import org.junit.jupiter.api.{AfterAll, Test, TestInstance}
@ -42,7 +41,6 @@ class PekkoHttpServerRouteTest {
private val client: WebClient = WebClient.of() private val client: WebClient = WebClient.of()
implicit val system: ActorSystem = ActorSystem("my-system") implicit val system: ActorSystem = ActorSystem("my-system")
implicit val materializer: ActorMaterializer = ActorMaterializer()
private def buildAddress(port: Int): URI = try private def buildAddress(port: Int): URI = try
new URI("http://localhost:" + port + "/") new URI("http://localhost:" + port + "/")

2
instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestAsyncWebServer.scala
View File

@ -10,7 +10,6 @@ import org.apache.pekko.http.scaladsl.Http
import org.apache.pekko.http.scaladsl.Http.ServerBinding import org.apache.pekko.http.scaladsl.Http.ServerBinding
import org.apache.pekko.http.scaladsl.model.HttpMethods.GET import org.apache.pekko.http.scaladsl.model.HttpMethods.GET
import org.apache.pekko.http.scaladsl.model._ import org.apache.pekko.http.scaladsl.model._
import org.apache.pekko.stream.ActorMaterializer
import io.opentelemetry.instrumentation.testing.junit.http.{ import io.opentelemetry.instrumentation.testing.junit.http.{
AbstractHttpServerTest, AbstractHttpServerTest,
ServerEndpoint ServerEndpoint
@ -22,7 +21,6 @@ import scala.concurrent.{Await, ExecutionContextExecutor, Future}
object PekkoHttpTestAsyncWebServer { object PekkoHttpTestAsyncWebServer {
implicit val system: ActorSystem = ActorSystem("my-system") implicit val system: ActorSystem = ActorSystem("my-system")
implicit val materializer: ActorMaterializer = ActorMaterializer()
// needed for the future flatMap/onComplete in the end // needed for the future flatMap/onComplete in the end
implicit val executionContext: ExecutionContextExecutor = system.dispatcher implicit val executionContext: ExecutionContextExecutor = system.dispatcher
val asyncHandler: HttpRequest => Future[HttpResponse] = { val asyncHandler: HttpRequest => Future[HttpResponse] = {

8
instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestServerSourceWebServer.scala
View File

@ -13,16 +13,14 @@ import org.apache.pekko.http.scaladsl.Http
import org.apache.pekko.http.scaladsl.Http.ServerBinding import org.apache.pekko.http.scaladsl.Http.ServerBinding
import org.apache.pekko.http.scaladsl.model.StatusCodes.Found import org.apache.pekko.http.scaladsl.model.StatusCodes.Found
import org.apache.pekko.http.scaladsl.server.Directives._ import org.apache.pekko.http.scaladsl.server.Directives._
import org.apache.pekko.stream.ActorMaterializer
import org.apache.pekko.stream.scaladsl.Sink import org.apache.pekko.stream.scaladsl.Sink
import scala.concurrent.Await import scala.concurrent.{Await, ExecutionContext}
object PekkoHttpTestServerSourceWebServer { object PekkoHttpTestServerSourceWebServer {
implicit val system = ActorSystem("my-system") implicit val system: ActorSystem = ActorSystem("my-system")
implicit val materializer = ActorMaterializer()
// needed for the future flatMap/onComplete in the end // needed for the future flatMap/onComplete in the end
implicit val executionContext = system.dispatcher implicit val executionContext: ExecutionContext = system.dispatcher
var route = get { var route = get {
concat( concat(

8
instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestSyncWebServer.scala
View File

@ -10,7 +10,6 @@ import org.apache.pekko.http.scaladsl.Http
import org.apache.pekko.http.scaladsl.Http.ServerBinding import org.apache.pekko.http.scaladsl.Http.ServerBinding
import org.apache.pekko.http.scaladsl.model.HttpMethods.GET import org.apache.pekko.http.scaladsl.model.HttpMethods.GET
import org.apache.pekko.http.scaladsl.model._ import org.apache.pekko.http.scaladsl.model._
import org.apache.pekko.stream.ActorMaterializer
import io.opentelemetry.instrumentation.testing.junit.http.{ import io.opentelemetry.instrumentation.testing.junit.http.{
AbstractHttpServerTest, AbstractHttpServerTest,
ServerEndpoint ServerEndpoint
@ -18,13 +17,12 @@ import io.opentelemetry.instrumentation.testing.junit.http.{
import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint._ import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint._
import java.util.function.Supplier import java.util.function.Supplier
import scala.concurrent.Await import scala.concurrent.{Await, ExecutionContext}
object PekkoHttpTestSyncWebServer { object PekkoHttpTestSyncWebServer {
implicit val system = ActorSystem("my-system") implicit val system: ActorSystem = ActorSystem("my-system")
implicit val materializer = ActorMaterializer()
// needed for the future flatMap/onComplete in the end // needed for the future flatMap/onComplete in the end
implicit val executionContext = system.dispatcher implicit val executionContext: ExecutionContext = system.dispatcher
val syncHandler: HttpRequest => HttpResponse = { val syncHandler: HttpRequest => HttpResponse = {
case HttpRequest(GET, uri: Uri, _, _, _) => { case HttpRequest(GET, uri: Uri, _, _, _) => {
val endpoint = ServerEndpoint.forPath(uri.path.toString()) val endpoint = ServerEndpoint.forPath(uri.path.toString())

8
instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestWebServer.scala
View File

@ -13,15 +13,13 @@ import org.apache.pekko.http.scaladsl.Http
import org.apache.pekko.http.scaladsl.Http.ServerBinding import org.apache.pekko.http.scaladsl.Http.ServerBinding
import org.apache.pekko.http.scaladsl.model.StatusCodes.Found import org.apache.pekko.http.scaladsl.model.StatusCodes.Found
import org.apache.pekko.http.scaladsl.server.Directives._ import org.apache.pekko.http.scaladsl.server.Directives._
import org.apache.pekko.stream.ActorMaterializer
import scala.concurrent.Await import scala.concurrent.{Await, ExecutionContext}
object PekkoHttpTestWebServer { object PekkoHttpTestWebServer {
implicit val system = ActorSystem("my-system") implicit val system: ActorSystem = ActorSystem("my-system")
implicit val materializer = ActorMaterializer()
// needed for the future flatMap/onComplete in the end // needed for the future flatMap/onComplete in the end
implicit val executionContext = system.dispatcher implicit val executionContext: ExecutionContext = system.dispatcher
var route = get { var route = get {
concat( concat(