diff --git a/reposerver/src/main/scala/com/advancedtelematic/tuf/reposerver/Boot.scala b/reposerver/src/main/scala/com/advancedtelematic/tuf/reposerver/Boot.scala index c2866c05..314ee597 100644 --- 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/reposerver/src/main/scala/com/advancedtelematic/tuf/reposerver/http/TufReposerverRoutes.scala b/reposerver/src/main/scala/com/advancedtelematic/tuf/reposerver/http/TufReposerverRoutes.scala index 67c3141e..e190450c 100644 --- a/reposerver/src/main/scala/com/advancedtelematic/tuf/reposerver/http/TufReposerverRoutes.scala +++ b/reposerver/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 } } }