remove prefix, fix labels

lifk · Mar 2, 2019 · 519be42 · 519be42
1 parent a5d0650
commit 519be42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/src/main/kotlin/es/lifk/p6spy_prometheus/PrometheusJdbcEventListener.kt b/src/main/kotlin/es/lifk/p6spy_prometheus/PrometheusJdbcEventListener.kt
@@ -8,10 +8,10 @@ import io.prometheus.client.Gauge
 import io.prometheus.client.Histogram
 import java.util.concurrent.TimeUnit
 
-class PrometheusJdbcEventListener(prefix: String): SimpleJdbcEventListener() {
-    private val queries = Counter.build().name("${prefix}queries_total").help("Total queries.").register()
-    private val inProgressQueries = Gauge.build().name("${prefix}in_progress_queries").help("In progress queries.").register()
-    private val queryLatency = Histogram.build().name("${prefix}query_latency_milis").help("query latency in milis").register()
+class PrometheusJdbcEventListener: SimpleJdbcEventListener() {
+    private val queries = Counter.build().name("queries_total").labelNames("status").help("Total queries.").register()
+    private val inProgressQueries = Gauge.build().name("in_progress_queries").help("In progress queries.").register()
+    private val queryLatency = Histogram.build().name("query_latency_milis").help("query latency in milis").register()
 
     override fun onBeforeAnyExecute(statementInformation: StatementInformation) {
         inProgressQueries.inc()

diff --git a/src/main/kotlin/es/lifk/p6spy_prometheus/PrometheusP6Factory.kt b/src/main/kotlin/es/lifk/p6spy_prometheus/PrometheusP6Factory.kt
@@ -14,22 +14,9 @@ class PrometheusP6Factory: P6Factory {
     }
 
     override fun getJdbcEventListener(): JdbcEventListener {
-        return PrometheusJdbcEventListener(options.getPrefix())
+        return PrometheusJdbcEventListener()
     }
 
 }
 
-class PrometheusP6SpyOptions(private val optionsRepository: P6OptionsRepository) : P6SpyOptions(optionsRepository) {
-    override fun load(options: Map<String, String>) {
-        super.load(options)
-        optionsRepository.set(String::class.java, PREFIX, options[PREFIX])
-    }
-
-    fun getPrefix(): String {
-        return optionsRepository.get(String::class.java, PREFIX)
-    }
-
-    companion object {
-        const val PREFIX = "prefix"
-    }
-}
+class PrometheusP6SpyOptions(optionsRepository: P6OptionsRepository) : P6SpyOptions(optionsRepository)