fix rebase bugs

kamon-io · Oct 10, 2023 · 1f2e11e · 1f2e11e
1 parent 4ad2679
commit 1f2e11e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...n/kamon-akka/src/common/scala/kamon/instrumentation/akka/AkkaClusterShardingMetrics.scala b/...n/kamon-akka/src/common/scala/kamon/instrumentation/akka/AkkaClusterShardingMetrics.scala
@@ -85,7 +85,7 @@ object AkkaClusterShardingMetrics {
     private val _shardTelemetryMap = TrieMap.empty[String, ShardTelemetry]
 
     private def shardTelemetry(system: String, typeName: String, shardEntities: Histogram, shardMessages: Histogram): ShardTelemetry = {
-      _shardTelemetryMap.getOrElseUpdate(shardTelemetryKey(system, typeName), {
+      _shardTelemetryMap.atomicGetOrElseUpdate(shardTelemetryKey(system, typeName), {
         val entitiesPerShard = TrieMap.empty[String, AtomicLong]
         val messagesPerShard = TrieMap.empty[String, AtomicLong]
         val samplingInterval = AkkaRemoteInstrumentation.settings().shardMetricsSampleInterval

diff --git a/.../kamon-pekko/src/main/scala/kamon/instrumentation/pekko/PekkoClusterShardingMetrics.scala b/.../kamon-pekko/src/main/scala/kamon/instrumentation/pekko/PekkoClusterShardingMetrics.scala
@@ -85,7 +85,7 @@ object PekkoClusterShardingMetrics {
     private val _shardTelemetryMap = TrieMap.empty[String, ShardTelemetry]
 
     private def shardTelemetry(system: String, typeName: String, shardEntities: Histogram, shardMessages: Histogram): ShardTelemetry = {
-      _shardTelemetryMap.getOrElseUpdate(shardTelemetryKey(system, typeName), {
+      _shardTelemetryMap.atomicGetOrElseUpdate(shardTelemetryKey(system, typeName), {
         val entitiesPerShard = TrieMap.empty[String, AtomicLong]
         val messagesPerShard = TrieMap.empty[String, AtomicLong]
         val samplingInterval = PekkoRemoteInstrumentation.settings().shardMetricsSampleInterval