Revert "Added Automatic-Module-Name header to MANIFEST.MF in instrume…

…ntation libraries" This reverts commit 5a96981.
open-telemetry · Sep 30, 2023 · b98a797 · b98a797
1 parent 5a96981
commit b98a797
Show file tree

Hide file tree

Showing 68 changed files with 0 additions and 208 deletions.
diff --git 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>("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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...n/log4j/log4j-context-data/log4j-context-data-2.17/library-autoconfigure/build.gradle.kts b/...n/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
@@ -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
@@ -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
@@ -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
@@ -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")