Bump akka version to 2.6.11

kamon-io · Jan 19, 2021 · d58d55b · d58d55b
1 parent d18c5c8
commit d58d55b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/instrumentation/kamon-akka/build.sbt b/instrumentation/kamon-akka/build.sbt
@@ -5,7 +5,7 @@ val `Akka-2.4-version` = "2.4.20"
 // latest is 2.5.9
 val `Akka-2.5-version` = "2.5.26"
 // latest is 2.6.10
-val `Akka-2.6-version` = "2.6.8"
+val `Akka-2.6-version` = "2.6.11"
 
 /**
   * Compile Configurations

diff --git a/...mon-akka/src/common/scala/kamon/instrumentation/akka/remote/ShardingInstrumentation.scala b/...mon-akka/src/common/scala/kamon/instrumentation/akka/remote/ShardingInstrumentation.scala
@@ -33,12 +33,10 @@ class ShardingInstrumentation extends InstrumentationBuilder with VersionFilteri
       * whether it should be buffered or forwarded).
       */
     onType("akka.cluster.sharding.Shard")
-      // add sharding instruments
       .mixin(classOf[HasShardingInstruments.Mixin])
       .mixin(classOf[HasShardCounters.Mixin])
       .advise(isConstructor, InitializeShardAdvice)
       .advise(method("onLeaseAcquired"), ShardInitializedAdvice)
-      .advise(method("onEntitiesRemembered"), ShardInitializedAdvice)
       .advise(method("postStop"), ShardPostStopStoppedAdvice)
       .advise(method("getOrCreateEntity"), ShardGetOrCreateEntityAdvice)
       .advise(method("passivateCompleted"), ShardEntityTerminatedAdvice)
@@ -47,6 +45,16 @@ class ShardingInstrumentation extends InstrumentationBuilder with VersionFilteri
       .advise(method("deliverMessage"), ShardDeliverMessageAdvice)
   }
 
+  untilAkkaVersion("2.6", 10) {
+    onType("akka.cluster.sharding.Shard")
+    .advise(method("onEntitiesRemembered"), ShardInitializedAdvice)
+  }
+
+  afterAkkaVersion("2.6", 11) {
+    onType("akka.cluster.sharding.Shard")
+      .advise(method("shardInitialized"), ShardInitializedAdvice)
+  }
+
 }