Rename Akka and Scala forkjoin modules

Author: trask

.fossa.yml

@@ -279,7 +279,7 @@ targets:
       target: ':instrumentation:runtime-telemetry:library'
     - type: gradle
       path: ./
-      target: ':instrumentation:scala-fork-join-2.8:javaagent'
+      target: ':instrumentation:scala-forkjoin-2.8:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:spark-2.3:javaagent'
@@ -324,7 +324,7 @@ targets:
       target: ':instrumentation:akka:akka-actor-2.3:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:akka:akka-actor-fork-join-2.5:javaagent'
+      target: ':instrumentation:akka:akka-actor-forkjoin-2.5:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:akka:akka-http-10.0:javaagent'

.github/scripts/check-javaagent-suppression-keys.sh

@@ -48,6 +48,12 @@ for file in $(find instrumentation -name "*Module.java"); do
 
   matches=$(perl -0 -ne "print if /$expected/" "$file" | wc -l)
   if [ "$matches" == 0 ]; then
+    if grep -q "expandDeprecatedNames" "$file" \
+      && grep -q "\"$simple_module_name|deprecated:" "$file" \
+      && { [ "$module_name" == "$simple_module_name" ] || grep -q "\"$module_name|deprecated:" "$file"; }
+    then
+      continue
+    fi
     echo "Expected to find $expected in $file"
     exit 1
   fi

docs/contributing/documenting-instrumentation.md

@@ -124,7 +124,7 @@ Display name is mostly used for UI purposes, and has two main uses:
 - Providing a more user-friendly name for the instrumentation than the module name
   (e.g., "Apache CXF JAX-RS 2.x" instead of "jaxrs-2.0-cxf-3.2").
 - Collapsing multiple related modules into a single display name
-  (e.g., "Akka Actors" for both "akka-actor-2.3" and "akka-actor-fork-join-2.5").
+  (e.g., "Akka Actors" for both "akka-actor-2.3" and "akka-actor-forkjoin-2.5").
 
 ### Description (required)
 

docs/instrumentation-list.yaml

@@ -103,16 +103,16 @@ libraries:
   - com.typesafe.akka:akka-actor_2.11:[2.3,)
   - com.typesafe.akka:akka-actor_2.12:[2.3,)
   - com.typesafe.akka:akka-actor_2.13:[2.3,)
-- name: akka-actor-fork-join-2.5
+- name: akka-actor-forkjoin-2.5
   display_name: Akka Actors
   description: This instrumentation provides context propagation for the Akka Fork-Join
     Pool, it does not emit any telemetry on its own.
   library_link: https://doc.akka.io/libraries/akka-core/current/typed/index.html
   features:
   - CONTEXT_PROPAGATION
-  source_path: instrumentation/akka/akka-actor-fork-join-2.5
+  source_path: instrumentation/akka/akka-actor-forkjoin-2.5
   scope:
-    name: io.opentelemetry.akka-actor-fork-join-2.5
+    name: io.opentelemetry.akka-actor-forkjoin-2.5
   has_javaagent: true
   javaagent_target_versions:
   - com.typesafe.akka:akka-actor_2.11:[2.5,)
@@ -13998,14 +13998,14 @@ libraries:
       Enables the experimental span attribute `rxjava.canceled`.
     type: boolean
     default: false
-- name: scala-fork-join-2.8
+- name: scala-forkjoin-2.8
   display_name: Scala ForkJoinPool
   description: |
     This instrumentation enables context propagation for Scala fork-join tasks, it does not emit any telemetry on its own.
   library_link: https://www.scala-lang.org/api/2.12.0/scala/concurrent/forkjoin/package$$ForkJoinPool$.html
-  source_path: instrumentation/scala-fork-join-2.8
+  source_path: instrumentation/scala-forkjoin-2.8
   scope:
-    name: io.opentelemetry.scala-fork-join-2.8
+    name: io.opentelemetry.scala-forkjoin-2.8
   has_javaagent: true
   javaagent_target_versions:
   - org.scala-lang:scala-library:[2.8.0,2.12.0)

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/auditors/SuppressionListAuditor.java

