Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Metrics cache rework #2155

Merged
merged 3 commits into from
Apr 26, 2024
Merged

Metrics cache rework #2155

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
387b1d8
Used concurent data structure for cache
Apr 26, 2024
946b2ec
Merge branch 'refs/heads/master' into metrics-cache-rework
Apr 26, 2024
6cd0958
Fix debug log
Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions ...ability/prometheus-backend/src/main/scala/sttp/client4/prometheus/PrometheusBackend.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@ package sttp.client4.prometheus
import io.prometheus.metrics.core.datapoints.{GaugeDataPoint, Timer}
import io.prometheus.metrics.core.metrics.{Counter, Gauge, Histogram, Summary}
import io.prometheus.metrics.model.registry.{Collector, PrometheusRegistry}

import java.util.concurrent.ConcurrentHashMap
import sttp.client4.{wrappers, _}
import sttp.client4.listener.{ListenerBackend, RequestListener}
import sttp.client4.prometheus.PrometheusBackend.RequestCollectors
import sttp.client4.wrappers.FollowRedirectsBackend
import sttp.client4.{wrappers, _}
import sttp.model.StatusCode

import scala.collection.mutable
import java.util.concurrent.ConcurrentHashMap

object PrometheusBackend {
// TODO: Refactor metrics names according to Prometheus/OpenTelemetry standards
Expand Down Expand Up @@ -134,27 +132,30 @@ object PrometheusBackend {
Hence, we need to store a global cache o created histograms/gauges, so that we can properly re-use them.
*/

private def clear[T <: Collector](prometheusRegistry: PrometheusRegistry, collectors: mutable.WeakHashMap[PrometheusRegistry, ConcurrentHashMap[String, T]]): Unit = {
private def clear[T <: Collector](prometheusRegistry: PrometheusRegistry, collectors: ConcurrentHashMap[PrometheusRegistry, ConcurrentHashMap[String, T]]): Unit = {
collectors
.getOrElse(prometheusRegistry, new ConcurrentHashMap[String, T]())
.values()
.getOrDefault(prometheusRegistry, new ConcurrentHashMap[String, T]())
.values
.forEach(c => prometheusRegistry.unregister(c))
collectors.remove(prometheusRegistry)
}

private val histograms = new mutable.WeakHashMap[PrometheusRegistry, ConcurrentHashMap[String, Histogram]]
private val gauges = new mutable.WeakHashMap[PrometheusRegistry, ConcurrentHashMap[String, Gauge]]
private val counters = new mutable.WeakHashMap[PrometheusRegistry, ConcurrentHashMap[String, Counter]]
private val summaries = new mutable.WeakHashMap[PrometheusRegistry, ConcurrentHashMap[String, Summary]]
private val histograms = new ConcurrentHashMap[PrometheusRegistry, ConcurrentHashMap[String, Histogram]]
private val gauges = new ConcurrentHashMap[PrometheusRegistry, ConcurrentHashMap[String, Gauge]]
private val counters = new ConcurrentHashMap[PrometheusRegistry, ConcurrentHashMap[String, Counter]]
private val summaries = new ConcurrentHashMap[PrometheusRegistry, ConcurrentHashMap[String, Summary]]

private def cacheFor[T](
cache: mutable.WeakHashMap[PrometheusRegistry, ConcurrentHashMap[String, T]],
cache: ConcurrentHashMap[PrometheusRegistry, ConcurrentHashMap[String, T]],
prometheusRegistry: PrometheusRegistry
): ConcurrentHashMap[String, T] =
cache.synchronized {
// TODO remove synchronized and improve caching
cache.getOrElseUpdate(prometheusRegistry, new ConcurrentHashMap[String, T]())
}
cache.computeIfAbsent(
prometheusRegistry,
new java.util.function.Function[PrometheusRegistry, ConcurrentHashMap[String, T]] {
override def apply(t: PrometheusRegistry): ConcurrentHashMap[String, T] = new ConcurrentHashMap[String, T]()
}
)

final case class RequestCollectors(maybeTimer: Option[Timer], maybeGauge: Option[GaugeDataPoint])
}

Expand Down
4 changes: 3 additions & 1 deletion ...ity/prometheus-backend/src/test/scala/sttp/client4/prometheus/PrometheusBackendTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,9 @@ class PrometheusBackendTest
// then
eventually {
getMetricSnapshot(PrometheusBackend.DefaultRequestsInProgressGaugeName) shouldBe empty
getMetricSnapshot[GaugeDataPointSnapshot](customGaugeName).map(_.getValue).value shouldBe requestsNumber
val value1 = getMetricSnapshot[GaugeDataPointSnapshot](customGaugeName).map(_.getValue).value
println(value1)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: debug println can be removed.

value1 shouldBe requestsNumber
}

countDownLatch.countDown()
Expand Down
Loading