Skip to content

Commit a4e37d3

Browse files
rename api
1 parent 301b764 commit a4e37d3

File tree

3 files changed

+22
-28
lines changed

3 files changed

+22
-28
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,7 @@ private[akka] class ShardRegion(
907907
}
908908

909909
case ShardHome(shard, shardRegionRef) =>
910-
instrumentation.shardRegionReceiveShardHome(cluster.selfAddress, self, typeName, shard)
910+
instrumentation.onReceiveShardHome(cluster.selfAddress, self, typeName, shard)
911911
receiveShardHome(shard, shardRegionRef)
912912

913913
case ShardHomes(homes) =>
@@ -1456,7 +1456,7 @@ private[akka] class ShardRegion(
14561456
}
14571457

14581458
private def requestShardHome(shard: ShardId): Unit = {
1459-
instrumentation.shardRegionRequestShardHome(cluster.selfAddress, self, typeName, shard)
1459+
instrumentation.onRequestShardHome(cluster.selfAddress, self, typeName, shard)
14601460
coordinator.foreach(_ ! GetShardHome(shard))
14611461
}
14621462
}

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

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -97,19 +97,19 @@ class ClusterShardingTelemetryEnsemble(val instrumentations: Seq[ClusterSharding
9797
override def dependencies: immutable.Seq[String] =
9898
instrumentations.flatMap(_.dependencies)
9999

100-
override def shardRegionRequestShardHome(
100+
override def onRequestShardHome(
101101
selfAddress: Address,
102102
shardRegionActor: ActorRef,
103103
typeName: String,
104104
shardId: String): Unit =
105-
instrumentations.foreach(_.shardRegionRequestShardHome(selfAddress, shardRegionActor, typeName, shardId))
105+
instrumentations.foreach(_.onRequestShardHome(selfAddress, shardRegionActor, typeName, shardId))
106106

107-
override def shardRegionReceiveShardHome(
107+
override def onReceiveShardHome(
108108
selfAddress: Address,
109109
shardRegionActor: ActorRef,
110110
typeName: String,
111111
shardId: String): Unit =
112-
instrumentations.foreach(_.shardRegionReceiveShardHome(selfAddress, shardRegionActor, typeName, shardId))
112+
instrumentations.foreach(_.onReceiveShardHome(selfAddress, shardRegionActor, typeName, shardId))
113113
}
114114

115115
/**
@@ -137,13 +137,13 @@ class EmptyClusterShardingInstrumentation extends ClusterShardingInstrumentation
137137

138138
override def dependencies: immutable.Seq[String] = Nil
139139

140-
override def shardRegionRequestShardHome(
140+
override def onRequestShardHome(
141141
selfAddress: Address,
142142
shardRegionActor: ActorRef,
143143
typeName: String,
144144
shardId: String): Unit = ()
145145

146-
override def shardRegionReceiveShardHome(
146+
override def onReceiveShardHome(
147147
selfAddress: Address,
148148
shardRegionActor: ActorRef,
149149
typeName: String,
@@ -166,6 +166,18 @@ trait ClusterShardingInstrumentation {
166166
*/
167167
def incrementShardRegionBufferSize(selfAddress: Address, shardRegionActor: ActorRef, typeName: String): Unit
168168

169+
def onRequestShardHome(
170+
selfAddress: Address,
171+
shardRegionActor: ActorRef,
172+
typeName: String,
173+
shardId: String): Unit
174+
175+
def onReceiveShardHome(
176+
selfAddress: Address,
177+
shardRegionActor: ActorRef,
178+
typeName: String,
179+
shardId: String): Unit
180+
169181
/**
170182
* Optional dependencies for this instrumentation.
171183
*
@@ -174,22 +186,4 @@ trait ClusterShardingInstrumentation {
174186
* @return list of class names for optional instrumentation dependencies
175187
*/
176188
def dependencies: immutable.Seq[String]
177-
178-
/**
179-
* Triggered when a region requests the home of a shard.
180-
*/
181-
def shardRegionRequestShardHome(
182-
selfAddress: Address,
183-
shardRegionActor: ActorRef,
184-
typeName: String,
185-
shardId: String): Unit
186-
187-
/**
188-
* Triggered when a region receives the home of a shard.
189-
*/
190-
def shardRegionReceiveShardHome(
191-
selfAddress: Address,
192-
shardRegionActor: ActorRef,
193-
typeName: String,
194-
shardId: String): Unit
195189
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ class SpecClusterShardingTelemetry(@nowarn("msg=never used") system: ExtendedAct
7171

7272
override def dependencies: Seq[String] = Nil
7373

74-
override def shardRegionRequestShardHome(
74+
override def onRequestShardHome(
7575
selfAddress: Address,
7676
shardRegionActor: ActorRef,
7777
typeName: String,
7878
shardId: String): Unit =
7979
shardHomeRequests.incrementAndGet()
8080

81-
override def shardRegionReceiveShardHome(
81+
override def onReceiveShardHome(
8282
selfAddress: Address,
8383
shardRegionActor: ActorRef,
8484
typeName: String,

0 commit comments

Comments
 (0)