fix shading

Author: zeitlinger

javaagent/build.gradle.kts

@@ -57,9 +57,6 @@ dependencies {
   bootstrapLibs(project(":instrumentation-api"))
   // opentelemetry-api is an api dependency of :instrumentation-api, but opentelemetry-api-incubator is not
   bootstrapLibs("io.opentelemetry:opentelemetry-api-incubator")
-  bootstrapLibs(project(":instrumentation-api-incubator")) {
-    exclude("io.opentelemetry", "opentelemetry-sdk-extension-autoconfigure-spi")
-  }
   bootstrapLibs(project(":instrumentation-annotations-support"))
   bootstrapLibs(project(":javaagent-bootstrap"))
 
@@ -73,6 +70,7 @@ dependencies {
     exclude("io.opentelemetry", "opentelemetry-sdk-extension-autoconfigure-spi")
   }
   baseJavaagentLibs(project(":javaagent-extension-api"))
+  baseJavaagentLibs(project(":instrumentation-api-incubator"))
 
   baseJavaagentLibs(project(":javaagent-tooling")) {
     exclude("io.opentelemetry", "opentelemetry-sdk-extension-autoconfigure-spi")
@@ -432,13 +430,19 @@ fun CopySpec.copyByteBuddy(jar: Provider<RegularFile>) {
 fun ShadowJar.excludeBootstrapClasses() {
   dependencies {
     exclude(project(":instrumentation-api"))
-    exclude(project(":instrumentation-api-incubator"))
     exclude(project(":instrumentation-annotations-support"))
     exclude(project(":javaagent-bootstrap"))
   }
 
   // exclude the bootstrap part of the javaagent-extension-api
   exclude("io/opentelemetry/javaagent/bootstrap/**")
+
+  // all in instrumentation-api-incubator except the bridge package
+  exclude("io/opentelemetry/instrumentation/api/incubator/builder/**")
+  exclude("io/opentelemetry/instrumentation/api/incubator/config/**")
+  exclude("io/opentelemetry/instrumentation/api/incubator/instrumenter/**")
+  exclude("io/opentelemetry/instrumentation/api/incubator/log/**")
+  exclude("io/opentelemetry/instrumentation/api/incubator/semconv/**")
 }
 
 class JavaagentProvider(