Remove separate exporter configuration which we always have in distro… (#5331)

* Remove separate exporter configuration which we always have in distro now.

* Actually remove

javaagent-exporters/build.gradle.kts

@@ -1,22 +0,0 @@
-// Project to collect and shade exporter dependencies included in the agent's full distribution.
-
-plugins {
-  id("otel.java-conventions")
-}
-
-dependencies {
-  implementation("io.opentelemetry:opentelemetry-exporter-jaeger")
-  implementation("io.opentelemetry:opentelemetry-exporter-otlp")
-  implementation("io.opentelemetry:opentelemetry-exporter-otlp-metrics")
-  implementation("io.opentelemetry:opentelemetry-exporter-otlp-logs")
-  implementation("io.opentelemetry:opentelemetry-exporter-otlp-http-trace")
-  implementation("io.opentelemetry:opentelemetry-exporter-otlp-http-metrics")
-  implementation("io.opentelemetry:opentelemetry-exporter-otlp-http-logs")
-  implementation("io.opentelemetry:opentelemetry-exporter-logging-otlp")
-
-  implementation("io.opentelemetry:opentelemetry-exporter-prometheus")
-  implementation("io.prometheus:simpleclient")
-  implementation("io.prometheus:simpleclient_httpserver")
-
-  implementation("io.opentelemetry:opentelemetry-exporter-zipkin")
-}

javaagent-tooling/build.gradle.kts

@@ -30,8 +30,22 @@ dependencies {
   implementation("io.opentelemetry:opentelemetry-sdk-extension-resources")
   implementation("io.opentelemetry:opentelemetry-extension-noop-api")
 
-  // Other exporters are in javaagent-exporters
+  // Exporters with dependencies
+  implementation("io.opentelemetry:opentelemetry-exporter-jaeger")
   implementation("io.opentelemetry:opentelemetry-exporter-logging")
+  implementation("io.opentelemetry:opentelemetry-exporter-otlp")
+  implementation("io.opentelemetry:opentelemetry-exporter-otlp-metrics")
+  implementation("io.opentelemetry:opentelemetry-exporter-otlp-logs")
+  implementation("io.opentelemetry:opentelemetry-exporter-otlp-http-trace")
+  implementation("io.opentelemetry:opentelemetry-exporter-otlp-http-metrics")
+  implementation("io.opentelemetry:opentelemetry-exporter-otlp-http-logs")
+  implementation("io.opentelemetry:opentelemetry-exporter-logging-otlp")
+
+  implementation("io.opentelemetry:opentelemetry-exporter-prometheus")
+  implementation("io.prometheus:simpleclient")
+  implementation("io.prometheus:simpleclient_httpserver")
+
+  implementation("io.opentelemetry:opentelemetry-exporter-zipkin")
 
   api("net.bytebuddy:byte-buddy-dep")
   implementation("org.slf4j:slf4j-api")

javaagent/build.gradle.kts

@@ -30,13 +30,9 @@ val javaagentLibs by configurations.creating {
   isCanBeConsumed = false
   extendsFrom(baseJavaagentLibs)
 }
-// this configuration collects just exporter libs (also placed in the agent classloader & isolated from the instrumented application)
-val exporterLibs by configurations.creating {
-  isCanBeResolved = true
-  isCanBeConsumed = false
-}
+
 // exclude dependencies that are to be placed in bootstrap from agent libs - they won't be added to inst/
-listOf(baseJavaagentLibs, javaagentLibs, exporterLibs).forEach {
+listOf(baseJavaagentLibs, javaagentLibs).forEach {
   it.run {
     exclude("org.slf4j")
     exclude("io.opentelemetry", "opentelemetry-api")
@@ -69,8 +65,6 @@ dependencies {
   baseJavaagentLibs(project(":instrumentation:internal:internal-reflection:javaagent"))
   baseJavaagentLibs(project(":instrumentation:internal:internal-url-class-loader:javaagent"))
 
-  exporterLibs(project(":javaagent-exporters"))
-
   // concurrentlinkedhashmap-lru and weak-lock-free are copied in to the instrumentation-api module
   licenseReportDependencies("com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2")
   licenseReportDependencies("com.blogspot.mydailyjava:weak-lock-free:0.18")
@@ -135,19 +129,12 @@ tasks {
     excludeBootstrapJars()
   }
 
-  val relocateExporterLibs by registering(ShadowJar::class) {
-    configurations = listOf(exporterLibs)
-
-    archiveFileName.set("exporterLibs-relocated.jar")
-  }
-
   // Includes everything needed for OOTB experience
   val shadowJar by existing(ShadowJar::class) {
     configurations = listOf(bootstrapLibs)
 
-    dependsOn(relocateJavaagentLibs, relocateExporterLibs)
+    dependsOn(relocateJavaagentLibs)
     isolateClasses(relocateJavaagentLibs.get().outputs.files)
-    isolateClasses(relocateExporterLibs.get().outputs.files)
 
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 

settings.gradle.kts

@@ -91,7 +91,6 @@ include(":muzzle")
 include(":opentelemetry-api-shaded-for-instrumenting")
 include(":opentelemetry-ext-annotations-shaded-for-instrumenting")
 include(":javaagent-bootstrap")
-include(":javaagent-exporters")
 include(":javaagent-extension-api")
 include(":javaagent-tooling")
 include(":javaagent-tooling:javaagent-tooling-java9")