@@ -31,7 +31,7 @@ public class SuppressionListAuditor implements DocumentationAuditor {
 
   // Used for consolidating instrumentation groups where we override the key with the value
   private static final Map<String, String> INSTRUMENTATION_DISABLE_OVERRIDES =
-      Map.of("akka-actor-fork-join", "akka-actor");
+      Map.of("akka-actor-forkjoin", "akka-actor");
 
   private static final List<String> INSTRUMENTATION_EXCLUSIONS =
       List.of("resources", "spring-boot-resources");

instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/auditors/SuppressionListAuditorTest.java

@@ -139,10 +139,10 @@ void testParseInstrumentationList() {
       - com.typesafe.akka:akka-actor_2.11:[2.3,)
       - com.typesafe.akka:akka-actor_2.12:[2.3,)
       - com.typesafe.akka:akka-actor_2.13:[2.3,)
-  - name: akka-actor-fork-join-2.5
-    source_path: instrumentation/akka/akka-actor-fork-join-2.5
+  - name: akka-actor-forkjoin-2.5
+    source_path: instrumentation/akka/akka-actor-forkjoin-2.5
     scope:
-      name: io.opentelemetry.akka-actor-fork-join-2.5
+      name: io.opentelemetry.akka-actor-forkjoin-2.5
     target_versions:
       javaagent:
       - com.typesafe.akka:akka-actor_2.12:[2.5,2.6)
@@ -160,7 +160,7 @@ void testParseInstrumentationList() {
     assertThat(result).hasSize(4);
     assertThat(result)
         .containsExactlyInAnyOrder(
-            "activej-http-6.0", "akka-actor-2.3", "akka-actor-fork-join-2.5", "akka-http-10.0");
+            "activej-http-6.0", "akka-actor-2.3", "akka-actor-forkjoin-2.5", "akka-http-10.0");
   }
 
   @Test
@@ -171,7 +171,7 @@ void testIdentifyMissingItems() {
             "methods",
             "akka-actor-2.3",
             "activej-http-6.0",
-            "akka-actor-fork-join-2.5",
+            "akka-actor-forkjoin-2.5",
             "camel-2.20");
 
     var missingItems =

…fork-join-2.5/javaagent/build.gradle.kts …-forkjoin-2.5/javaagent/build.gradle.ktsinstrumentation/akka/akka-actor-fork-join-2.5/javaagent/build.gradle.kts renamed to instrumentation/akka/akka-actor-forkjoin-2.5/javaagent/build.gradle.kts instrumentation/akka/akka-actor-fork-join-2.5/javaagent/build.gradle.kts renamed to instrumentation/akka/akka-actor-forkjoin-2.5/javaagent/build.gradle.kts

@@ -3,8 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.akkaforkjoin;
+package io.opentelemetry.javaagent.instrumentation.akka.actor.forkjoin.v2_5;
 
+import static io.opentelemetry.javaagent.extension.instrumentation.internal.DeprecatedInstrumentationNames.expandDeprecatedNames;
 import static java.util.Arrays.asList;
 
 import com.google.auto.service.AutoService;
@@ -15,7 +16,12 @@
 @AutoService(InstrumentationModule.class)
 public class AkkaActorForkJoinInstrumentationModule extends InstrumentationModule {
   public AkkaActorForkJoinInstrumentationModule() {
-    super("akka-actor-fork-join", "akka-actor-fork-join-2.5", "akka-actor");
+    super(
+        "akka-actor-forkjoin",
+        expandDeprecatedNames(
+            "akka-actor-forkjoin|deprecated:akka-actor-fork-join",
+            "akka-actor-forkjoin-2.5|deprecated:akka-actor-fork-join-2.5",
+            "akka-actor"));
   }
 
   @Override

…aActorForkJoinInstrumentationModule.java …aActorForkJoinInstrumentationModule.javainstrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaforkjoin/AkkaActorForkJoinInstrumentationModule.java renamed to instrumentation/akka/akka-actor-forkjoin-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akka/actor/forkjoin/v2_5/AkkaActorForkJoinInstrumentationModule.java instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaforkjoin/AkkaActorForkJoinInstrumentationModule.java renamed to instrumentation/akka/akka-actor-forkjoin-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akka/actor/forkjoin/v2_5/AkkaActorForkJoinInstrumentationModule.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.akkaforkjoin;
+package io.opentelemetry.javaagent.instrumentation.akka.actor.forkjoin.v2_5;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;

…oin/AkkaForkJoinPoolInstrumentation.java …2_5/AkkaForkJoinPoolInstrumentation.javainstrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaforkjoin/AkkaForkJoinPoolInstrumentation.java renamed to instrumentation/akka/akka-actor-forkjoin-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akka/actor/forkjoin/v2_5/AkkaForkJoinPoolInstrumentation.java instrumentation/akka/akka-actor-fork-join-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkaforkjoin/AkkaForkJoinPoolInstrumentation.java renamed to instrumentation/akka/akka-actor-forkjoin-2.5/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akka/actor/forkjoin/v2_5/AkkaForkJoinPoolInstrumentation.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.akkaforkjoin;
+package io.opentelemetry.javaagent.instrumentation.akka.actor.forkjoin.v2_5;
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.extendsClass;
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;