rebasing

Author: sebastian-alfers

akka-cluster-sharding/src/main/scala/akka/cluster/sharding/ShardRegion.scala

@@ -1457,7 +1457,7 @@ private[akka] class ShardRegion(
   }
 
   private def requestShardHome(shard: ShardId): Unit = {
-    instrumentation.requestedShardHome(cluster.selfAddress, self, typeName, shard)
+    instrumentation.regionRequestedShardHome(cluster.selfAddress, self, typeName, shard)
     coordinator.foreach(_ ! GetShardHome(shard))
   }
 }

akka-cluster-sharding/src/main/scala/akka/cluster/sharding/internal/ClusterShardingInstrumentation.scala

@@ -111,10 +111,6 @@ class ClusterShardingTelemetryEnsemble(val instrumentations: Seq[ClusterSharding
       shardId: String): Unit =
     instrumentations.foreach(_.receivedShardHome(selfAddress, shardRegionActor, typeName, shardId))
 
-  override def dependencies: immutable.Seq[String] =
-    instrumentations.flatMap(_.dependencies)
-
-
   override def shardHandoffStarted(
       selfAddress: Address,
       shardCoordinatorActor: ActorRef,

akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingInstrumentationSpec.scala

@@ -7,13 +7,13 @@ package akka.cluster.sharding
 import scala.concurrent.duration._
 
 import org.scalatest.concurrent.ScalaFutures
-import org.scalatest.time.{Seconds, Span}
+import org.scalatest.time.{ Seconds, Span }
 import org.scalatest.concurrent.Eventually.eventually
 
-import akka.actor.{Actor, ActorLogging, Address, Props}
+import akka.actor.{ Actor, ActorLogging, Address, Props }
 import akka.cluster.Cluster
 import akka.cluster.MemberStatus
-import akka.cluster.sharding.ClusterShardingInstrumentationSpec.GiveMeYourHome.{Get, Home}
+import akka.cluster.sharding.ClusterShardingInstrumentationSpec.GiveMeYourHome.{ Get, Home }
 import akka.cluster.sharding.internal.ClusterShardingInstrumentationProvider
 import akka.remote.testkit.Direction
 import akka.testkit.TestProbe

akka-cluster-sharding/src/multi-jvm/scala/akka/cluster/sharding/ClusterShardingInstrumentationSpecTelemetry.scala

@@ -21,6 +21,7 @@ class ClusterShardingInstrumentationSpecTelemetry(@nowarn("msg=never used") syst
   val finishShardHandoffDurationCounter = new AtomicInteger(0)
   val shardHomeRequests = new AtomicInteger(0)
   val shardHomeResponses = new AtomicInteger(0)
+  val dropMessageCounter = new AtomicInteger(0)
 
   override def shardRegionBufferSize(
       selfAddress: Address,
@@ -63,5 +64,8 @@ class ClusterShardingInstrumentationSpecTelemetry(@nowarn("msg=never used") syst
       typeName: String,
       shardId: String): Unit = shardHomeResponses.incrementAndGet()
 
+  override def messageDropped(selfAddress: Address, self: ActorRef, typeName: String): Unit =
+    dropMessageCounter.incrementAndGet()
+
   override def dependencies: Seq[String] = Nil
 }