Refactor the dd-java-agent build so otel-shim depends on otel-bootstrap.

This lets us move more OTel support classes to the shared otel-bootstrap,
reducing duplication - we'll only need extra copies of classes when they
explicitly refer to OTel classes (in which case we need one copy for our
drop-in support and another for auto-instrumentation of the OTel API.)

Author: mcculls

dd-java-agent/agent-otel/otel-bootstrap/build.gradle

@@ -73,7 +73,6 @@ dependencies {
   embeddedClasspath group: 'io.opentelemetry.javaagent.instrumentation', name: 'opentelemetry-javaagent-servlet-common-bootstrap', version: "$otelInstrumentationApiVersion-alpha"
 
   compileOnly project(':dd-java-agent:agent-bootstrap')
-  implementation project(':dd-java-agent:agent-otel:otel-shim')
 }
 
 tasks.named("shadowJar", ShadowJar) {
@@ -93,6 +92,7 @@ tasks.named("shadowJar", ShadowJar) {
   include 'io/opentelemetry/instrumentation/api/**'
   exclude 'io/opentelemetry/instrumentation/api/incubator/log/**'
   exclude 'io/opentelemetry/instrumentation/api/incubator/semconv/db/*Sanitizer*'
+  exclude 'io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlStatementInfo*'
   exclude 'io/opentelemetry/instrumentation/api/internal/cache/**'
   exclude 'io/opentelemetry/instrumentation/api/internal/RuntimeVirtualFieldSupplier*'
   exclude 'io/opentelemetry/instrumentation/api/util/VirtualField*'
@@ -104,15 +104,13 @@ tasks.named("shadowJar", ShadowJar) {
   exclude 'io/opentelemetry/javaagent/bootstrap/internal/EmptyInstrumentationConfig*'
   exclude 'io/opentelemetry/javaagent/bootstrap/internal/InClassLoaderMatcher*'
   exclude 'io/opentelemetry/javaagent/bootstrap/internal/InstrumentationConfig*'
-  include 'datadog/opentelemetry/shim/**'
   include 'datadog/trace/bootstrap/otel/**'
 
   relocate 'io.opentelemetry.api', 'datadog.trace.bootstrap.otel.api'
   relocate 'io.opentelemetry.context', 'datadog.trace.bootstrap.otel.context'
   relocate 'io.opentelemetry.semconv', 'datadog.trace.bootstrap.otel.semconv'
   relocate 'io.opentelemetry.instrumentation.api', 'datadog.trace.bootstrap.otel.instrumentation.api'
   relocate 'io.opentelemetry.javaagent.bootstrap', 'datadog.trace.bootstrap.otel.instrumentation'
-  relocate 'datadog.opentelemetry.shim', 'datadog.trace.bootstrap.otel.shim'
 }
 
 tasks.named("jar", Jar) {

dd-java-agent/agent-otel/otel-shim/build.gradle

@@ -6,6 +6,7 @@ minimumBranchCoverage = 0.0
 dependencies {
   // minimum OpenTelemetry API version this shim is compatible with
   compileOnly group: 'io.opentelemetry', name: 'opentelemetry-api', version: '1.47.0'
+  compileOnly project(':dd-java-agent:agent-otel:otel-bootstrap')
 
   implementation project(':products:metrics:metrics-api')
   implementation project(':internal-api')

dd-java-agent/build.gradle

@@ -150,6 +150,11 @@ def generalShadowJarConfig(ShadowJar shadowJarTask) {
       relocate 'org.snakeyaml.engine', 'datadog.snakeyaml.engine'
       relocate 'okhttp3', 'datadog.okhttp3'
       relocate 'okio', 'datadog.okio'
+
+      // embed an extra copy of our otel-shim for drop-in/extension support
+      relocate 'io.opentelemetry.api', 'datadog.trace.bootstrap.otel.api'
+      relocate 'io.opentelemetry.context', 'datadog.trace.bootstrap.otel.context'
+      relocate 'datadog.opentelemetry.shim', 'datadog.trace.bootstrap.otel.shim'
     }
 
     if (!project.hasProperty("disableShadowRelocate") || !disableShadowRelocate) {
@@ -362,6 +367,8 @@ dependencies {
   shadowInclude project(path: ':dd-java-agent:agent-bootstrap')
   shadowInclude project(path: ':dd-java-agent:agent-debugger:debugger-bootstrap')
   shadowInclude project(path: ':dd-java-agent:agent-otel:otel-bootstrap', configuration: 'shadow')
+  // embed an extra copy of our otel-shim for drop-in/extension support
+  shadowInclude project(path: ':dd-java-agent:agent-otel:otel-shim')
   shadowInclude project(path: ':products:feature-flagging:feature-flagging-bootstrap')
 
   // Includes for the shared internal shadow jar