Skip to content

Commit 9b2a842

Browse files
more api rename
1 parent 5c20bcd commit 9b2a842

File tree

4 files changed

+19
-25
lines changed

4 files changed

+19
-25
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ object ShardCoordinator {
648648
private val instrumentation = ClusterShardingInstrumentationProvider.get(context.system).instrumentation
649649
private val cluster = Cluster(context.system)
650650

651-
instrumentation.onBeginShardHandoff(cluster.selfAddress, self, typeName, shard)
651+
instrumentation.shardHandoffStarted(cluster.selfAddress, self, typeName, shard)
652652

653653
regions.foreach { region =>
654654
region ! BeginHandOff(shard)
@@ -713,7 +713,7 @@ object ShardCoordinator {
713713
}
714714

715715
def done(ok: Boolean): Unit = {
716-
instrumentation.onFinishedShardHandoff(cluster.selfAddress, self, typeName, shard, ok)
716+
instrumentation.shardHandoffFinished(cluster.selfAddress, self, typeName, shard, ok)
717717
context.parent ! RebalanceDone(shard, ok)
718718
context.stop(self)
719719
}

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
@@ -1298,7 +1298,7 @@ private[akka] class ShardRegion(
12981298
context.system.deadLetters ! msg
12991299
} else {
13001300
shardBuffers.append(shardId, msg, snd)
1301-
instrumentation.incrementShardRegionBufferSize(cluster.selfAddress, self, typeName)
1301+
instrumentation.shardRegionBufferSizeIncremented(cluster.selfAddress, self, typeName)
13021302
// log some insight to how buffers are filled up every 10% of the buffer capacity
13031303
val tot = totBufSize + 1
13041304
if (tot % (bufferSize / 10) == 0) {
@@ -1374,7 +1374,7 @@ private[akka] class ShardRegion(
13741374
shardId,
13751375
buf.size + 1)
13761376
shardBuffers.append(shardId, msg, snd)
1377-
instrumentation.incrementShardRegionBufferSize(cluster.selfAddress, self, typeName)
1377+
instrumentation.shardRegionBufferSizeIncremented(cluster.selfAddress, self, typeName)
13781378
}
13791379

13801380
case _ =>

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

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -88,26 +88,26 @@ class ClusterShardingTelemetryEnsemble(val instrumentations: Seq[ClusterSharding
8888
size: Int): Unit =
8989
instrumentations.foreach(_.shardRegionBufferSize(selfAddress, shardRegionActor, typeName, size))
9090

91-
override def incrementShardRegionBufferSize(
91+
override def shardRegionBufferSizeIncremented(
9292
selfAddress: Address,
9393
shardRegionActor: ActorRef,
9494
typeName: String): Unit =
95-
instrumentations.foreach(_.incrementShardRegionBufferSize(selfAddress, shardRegionActor, typeName))
95+
instrumentations.foreach(_.shardRegionBufferSizeIncremented(selfAddress, shardRegionActor, typeName))
9696

97-
override def onBeginShardHandoff(
97+
override def shardHandoffStarted(
9898
selfAddress: Address,
9999
shardCoordinatorActor: ActorRef,
100100
typeName: String,
101101
shard: String): Unit =
102-
instrumentations.foreach(_.onBeginShardHandoff(selfAddress, shardCoordinatorActor, typeName, shard))
102+
instrumentations.foreach(_.shardHandoffStarted(selfAddress, shardCoordinatorActor, typeName, shard))
103103

104-
override def onFinishedShardHandoff(
104+
override def shardHandoffFinished(
105105
selfAddress: Address,
106106
shardCoordinatorActor: ActorRef,
107107
typeName: String,
108108
shard: String,
109109
ok: Boolean): Unit =
110-
instrumentations.foreach(_.onFinishedShardHandoff(selfAddress, shardCoordinatorActor, typeName, shard, ok))
110+
instrumentations.foreach(_.shardHandoffFinished(selfAddress, shardCoordinatorActor, typeName, shard, ok))
111111

112112
override def dependencies: immutable.Seq[String] =
113113
instrumentations.flatMap(_.dependencies)
@@ -131,18 +131,18 @@ class EmptyClusterShardingInstrumentation extends ClusterShardingInstrumentation
131131
typeName: String,
132132
size: Int): Unit = ()
133133

134-
override def incrementShardRegionBufferSize(
134+
override def shardRegionBufferSizeIncremented(
135135
selfAddress: Address,
136136
shardRegionActor: ActorRef,
137137
typeName: String): Unit = ()
138138

139-
override def onBeginShardHandoff(
139+
override def shardHandoffStarted(
140140
selfAddress: Address,
141141
shardRegionActor: ActorRef,
142142
typeName: String,
143143
shard: String): Unit = ()
144144

145-
override def onFinishedShardHandoff(
145+
override def shardHandoffFinished(
146146
selfAddress: Address,
147147
self: ActorRef,
148148
typeName: String,
@@ -158,19 +158,13 @@ class EmptyClusterShardingInstrumentation extends ClusterShardingInstrumentation
158158
@InternalStableApi
159159
trait ClusterShardingInstrumentation {
160160

161-
/**
162-
* @param size set current size of the buffer.
163-
*/
164161
def shardRegionBufferSize(selfAddress: Address, shardRegionActor: ActorRef, typeName: String, size: Int): Unit
165162

166-
/**
167-
* Increase the current size of the buffer by one.
168-
*/
169-
def incrementShardRegionBufferSize(selfAddress: Address, shardRegionActor: ActorRef, typeName: String): Unit
163+
def shardRegionBufferSizeIncremented(selfAddress: Address, shardRegionActor: ActorRef, typeName: String): Unit
170164

171-
def onBeginShardHandoff(selfAddress: Address, shardCoordinatorActor: ActorRef, typeName: String, shard: String): Unit
165+
def shardHandoffStarted(selfAddress: Address, shardCoordinatorActor: ActorRef, typeName: String, shard: String): Unit
172166

173-
def onFinishedShardHandoff(
167+
def shardHandoffFinished(
174168
selfAddress: Address,
175169
shardCoordinatorActor: ActorRef,
176170
typeName: String,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ class ClusterShardingInstrumentationSpecTelemetry(@nowarn("msg=never used") syst
2828
shardRegionBufferSizeCounter.set(size)
2929
}
3030

31-
override def incrementShardRegionBufferSize(
31+
override def shardRegionBufferSizeIncremented(
3232
selfAddress: Address,
3333
shardRegionActor: ActorRef,
3434
typeName: String): Unit = {
3535
shardRegionBufferSizeCounter.incrementAndGet()
3636
}
3737

38-
override def onBeginShardHandoff(
38+
override def shardHandoffStarted(
3939
selfAddress: Address,
4040
shardCoordinatorActor: ActorRef,
4141
typeName: String,
4242
shard: String): Unit = beginShardHandoffDurationCounter.incrementAndGet()
4343

44-
override def onFinishedShardHandoff(
44+
override def shardHandoffFinished(
4545
selfAddress: Address,
4646
shardCoordinatorActor: ActorRef,
4747
typeName: String,

0 commit comments

Comments
 (0)