docker compose fixed (#185)

* docker compose fixed

* fmt fixed

app3/app/TraceApplicationLoader.scala

@@ -36,4 +36,5 @@ class TraceComponents(context: Context)
   }
 
   override def ws: WSClient = wsClient
+  override def configuration: Configuration = context.initialConfiguration
 }

app3/app/TraceModule.scala

@@ -1,7 +1,9 @@
 import controllers.AppController
+import play.api.Configuration
 import play.api.libs.ws.WSClient
 import play.api.mvc.ControllerComponents
 import service.TraceService
+
 import scala.concurrent.ExecutionContext
 
 trait TraceModule {
@@ -14,4 +16,6 @@ trait TraceModule {
   implicit val ec: ExecutionContext = scala.concurrent.ExecutionContext.global
   def ws: WSClient
   def controllerComponents: ControllerComponents
+  def configuration: Configuration
+
 }

app3/app/service/TraceService.scala

@@ -2,15 +2,17 @@ package service
 
 import models.TraceResponse
 import play.api.libs.ws.WSClient
-import play.api.{Logging, MarkerContext}
+import play.api.{Configuration, Logging, MarkerContext}
 import utils.ContextId
 
+import javax.inject.Inject
 import scala.concurrent.{ExecutionContext, Future}
 
-class TraceService(ws: WSClient) extends Logging {
+class TraceService @Inject() (ws: WSClient, config: Configuration)
+    extends Logging {
 
-  private lazy val api4URL = "http://app4:9004/api/v1/trace"
-  private lazy val api5URL = "http://app5:9005/api/v1/trace"
+  private lazy val api4URL = config.get[String]("app4.url")
+  private lazy val api5URL = config.get[String]("app5.url")
 
   def getTrace(ctxId: String)(implicit
       mc: MarkerContext,

app3/conf/application.conf

@@ -2,6 +2,17 @@ play.application.loader=TraceApplicationLoader
 play.http.secret.key="jK/^7eTYZVWn^ItVo9g7l9NlY6SwJL3Qa[eUZEV07OeG=jyvS^MJ>5M@U]k?7rXj"
 play.server.http.port = 9003
 
+
+app4 {
+  url = "http://localhost:9004/api/v1/trace"
+  url = ${?APP4_URL}
+}
+
+app5 {
+  url = "http://localhost:9005/api/v1/trace"
+  url = ${?APP5_URL}
+}
+
 play.filters.hosts {
   allowed = ["."]
 }

docker/opentelemetry/docker-compose.yml

@@ -80,6 +80,8 @@ services:
       - OTEL_METRICS_EXPORTER=prometheus
       - OTEL_EXPORTER_PROMETHEUS_PORT=9094
       - OTEL_EXPORTER_PROMETHEUS_HOST=0.0.0.0
+      - APP4_URL=http://app4:9004/api/v1/trace
+      - APP5_URL=http://app5:9005/api/v1/trace
     networks:
       - tracenet
     ports:

project/Dependencies.scala

@@ -42,7 +42,7 @@ object Dependencies {
   lazy val JavaInstrumentVersion = "2.5.0"
 
   lazy val openTelemetryDependencies = {
-    val version = "1.39.0"
+    val version = "1.38.0"
     Seq(
       "io.opentelemetry" % "opentelemetry-api" % version,
       "io.opentelemetry.instrumentation" % "opentelemetry-logback-appender-1.0" % s"$JavaInstrumentVersion-alpha" % "runtime"