From 22a02a05df391597ee04f2524b7d975d07e76bd8 Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Tue, 23 May 2017 20:18:49 -0700
Subject: Passing User-Agent in outgoing HTTP requests, Returning services'
 dependencies in /version

---
 src/main/scala/xyz/driver/core/rest.scala | 35 +++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

(limited to 'src/main/scala/xyz/driver/core/rest.scala')

diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala
index f1eab45..c13cce9 100644
--- a/src/main/scala/xyz/driver/core/rest.scala
+++ b/src/main/scala/xyz/driver/core/rest.scala
@@ -9,6 +9,9 @@ import akka.http.scaladsl.server.Directive0
 import com.typesafe.scalalogging.Logger
 import akka.http.scaladsl.unmarshalling.Unmarshal
 import akka.http.scaladsl.unmarshalling.Unmarshaller
+import akka.http.scaladsl.settings.ClientConnectionSettings
+import akka.http.scaladsl.settings.ConnectionPoolSettings
+import akka.http.scaladsl.model.headers.`User-Agent`
 import akka.stream.ActorMaterializer
 import akka.stream.scaladsl.Flow
 import akka.util.ByteString
@@ -251,7 +254,26 @@ package rest {
     def discover[T <: Service](serviceName: Name[Service]): T
   }
 
-  class HttpRestServiceTransport(actorSystem: ActorSystem,
+  class NoServiceDiscovery extends ServiceDiscovery with SavingUsedServiceDiscovery {
+
+    def discover[T <: Service](serviceName: Name[Service]): T =
+      throw new IllegalArgumentException(s"Service with name $serviceName is unknown")
+  }
+
+  trait SavingUsedServiceDiscovery {
+
+    private val usedServices = new scala.collection.mutable.HashSet[String]()
+
+    def saveServiceUsage(serviceName: Name[Service]): Unit = usedServices.synchronized {
+      usedServices += serviceName.value
+    }
+
+    def getUsedServices: Set[String] = usedServices.synchronized { usedServices.toSet }
+  }
+
+  class HttpRestServiceTransport(applicationName: Name[App],
+                                 applicationVersion: String,
+                                 actorSystem: ActorSystem,
                                  executionContext: ExecutionContext,
                                  log: Logger,
                                  time: TimeProvider)
@@ -260,6 +282,15 @@ package rest {
     protected implicit val materializer = ActorMaterializer()(actorSystem)
     protected implicit val execution    = executionContext
 
+    private val client = Http()(actorSystem)
+
+    private val clientConnectionSettings: ClientConnectionSettings =
+      ClientConnectionSettings(actorSystem).withUserAgentHeader(
+        Option(`User-Agent`(applicationName.value + "/" + applicationVersion)))
+
+    private val connectionPoolSettings: ConnectionPoolSettings = ConnectionPoolSettings(actorSystem)
+      .withConnectionSettings(clientConnectionSettings)
+
     def sendRequestGetResponse(context: ServiceRequestContext)(requestStub: HttpRequest): Future[HttpResponse] = {
 
       val requestTime = time.currentTime()
@@ -272,7 +303,7 @@ package rest {
 
       log.info(s"Sending request to ${request.method} ${request.uri}")
 
-      val response = Http()(actorSystem).singleRequest(request)(materializer)
+      val response = client.singleRequest(request, settings = connectionPoolSettings)(materializer)
 
       response.onComplete {
         case Success(r) =>
-- 
cgit v1.2.3