From 177f0aec7c0629ad77cf64d4ab8ccb42648fae1b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 8 Jul 2022 17:07:41 -0700 Subject: [PATCH] Rename instrumentation-api-annotation-support (#6288) --- ...try.instrumentation.javaagent-instrumentation.gradle.kts | 2 +- .../src/main/kotlin/otel.java-conventions.gradle.kts | 6 +++--- docs/contributing/javaagent-structure.md | 2 +- examples/extension/build.gradle | 2 +- .../build.gradle.kts | 0 .../api/annotation/support/AnnotationReflectionHelper.java | 0 .../api/annotation/support/AttributeBinding.java | 0 .../api/annotation/support/AttributeBindingFactory.java | 0 .../api/annotation/support/AttributeBindings.java | 0 .../api/annotation/support/MethodArgumentsExtractor.java | 0 .../instrumentation/api/annotation/support/MethodCache.java | 0 .../api/annotation/support/MethodExtractor.java | 0 .../annotation/support/MethodSpanAttributesExtractor.java | 0 .../support/ParameterAttributeNamesExtractor.java | 0 .../api/annotation/support/ParameterizedClass.java | 0 .../support/async/AsyncOperationEndStrategies.java | 0 .../support/async/AsyncOperationEndStrategiesImpl.java | 0 .../annotation/support/async/AsyncOperationEndStrategy.java | 0 .../annotation/support/async/AsyncOperationEndSupport.java | 0 .../support/async/Jdk8AsyncOperationEndStrategy.java | 0 .../api/annotation/support/async/package-info.java | 0 .../api/annotation/support/package-info.java | 0 .../support/AnnotationReflectionHelperTest.groovy | 0 .../annotation/support/AttributeBindingFactoryTest.groovy | 0 .../support/MethodSpanAttributesExtractorTest.groovy | 0 .../api/annotation/support/ParameterizedClassTest.groovy | 0 .../support/async/AsyncOperationEndSupportTest.java | 0 .../support/async/Jdk8AsyncOperationEndStrategyTest.java | 0 .../api/annotation/support/CustomAnnotation.java | 0 .../api/annotation/support/MethodCacheTest.java | 0 instrumentation/guava-10.0/javaagent/build.gradle.kts | 2 +- instrumentation/guava-10.0/library/build.gradle.kts | 2 +- instrumentation/methods/javaagent/build.gradle.kts | 2 +- .../javaagent/build.gradle.kts | 4 ++-- .../reactor/reactor-3.1/javaagent/build.gradle.kts | 2 +- .../reactor/reactor-3.1/library/build.gradle.kts | 2 +- .../rxjava/rxjava-2.0/javaagent/build.gradle.kts | 2 +- instrumentation/rxjava/rxjava-2.0/library/build.gradle.kts | 2 +- .../rxjava/rxjava-3-common/library/build.gradle.kts | 2 +- .../rxjava/rxjava-3.0/javaagent/build.gradle.kts | 2 +- instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts | 2 +- .../rxjava/rxjava-3.1.1/javaagent/build.gradle.kts | 2 +- .../rxjava/rxjava-3.1.1/library/build.gradle.kts | 2 +- .../spring/spring-boot-autoconfigure/build.gradle.kts | 4 ++-- javaagent-tooling/build.gradle.kts | 2 +- javaagent/build.gradle.kts | 4 ++-- settings.gradle.kts | 2 +- 47 files changed, 26 insertions(+), 26 deletions(-) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/build.gradle.kts (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelper.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBinding.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindingFactory.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindings.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodArgumentsExtractor.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCache.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodExtractor.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractor.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterAttributeNamesExtractor.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterizedClass.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategies.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategiesImpl.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategy.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupport.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategy.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/package-info.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/package-info.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelperTest.groovy (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindingFactoryTest.groovy (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractorTest.groovy (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/ParameterizedClassTest.groovy (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupportTest.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategyTest.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/CustomAnnotation.java (100%) rename {instrumentation-api-annotation-support => instrumentation-annotations-support}/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCacheTest.java (100%) diff --git a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-instrumentation.gradle.kts b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-instrumentation.gradle.kts index 3f107fb4b3..49b5350707 100644 --- a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-instrumentation.gradle.kts +++ b/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") diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts index d41e5c9afe..2b491bebdf 100644 --- a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/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")) diff --git a/docs/contributing/javaagent-structure.md b/docs/contributing/javaagent-structure.md index bd38428a05..007ad8a802 100644 --- a/docs/contributing/javaagent-structure.md +++ b/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**: diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index 25f71872be..e3e1d46038 100644 --- a/examples/extension/build.gradle +++ b/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}") } diff --git a/instrumentation-api-annotation-support/build.gradle.kts b/instrumentation-annotations-support/build.gradle.kts similarity index 100% rename from instrumentation-api-annotation-support/build.gradle.kts rename to instrumentation-annotations-support/build.gradle.kts diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelper.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelper.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelper.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelper.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBinding.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBinding.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBinding.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBinding.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindingFactory.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindingFactory.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindingFactory.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindingFactory.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindings.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindings.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindings.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindings.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodArgumentsExtractor.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodArgumentsExtractor.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodArgumentsExtractor.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodArgumentsExtractor.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCache.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCache.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCache.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCache.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodExtractor.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodExtractor.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodExtractor.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodExtractor.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractor.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractor.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractor.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractor.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterAttributeNamesExtractor.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterAttributeNamesExtractor.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterAttributeNamesExtractor.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterAttributeNamesExtractor.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterizedClass.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterizedClass.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterizedClass.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterizedClass.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategies.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategies.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategies.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategies.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategiesImpl.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategiesImpl.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategiesImpl.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategiesImpl.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategy.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategy.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategy.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategy.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupport.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupport.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupport.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupport.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategy.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategy.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategy.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategy.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/package-info.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/package-info.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/package-info.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/package-info.java diff --git a/instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/package-info.java b/instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/package-info.java similarity index 100% rename from instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/package-info.java rename to instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/package-info.java diff --git a/instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelperTest.groovy b/instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelperTest.groovy similarity index 100% rename from instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelperTest.groovy rename to instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelperTest.groovy diff --git a/instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindingFactoryTest.groovy b/instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindingFactoryTest.groovy similarity index 100% rename from instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindingFactoryTest.groovy rename to instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindingFactoryTest.groovy diff --git a/instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractorTest.groovy b/instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractorTest.groovy similarity index 100% rename from instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractorTest.groovy rename to instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractorTest.groovy diff --git a/instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/ParameterizedClassTest.groovy b/instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/ParameterizedClassTest.groovy similarity index 100% rename from instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/ParameterizedClassTest.groovy rename to instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/ParameterizedClassTest.groovy diff --git a/instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupportTest.java b/instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupportTest.java similarity index 100% rename from instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupportTest.java rename to instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupportTest.java diff --git a/instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategyTest.java b/instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategyTest.java similarity index 100% rename from instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategyTest.java rename to instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategyTest.java diff --git a/instrumentation-api-annotation-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/CustomAnnotation.java b/instrumentation-annotations-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/CustomAnnotation.java similarity index 100% rename from instrumentation-api-annotation-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/CustomAnnotation.java rename to instrumentation-annotations-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/CustomAnnotation.java diff --git a/instrumentation-api-annotation-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCacheTest.java b/instrumentation-annotations-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCacheTest.java similarity index 100% rename from instrumentation-api-annotation-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCacheTest.java rename to instrumentation-annotations-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCacheTest.java diff --git a/instrumentation/guava-10.0/javaagent/build.gradle.kts b/instrumentation/guava-10.0/javaagent/build.gradle.kts index a47239340a..34365ed0b1 100644 --- a/instrumentation/guava-10.0/javaagent/build.gradle.kts +++ b/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")) diff --git a/instrumentation/guava-10.0/library/build.gradle.kts b/instrumentation/guava-10.0/library/build.gradle.kts index ded97b955b..b13f221d28 100644 --- a/instrumentation/guava-10.0/library/build.gradle.kts +++ b/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")) } diff --git a/instrumentation/methods/javaagent/build.gradle.kts b/instrumentation/methods/javaagent/build.gradle.kts index 3c5bcae9a5..314d57464b 100644 --- a/instrumentation/methods/javaagent/build.gradle.kts +++ b/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().configureEach { diff --git a/instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts b/instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts index 696f2d4673..7b50ccab82 100644 --- a/instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts +++ b/instrumentation/opentelemetry-annotations-1.0/javaagent/build.gradle.kts @@ -15,7 +15,7 @@ muzzle { val versions: Map 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") } diff --git a/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts index f803681491..9c5ad446c9 100644 --- a/instrumentation/reactor/reactor-3.1/javaagent/build.gradle.kts +++ b/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") diff --git a/instrumentation/reactor/reactor-3.1/library/build.gradle.kts b/instrumentation/reactor/reactor-3.1/library/build.gradle.kts index cf71da585b..2b4bdf7fa3 100644 --- a/instrumentation/reactor/reactor-3.1/library/build.gradle.kts +++ b/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")) diff --git a/instrumentation/rxjava/rxjava-2.0/javaagent/build.gradle.kts b/instrumentation/rxjava/rxjava-2.0/javaagent/build.gradle.kts index 8e17a27caa..312eccc241 100644 --- a/instrumentation/rxjava/rxjava-2.0/javaagent/build.gradle.kts +++ b/instrumentation/rxjava/rxjava-2.0/javaagent/build.gradle.kts @@ -18,7 +18,7 @@ tasks.withType().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")) diff --git a/instrumentation/rxjava/rxjava-2.0/library/build.gradle.kts b/instrumentation/rxjava/rxjava-2.0/library/build.gradle.kts index d81afbc0d1..ac32a8f375 100644 --- a/instrumentation/rxjava/rxjava-2.0/library/build.gradle.kts +++ b/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")) } diff --git a/instrumentation/rxjava/rxjava-3-common/library/build.gradle.kts b/instrumentation/rxjava/rxjava-3-common/library/build.gradle.kts index c807ba79fe..8542348d7a 100644 --- a/instrumentation/rxjava/rxjava-3-common/library/build.gradle.kts +++ b/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().configureEach { diff --git a/instrumentation/rxjava/rxjava-3.0/javaagent/build.gradle.kts b/instrumentation/rxjava/rxjava-3.0/javaagent/build.gradle.kts index d3ff16300d..0e8c7db246 100644 --- a/instrumentation/rxjava/rxjava-3.0/javaagent/build.gradle.kts +++ b/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")) diff --git a/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts b/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts index 2e5a8faeab..3960866880 100644 --- a/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts +++ b/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")) diff --git a/instrumentation/rxjava/rxjava-3.1.1/javaagent/build.gradle.kts b/instrumentation/rxjava/rxjava-3.1.1/javaagent/build.gradle.kts index 20730e889e..32f399f971 100644 --- a/instrumentation/rxjava/rxjava-3.1.1/javaagent/build.gradle.kts +++ b/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")) diff --git a/instrumentation/rxjava/rxjava-3.1.1/library/build.gradle.kts b/instrumentation/rxjava/rxjava-3.1.1/library/build.gradle.kts index 2feae3b342..61931f68e6 100644 --- a/instrumentation/rxjava/rxjava-3.1.1/library/build.gradle.kts +++ b/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")) diff --git a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts index c16120b308..01541752c7 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts +++ b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts @@ -9,7 +9,7 @@ val versions: Map 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 { diff --git a/javaagent-tooling/build.gradle.kts b/javaagent-tooling/build.gradle.kts index bc5ccda0ea..53b2f67d80 100644 --- a/javaagent-tooling/build.gradle.kts +++ b/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")) diff --git a/javaagent/build.gradle.kts b/javaagent/build.gradle.kts index 6fb732a53a..f791c7c1b8 100644 --- a/javaagent/build.gradle.kts +++ b/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")) } diff --git a/settings.gradle.kts b/settings.gradle.kts index f112967fd0..8ae7a11018 100644 --- a/settings.gradle.kts +++ b/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")