open-telemetry · iNikem · Nov 20, 2020 · Nov 20, 2020 · Nov 20, 2020
diff --git a/...n-2.5/akka-context-propagation-2.5.gradle → ...tion/akka-actor-2.5/akka-actor-2.5.gradle b/...n-2.5/akka-context-propagation-2.5.gradle → ...tion/akka-actor-2.5/akka-actor-2.5.gradle
diff --git a/...textPropagationInstrumentationModule.java → ...actor/AkkaActorInstrumentationModule.java b/...textPropagationInstrumentationModule.java → ...actor/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.concurrent.Callable;
 
 @AutoService(InstrumentationModule.class)
-public class AkkaContextPropagationInstrumentationModule extends InstrumentationModule {
-  public AkkaContextPropagationInstrumentationModule() {
-    super("akka-context-propagation", "akka-context-propagation-2.5");
+public class AkkaActorInstrumentationModule extends InstrumentationModule {
+  public AkkaActorInstrumentationModule() {
+    super("akka-actor", "akka-actor-2.5");
   }
 
   @Override

diff --git a/...rent/AkkaForkJoinPoolInstrumentation.java → ...ctor/AkkaForkJoinPoolInstrumentation.java b/...rent/AkkaForkJoinPoolInstrumentation.java → ...ctor/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;

diff --git a/...rent/AkkaForkJoinTaskInstrumentation.java → ...ctor/AkkaForkJoinTaskInstrumentation.java b/...rent/AkkaForkJoinTaskInstrumentation.java → ...ctor/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;

diff --git a/...-2.5/src/test/groovy/AkkaActorTest.groovy → ...-2.5/src/test/groovy/AkkaActorTest.groovy b/...-2.5/src/test/groovy/AkkaActorTest.groovy → ...-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"() {

diff --git a/...vy/AkkaExecutorInstrumentationTest.groovy → ...vy/AkkaExecutorInstrumentationTest.groovy b/...vy/AkkaExecutorInstrumentationTest.groovy → ...vy/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

diff --git a/...ation-2.5/src/test/scala/AkkaActors.scala → ...actor-2.5/src/test/scala/AkkaActors.scala b/...ation-2.5/src/test/scala/AkkaActors.scala → ...actor-2.5/src/test/scala/AkkaActors.scala
diff --git a/...on-2.5/src/test/scala/AkkaAsyncChild.java → ...or-2.5/src/test/scala/AkkaAsyncChild.java b/...on-2.5/src/test/scala/AkkaAsyncChild.java → ...or-2.5/src/test/scala/AkkaAsyncChild.java
diff --git a/...otlin-coroutines/kotlin-coroutines.gradle → ...linx-coroutines/kotlinx-coroutines.gradle b/...otlin-coroutines/kotlin-coroutines.gradle → ...linx-coroutines/kotlinx-coroutines.gradle
diff --git a/...otlinCoroutinesInstrumentationModule.java → ...otlinCoroutinesInstrumentationModule.java b/...otlinCoroutinesInstrumentationModule.java → ...otlinCoroutinesInstrumentationModule.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 @@ object can be found (tied to the chain of Continutations in the Coroutine).
   */
 
   public KotlinCoroutinesInstrumentationModule() {
-    super("kotlin-coroutines");
+    super("kotlinx-coroutines");
   }
 
   @Override
@@ -134,6 +134,7 @@ public CoroutineWrapper(Continuation<T> proxy) {
       this.contextWrapper = new CoroutineContextWrapper(proxy.getContext());
     }
 
+    @Override
     public String toString() {
       return proxy.toString();
     }
@@ -188,6 +189,7 @@ public CoroutineContext plus(@NotNull CoroutineContext coroutineContext) {
       return proxy.plus(coroutineContext);
     }
 
+    @Override
     public String toString() {
       return proxy.toString();
     }

diff --git a/...KotlinCoroutineInstrumentationTest.groovy → ...KotlinCoroutineInstrumentationTest.groovy b/...KotlinCoroutineInstrumentationTest.groovy → ...KotlinCoroutineInstrumentationTest.groovy
diff --git a/...s/src/test/kotlin/KotlinCoroutineTests.kt → ...s/src/test/kotlin/KotlinCoroutineTests.kt b/...s/src/test/kotlin/KotlinCoroutineTests.kt → ...s/src/test/kotlin/KotlinCoroutineTests.kt
diff --git a/.../scala-concurrent/scala-concurrent.gradle → ...on/scala-executors/scala-executors.gradle b/.../scala-concurrent/scala-concurrent.gradle → ...on/scala-executors/scala-executors.gradle
diff --git a/...ScalaConcurrentInstrumentationModule.java → ...ScalaConcurrentInstrumentationModule.java b/...ScalaConcurrentInstrumentationModule.java → ...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 @@
 @AutoService(InstrumentationModule.class)
 public class ScalaConcurrentInstrumentationModule extends InstrumentationModule {
   public ScalaConcurrentInstrumentationModule() {
-    super("scala-concurrent");
+    super("scala-executors");
   }
 
   @Override

diff --git a/...ent/ScalaForkJoinPoolInstrumentation.java → ...ors/ScalaForkJoinPoolInstrumentation.java b/...ent/ScalaForkJoinPoolInstrumentation.java → ...ors/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;

diff --git a/...ent/ScalaForkJoinTaskInstrumentation.java → ...ors/ScalaForkJoinTaskInstrumentation.java b/...ent/ScalaForkJoinTaskInstrumentation.java → ...ors/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;

diff --git a/...ent/src/slickTest/groovy/SlickTest.groovy → ...ors/src/slickTest/groovy/SlickTest.groovy b/...ent/src/slickTest/groovy/SlickTest.groovy → ...ors/src/slickTest/groovy/SlickTest.groovy
diff --git a/...rent/src/slickTest/scala/SlickUtils.scala → ...tors/src/slickTest/scala/SlickUtils.scala b/...rent/src/slickTest/scala/SlickUtils.scala → ...tors/src/slickTest/scala/SlickUtils.scala
diff --git a/...y/ScalaExecutorInstrumentationTest.groovy → ...y/ScalaExecutorInstrumentationTest.groovy b/...y/ScalaExecutorInstrumentationTest.groovy → ...y/ScalaExecutorInstrumentationTest.groovy
diff --git a/...st/groovy/ScalaInstrumentationTest.groovy → ...st/groovy/ScalaInstrumentationTest.groovy b/...st/groovy/ScalaInstrumentationTest.groovy → ...st/groovy/ScalaInstrumentationTest.groovy
diff --git a/...rrent/src/test/scala/ScalaAsyncChild.java → ...utors/src/test/scala/ScalaAsyncChild.java b/...rrent/src/test/scala/ScalaAsyncChild.java → ...utors/src/test/scala/ScalaAsyncChild.java
diff --git a/...src/test/scala/ScalaConcurrentTests.scala → ...src/test/scala/ScalaConcurrentTests.scala b/...src/test/scala/ScalaConcurrentTests.scala → ...src/test/scala/ScalaConcurrentTests.scala
diff --git a/settings.gradle b/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'