Merge pull request #246 from advancedtelematic/fix-metrics-routes

move prometheus metrics to unsealed portion of routes
advancedtelematic · Sep 16, 2019 · 5558b13 · 5558b13
2 parents fb10456 + 67dfd72
commit 5558b13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/reposerver/src/main/scala/com/advancedtelematic/tuf/reposerver/Boot.scala b/reposerver/src/main/scala/com/advancedtelematic/tuf/reposerver/Boot.scala
@@ -79,8 +79,9 @@ object Boot extends BootApp
       tracing.traceRequests { implicit requestTracing =>
         new TufReposerverRoutes(keyStoreClient, NamespaceValidation.withDatabase, targetStore,
           messageBusPublisher,
+          prometheusMetricsRoutes,
           Seq(keyserverHealthCheck)).routes
-      } ~ prometheusMetricsRoutes
+      }
     }
 
   Http().bindAndHandle(routes, host, port)

diff --git a/...server/src/main/scala/com/advancedtelematic/tuf/reposerver/http/TufReposerverRoutes.scala b/...server/src/main/scala/com/advancedtelematic/tuf/reposerver/http/TufReposerverRoutes.scala
@@ -18,6 +18,7 @@ class TufReposerverRoutes(keyserverClient: KeyserverClient,
                           namespaceValidation: NamespaceValidation,
                           targetStore: TargetStore,
                           messageBusPublisher: MessageBusPublisher,
+                          metricsRoutes: Route = Directives.reject,
                           dependencyChecks: Seq[HealthCheck] = Seq.empty)
                          (implicit val db: Database, val ec: ExecutionContext, mat: Materializer) extends VersionInfo {
 
@@ -28,7 +29,7 @@ class TufReposerverRoutes(keyserverClient: KeyserverClient,
       ErrorHandler.handleErrors {
         pathPrefix("api" / "v1") {
           new RepoResource(keyserverClient, namespaceValidation, targetStore, new TufTargetsPublisher(messageBusPublisher)).route
-        } ~ DbHealthResource(versionMap, dependencies = dependencyChecks).route
+        } ~ DbHealthResource(versionMap, dependencies = dependencyChecks).route ~ metricsRoutes
       }
     }
 }