Merge branch '0.2.x' into 0.3.x

# Conflicts:
#	app/com/github/stijndehaes/playprometheusfilters/PrometheusModule.scala
#	build.sbt

app/com/github/stijndehaes/playprometheusfilters/PrometheusModule.scala

@@ -6,8 +6,10 @@ import io.prometheus.client.CollectorRegistry
 
 class PrometheusModule extends Module {
 
-  override def bindings(environment: Environment, configuration: Configuration): Seq[Binding[_]] =  Seq(
-    bind[CollectorRegistry].to(CollectorRegistry.defaultRegistry)
-  )
-
+  override def bindings(environment: Environment, configuration: Configuration): Seq[Binding[_]] = {
+    CollectorRegistry.defaultRegistry.clear()
+    Seq(
+      bind[CollectorRegistry].to(CollectorRegistry.defaultRegistry)
+    )
+  }
 }

app/com/github/stijndehaes/playprometheusfilters/controllers/PrometheusController.scala

@@ -6,11 +6,15 @@ import javax.inject._
 import play.api.mvc._
 import io.prometheus.client.CollectorRegistry
 import io.prometheus.client.exporter.common.TextFormat
+import org.slf4j.LoggerFactory
 import play.api.http.HttpEntity
 
 class PrometheusController @Inject()(registry: CollectorRegistry, cc: ControllerComponents) extends AbstractController(cc) {
 
+  private val logger = LoggerFactory.getLogger(classOf[PrometheusController])
+
   def getMetrics = Action {
+    logger.trace("Metrics call received")
     val samples = new StringBuilder()
     val writer = new WriterAdapter(samples)
     TextFormat.write004(writer, registry.metricFamilySamples())

app/com/github/stijndehaes/playprometheusfilters/filters/StatusAndRouteLatencyFilter.scala

@@ -1,13 +1,14 @@
 package com.github.stijndehaes.playprometheusfilters.filters
 
 import akka.stream.Materializer
-import com.google.inject.Inject
+import com.google.inject.{Inject, Singleton}
 import io.prometheus.client.{Collector, CollectorRegistry, Histogram}
 import play.api.mvc.{Filter, RequestHeader, Result}
 import play.api.routing.Router
 
 import scala.concurrent.{ExecutionContext, Future}
 
+@Singleton
 class StatusAndRouteLatencyFilter @Inject()(registry: CollectorRegistry) (implicit val mat: Materializer, ec: ExecutionContext) extends Filter {
 
   private[filters] val requestLatency = Histogram.build

build.sbt

@@ -1,7 +1,7 @@
 name := "play-prometheus-filters"
 organization := "com.github.stijndehaes"
 
-version := "0.3.0"
+version := "0.3.1"
 
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)