diff --git a/instrumentation/akka-context-propagation-2.5/akka-context-propagation-2.5.gradle b/instrumentation/akka-actor-2.5/akka-actor-2.5.gradle similarity index 100% rename from instrumentation/akka-context-propagation-2.5/akka-context-propagation-2.5.gradle rename to instrumentation/akka-actor-2.5/akka-actor-2.5.gradle diff --git a/instrumentation/akka-context-propagation-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaconcurrent/AkkaContextPropagationInstrumentationModule.java b/instrumentation/akka-actor-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorInstrumentationModule.java similarity index 80% rename from instrumentation/akka-context-propagation-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaconcurrent/AkkaContextPropagationInstrumentationModule.java rename to instrumentation/akka-actor-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaActorInstrumentationModule.java index 765e5288eb..9864112b7a 100644 --- a/instrumentation/akka-context-propagation-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaconcurrent/AkkaContextPropagationInstrumentationModule.java +++ b/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 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/instrumentation/akka-context-propagation-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaconcurrent/AkkaForkJoinPoolInstrumentation.java b/instrumentation/akka-actor-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinPoolInstrumentation.java similarity index 97% rename from instrumentation/akka-context-propagation-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaconcurrent/AkkaForkJoinPoolInstrumentation.java rename to instrumentation/akka-actor-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinPoolInstrumentation.java index 26154bc60d..9c93a06d17 100644 --- a/instrumentation/akka-context-propagation-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaconcurrent/AkkaForkJoinPoolInstrumentation.java +++ b/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; diff --git a/instrumentation/akka-context-propagation-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaconcurrent/AkkaForkJoinTaskInstrumentation.java b/instrumentation/akka-actor-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinTaskInstrumentation.java similarity index 98% rename from instrumentation/akka-context-propagation-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaconcurrent/AkkaForkJoinTaskInstrumentation.java rename to instrumentation/akka-actor-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaactor/AkkaForkJoinTaskInstrumentation.java index aac02ebc59..659014d324 100644 --- a/instrumentation/akka-context-propagation-2.5/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaconcurrent/AkkaForkJoinTaskInstrumentation.java +++ b/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; diff --git a/instrumentation/akka-context-propagation-2.5/src/test/groovy/AkkaActorTest.groovy b/instrumentation/akka-actor-2.5/src/test/groovy/AkkaActorTest.groovy similarity index 90% rename from instrumentation/akka-context-propagation-2.5/src/test/groovy/AkkaActorTest.groovy rename to instrumentation/akka-actor-2.5/src/test/groovy/AkkaActorTest.groovy index a9cd55121b..de93cf3b9c 100644 --- a/instrumentation/akka-context-propagation-2.5/src/test/groovy/AkkaActorTest.groovy +++ b/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"() { diff --git a/instrumentation/akka-context-propagation-2.5/src/test/groovy/AkkaExecutorInstrumentationTest.groovy b/instrumentation/akka-actor-2.5/src/test/groovy/AkkaExecutorInstrumentationTest.groovy similarity index 98% rename from instrumentation/akka-context-propagation-2.5/src/test/groovy/AkkaExecutorInstrumentationTest.groovy rename to instrumentation/akka-actor-2.5/src/test/groovy/AkkaExecutorInstrumentationTest.groovy index 358cdb46f9..1737d3aeaf 100644 --- a/instrumentation/akka-context-propagation-2.5/src/test/groovy/AkkaExecutorInstrumentationTest.groovy +++ b/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 diff --git a/instrumentation/akka-context-propagation-2.5/src/test/scala/AkkaActors.scala b/instrumentation/akka-actor-2.5/src/test/scala/AkkaActors.scala similarity index 100% rename from instrumentation/akka-context-propagation-2.5/src/test/scala/AkkaActors.scala rename to instrumentation/akka-actor-2.5/src/test/scala/AkkaActors.scala diff --git a/instrumentation/akka-context-propagation-2.5/src/test/scala/AkkaAsyncChild.java b/instrumentation/akka-actor-2.5/src/test/scala/AkkaAsyncChild.java similarity index 100% rename from instrumentation/akka-context-propagation-2.5/src/test/scala/AkkaAsyncChild.java rename to instrumentation/akka-actor-2.5/src/test/scala/AkkaAsyncChild.java diff --git a/instrumentation/kotlin-coroutines/kotlin-coroutines.gradle b/instrumentation/kotlinx-coroutines/kotlinx-coroutines.gradle similarity index 100% rename from instrumentation/kotlin-coroutines/kotlin-coroutines.gradle rename to instrumentation/kotlinx-coroutines/kotlinx-coroutines.gradle diff --git a/instrumentation/kotlin-coroutines/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlincoroutines/KotlinCoroutinesInstrumentationModule.java b/instrumentation/kotlinx-coroutines/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationModule.java similarity index 98% rename from instrumentation/kotlin-coroutines/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlincoroutines/KotlinCoroutinesInstrumentationModule.java rename to instrumentation/kotlinx-coroutines/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlinxcoroutines/KotlinCoroutinesInstrumentationModule.java index e1ed8efa4c..26a2aa6fdc 100644 --- a/instrumentation/kotlin-coroutines/src/main/java/io/opentelemetry/javaagent/instrumentation/kotlincoroutines/KotlinCoroutinesInstrumentationModule.java +++ b/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(); } diff --git a/instrumentation/kotlin-coroutines/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy b/instrumentation/kotlinx-coroutines/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy similarity index 100% rename from instrumentation/kotlin-coroutines/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy rename to instrumentation/kotlinx-coroutines/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy diff --git a/instrumentation/kotlin-coroutines/src/test/kotlin/KotlinCoroutineTests.kt b/instrumentation/kotlinx-coroutines/src/test/kotlin/KotlinCoroutineTests.kt similarity index 100% rename from instrumentation/kotlin-coroutines/src/test/kotlin/KotlinCoroutineTests.kt rename to instrumentation/kotlinx-coroutines/src/test/kotlin/KotlinCoroutineTests.kt diff --git a/instrumentation/scala-concurrent/scala-concurrent.gradle b/instrumentation/scala-executors/scala-executors.gradle similarity index 100% rename from instrumentation/scala-concurrent/scala-concurrent.gradle rename to instrumentation/scala-executors/scala-executors.gradle diff --git a/instrumentation/scala-concurrent/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaconcurrent/ScalaConcurrentInstrumentationModule.java b/instrumentation/scala-executors/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaexecutors/ScalaConcurrentInstrumentationModule.java similarity index 84% rename from instrumentation/scala-concurrent/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaconcurrent/ScalaConcurrentInstrumentationModule.java rename to instrumentation/scala-executors/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaexecutors/ScalaConcurrentInstrumentationModule.java index 77bc2f4842..f1c85e5101 100644 --- a/instrumentation/scala-concurrent/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaconcurrent/ScalaConcurrentInstrumentationModule.java +++ b/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 diff --git a/instrumentation/scala-concurrent/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaconcurrent/ScalaForkJoinPoolInstrumentation.java b/instrumentation/scala-executors/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaexecutors/ScalaForkJoinPoolInstrumentation.java similarity index 97% rename from instrumentation/scala-concurrent/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaconcurrent/ScalaForkJoinPoolInstrumentation.java rename to instrumentation/scala-executors/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaexecutors/ScalaForkJoinPoolInstrumentation.java index d101e9ff96..331d876d02 100644 --- a/instrumentation/scala-concurrent/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaconcurrent/ScalaForkJoinPoolInstrumentation.java +++ b/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; diff --git a/instrumentation/scala-concurrent/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaconcurrent/ScalaForkJoinTaskInstrumentation.java b/instrumentation/scala-executors/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaexecutors/ScalaForkJoinTaskInstrumentation.java similarity index 98% rename from instrumentation/scala-concurrent/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaconcurrent/ScalaForkJoinTaskInstrumentation.java rename to instrumentation/scala-executors/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaexecutors/ScalaForkJoinTaskInstrumentation.java index 0eb6e89326..9d1e583048 100644 --- a/instrumentation/scala-concurrent/src/main/java/io/opentelemetry/javaagent/instrumentation/scalaconcurrent/ScalaForkJoinTaskInstrumentation.java +++ b/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; diff --git a/instrumentation/scala-concurrent/src/slickTest/groovy/SlickTest.groovy b/instrumentation/scala-executors/src/slickTest/groovy/SlickTest.groovy similarity index 100% rename from instrumentation/scala-concurrent/src/slickTest/groovy/SlickTest.groovy rename to instrumentation/scala-executors/src/slickTest/groovy/SlickTest.groovy diff --git a/instrumentation/scala-concurrent/src/slickTest/scala/SlickUtils.scala b/instrumentation/scala-executors/src/slickTest/scala/SlickUtils.scala similarity index 100% rename from instrumentation/scala-concurrent/src/slickTest/scala/SlickUtils.scala rename to instrumentation/scala-executors/src/slickTest/scala/SlickUtils.scala diff --git a/instrumentation/scala-concurrent/src/test/groovy/ScalaExecutorInstrumentationTest.groovy b/instrumentation/scala-executors/src/test/groovy/ScalaExecutorInstrumentationTest.groovy similarity index 100% rename from instrumentation/scala-concurrent/src/test/groovy/ScalaExecutorInstrumentationTest.groovy rename to instrumentation/scala-executors/src/test/groovy/ScalaExecutorInstrumentationTest.groovy diff --git a/instrumentation/scala-concurrent/src/test/groovy/ScalaInstrumentationTest.groovy b/instrumentation/scala-executors/src/test/groovy/ScalaInstrumentationTest.groovy similarity index 100% rename from instrumentation/scala-concurrent/src/test/groovy/ScalaInstrumentationTest.groovy rename to instrumentation/scala-executors/src/test/groovy/ScalaInstrumentationTest.groovy diff --git a/instrumentation/scala-concurrent/src/test/scala/ScalaAsyncChild.java b/instrumentation/scala-executors/src/test/scala/ScalaAsyncChild.java similarity index 100% rename from instrumentation/scala-concurrent/src/test/scala/ScalaAsyncChild.java rename to instrumentation/scala-executors/src/test/scala/ScalaAsyncChild.java diff --git a/instrumentation/scala-concurrent/src/test/scala/ScalaConcurrentTests.scala b/instrumentation/scala-executors/src/test/scala/ScalaConcurrentTests.scala similarity index 100% rename from instrumentation/scala-concurrent/src/test/scala/ScalaConcurrentTests.scala rename to instrumentation/scala-executors/src/test/scala/ScalaConcurrentTests.scala diff --git a/settings.gradle b/settings.gradle index 8dd4f0c3b8..eff9805cfa 100644 --- 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'