Rename instrumentation-api-annotation-support (#6288)

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

@@ -7,7 +7,7 @@ plugins {
 dependencies {
   add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
   add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
-  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support")
+  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")
   add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-appender-api-internal")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")

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

@@ -146,7 +146,7 @@ testing {
 
       implementation("org.objenesis:objenesis")
       implementation("org.spockframework:spock-core") {
-        with (this as ExternalDependency) {
+        with(this as ExternalDependency) {
           // exclude optional dependencies
           exclude(group = "cglib", module = "cglib-nodep")
           exclude(group = "net.bytebuddy", module = "byte-buddy")
@@ -157,7 +157,7 @@ testing {
         }
       }
       implementation("org.spockframework:spock-junit4") {
-        with (this as ExternalDependency) {
+        with(this as ExternalDependency) {
           // spock-core is already added as dependency
           // exclude it here to avoid pulling in optional dependencies
           exclude(group = "org.spockframework", module = "spock-core")
@@ -376,7 +376,7 @@ configurations.configureEach {
     dependencySubstitution {
       substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")).using(project(":instrumentation-api"))
       substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")).using(project(":instrumentation-api-semconv"))
-      substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support")).using(project(":instrumentation-api-annotation-support"))
+      substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")).using(project(":instrumentation-annotations-support"))
       substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-appender-api-internal")).using(project(":instrumentation-appender-api-internal"))
       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"))

docs/contributing/javaagent-structure.md

@@ -35,7 +35,7 @@ The bootstrap class loader contains several modules:
   to all classloaders running within the instrumented application. The classes located in these
   modules are used by both javaagent and library instrumentations - they all must be usable even
   without the javaagent present.
-* **The `instrumentation-api-annotation-support` module**:
+* **The `instrumentation-annotations-support` module**:
   it contains classes that provide support for annotation-based auto-instrumentation, e.g.
   the `@WithSpan` annotation. This module is internal and its APIs are considered unstable.
 * **The `instrumentation-appender-api-internal` module**:

examples/extension/build.gradle

@@ -106,7 +106,7 @@ dependencies {
   //TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions.opentelemetryJavaagentAlpha}")
   add("codegen", "ch.qos.logback:logback-classic:1.2.3")
-  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:${versions.opentelemetryJavaagentAlpha}")
+  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:${versions.opentelemetryJavaagentAlpha}")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:${versions.opentelemetryJavaagentAlpha}")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions.opentelemetryJavaagentAlpha}")
 }

instrumentation/guava-10.0/javaagent/build.gradle.kts

@@ -20,7 +20,7 @@ dependencies {
   bootstrap(project(":instrumentation:executors:bootstrap"))
 
   library("com.google.guava:guava:10.0")
-  compileOnly(project(":instrumentation-api-annotation-support"))
+  compileOnly(project(":instrumentation-annotations-support"))
 
   implementation(project(":instrumentation:guava-10.0:library"))
 

instrumentation/guava-10.0/library/build.gradle.kts

@@ -4,5 +4,5 @@ plugins {
 
 dependencies {
   library("com.google.guava:guava:10.0")
-  implementation(project(":instrumentation-api-annotation-support"))
+  implementation(project(":instrumentation-annotations-support"))
 }

instrumentation/methods/javaagent/build.gradle.kts

@@ -10,7 +10,7 @@ muzzle {
 
 dependencies {
   compileOnly(project(":javaagent-tooling"))
-  compileOnly(project(":instrumentation-api-annotation-support"))
+  compileOnly(project(":instrumentation-annotations-support"))
 }
 
 tasks.withType<Test>().configureEach {

instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts

@@ -15,7 +15,7 @@ muzzle {
 val versions: Map<String, String> by project
 
 dependencies {
-  compileOnly(project(":instrumentation-api-annotation-support"))
+  compileOnly(project(":instrumentation-annotations-support"))
 
   compileOnly(project(":javaagent-tooling"))
 
@@ -26,7 +26,7 @@ dependencies {
   compileOnly(project(":opentelemetry-ext-annotations-shaded-for-instrumenting", configuration = "shadow"))
 
   testImplementation("io.opentelemetry:opentelemetry-extension-annotations")
-  testImplementation(project(":instrumentation-api-annotation-support"))
+  testImplementation(project(":instrumentation-annotations-support"))
   testImplementation("net.bytebuddy:byte-buddy")
 }
 

instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
   implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
 
   compileOnly(project(":javaagent-tooling"))
-  compileOnly(project(":instrumentation-api-annotation-support"))
+  compileOnly(project(":instrumentation-annotations-support"))
   compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow"))
 
   testLibrary("io.projectreactor:reactor-test:3.1.0.RELEASE")

instrumentation/reactor/reactor-3.1/library/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   library("io.projectreactor:reactor-core:3.1.0.RELEASE")
-  implementation(project(":instrumentation-api-annotation-support"))
+  implementation(project(":instrumentation-annotations-support"))
   testLibrary("io.projectreactor:reactor-test:3.1.0.RELEASE")
 
   testImplementation(project(":instrumentation:reactor:reactor-3.1:testing"))

instrumentation/rxjava/rxjava-2.0/javaagent/build.gradle.kts

@@ -18,7 +18,7 @@ tasks.withType<Test>().configureEach {
 
 dependencies {
   library("io.reactivex.rxjava2:rxjava:2.0.6")
-  compileOnly(project(":instrumentation-api-annotation-support"))
+  compileOnly(project(":instrumentation-annotations-support"))
 
   implementation(project(":instrumentation:rxjava:rxjava-2.0:library"))
 

instrumentation/rxjava/rxjava-2.0/library/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   library("io.reactivex.rxjava2:rxjava:2.1.3")
-  implementation(project(":instrumentation-api-annotation-support"))
+  implementation(project(":instrumentation-annotations-support"))
 
   testImplementation(project(":instrumentation:rxjava:rxjava-2.0:testing"))
 }

instrumentation/rxjava/rxjava-3-common/library/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   library("io.reactivex.rxjava3:rxjava:3.0.12")
-  implementation(project(":instrumentation-api-annotation-support"))
+  implementation(project(":instrumentation-annotations-support"))
 }
 
 tasks.withType<Test>().configureEach {

instrumentation/rxjava/rxjava-3.0/javaagent/build.gradle.kts

@@ -13,7 +13,7 @@ muzzle {
 
 dependencies {
   library("io.reactivex.rxjava3:rxjava:3.0.0")
-  compileOnly(project(":instrumentation-api-annotation-support"))
+  compileOnly(project(":instrumentation-annotations-support"))
 
   implementation(project(":instrumentation:rxjava:rxjava-3.0:library"))
 

instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   library("io.reactivex.rxjava3:rxjava:3.0.12")
-  implementation(project(":instrumentation-api-annotation-support"))
+  implementation(project(":instrumentation-annotations-support"))
   implementation(project(":instrumentation:rxjava:rxjava-3-common:library"))
 
   testImplementation(project(":instrumentation:rxjava:rxjava-3-common:testing"))

instrumentation/rxjava/rxjava-3.1.1/javaagent/build.gradle.kts

@@ -13,7 +13,7 @@ muzzle {
 
 dependencies {
   library("io.reactivex.rxjava3:rxjava:3.1.1")
-  compileOnly(project(":instrumentation-api-annotation-support"))
+  compileOnly(project(":instrumentation-annotations-support"))
 
   implementation(project(":instrumentation:rxjava:rxjava-3.1.1:library"))
 

instrumentation/rxjava/rxjava-3.1.1/library/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   library("io.reactivex.rxjava3:rxjava:3.1.1")
-  implementation(project(":instrumentation-api-annotation-support"))
+  implementation(project(":instrumentation-annotations-support"))
   implementation(project(":instrumentation:rxjava:rxjava-3-common:library"))
 
   testImplementation(project(":instrumentation:rxjava:rxjava-3-common:testing"))

instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts

@@ -9,7 +9,7 @@ val versions: Map<String, String> by project
 val springBootVersion = versions["org.springframework.boot"]
 
 dependencies {
-  implementation(project(":instrumentation-api-annotation-support"))
+  implementation(project(":instrumentation-annotations-support"))
 
   implementation("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
   annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor:$springBootVersion")
@@ -58,7 +58,7 @@ dependencies {
   testImplementation("io.opentelemetry:opentelemetry-exporter-jaeger")
   testImplementation("io.opentelemetry:opentelemetry-exporter-otlp")
   testImplementation("io.opentelemetry:opentelemetry-exporter-zipkin")
-  testImplementation(project(":instrumentation-api-annotation-support"))
+  testImplementation(project(":instrumentation-annotations-support"))
 }
 
 tasks.compileTestJava {

javaagent-tooling/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
   implementation(project(":javaagent-extension-api"))
   implementation(project(":javaagent-tooling:javaagent-tooling-java9"))
   implementation(project(":instrumentation-api"))
-  implementation(project(":instrumentation-api-annotation-support"))
+  implementation(project(":instrumentation-annotations-support"))
   implementation(project(":instrumentation-appender-api-internal"))
   implementation(project(":instrumentation-appender-sdk-internal"))
   implementation(project(":muzzle"))

javaagent/build.gradle.kts

@@ -54,7 +54,7 @@ val licenseReportDependencies by configurations.creating {
 dependencies {
   bootstrapLibs(project(":instrumentation-api"))
   bootstrapLibs(project(":instrumentation-api-semconv"))
-  bootstrapLibs(project(":instrumentation-api-annotation-support"))
+  bootstrapLibs(project(":instrumentation-annotations-support"))
   bootstrapLibs(project(":instrumentation-appender-api-internal"))
   bootstrapLibs(project(":javaagent-bootstrap"))
 
@@ -281,7 +281,7 @@ fun ShadowJar.excludeBootstrapClasses() {
   dependencies {
     exclude(project(":instrumentation-api"))
     exclude(project(":instrumentation-api-semconv"))
-    exclude(project(":instrumentation-api-annotation-support"))
+    exclude(project(":instrumentation-annotations-support"))
     exclude(project(":instrumentation-appender-api-internal"))
     exclude(project(":javaagent-bootstrap"))
   }

settings.gradle.kts

@@ -111,7 +111,7 @@ include(":instrumentation-api-semconv")
 include(":instrumentation-appender-api-internal")
 include(":instrumentation-appender-sdk-internal")
 include(":instrumentation-annotations")
-include(":instrumentation-api-annotation-support")
+include(":instrumentation-annotations-support")
 
 // misc
 include(":dependencyManagement")