diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts index 3ffaee72bf2a..66fb23b38e16 100644 --- a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts @@ -186,9 +186,6 @@ testing { } } -// module name -val moduleName: String? by extra - tasks { named("jar") { // By default Gradle Jar task can put multiple files with the same name @@ -207,10 +204,6 @@ tasks { "Implementation-Vendor" to "OpenTelemetry", "Implementation-URL" to "https://github.com/open-telemetry/opentelemetry-java-instrumentation" ) - - if (moduleName != null) { - attributes["Automatic-Module-Name"] = moduleName - } } } diff --git a/instrumentation-api-semconv/build.gradle.kts b/instrumentation-api-semconv/build.gradle.kts index a333540e7eba..937bef23896b 100644 --- a/instrumentation-api-semconv/build.gradle.kts +++ b/instrumentation-api-semconv/build.gradle.kts @@ -10,9 +10,6 @@ plugins { group = "io.opentelemetry.instrumentation" -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.api.semconv") - dependencies { api("io.opentelemetry:opentelemetry-semconv") api(project(":instrumentation-api")) diff --git a/instrumentation-api/build.gradle.kts b/instrumentation-api/build.gradle.kts index 41d85c387544..ec73a8ed0c2f 100644 --- a/instrumentation-api/build.gradle.kts +++ b/instrumentation-api/build.gradle.kts @@ -11,9 +11,6 @@ plugins { group = "io.opentelemetry.instrumentation" -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.api") - dependencies { api("io.opentelemetry:opentelemetry-api") implementation("io.opentelemetry:opentelemetry-extension-incubator") diff --git a/instrumentation/apache-dbcp-2.0/library/build.gradle.kts b/instrumentation/apache-dbcp-2.0/library/build.gradle.kts index 6a475820cbd4..fd5f4f6a2712 100644 --- a/instrumentation/apache-dbcp-2.0/library/build.gradle.kts +++ b/instrumentation/apache-dbcp-2.0/library/build.gradle.kts @@ -3,9 +3,6 @@ plugins { id("otel.nullaway-conventions") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.apachedbcp.v2_0") - dependencies { library("org.apache.commons:commons-dbcp2:2.0") diff --git a/instrumentation/apache-dubbo-2.7/library-autoconfigure/build.gradle.kts b/instrumentation/apache-dubbo-2.7/library-autoconfigure/build.gradle.kts index 4ee5f4ef8da3..c37558dd4f6d 100644 --- a/instrumentation/apache-dubbo-2.7/library-autoconfigure/build.gradle.kts +++ b/instrumentation/apache-dubbo-2.7/library-autoconfigure/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.apachedubbo.v2_7") - dependencies { compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/build.gradle.kts b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/build.gradle.kts index 2d194163338b..bd9927795b0e 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.3/library/build.gradle.kts +++ b/instrumentation/apache-httpclient/apache-httpclient-4.3/library/build.gradle.kts @@ -4,9 +4,6 @@ plugins { id("otel.animalsniffer-conventions") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.apachehttpclient.v4_3") - dependencies { library("org.apache.httpcomponents:httpclient:4.3") diff --git a/instrumentation/armeria-1.3/library/build.gradle.kts b/instrumentation/armeria-1.3/library/build.gradle.kts index 1147154ee697..2d38bf072d15 100644 --- a/instrumentation/armeria-1.3/library/build.gradle.kts +++ b/instrumentation/armeria-1.3/library/build.gradle.kts @@ -3,9 +3,6 @@ plugins { id("otel.nullaway-conventions") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.armeria.v1_3") - dependencies { library("com.linecorp.armeria:armeria:1.3.0") diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/build.gradle.kts b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/build.gradle.kts index 9a92e7c52466..f1bc5ba6cae9 100644 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/build.gradle.kts +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.awslambdacore.v1_0") - dependencies { compileOnly("io.opentelemetry:opentelemetry-sdk") compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure") diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts index 954b87840a8a..02899f461ec1 100644 --- a/instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts +++ b/instrumentation/aws-lambda/aws-lambda-events-2.2/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.awslambdaevents.v2_2") - dependencies { api(project(":instrumentation:aws-lambda:aws-lambda-core-1.0:library")) diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts index 756204e86e22..8ca4a2fd6226 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.awssdk.v1_11.autoconfigure") - base.archivesName.set("${base.archivesName.get()}-autoconfigure") dependencies { diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts index 9a5c7797b743..aa9e0634a867 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.awssdk.v1_11") - dependencies { implementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator") diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts index 7ef90c455ee8..4c6d8aacf0fc 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library-autoconfigure/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.awssdk.v2_2.autoconfigure") - base.archivesName.set("${base.archivesName.get()}-autoconfigure") dependencies { diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts index b928989e90bb..f50dd96dcfab 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.awssdk.v2_2") - dependencies { implementation("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator") diff --git a/instrumentation/c3p0-0.9/library/build.gradle.kts b/instrumentation/c3p0-0.9/library/build.gradle.kts index ec45435d8ac5..d6970bff8f9e 100644 --- a/instrumentation/c3p0-0.9/library/build.gradle.kts +++ b/instrumentation/c3p0-0.9/library/build.gradle.kts @@ -3,9 +3,6 @@ plugins { id("otel.nullaway-conventions") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.c3p0.v0_9") - dependencies { library("com.mchange:c3p0:0.9.2") diff --git a/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts b/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts index c66c7ac26af5..c0f0592742a9 100644 --- a/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4.4/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.cassandra.v4_4") - dependencies { library("com.datastax.oss:java-driver-core:4.4.0") diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/build.gradle.kts index 0ab5f2d7b542..2af7dc297a23 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.elasticsearch.rest.v7_0") - dependencies { library("org.elasticsearch.client:elasticsearch-rest-client:7.0.0") implementation("net.bytebuddy:byte-buddy") diff --git a/instrumentation/elasticsearch/elasticsearch-rest-common/library/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-rest-common/library/build.gradle.kts index 323c2c3667b4..667d2ae3ae34 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-common/library/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-rest-common/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.elasticsearch.rest") - dependencies { compileOnly("org.elasticsearch.client:rest:5.0.0") compileOnly("com.google.auto.value:auto-value-annotations") diff --git a/instrumentation/graphql-java-12.0/library/build.gradle.kts b/instrumentation/graphql-java-12.0/library/build.gradle.kts index 2149ce6598c2..5674a1bdb25b 100644 --- a/instrumentation/graphql-java-12.0/library/build.gradle.kts +++ b/instrumentation/graphql-java-12.0/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.graphql.v12_0") - dependencies { library("com.graphql-java:graphql-java:12.0") diff --git a/instrumentation/grpc-1.6/library/build.gradle.kts b/instrumentation/grpc-1.6/library/build.gradle.kts index e87012b291ea..807f6950a246 100644 --- a/instrumentation/grpc-1.6/library/build.gradle.kts +++ b/instrumentation/grpc-1.6/library/build.gradle.kts @@ -3,9 +3,6 @@ plugins { id("otel.animalsniffer-conventions") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.grpc.v1_6") - val grpcVersion = "1.6.0" dependencies { diff --git a/instrumentation/guava-10.0/library/build.gradle.kts b/instrumentation/guava-10.0/library/build.gradle.kts index 8d7477847a05..b13f221d28d9 100644 --- a/instrumentation/guava-10.0/library/build.gradle.kts +++ b/instrumentation/guava-10.0/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.guava.v10_0") - dependencies { library("com.google.guava:guava:10.0") implementation(project(":instrumentation-annotations-support")) diff --git a/instrumentation/hikaricp-3.0/library/build.gradle.kts b/instrumentation/hikaricp-3.0/library/build.gradle.kts index cde634ad0e8a..df4c38e46395 100644 --- a/instrumentation/hikaricp-3.0/library/build.gradle.kts +++ b/instrumentation/hikaricp-3.0/library/build.gradle.kts @@ -3,9 +3,6 @@ plugins { id("otel.nullaway-conventions") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.hikaricp.v3_0") - dependencies { library("com.zaxxer:HikariCP:3.0.0") diff --git a/instrumentation/java-http-client/library/build.gradle.kts b/instrumentation/java-http-client/library/build.gradle.kts index e0d6e155d26e..2e15cb3ad109 100644 --- a/instrumentation/java-http-client/library/build.gradle.kts +++ b/instrumentation/java-http-client/library/build.gradle.kts @@ -3,9 +3,6 @@ plugins { id("otel.nullaway-conventions") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.httpclient") - otelJava { minJavaVersionSupported.set(JavaVersion.VERSION_11) } diff --git a/instrumentation/jdbc/library/build.gradle.kts b/instrumentation/jdbc/library/build.gradle.kts index 1423cd9a1ded..e5c6649cff54 100644 --- a/instrumentation/jdbc/library/build.gradle.kts +++ b/instrumentation/jdbc/library/build.gradle.kts @@ -8,9 +8,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.jdbc") - dependencies { compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") diff --git a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/build.gradle.kts b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/build.gradle.kts index 0fbb2da784d8..16a485cd4b1d 100644 --- a/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/build.gradle.kts +++ b/instrumentation/jetty-httpclient/jetty-httpclient-9.2/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.jetty.httpclient.v9_2") - // Jetty client 9.2 is the best starting point, HttpClient.send() is stable there val jettyVers_base9 = "9.2.0.v20140526" diff --git a/instrumentation/jmx-metrics/library/build.gradle.kts b/instrumentation/jmx-metrics/library/build.gradle.kts index c4b761627d42..375e5e77d932 100644 --- a/instrumentation/jmx-metrics/library/build.gradle.kts +++ b/instrumentation/jmx-metrics/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.jmx") - dependencies { implementation("org.snakeyaml:snakeyaml-engine") diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts index a637486e3113..2b5e3a333aed 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts +++ b/instrumentation/kafka/kafka-clients/kafka-clients-2.6/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.kafkaclients.v2_6") - dependencies { implementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-common:library")) library("org.apache.kafka:kafka-clients:2.6.0") diff --git a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/build.gradle.kts b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/build.gradle.kts index 92c0d1e6090e..780051761e57 100644 --- a/instrumentation/kafka/kafka-clients/kafka-clients-common/library/build.gradle.kts +++ b/instrumentation/kafka/kafka-clients/kafka-clients-common/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.kafka") - dependencies { compileOnly("org.apache.kafka:kafka-clients:0.11.0.0") compileOnly("com.google.auto.value:auto-value-annotations") diff --git a/instrumentation/ktor/ktor-1.0/library/build.gradle.kts b/instrumentation/ktor/ktor-1.0/library/build.gradle.kts index 9a135abac8fc..85102d338c4a 100644 --- a/instrumentation/ktor/ktor-1.0/library/build.gradle.kts +++ b/instrumentation/ktor/ktor-1.0/library/build.gradle.kts @@ -6,9 +6,6 @@ plugins { id("org.jetbrains.kotlin.jvm") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.ktor.v1_0") - dependencies { library("io.ktor:ktor-server-core:1.0.0") diff --git a/instrumentation/ktor/ktor-2.0/library/build.gradle.kts b/instrumentation/ktor/ktor-2.0/library/build.gradle.kts index 52c950725bcb..0a723cd48685 100644 --- a/instrumentation/ktor/ktor-2.0/library/build.gradle.kts +++ b/instrumentation/ktor/ktor-2.0/library/build.gradle.kts @@ -6,9 +6,6 @@ plugins { id("org.jetbrains.kotlin.jvm") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.ktor.v2_0") - val ktorVersion = "2.0.0" dependencies { diff --git a/instrumentation/ktor/ktor-common/library/build.gradle.kts b/instrumentation/ktor/ktor-common/library/build.gradle.kts index 257bf390983c..0362618225fc 100644 --- a/instrumentation/ktor/ktor-common/library/build.gradle.kts +++ b/instrumentation/ktor/ktor-common/library/build.gradle.kts @@ -5,9 +5,6 @@ plugins { id("org.jetbrains.kotlin.jvm") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.ktor") - dependencies { compileOnly("org.jetbrains.kotlin:kotlin-stdlib-jdk8") testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") diff --git a/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts b/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts index f59a020952fb..f4e825b1d015 100644 --- a/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts +++ b/instrumentation/lettuce/lettuce-5.1/library/build.gradle.kts @@ -3,9 +3,6 @@ plugins { id("otel.nullaway-conventions") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.lettuce.v5_1") - dependencies { library("io.lettuce:lettuce-core:5.1.0.RELEASE") diff --git a/instrumentation/lettuce/lettuce-common/library/build.gradle.kts b/instrumentation/lettuce/lettuce-common/library/build.gradle.kts index 63cf695080b7..1cfd24470d37 100644 --- a/instrumentation/lettuce/lettuce-common/library/build.gradle.kts +++ b/instrumentation/lettuce/lettuce-common/library/build.gradle.kts @@ -1,6 +1,3 @@ plugins { id("otel.library-instrumentation") } - -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.lettuce.common") diff --git a/instrumentation/log4j/log4j-appender-1.2/javaagent/build.gradle.kts b/instrumentation/log4j/log4j-appender-1.2/javaagent/build.gradle.kts index 9e2bed701542..0cf053ff67e3 100644 --- a/instrumentation/log4j/log4j-appender-1.2/javaagent/build.gradle.kts +++ b/instrumentation/log4j/log4j-appender-1.2/javaagent/build.gradle.kts @@ -12,9 +12,6 @@ muzzle { } } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.log4j.appender") - dependencies { // 1.2 introduces MDC and there's no version earlier than 1.2.4 available library("log4j:log4j:1.2.4") diff --git a/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts b/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts index eff646ad61b5..6a48ee260f96 100644 --- a/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts +++ b/instrumentation/log4j/log4j-appender-2.17/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.log4j.appender.v2_17") - dependencies { library("org.apache.logging.log4j:log4j-core:2.17.0") diff --git a/instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/build.gradle.kts b/instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/build.gradle.kts index b910d02a04ae..7425e00ef5b7 100644 --- a/instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/build.gradle.kts +++ b/instrumentation/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.log4j.contextdata.v2_17") - base.archivesName.set("${base.archivesName.get()}-autoconfigure") dependencies { diff --git a/instrumentation/log4j/log4j-mdc-1.2/javaagent/build.gradle.kts b/instrumentation/log4j/log4j-mdc-1.2/javaagent/build.gradle.kts index 8a7e132ce723..9ede7f4fc5b1 100644 --- a/instrumentation/log4j/log4j-mdc-1.2/javaagent/build.gradle.kts +++ b/instrumentation/log4j/log4j-mdc-1.2/javaagent/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.javaagent-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.log4j.mdc") - muzzle { pass { group.set("log4j") diff --git a/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts b/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts index e66e7f3615ba..17daeaa0fd4c 100644 --- a/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts +++ b/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts @@ -3,9 +3,6 @@ plugins { id("org.graalvm.buildtools.native") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.logback.appender.v1_0") - dependencies { compileOnly(project(":muzzle")) diff --git a/instrumentation/logback/logback-mdc-1.0/library/build.gradle.kts b/instrumentation/logback/logback-mdc-1.0/library/build.gradle.kts index eed4691c1015..76537740d178 100644 --- a/instrumentation/logback/logback-mdc-1.0/library/build.gradle.kts +++ b/instrumentation/logback/logback-mdc-1.0/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.logback.mdc.v1_0") - testing { suites { val addBaggageTest by registering(JvmTestSuite::class) { diff --git a/instrumentation/micrometer/micrometer-1.5/library/build.gradle.kts b/instrumentation/micrometer/micrometer-1.5/library/build.gradle.kts index 0cb4dd7b7492..997677f7de3f 100644 --- a/instrumentation/micrometer/micrometer-1.5/library/build.gradle.kts +++ b/instrumentation/micrometer/micrometer-1.5/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.micrometer.v1_5") - dependencies { compileOnly("io.opentelemetry:opentelemetry-extension-incubator") diff --git a/instrumentation/mongo/mongo-3.1/library/build.gradle.kts b/instrumentation/mongo/mongo-3.1/library/build.gradle.kts index 1ee7a7b7beba..1504784c794e 100644 --- a/instrumentation/mongo/mongo-3.1/library/build.gradle.kts +++ b/instrumentation/mongo/mongo-3.1/library/build.gradle.kts @@ -3,9 +3,6 @@ plugins { id("otel.nullaway-conventions") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.mongo.v3_1") - dependencies { library("org.mongodb:mongo-java-driver:3.1.0") diff --git a/instrumentation/netty/netty-4-common/library/build.gradle.kts b/instrumentation/netty/netty-4-common/library/build.gradle.kts index dc29821c2fe6..feefae65cfe1 100644 --- a/instrumentation/netty/netty-4-common/library/build.gradle.kts +++ b/instrumentation/netty/netty-4-common/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.netty.v4.common") - dependencies { compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") diff --git a/instrumentation/netty/netty-4.1/library/build.gradle.kts b/instrumentation/netty/netty-4.1/library/build.gradle.kts index 7228ae477899..eb20fd9db5a8 100644 --- a/instrumentation/netty/netty-4.1/library/build.gradle.kts +++ b/instrumentation/netty/netty-4.1/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.netty.v4_1") - dependencies { library("io.netty:netty-codec-http:4.1.0.Final") implementation(project(":instrumentation:netty:netty-4-common:library")) diff --git a/instrumentation/netty/netty-common/library/build.gradle.kts b/instrumentation/netty/netty-common/library/build.gradle.kts index 2a4bb307c8a9..8f6b7c537697 100644 --- a/instrumentation/netty/netty-common/library/build.gradle.kts +++ b/instrumentation/netty/netty-common/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.netty.common") - dependencies { compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") diff --git a/instrumentation/okhttp/okhttp-3.0/library/build.gradle.kts b/instrumentation/okhttp/okhttp-3.0/library/build.gradle.kts index 1716e4c42b7d..4d262a4cf477 100644 --- a/instrumentation/okhttp/okhttp-3.0/library/build.gradle.kts +++ b/instrumentation/okhttp/okhttp-3.0/library/build.gradle.kts @@ -4,9 +4,6 @@ plugins { id("otel.animalsniffer-conventions") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.okhttp.v3_0") - dependencies { library("com.squareup.okhttp3:okhttp:3.0.0") diff --git a/instrumentation/oracle-ucp-11.2/library/build.gradle.kts b/instrumentation/oracle-ucp-11.2/library/build.gradle.kts index f4c311e461f6..a2fa7819af1c 100644 --- a/instrumentation/oracle-ucp-11.2/library/build.gradle.kts +++ b/instrumentation/oracle-ucp-11.2/library/build.gradle.kts @@ -3,9 +3,6 @@ plugins { id("otel.nullaway-conventions") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.oracleucp.v11_2") - dependencies { library("com.oracle.database.jdbc:ucp:11.2.0.4") diff --git a/instrumentation/oshi/library/build.gradle.kts b/instrumentation/oshi/library/build.gradle.kts index 38e0d8cb7e39..23a3b0382096 100644 --- a/instrumentation/oshi/library/build.gradle.kts +++ b/instrumentation/oshi/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.oshi") - dependencies { library("com.github.oshi:oshi-core:5.3.1") diff --git a/instrumentation/quartz-2.0/library/build.gradle.kts b/instrumentation/quartz-2.0/library/build.gradle.kts index 5b8b51e481cc..44947f6e2b97 100644 --- a/instrumentation/quartz-2.0/library/build.gradle.kts +++ b/instrumentation/quartz-2.0/library/build.gradle.kts @@ -3,9 +3,6 @@ plugins { id("otel.nullaway-conventions") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.quartz.v2_0") - dependencies { library("org.quartz-scheduler:quartz:2.0.0") diff --git a/instrumentation/r2dbc-1.0/library/build.gradle.kts b/instrumentation/r2dbc-1.0/library/build.gradle.kts index c2b6b4095482..bad31be4f606 100644 --- a/instrumentation/r2dbc-1.0/library/build.gradle.kts +++ b/instrumentation/r2dbc-1.0/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.r2dbc.v1_0") - dependencies { library("io.r2dbc:r2dbc-spi:1.0.0.RELEASE") implementation("io.r2dbc:r2dbc-proxy:1.0.1.RELEASE") diff --git a/instrumentation/ratpack/ratpack-1.7/library/build.gradle.kts b/instrumentation/ratpack/ratpack-1.7/library/build.gradle.kts index 31f1cc71d418..7386823c002e 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/build.gradle.kts +++ b/instrumentation/ratpack/ratpack-1.7/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.ratpack.v1_7") - dependencies { library("io.ratpack:ratpack-core:1.7.0") diff --git a/instrumentation/reactor/reactor-3.1/library/build.gradle.kts b/instrumentation/reactor/reactor-3.1/library/build.gradle.kts index 297e1c66d748..5ec7deacdfa5 100644 --- a/instrumentation/reactor/reactor-3.1/library/build.gradle.kts +++ b/instrumentation/reactor/reactor-3.1/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.reactor.v3_1") - dependencies { library("io.projectreactor:reactor-core:3.1.0.RELEASE") implementation(project(":instrumentation-annotations-support")) diff --git a/instrumentation/restlet/restlet-1.1/library/build.gradle.kts b/instrumentation/restlet/restlet-1.1/library/build.gradle.kts index 600c9aefdbc0..7a6ba61f4994 100644 --- a/instrumentation/restlet/restlet-1.1/library/build.gradle.kts +++ b/instrumentation/restlet/restlet-1.1/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.restlet.v1_1") - repositories { mavenCentral() maven("https://maven.restlet.talend.com/") diff --git a/instrumentation/restlet/restlet-2.0/library/build.gradle.kts b/instrumentation/restlet/restlet-2.0/library/build.gradle.kts index 467576b25f99..2c5dc577f6e8 100644 --- a/instrumentation/restlet/restlet-2.0/library/build.gradle.kts +++ b/instrumentation/restlet/restlet-2.0/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.restlet.v2_0") - repositories { mavenCentral() maven("https://maven.restlet.talend.com/") diff --git a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/build.gradle.kts b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/build.gradle.kts index b8a35723bbd9..892247fdf2b8 100644 --- a/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/build.gradle.kts +++ b/instrumentation/rocketmq/rocketmq-client/rocketmq-client-4.8/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.rocketmqclient.v4_8") - dependencies { library("org.apache.rocketmq:rocketmq-client:4.8.0") diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/build.gradle.kts b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/build.gradle.kts index 8a2e900a1261..3f3b0b13a763 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/build.gradle.kts +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java17/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.runtimemetrics.java17") - otelJava { minJavaVersionSupported.set(JavaVersion.VERSION_17) } diff --git a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/build.gradle.kts b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/build.gradle.kts index 0a8da8e7c037..4957c47b0e47 100644 --- a/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/build.gradle.kts +++ b/instrumentation/runtime-telemetry/runtime-telemetry-java8/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.runtimemetrics.java8") - dependencies { implementation(project(":instrumentation-api")) implementation("io.opentelemetry:opentelemetry-extension-incubator") diff --git a/instrumentation/rxjava/rxjava-1.0/library/build.gradle.kts b/instrumentation/rxjava/rxjava-1.0/library/build.gradle.kts index 2d927bbe93e2..e98873ae5d94 100644 --- a/instrumentation/rxjava/rxjava-1.0/library/build.gradle.kts +++ b/instrumentation/rxjava/rxjava-1.0/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.rxjava.v1_0") - dependencies { library("io.reactivex:rxjava:1.0.7") } diff --git a/instrumentation/rxjava/rxjava-2.0/library/build.gradle.kts b/instrumentation/rxjava/rxjava-2.0/library/build.gradle.kts index ec1c13d66fdd..ecc9ad8a068d 100644 --- a/instrumentation/rxjava/rxjava-2.0/library/build.gradle.kts +++ b/instrumentation/rxjava/rxjava-2.0/library/build.gradle.kts @@ -3,9 +3,6 @@ plugins { id("otel.animalsniffer-conventions") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.rxjava.v2_0") - dependencies { library("io.reactivex.rxjava2:rxjava:2.1.3") implementation(project(":instrumentation-annotations-support")) diff --git a/instrumentation/rxjava/rxjava-3-common/library/build.gradle.kts b/instrumentation/rxjava/rxjava-3-common/library/build.gradle.kts index 267e3cc6d5c9..8542348d7a2a 100644 --- a/instrumentation/rxjava/rxjava-3-common/library/build.gradle.kts +++ b/instrumentation/rxjava/rxjava-3-common/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.rxjava.v3.common") - dependencies { library("io.reactivex.rxjava3:rxjava:3.0.12") implementation(project(":instrumentation-annotations-support")) diff --git a/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts b/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts index eac1e29ef723..396086688085 100644 --- a/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts +++ b/instrumentation/rxjava/rxjava-3.0/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.rxjava.v3_0") - dependencies { library("io.reactivex.rxjava3:rxjava:3.0.12") implementation(project(":instrumentation-annotations-support")) 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 d9f33ba90805..61931f68e631 100644 --- a/instrumentation/rxjava/rxjava-3.1.1/library/build.gradle.kts +++ b/instrumentation/rxjava/rxjava-3.1.1/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.rxjava.v3_1_1") - dependencies { library("io.reactivex.rxjava3:rxjava:3.1.1") implementation(project(":instrumentation-annotations-support")) diff --git a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts index bb06ccbe8af7..27283a684df6 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts +++ b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.spring.autoconfigure") - // Name the Spring Boot modules in accordance with https://docs.spring.io/spring-boot/docs/current/reference/html/features.html#features.developing-auto-configuration.custom-starter base.archivesName.set("opentelemetry-spring-boot") group = "io.opentelemetry.instrumentation" diff --git a/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts b/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts index 9dea7b37b54f..12cc81a29502 100644 --- a/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts +++ b/instrumentation/spring/spring-integration-4.1/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.spring.integration.v4_1") - dependencies { compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") diff --git a/instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts b/instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts index 10b62ffc8f4a..66499b5c303f 100644 --- a/instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts +++ b/instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.spring.kafka.v2_7") - dependencies { compileOnly(project(":muzzle")) diff --git a/instrumentation/spring/spring-web/spring-web-3.1/library/build.gradle.kts b/instrumentation/spring/spring-web/spring-web-3.1/library/build.gradle.kts index 331105795e6c..f852b2dccbcc 100644 --- a/instrumentation/spring/spring-web/spring-web-3.1/library/build.gradle.kts +++ b/instrumentation/spring/spring-web/spring-web-3.1/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.spring.web.v3_1") - dependencies { compileOnly("org.springframework:spring-web:3.1.0.RELEASE") diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/build.gradle.kts b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/build.gradle.kts index 831151b3f31e..1df4b62e1934 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/build.gradle.kts +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.3/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.spring.webflux.v5_3") - dependencies { library("org.springframework:spring-webflux:5.3.0") diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/build.gradle.kts b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/build.gradle.kts index c6ad602f342b..920cebcbeab5 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/build.gradle.kts +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.spring.webmvc.v5_3") - val versions: Map by project val springBootVersion = versions["org.springframework.boot"] diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/build.gradle.kts b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/build.gradle.kts index cdb3cbce7e72..4fb5e4f64ac6 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/build.gradle.kts +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/library/build.gradle.kts @@ -2,9 +2,6 @@ plugins { id("otel.library-instrumentation") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.spring.webmvc.v6_0") - dependencies { compileOnly("org.springframework:spring-webmvc:6.0.0") compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0") diff --git a/instrumentation/vibur-dbcp-11.0/library/build.gradle.kts b/instrumentation/vibur-dbcp-11.0/library/build.gradle.kts index dfedc23822a0..381f5c75b8d5 100644 --- a/instrumentation/vibur-dbcp-11.0/library/build.gradle.kts +++ b/instrumentation/vibur-dbcp-11.0/library/build.gradle.kts @@ -3,9 +3,6 @@ plugins { id("otel.nullaway-conventions") } -// module name -val moduleName: String by extra("io.opentelemetry.instrumentation.viburdbcp.v11_0") - dependencies { library("org.vibur:vibur-dbcp:11.0")