Cleanup bnd warnings by disabling on test modules

Author: jack-berg

all/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
 
 description = "OpenTelemetry All"
 otelJava.moduleName.set("io.opentelemetry.all")
+otelJava.osgiEnabled.set(false)
 
 // Skip ossIndexAudit on test module
 tasks.named("ossIndexAudit") {

animal-sniffer-signature/build.gradle.kts

@@ -8,6 +8,7 @@ plugins {
 
 description = "Build tool to generate the Animal Sniffer Android signature"
 otelJava.moduleName.set("io.opentelemetry.internal.animalsniffer")
+otelJava.osgiEnabled.set(false)
 
 val signatureJar = configurations.create("signatureJar") {
   isCanBeConsumed = false

api/testing-internal/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
 
 description = "OpenTelemetry API Testing (Internal)"
 otelJava.moduleName.set("io.opentelemetry.api.testing.internal")
+otelJava.osgiEnabled.set(false)
 
 dependencies {
   api(project(":api:all"))

buildSrc/src/main/kotlin/io/opentelemetry/gradle/OtelJavaExtension.kt

@@ -12,6 +12,10 @@ import org.gradle.api.provider.Property
 abstract class OtelJavaExtension {
     abstract val moduleName: Property<String>
 
+    // Set to false for modules that are not OSGi bundles (e.g. test helpers, build tooling,
+    // aggregators). Skips BND bundle metadata generation entirely.
+    abstract val osgiEnabled: Property<Boolean>
+
     abstract val osgiOptionalPackages: ListProperty<String>
 
     // Packages accessed via Class.forName that are not on the compile classpath (e.g. due to
@@ -24,6 +28,7 @@ abstract class OtelJavaExtension {
 
     init {
         minJavaVersionSupported.convention(JavaVersion.VERSION_1_8)
+        osgiEnabled.convention(true)
         osgiOptionalPackages.convention(emptyList<String>())
         osgiDynamicImportPackages.convention(emptyList<String>())
     }

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

@@ -133,34 +133,37 @@ tasks {
   }
 
   afterEvaluate {
-    named<Jar>("jar") {
-      // Configure OSGi metadata
-      bundle {
-        // Compute import packages.
-        // Certain packages like javax.annotation.* are always optional.
-        // Modules may have additional optional packages, typically corresponding to compileOnly dependencies.
-        // Append wildcard "*" last to import any other referenced packages
-        val optionalPackages = mutableListOf("javax.annotation")
-        optionalPackages.addAll(otelJava.osgiOptionalPackages.get())
-        val importPackages = optionalPackages.joinToString(",") { "$it.*;resolution:=optional;version=\"\${@}\"" } + ",*"
-
-        // Packages accessed via Class.forName that are not on the compile classpath cannot be made
-        // optional via Import-Package (BND cannot resolve version="${@}" for them). Instead, exclude
-        // them from Import-Package and declare them as DynamicImport-Package so OSGi does not
-        // require them at resolution time but can still wire them at runtime when available.
-        val dynamicImportPackages = otelJava.osgiDynamicImportPackages.get()
-        val negations = dynamicImportPackages.joinToString(",") { "!$it" }
-        val fullImportPackages = if (negations.isNotEmpty()) "$negations,$importPackages" else importPackages
-
-        val bndInstructions = mutableMapOf(
-          // Once https://github.com/open-telemetry/opentelemetry-java/issues/6970 is resolved, exclude .internal packages
-          "-exportcontents" to "io.opentelemetry.*",
-          "Import-Package" to fullImportPackages
-        )
-        if (dynamicImportPackages.isNotEmpty()) {
-          bndInstructions["DynamicImport-Package"] = dynamicImportPackages.joinToString(",") { "$it,$it.*" }
+    if (otelJava.osgiEnabled.get()) {
+      named<Jar>("jar") {
+        // Configure OSGi metadata
+        bundle {
+          // Compute import packages.
+          // Certain packages like javax.annotation.* are always optional.
+          // Modules may have additional optional packages, typically corresponding to compileOnly dependencies.
+          // Append wildcard "*" last to import any other referenced packages.
+          val optionalPackages = mutableListOf("javax.annotation")
+          optionalPackages.addAll(otelJava.osgiOptionalPackages.get())
+          val importPackages = optionalPackages.joinToString(",") { "$it.*;resolution:=optional;version=\"\${@}\"" } + ",*"
+
+          // Packages accessed via Class.forName that are not on the compile classpath cannot be made
+          // optional via Import-Package (BND cannot resolve version="${@}" for them). Instead, exclude
+          // them from Import-Package and declare them as DynamicImport-Package so OSGi does not
+          // require them at resolution time but can still wire them at runtime when available.
+          val dynamicImportPackages = otelJava.osgiDynamicImportPackages.get()
+          val negations = dynamicImportPackages.joinToString(",") { "!$it" }
+          val fullImportPackages = if (negations.isNotEmpty()) "$negations,$importPackages" else importPackages
+
+          val bndInstructions = mutableMapOf(
+            // Exclude shaded internal packages from exports; they are implementation details and
+            // should not be part of the OSGi bundle's public API surface.
+            "-exportcontents" to "!io.opentelemetry.internal.shaded.*,io.opentelemetry.*",
+            "Import-Package" to fullImportPackages
+          )
+          if (dynamicImportPackages.isNotEmpty()) {
+            bndInstructions["DynamicImport-Package"] = dynamicImportPackages.joinToString(",") { "$it,$it.*" }
+          }
+          bnd(bndInstructions)
         }
-        bnd(bndInstructions)
       }
     }
   }

exporters/common/compile-stub/build.gradle.kts

@@ -4,3 +4,4 @@ plugins {
 
 description = "OpenTelemetry Exporter Compile Stub"
 otelJava.moduleName.set("io.opentelemetry.exporter.internal.compile-stub")
+otelJava.osgiEnabled.set(false)

integration-tests/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
 
 description = "OpenTelemetry Integration Tests"
 otelJava.moduleName.set("io.opentelemetry.integration.tests")
+otelJava.osgiEnabled.set(false)
 
 dependencies {
   testImplementation(project(":sdk:all"))

integration-tests/graal-incubating/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
 
 description = "OpenTelemetry Graal Integration Tests (Incubating)"
 otelJava.moduleName.set("io.opentelemetry.graal.integration.tests.incubating")
+otelJava.osgiEnabled.set(false)
 otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_17)
 
 sourceSets {

integration-tests/graal/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
 
 description = "OpenTelemetry Graal Integration Tests"
 otelJava.moduleName.set("io.opentelemetry.graal.integration.tests")
+otelJava.osgiEnabled.set(false)
 otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_17)
 
 sourceSets {

integration-tests/otlp/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
 
 description = "OTLP Exporter Integration Tests"
 otelJava.moduleName.set("io.opentelemetry.integration.tests.otlp")
+otelJava.osgiEnabled.set(false)
 
 dependencies {
   api("org.testcontainers:testcontainers-junit-jupiter")