Rename propagation modules (#1706)

* Rename propagation modules

* Fix test

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.akkaconcurrent;
+package io.opentelemetry.javaagent.instrumentation.akkaactor;
 
 import static java.util.Arrays.asList;
 
@@ -18,9 +18,9 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 
 @AutoService(InstrumentationModule.class)
-public class AkkaContextPropagationInstrumentationModule extends InstrumentationModule {
+public class AkkaActorInstrumentationModule extends InstrumentationModule {
-  public AkkaContextPropagationInstrumentationModule() {
+  public AkkaActorInstrumentationModule() {
-    super("akka-context-propagation", "akka-context-propagation-2.5");
+    super("akka-actor", "akka-actor-2.5");
   }
 
   @Override

instrumentation/akka-actor-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinPoolInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.akkaconcurrent;
+package io.opentelemetry.javaagent.instrumentation.akkaactor;
 
 import static net.bytebuddy.matcher.ElementMatchers.nameMatches;
 import static net.bytebuddy.matcher.ElementMatchers.named;

instrumentation/akka-actor-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinTaskInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.akkaconcurrent;
+package io.opentelemetry.javaagent.instrumentation.akkaactor;
 
 import static io.opentelemetry.javaagent.tooling.ClassLoaderMatcher.hasClassesNamed;
 import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;

instrumentation/akka-actor-2.5/src/test/groovy/AkkaActorTest.groovy

@@ -7,7 +7,7 @@ import io.opentelemetry.instrumentation.test.AgentTestRunner
 
 class AkkaActorTest extends AgentTestRunner {
 
-  // TODO this test doesn't really depend on otel.instrumentation.akka_context_propagation.enabled=true
+  // TODO this test doesn't really depend on otel.instrumentation.akka-actor.enabled=true
   //  but setting this property here is needed when running both this test
   //  and AkkaExecutorInstrumentationTest in the run, otherwise get
   //  "class redefinition failed: attempted to change superclass or interfaces"
@@ -16,7 +16,7 @@ class AkkaActorTest extends AgentTestRunner {
   //  instrumentation in this module, is it just to verify that the instrumentation doesn't break
   //  this scenario?)
   static {
-    System.setProperty("otel.instrumentation.akka_context_propagation.enabled", "true")
+    System.setProperty("otel.instrumentation.akka-actor.enabled", "true")
   }
 
   def "akka #testMethod"() {

instrumentation/akka-actor-2.5/src/test/groovy/AkkaExecutorInstrumentationTest.groovy

@@ -25,7 +25,7 @@ import spock.lang.Shared
 class AkkaExecutorInstrumentationTest extends AgentTestRunner {
 
   static {
-    System.setProperty("otel.instrumentation.akka_context_propagation.enabled", "true")
+    System.setProperty("otel.instrumentation.akka-actor.enabled", "true")
   }
 
   @Shared

instrumentation/kotlinx-coroutines/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationModule.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.kotlincoroutines;
+package io.opentelemetry.javaagent.instrumentation.kotlinxcoroutines;
 
 import static java.util.Collections.singletonList;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -53,7 +53,7 @@ public class KotlinCoroutinesInstrumentationModule extends InstrumentationModule
   */
 
   public KotlinCoroutinesInstrumentationModule() {
-    super("kotlin-coroutines");
+    super("kotlinx-coroutines");
   }
 
   @Override
@@ -134,6 +134,7 @@ public class KotlinCoroutinesInstrumentationModule extends InstrumentationModule
       this.contextWrapper = new CoroutineContextWrapper(proxy.getContext());
     }
 
+    @Override
     public String toString() {
       return proxy.toString();
     }
@@ -188,6 +189,7 @@ public class KotlinCoroutinesInstrumentationModule extends InstrumentationModule
       return proxy.plus(coroutineContext);
     }
 
+    @Override
     public String toString() {
       return proxy.toString();
     }

instrumentation/scala-executors/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaexecutors/ScalaConcurrentInstrumentationModule.java

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.scalaconcurrent;
+package io.opentelemetry.javaagent.instrumentation.scalaexecutors;
 
-import static io.opentelemetry.javaagent.instrumentation.scalaconcurrent.ScalaForkJoinTaskInstrumentation.TASK_CLASS_NAME;
+import static io.opentelemetry.javaagent.instrumentation.scalaexecutors.ScalaForkJoinTaskInstrumentation.TASK_CLASS_NAME;
 import static java.util.Arrays.asList;
 
 import com.google.auto.service.AutoService;
@@ -21,7 +21,7 @@ import java.util.concurrent.Callable;
 @AutoService(InstrumentationModule.class)
 public class ScalaConcurrentInstrumentationModule extends InstrumentationModule {
   public ScalaConcurrentInstrumentationModule() {
-    super("scala-concurrent");
+    super("scala-executors");
   }
 
   @Override

instrumentation/scala-executors/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaexecutors/ScalaForkJoinPoolInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.scalaconcurrent;
+package io.opentelemetry.javaagent.instrumentation.scalaexecutors;
 
 import static net.bytebuddy.matcher.ElementMatchers.nameMatches;
 import static net.bytebuddy.matcher.ElementMatchers.named;

instrumentation/scala-executors/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaexecutors/ScalaForkJoinTaskInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.scalaconcurrent;
+package io.opentelemetry.javaagent.instrumentation.scalaexecutors;
 
 import static io.opentelemetry.javaagent.tooling.ClassLoaderMatcher.hasClassesNamed;
 import static io.opentelemetry.javaagent.tooling.bytebuddy.matcher.AgentElementMatchers.extendsClass;

settings.gradle

@@ -53,7 +53,7 @@ include ':utils:test-utils'
 // smoke tests
 include ':smoke-tests'
 
-include ':instrumentation:akka-context-propagation-2.5'
+include ':instrumentation:akka-actor-2.5'
 include ':instrumentation:akka-http-10.0'
 include ':instrumentation:apache-camel-2.20'
 include ':instrumentation:apache-httpasyncclient-4.0'
@@ -125,7 +125,7 @@ include ':instrumentation:jsp-2.3'
 include ':instrumentation:kafka-clients-0.11'
 include ':instrumentation:kafka-streams-0.11'
 include ':instrumentation:khttp-0.1'
-include ':instrumentation:kotlin-coroutines'
+include ':instrumentation:kotlinx-coroutines'
 include ':instrumentation:kubernetes-client-7.0'
 include ':instrumentation:lettuce:lettuce-common'
 include ':instrumentation:lettuce:lettuce-4.0'
@@ -169,7 +169,7 @@ include ':instrumentation:redisson-3.0'
 include ':instrumentation:rmi'
 include ':instrumentation:rxjava-1.0'
 include ':instrumentation:rxjava-1.0'
-include ':instrumentation:scala-concurrent'
+include ':instrumentation:scala-executors'
 include ':instrumentation:servlet:glassfish-testing'
 include ':instrumentation:servlet:servlet-common'
 include ':instrumentation:servlet:servlet-2.2'