Change akka-actor base version from 2.5 to 2.3 (#6439)

* Change akka-actor base version

* Updates

* spotless

Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>

instrumentation/akka/akka-actor-2.5/javaagent/build.gradle.kts → instrumentation/akka/akka-actor-2.3/javaagent/build.gradle.kts

@@ -7,25 +7,28 @@ muzzle {
   pass {
     group.set("com.typesafe.akka")
     module.set("akka-actor_2.11")
-    versions.set("[2.5.0,)")
+    versions.set("[2.3,)")
+    assertInverse.set(true)
   }
   pass {
     group.set("com.typesafe.akka")
     module.set("akka-actor_2.12")
-    versions.set("[2.5.0,)")
+    versions.set("[2.3,)")
+    assertInverse.set(true)
   }
   pass {
     group.set("com.typesafe.akka")
     module.set("akka-actor_2.13")
-    versions.set("(,)")
+    versions.set("[2.3,)")
+    assertInverse.set(true)
   }
 }
 
 dependencies {
   bootstrap(project(":instrumentation:executors:bootstrap"))
 
-  compileOnly("com.typesafe.akka:akka-actor_2.11:2.5.0")
-  testImplementation("com.typesafe.akka:akka-actor_2.11:2.5.0")
+  compileOnly("com.typesafe.akka:akka-actor_2.11:2.3.2") // first version in maven central
+  testImplementation("com.typesafe.akka:akka-actor_2.11:2.3.2") // first version in maven central
 
   latestDepTestLibrary("com.typesafe.akka:akka-actor_2.13:+")
 }

instrumentation/akka/akka-actor-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorInstrumentationModule.java → instrumentation/akka/akka-actor-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorInstrumentationModule.java

@@ -15,7 +15,7 @@ import java.util.List;
 @AutoService(InstrumentationModule.class)
 public class AkkaActorInstrumentationModule extends InstrumentationModule {
   public AkkaActorInstrumentationModule() {
-    super("akka-actor", "akka-actor-2.5");
+    super("akka-actor", "akka-actor-2.3");
   }
 
   @Override

instrumentation/akka/akka-actor-2.5/javaagent/src/test/scala/io/opentelemetry/instrumentation/akkaactor/AkkaActorTest.scala → instrumentation/akka/akka-actor-2.3/javaagent/src/test/scala/io/opentelemetry/instrumentation/akkaactor/AkkaActorTest.scala

@@ -5,7 +5,6 @@
 
 package io.opentelemetry.instrumentation.akkaactor
 
-import collection.JavaConverters._
 import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.instrumentation.testing.junit.{
   AgentInstrumentationExtension,
@@ -18,7 +17,7 @@ import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
 
 import java.util.function.Consumer
-import scala.compat.java8.FunctionConverters._
+import scala.collection.JavaConverters._
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class AkkaActorTest {

instrumentation/akka/akka-actor-fork-join-2.5/javaagent/build.gradle.kts

@@ -7,7 +7,8 @@ muzzle {
   pass {
     group.set("com.typesafe.akka")
     module.set("akka-actor_2.11")
-    versions.set("[2.5.0,)")
+    versions.set("[2.5,)")
+    assertInverse.set(true)
   }
 }
 

instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorForkJoinInstrumentationModule.java

@@ -15,7 +15,7 @@ import java.util.List;
 @AutoService(InstrumentationModule.class)
 public class AkkaActorForkJoinInstrumentationModule extends InstrumentationModule {
   public AkkaActorForkJoinInstrumentationModule() {
-    super("akka-actor", "akka-actor-fork-join", "akka-actor-2.5", "akka-actor-fork-join-2.5");
+    super("akka-actor", "akka-actor-fork-join", "akka-actor-fork-join-2.5");
   }
 
   @Override

instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts

@@ -48,7 +48,7 @@ dependencies {
 
   // these instrumentations are not needed for the tests to pass
   // they are here to test for context leaks
-  testInstrumentation(project(":instrumentation:akka:akka-actor-2.5:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-actor-2.3:javaagent"))
   testInstrumentation(project(":instrumentation:akka:akka-actor-fork-join-2.5:javaagent"))
 
   latestDepTestLibrary("com.typesafe.akka:akka-http_2.13:+")

instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts

@@ -47,7 +47,7 @@ dependencies {
 
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
-  testInstrumentation(project(":instrumentation:akka:akka-actor-2.5:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-actor-2.3:javaagent"))
   testInstrumentation(project(":instrumentation:akka:akka-http-10.0:javaagent"))
 
   testImplementation("com.typesafe.play:play-java_$scalaVersion:$playVersion")

instrumentation/play/play-ws/play-ws-1.0/javaagent/build.gradle.kts

@@ -35,7 +35,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
   testInstrumentation(project(":instrumentation:akka:akka-http-10.0:javaagent"))
-  testInstrumentation(project(":instrumentation:akka:akka-actor-2.5:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-actor-2.3:javaagent"))
 
   latestDepTestLibrary("com.typesafe.play:play-ahc-ws-standalone_$scalaVersion:1.+")
 }

instrumentation/play/play-ws/play-ws-2.0/javaagent/build.gradle.kts

@@ -41,7 +41,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
   testInstrumentation(project(":instrumentation:akka:akka-http-10.0:javaagent"))
-  testInstrumentation(project(":instrumentation:akka:akka-actor-2.5:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-actor-2.3:javaagent"))
 
   latestDepTestLibrary("com.typesafe.play:play-ahc-ws-standalone_$scalaVersion:2.0.+")
 }

instrumentation/play/play-ws/play-ws-2.1/javaagent/build.gradle.kts

@@ -40,7 +40,7 @@ dependencies {
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
   testInstrumentation(project(":instrumentation:akka:akka-http-10.0:javaagent"))
-  testInstrumentation(project(":instrumentation:akka:akka-actor-2.5:javaagent"))
+  testInstrumentation(project(":instrumentation:akka:akka-actor-2.3:javaagent"))
 
   latestDepTestLibrary("com.typesafe.play:play-ahc-ws-standalone_2.13:+")
 }

settings.gradle.kts

@@ -135,7 +135,7 @@ include(":smoke-tests:images:servlet:servlet-3.0")
 include(":smoke-tests:images:servlet:servlet-5.0")
 include(":smoke-tests:images:spring-boot")
 
-include(":instrumentation:akka:akka-actor-2.5:javaagent")
+include(":instrumentation:akka:akka-actor-2.3:javaagent")
 include(":instrumentation:akka:akka-actor-fork-join-2.5:javaagent")
 include(":instrumentation:akka:akka-http-10.0:javaagent")
 include(":instrumentation:apache-camel-2.20:javaagent")