Rename javaagent-api artifact to javaagent-instrumentation-api (#3513)

* part 1

* part 2

* Undo change in examples

* Spotless

benchmark/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
   jmh("net.bytebuddy:byte-buddy-agent")
 
   jmh(project(":instrumentation-api"))
-  jmh(project(":javaagent-api"))
+  jmh(project(":javaagent-instrumentation-api"))
   jmh(project(":javaagent-tooling"))
   jmh(project(":javaagent-extension-api"))
 

buildSrc/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts

@@ -14,7 +14,7 @@ dependencies {
   // Integration tests may need to define custom instrumentation modules so we include the standard
   // instrumentation infrastructure for testing too.
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
-  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-api")
+  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
   // Apply common dependencies for instrumentation.
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api") {

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -278,7 +278,7 @@ configurations.configureEach {
     // what modules they add to reference generically.
     dependencySubstitution {
       substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")).using(project(":instrumentation-api"))
-      substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-api")).using(project(":javaagent-api"))
+      substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api")).using(project(":javaagent-instrumentation-api"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")).using(project(":javaagent-bootstrap"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")).using(project(":javaagent-extension-api"))
       substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")).using(project(":javaagent-tooling"))

docs/contributing/javaagent-jar-components.md

@@ -27,7 +27,7 @@ class from there.
 `io.opentelemetry.javaagent.bootstrap.AgentInitializer` and a few other classes that live in the bootstrap class
 loader but are not used directly by auto-instrumentation
 
-#### `instrumentation-api` and `javaagent-api` modules
+#### `instrumentation-api` and `javaagent-instrumentation-api` modules
 
 These modules contain support classes for actual instrumentations to be loaded
 later and separately. These classes should be available from all possible
@@ -38,7 +38,7 @@ possible. Otherwise, there is a risk of accidentally exposing these classes to
 the actual application.
 
 `instrumentation-api` contains classes that are needed for both library and auto-instrumentation,
-while `javaagent-api` contains classes that are only needed for auto-instrumentation.
+while `javaagent-instrumentation-api` contains classes that are only needed for auto-instrumentation.
 
 ### Modules that live in the agent class loader
 
@@ -83,7 +83,7 @@ module
 Available in the bootstrap class loader:
 
 - `io/opentelemetry/javaagent/bootstrap/` - contains the `javaagent-bootstrap` module
-- `io/opentelemetry/javaagent/instrumentation/api/` - contains the `javaagent-api` module
+- `io/opentelemetry/javaagent/instrumentation/api/` - contains the `javaagent-instrumentation-api` module
 - `io/opentelemetry/javaagent/shaded/instrumentation/api/` - contains the `instrumentation-api` module,
  shaded during creation of `javaagent` jar file by Shadow Gradle plugin
 - `io/opentelemetry/javaagent/shaded/io/` - contains the OpenTelemetry API and its dependency gRPC

docs/contributing/writing-instrumentation-module.md

@@ -300,7 +300,7 @@ then inlining Java 8 default method calls (or static methods in an interface) in
 will result in a `java.lang.VerifyError` at runtime, since Java 8 default method invocations are not
 legal in Java 7 (and prior) bytecode.
 Because OpenTelemetry API has many common default/static interface methods (e.g. `Span.current()`),
-the `javaagent-api` artifact has a class `Java8BytecodeBridge` which provides static methods
+the `javaagent-instrumentation-api` artifact has a class `Java8BytecodeBridge` which provides static methods
 for accessing these default methods from advice.
 In fact, we suggest avoiding Java 8 language features in advice classes at all - sometimes you don't
 know what bytecode version is used by the instrumented class.

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/net/NetPeerAttributes.java

@@ -18,7 +18,8 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class NetPeerAttributes {
 
-  // TODO: this should only be used by the javaagent; move to javaagent-api after removing all
+  // TODO: this should only be used by the javaagent; move to javaagent-instrumentation-api after
+  // removing all
   // library usages
   public static final NetPeerAttributes INSTANCE =
       new NetPeerAttributes(

instrumentation/build.gradle.kts

@@ -26,7 +26,7 @@ subprojects {
 
 dependencies {
   compileOnly(project(":instrumentation-api"))
-  compileOnly(project(":javaagent-api"))
+  compileOnly(project(":javaagent-instrumentation-api"))
   implementation(project(":javaagent-tooling"))
   implementation(project(":javaagent-extension-api"))
 }
@@ -49,7 +49,7 @@ tasks {
       //These classes are added to bootstrap classloader by javaagent module
       exclude(project(":javaagent-bootstrap"))
       exclude(project(":instrumentation-api"))
-      exclude(project(":javaagent-api"))
+      exclude(project(":javaagent-instrumentation-api"))
     }
   }
 

instrumentation/hibernate/hibernate-common/javaagent/build.gradle.kts

@@ -6,5 +6,5 @@ plugins {
 }
 
 dependencies {
-  compileOnly(project(":javaagent-api"))
+  compileOnly(project(":javaagent-instrumentation-api"))
 }

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
   implementation("org.slf4j:jcl-over-slf4j")
   implementation("org.slf4j:jul-to-slf4j")
 
-  implementation(project(":javaagent-api"))
+  implementation(project(":javaagent-instrumentation-api"))
   implementation(project(":instrumentation-api"))
   implementation(project(":instrumentation:jaxrs:jaxrs-2.0:jaxrs-2.0-common:javaagent"))
 

javaagent-bootstrap/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-sdk")
 
   implementation(project(":instrumentation-api"))
-  implementation(project(":javaagent-api"))
+  implementation(project(":javaagent-instrumentation-api"))
 
   implementation("org.slf4j:slf4j-api")
   implementation("org.slf4j:slf4j-simple")

javaagent-extension-api/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
   api("org.slf4j:slf4j-api")
 
   implementation(project(":instrumentation-api"))
-  implementation(project(":javaagent-api"))
+  implementation(project(":javaagent-instrumentation-api"))
 
   // metrics are unstable, do not expose as api
   implementation("io.opentelemetry:opentelemetry-sdk-metrics")

javaagent-tooling/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
 
   implementation(project(":javaagent-bootstrap"))
   implementation(project(":javaagent-extension-api"))
-  implementation(project(":javaagent-api"))
+  implementation(project(":javaagent-instrumentation-api"))
   implementation(project(":instrumentation-api"))
 
   implementation("io.opentelemetry:opentelemetry-api")

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/InstrumentationClassPredicate.java

@@ -30,8 +30,9 @@ public final class InstrumentationClassPredicate {
    *
    * <p>This set of classes is defined by a package naming convention: all javaagent and library
    * instrumentation classes are treated as "helper" classes and are subjected to the reference
-   * collection process. All others (including {@code instrumentation-api} and {@code javaagent-api}
-   * modules are not scanned for references (but references to them are collected).
+   * collection process. All others (including {@code instrumentation-api} and {@code
+   * javaagent-instrumentation-api} modules are not scanned for references (but references to them
+   * are collected).
    *
    * <p>Aside from "standard" instrumentation helper class packages, instrumentation modules can
    * pass an additional predicate to include instrumentation helper classes from 3rd party packages.

javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/muzzle/InstrumentationClassPredicateTest.groovy

@@ -37,6 +37,6 @@ class InstrumentationClassPredicateTest extends Specification {
     "Java SDK class"            | "java.util.ArrayList"
     "javaagent-tooling class"   | "io.opentelemetry.javaagent.tooling.Constants"
     "instrumentation-api class" | "io.opentelemetry.instrumentation.api.InstrumentationVersion"
-    "javaagent-api class"       | "io.opentelemetry.javaagent.instrumentation.api.ContextStore"
+    "javaagent-instrumentation-api class"       | "io.opentelemetry.javaagent.instrumentation.api.ContextStore"
   }
 }

javaagent/build.gradle.kts

@@ -119,7 +119,7 @@ val licenseReportDependencies by configurations.creating
 
 dependencies {
   testCompileOnly(project(":javaagent-bootstrap"))
-  testCompileOnly(project(":javaagent-api"))
+  testCompileOnly(project(":javaagent-instrumentation-api"))
 
   testImplementation("com.google.guava:guava")
 

settings.gradle.kts

@@ -62,7 +62,7 @@ include(":javaagent")
 include(":bom-alpha")
 include(":instrumentation-api")
 include(":instrumentation-api-caching")
-include(":javaagent-api")
+include(":javaagent-instrumentation-api")
 
 // misc
 include(":dependencyManagement")

testing-common/build.gradle.kts

@@ -9,7 +9,7 @@ group = "io.opentelemetry.javaagent"
 sourceSets {
   main {
     val armeriaShadedDeps = project(":testing:armeria-shaded-for-testing")
-    output.dir(armeriaShadedDeps .file("build/extracted/shadow"), "builtBy" to ":testing:armeria-shaded-for-testing:extractShadowJar")
+    output.dir(armeriaShadedDeps.file("build/extracted/shadow"), "builtBy" to ":testing:armeria-shaded-for-testing:extractShadowJar")
   }
 }
 
@@ -48,7 +48,7 @@ dependencies {
   annotationProcessor("com.google.auto.service:auto-service")
   compileOnly("com.google.auto.service:auto-service")
 
-  testImplementation(project(":javaagent-api"))
+  testImplementation(project(":javaagent-instrumentation-api"))
   testImplementation(project(":javaagent-tooling"))
   testImplementation(project(":javaagent-bootstrap"))
   testImplementation(project(":javaagent-extension-api"))

testing-common/integration-tests/build.gradle.kts

@@ -6,7 +6,7 @@ dependencies {
   implementation(project(":testing-common:library-for-integration-tests"))
 
   testCompileOnly(project(":instrumentation-api"))
-  testCompileOnly(project(":javaagent-api"))
+  testCompileOnly(project(":javaagent-instrumentation-api"))
   testCompileOnly(project(":javaagent-tooling"))
   testCompileOnly(project(":javaagent-extension-api"))
 

testing/agent-exporter/build.gradle.kts

@@ -14,7 +14,7 @@ dependencies {
   compileOnly("com.google.auto.service:auto-service")
 
   implementation(project(":instrumentation-api"))
-  implementation(project(":javaagent-api"))
+  implementation(project(":javaagent-instrumentation-api"))
   implementation(project(":javaagent-extension-api"))
   implementation(project(":javaagent-tooling"))
   implementation("io.opentelemetry:opentelemetry-proto")