Skip to content

Commit 177f0ae

Browse files
trasktrask
authored
Rename instrumentation-api-annotation-support (#6288)
1 parent ab724e1 commit 177f0ae

File tree

47 files changed

+26
-26
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+26
-26
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
dependencies {
88
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
99
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
10-
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support")
10+
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")
1111
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-appender-api-internal")
1212
add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
1313
add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ testing {
146146

147147
implementation("org.objenesis:objenesis")
148148
implementation("org.spockframework:spock-core") {
149-
with (this as ExternalDependency) {
149+
with(this as ExternalDependency) {
150150
// exclude optional dependencies
151151
exclude(group = "cglib", module = "cglib-nodep")
152152
exclude(group = "net.bytebuddy", module = "byte-buddy")
@@ -157,7 +157,7 @@ testing {
157157
}
158158
}
159159
implementation("org.spockframework:spock-junit4") {
160-
with (this as ExternalDependency) {
160+
with(this as ExternalDependency) {
161161
// spock-core is already added as dependency
162162
// exclude it here to avoid pulling in optional dependencies
163163
exclude(group = "org.spockframework", module = "spock-core")
@@ -376,7 +376,7 @@ configurations.configureEach {
376376
dependencySubstitution {
377377
substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")).using(project(":instrumentation-api"))
378378
substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")).using(project(":instrumentation-api-semconv"))
379-
substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support")).using(project(":instrumentation-api-annotation-support"))
379+
substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")).using(project(":instrumentation-annotations-support"))
380380
substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-appender-api-internal")).using(project(":instrumentation-appender-api-internal"))
381381
substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")).using(project(":javaagent-bootstrap"))
382382
substitute(module("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")).using(project(":javaagent-extension-api"))

‎docs/contributing/javaagent-structure.md

+1-1

‎examples/extension/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ dependencies {
106106
//TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
107107
add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions.opentelemetryJavaagentAlpha}")
108108
add("codegen", "ch.qos.logback:logback-classic:1.2.3")
109-
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:${versions.opentelemetryJavaagentAlpha}")
109+
add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support:${versions.opentelemetryJavaagentAlpha}")
110110
add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:${versions.opentelemetryJavaagentAlpha}")
111111
add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:${versions.opentelemetryJavaagentAlpha}")
112112
}

‎instrumentation-api-annotation-support/build.gradle.kts ‎instrumentation-annotations-support/build.gradle.kts

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelper.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelper.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBinding.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBinding.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindingFactory.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindingFactory.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindings.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindings.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodArgumentsExtractor.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodArgumentsExtractor.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCache.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCache.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodExtractor.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodExtractor.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractor.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractor.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterAttributeNamesExtractor.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterAttributeNamesExtractor.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterizedClass.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/ParameterizedClass.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategies.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategies.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategiesImpl.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategiesImpl.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategy.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndStrategy.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupport.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupport.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategy.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategy.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/package-info.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/async/package-info.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/package-info.java ‎instrumentation-annotations-support/src/main/java/io/opentelemetry/instrumentation/api/annotation/support/package-info.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelperTest.groovy ‎instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/AnnotationReflectionHelperTest.groovy

File renamed without changes.

‎instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindingFactoryTest.groovy ‎instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/AttributeBindingFactoryTest.groovy

File renamed without changes.

‎instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractorTest.groovy ‎instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/MethodSpanAttributesExtractorTest.groovy

File renamed without changes.

‎instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/ParameterizedClassTest.groovy ‎instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/ParameterizedClassTest.groovy

File renamed without changes.

‎instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupportTest.java ‎instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupportTest.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategyTest.java ‎instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategyTest.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/CustomAnnotation.java ‎instrumentation-annotations-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/CustomAnnotation.java

File renamed without changes.

‎instrumentation-api-annotation-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCacheTest.java ‎instrumentation-annotations-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/MethodCacheTest.java

File renamed without changes.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
bootstrap(project(":instrumentation:executors:bootstrap"))
2121

2222
library("com.google.guava:guava:10.0")
23-
compileOnly(project(":instrumentation-api-annotation-support"))
23+
compileOnly(project(":instrumentation-annotations-support"))
2424

2525
implementation(project(":instrumentation:guava-10.0:library"))
2626

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ plugins {
44

55
dependencies {
66
library("com.google.guava:guava:10.0")
7-
implementation(project(":instrumentation-api-annotation-support"))
7+
implementation(project(":instrumentation-annotations-support"))
88
}

‎instrumentation/methods/javaagent/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ muzzle {
1010

1111
dependencies {
1212
compileOnly(project(":javaagent-tooling"))
13-
compileOnly(project(":instrumentation-api-annotation-support"))
13+
compileOnly(project(":instrumentation-annotations-support"))
1414
}
1515

1616
tasks.withType<Test>().configureEach {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ muzzle {
1515
val versions: Map<String, String> by project
1616

1717
dependencies {
18-
compileOnly(project(":instrumentation-api-annotation-support"))
18+
compileOnly(project(":instrumentation-annotations-support"))
1919

2020
compileOnly(project(":javaagent-tooling"))
2121

@@ -26,7 +26,7 @@ dependencies {
2626
compileOnly(project(":opentelemetry-ext-annotations-shaded-for-instrumenting", configuration = "shadow"))
2727

2828
testImplementation("io.opentelemetry:opentelemetry-extension-annotations")
29-
testImplementation(project(":instrumentation-api-annotation-support"))
29+
testImplementation(project(":instrumentation-annotations-support"))
3030
testImplementation("net.bytebuddy:byte-buddy")
3131
}
3232

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
implementation(project(":instrumentation:opentelemetry-api:opentelemetry-api-1.0:javaagent"))
2626

2727
compileOnly(project(":javaagent-tooling"))
28-
compileOnly(project(":instrumentation-api-annotation-support"))
28+
compileOnly(project(":instrumentation-annotations-support"))
2929
compileOnly(project(":opentelemetry-api-shaded-for-instrumenting", configuration = "shadow"))
3030

3131
testLibrary("io.projectreactor:reactor-test:3.1.0.RELEASE")

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
dependencies {
66
library("io.projectreactor:reactor-core:3.1.0.RELEASE")
7-
implementation(project(":instrumentation-api-annotation-support"))
7+
implementation(project(":instrumentation-annotations-support"))
88
testLibrary("io.projectreactor:reactor-test:3.1.0.RELEASE")
99

1010
testImplementation(project(":instrumentation:reactor:reactor-3.1:testing"))

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ tasks.withType<Test>().configureEach {
1818

1919
dependencies {
2020
library("io.reactivex.rxjava2:rxjava:2.0.6")
21-
compileOnly(project(":instrumentation-api-annotation-support"))
21+
compileOnly(project(":instrumentation-annotations-support"))
2222

2323
implementation(project(":instrumentation:rxjava:rxjava-2.0:library"))
2424

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
dependencies {
66
library("io.reactivex.rxjava2:rxjava:2.1.3")
7-
implementation(project(":instrumentation-api-annotation-support"))
7+
implementation(project(":instrumentation-annotations-support"))
88

99
testImplementation(project(":instrumentation:rxjava:rxjava-2.0:testing"))
1010
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
dependencies {
66
library("io.reactivex.rxjava3:rxjava:3.0.12")
7-
implementation(project(":instrumentation-api-annotation-support"))
7+
implementation(project(":instrumentation-annotations-support"))
88
}
99

1010
tasks.withType<Test>().configureEach {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ muzzle {
1313

1414
dependencies {
1515
library("io.reactivex.rxjava3:rxjava:3.0.0")
16-
compileOnly(project(":instrumentation-api-annotation-support"))
16+
compileOnly(project(":instrumentation-annotations-support"))
1717

1818
implementation(project(":instrumentation:rxjava:rxjava-3.0:library"))
1919

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
dependencies {
66
library("io.reactivex.rxjava3:rxjava:3.0.12")
7-
implementation(project(":instrumentation-api-annotation-support"))
7+
implementation(project(":instrumentation-annotations-support"))
88
implementation(project(":instrumentation:rxjava:rxjava-3-common:library"))
99

1010
testImplementation(project(":instrumentation:rxjava:rxjava-3-common:testing"))

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ muzzle {
1313

1414
dependencies {
1515
library("io.reactivex.rxjava3:rxjava:3.1.1")
16-
compileOnly(project(":instrumentation-api-annotation-support"))
16+
compileOnly(project(":instrumentation-annotations-support"))
1717

1818
implementation(project(":instrumentation:rxjava:rxjava-3.1.1:library"))
1919

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
dependencies {
66
library("io.reactivex.rxjava3:rxjava:3.1.1")
7-
implementation(project(":instrumentation-api-annotation-support"))
7+
implementation(project(":instrumentation-annotations-support"))
88
implementation(project(":instrumentation:rxjava:rxjava-3-common:library"))
99

1010
testImplementation(project(":instrumentation:rxjava:rxjava-3-common:testing"))

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ val versions: Map<String, String> by project
99
val springBootVersion = versions["org.springframework.boot"]
1010

1111
dependencies {
12-
implementation(project(":instrumentation-api-annotation-support"))
12+
implementation(project(":instrumentation-annotations-support"))
1313

1414
implementation("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
1515
annotationProcessor("org.springframework.boot:spring-boot-autoconfigure-processor:$springBootVersion")
@@ -58,7 +58,7 @@ dependencies {
5858
testImplementation("io.opentelemetry:opentelemetry-exporter-jaeger")
5959
testImplementation("io.opentelemetry:opentelemetry-exporter-otlp")
6060
testImplementation("io.opentelemetry:opentelemetry-exporter-zipkin")
61-
testImplementation(project(":instrumentation-api-annotation-support"))
61+
testImplementation(project(":instrumentation-annotations-support"))
6262
}
6363

6464
tasks.compileTestJava {

‎javaagent-tooling/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
implementation(project(":javaagent-extension-api"))
1414
implementation(project(":javaagent-tooling:javaagent-tooling-java9"))
1515
implementation(project(":instrumentation-api"))
16-
implementation(project(":instrumentation-api-annotation-support"))
16+
implementation(project(":instrumentation-annotations-support"))
1717
implementation(project(":instrumentation-appender-api-internal"))
1818
implementation(project(":instrumentation-appender-sdk-internal"))
1919
implementation(project(":muzzle"))

‎javaagent/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ val licenseReportDependencies by configurations.creating {
5454
dependencies {
5555
bootstrapLibs(project(":instrumentation-api"))
5656
bootstrapLibs(project(":instrumentation-api-semconv"))
57-
bootstrapLibs(project(":instrumentation-api-annotation-support"))
57+
bootstrapLibs(project(":instrumentation-annotations-support"))
5858
bootstrapLibs(project(":instrumentation-appender-api-internal"))
5959
bootstrapLibs(project(":javaagent-bootstrap"))
6060

@@ -281,7 +281,7 @@ fun ShadowJar.excludeBootstrapClasses() {
281281
dependencies {
282282
exclude(project(":instrumentation-api"))
283283
exclude(project(":instrumentation-api-semconv"))
284-
exclude(project(":instrumentation-api-annotation-support"))
284+
exclude(project(":instrumentation-annotations-support"))
285285
exclude(project(":instrumentation-appender-api-internal"))
286286
exclude(project(":javaagent-bootstrap"))
287287
}

‎settings.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ include(":instrumentation-api-semconv")
111111
include(":instrumentation-appender-api-internal")
112112
include(":instrumentation-appender-sdk-internal")
113113
include(":instrumentation-annotations")
114-
include(":instrumentation-api-annotation-support")
114+
include(":instrumentation-annotations-support")
115115

116116
// misc
117117
include(":dependencyManagement")

0 commit comments

Comments
 (0)