fix: Boostrap classloader issue, metrics-api and metrics-lib classes had same package

bric3 · bric3 · commit 33c2cacee7b1 · 2026-01-23T18:38:40.000+01:00
diff --git a/dd-java-agent/agent-bootstrap/build.gradle b/dd-java-agent/agent-bootstrap/build.gradle
@@ -24,8 +24,6 @@ dependencies {
   api project(':components:environment')
   api project(':components:json')
   api project(':products:metrics:metrics-agent')
-  // Note: metrics-lib is not transitively exposed by metrics-agent
-  // It's only bundled in metrics-agent's shadowJar
   api libs.instrument.java
   api libs.slf4j
   // ^ Generally a bad idea for libraries, but we're shadowing.
diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Constants.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Constants.java
@@ -22,6 +22,7 @@ public final class Constants {
     "datadog.instrument",
     "datadog.appsec.api",
     "datadog.metrics.api",
+    "datadog.metrics.statsd",
     "datadog.trace.api",
     "datadog.trace.bootstrap",
     "datadog.trace.config.inversion",
diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/MeterInstaller.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/MeterInstaller.java
@@ -5,7 +5,7 @@
 
 import datadog.metrics.agent.AgentMeter;
 import datadog.metrics.api.Monitoring;
-import datadog.metrics.api.MonitoringImpl;
+import datadog.metrics.impl.MonitoringImpl;
 import datadog.metrics.statsd.StatsDClient;
 import datadog.trace.api.Config;
 import datadog.trace.api.config.GeneralConfig;
diff --git a/dd-java-agent/instrumentation-testing/build.gradle b/dd-java-agent/instrumentation-testing/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 
   api project(':dd-java-agent:testing')
   api project(':products:metrics:metrics-api')
+  api project(':products:metrics:metrics-lib')
 
   implementation project(':dd-java-agent:agent-debugger')
 
diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy
@@ -15,7 +15,9 @@ import com.datadog.debugger.sink.DebuggerSink
 import com.datadog.debugger.sink.ProbeStatusSink
 import com.google.common.collect.Sets
 import datadog.communication.ddagent.DDAgentFeaturesDiscovery
+import datadog.metrics.agent.AgentMeter
 import datadog.metrics.api.Monitoring
+import datadog.metrics.impl.MonitoringImpl
 import datadog.metrics.statsd.StatsDClient
 import datadog.instrument.classinject.ClassInjector
 import datadog.trace.agent.test.asserts.ListWriterAssert
@@ -343,6 +345,10 @@ abstract class InstrumentationSpecification extends DDSpecification implements A
 
   @SuppressForbidden
   void setupSpec() {
+    AgentMeter.registerIfAbsent(
+    STATS_D_CLIENT,
+    new MonitoringImpl(STATS_D_CLIENT, 10, TimeUnit.SECONDS)
+    )
 
     // If this fails, it's likely the result of another test loading Config before it can be
     // injected into the bootstrap classpath. If one test extends AgentTestRunner in a module, all tests must extend
@@ -379,8 +385,7 @@ abstract class InstrumentationSpecification extends DDSpecification implements A
       TEST_AGENT_WRITER = DDAgentWriter.builder().agentApi(TEST_AGENT_API).build()
     }
 
-    TEST_TRACER =
-    Spy(
+    TEST_TRACER = Spy(
     CoreTracer.builder()
     .writer(TEST_WRITER)
     .idGenerationStrategy(IdGenerationStrategy.fromName(idGenerationStrategyName()))
diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/BootstrapClasspathSetupListener.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/BootstrapClasspathSetupListener.java
@@ -69,6 +69,7 @@ public void launcherSessionOpened(LauncherSession session) {
     "datadog.instrument",
     "datadog.appsec.api",
     "datadog.metrics.api",
+    "datadog.metrics.statsd",
     "datadog.trace.api",
     "datadog.trace.bootstrap",
     "datadog.trace.config.inversion",
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/AggregateMetricTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/metrics/AggregateMetricTest.groovy
@@ -1,7 +1,7 @@
 package datadog.trace.common.metrics
 
 import datadog.metrics.agent.AgentMeter
-import datadog.metrics.api.MonitoringImpl
+import datadog.metrics.impl.MonitoringImpl
 import datadog.metrics.statsd.StatsDClient
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString
 import datadog.trace.test.util.DDSpecification
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentApiTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentApiTest.groovy
@@ -6,7 +6,7 @@ import datadog.communication.ddagent.DDAgentFeaturesDiscovery
 import datadog.communication.http.OkHttpUtils
 import datadog.communication.serialization.ByteBufferConsumer
 import datadog.metrics.api.Monitoring
-import datadog.metrics.api.MonitoringImpl
+import datadog.metrics.impl.MonitoringImpl
 import datadog.metrics.statsd.StatsDClient
 import datadog.communication.serialization.FlushingBuffer
 import datadog.communication.serialization.msgpack.MsgPackWriter
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterCombinedTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterCombinedTest.groovy
@@ -10,7 +10,7 @@ import datadog.trace.api.datastreams.NoopPathwayContext
 import datadog.trace.common.writer.ddagent.DDAgentApi
 import datadog.communication.ddagent.DDAgentFeaturesDiscovery
 import datadog.communication.http.OkHttpUtils
-import datadog.metrics.api.MonitoringImpl
+import datadog.metrics.impl.MonitoringImpl
 import datadog.metrics.statsd.StatsDClient
 import datadog.trace.common.writer.ddagent.TraceMapperV0_4
 import datadog.trace.common.writer.ddagent.TraceMapperV0_5
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterTest.groovy
@@ -8,7 +8,7 @@ import datadog.trace.api.datastreams.NoopPathwayContext
 import datadog.trace.common.writer.ddagent.DDAgentApi
 import datadog.trace.common.writer.ddagent.DDAgentMapperDiscovery
 import datadog.metrics.statsd.StatsDClient
-import datadog.metrics.api.MonitoringImpl
+import datadog.metrics.impl.MonitoringImpl
 import datadog.trace.core.CoreTracer
 import datadog.trace.core.DDSpan
 import datadog.trace.core.DDSpanContext
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterCombinedTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterCombinedTest.groovy
@@ -10,7 +10,7 @@ import datadog.trace.api.civisibility.CiVisibilityWellKnownTags
 import datadog.trace.api.intake.TrackType
 import datadog.trace.api.sampling.PrioritySampling
 import datadog.trace.api.datastreams.NoopPathwayContext
-import datadog.metrics.api.MonitoringImpl
+import datadog.metrics.impl.MonitoringImpl
 import datadog.metrics.statsd.StatsDClient
 import datadog.trace.common.writer.ddintake.DDIntakeApi
 import datadog.trace.common.writer.ddintake.DDIntakeMapperDiscovery
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDIntakeWriterTest.groovy
@@ -6,7 +6,7 @@ import datadog.trace.api.DDTraceId
 import datadog.trace.api.intake.TrackType
 import datadog.trace.api.sampling.PrioritySampling
 import datadog.trace.api.datastreams.NoopPathwayContext
-import datadog.metrics.api.MonitoringImpl
+import datadog.metrics.impl.MonitoringImpl
 import datadog.metrics.statsd.StatsDClient
 import datadog.trace.common.writer.ddagent.DDAgentApi
 import datadog.trace.common.writer.ddagent.DDAgentMapperDiscovery
diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PayloadDispatcherImplTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/PayloadDispatcherImplTest.groovy
@@ -5,7 +5,7 @@ import datadog.trace.api.DDSpanId
 import datadog.trace.api.DDTraceId
 import datadog.trace.api.sampling.PrioritySampling
 import datadog.trace.api.datastreams.NoopPathwayContext
-import datadog.metrics.api.MonitoringImpl
+import datadog.metrics.impl.MonitoringImpl
 import datadog.metrics.statsd.StatsDClient
 import datadog.trace.common.writer.ddagent.DDAgentApi
 import datadog.trace.common.writer.ddagent.DDAgentMapperDiscovery
diff --git a/dd-trace-core/src/traceAgentTest/groovy/DDApiIntegrationTest.groovy b/dd-trace-core/src/traceAgentTest/groovy/DDApiIntegrationTest.groovy
@@ -3,7 +3,7 @@ import datadog.communication.http.OkHttpUtils
 import datadog.communication.serialization.ByteBufferConsumer
 import datadog.communication.serialization.FlushingBuffer
 import datadog.communication.serialization.msgpack.MsgPackWriter
-import datadog.metrics.api.MonitoringImpl
+import datadog.metrics.impl.MonitoringImpl
 import datadog.metrics.statsd.StatsDClient
 import datadog.trace.api.Config
 import datadog.trace.common.writer.ListWriter
diff --git a/dd-trace-core/src/traceAgentTest/groovy/TraceMapperRealAgentTest.groovy b/dd-trace-core/src/traceAgentTest/groovy/TraceMapperRealAgentTest.groovy
@@ -1,6 +1,6 @@
 import datadog.communication.ddagent.DDAgentFeaturesDiscovery
 import datadog.communication.http.OkHttpUtils
-import datadog.metrics.api.MonitoringImpl
+import datadog.metrics.impl.MonitoringImpl
 import datadog.metrics.statsd.StatsDClient
 import datadog.trace.api.Config
 import datadog.trace.common.writer.PayloadDispatcherImpl
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistogram.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistogram.java
@@ -1,6 +1,7 @@
-package datadog.metrics.api;
+package datadog.metrics.impl;
 
 import com.datadoghq.sketch.ddsketch.DDSketch;
+import datadog.metrics.api.Histogram;
 import java.nio.ByteBuffer;
 
 /** Wrapper around the DDSketch library so that it can be used in an instrumentation */
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistograms.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/DDSketchHistograms.java
@@ -1,10 +1,12 @@
-package datadog.metrics.api;
+package datadog.metrics.impl;
 
 import com.datadoghq.sketch.ddsketch.DDSketch;
 import com.datadoghq.sketch.ddsketch.DDSketches;
 import com.datadoghq.sketch.ddsketch.mapping.BitwiseLinearlyInterpolatedMapping;
 import com.datadoghq.sketch.ddsketch.mapping.LogarithmicMapping;
 import com.datadoghq.sketch.ddsketch.store.CollapsingLowestDenseStore;
+import datadog.metrics.api.Histogram;
+import datadog.metrics.api.Histograms;
 
 public final class DDSketchHistograms implements Histograms {
   private static final BitwiseLinearlyInterpolatedMapping INDEX_MAPPING =
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/MonitoringImpl.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/MonitoringImpl.java
@@ -1,5 +1,8 @@
-package datadog.metrics.api;
+package datadog.metrics.impl;
 
+import datadog.metrics.api.Counter;
+import datadog.metrics.api.Monitoring;
+import datadog.metrics.api.Recording;
 import datadog.metrics.statsd.StatsDClient;
 import java.util.concurrent.TimeUnit;
 
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/StatsDCounter.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/StatsDCounter.java
@@ -1,7 +1,8 @@
-package datadog.metrics.api;
+package datadog.metrics.impl;
 
-import static datadog.metrics.api.Utils.mergeTags;
+import static datadog.metrics.impl.Utils.mergeTags;
 
+import datadog.metrics.api.Counter;
 import datadog.metrics.statsd.StatsDClient;
 
 public final class StatsDCounter implements Counter {
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/ThreadLocalRecording.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/ThreadLocalRecording.java
@@ -1,4 +1,6 @@
-package datadog.metrics.api;
+package datadog.metrics.impl;
+
+import datadog.metrics.api.Recording;
 
 public class ThreadLocalRecording extends Recording {
 
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/Timer.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/Timer.java
@@ -1,10 +1,12 @@
-package datadog.metrics.api;
+package datadog.metrics.impl;
 
-import static datadog.metrics.api.DDSketchHistograms.*;
-import static datadog.metrics.api.Utils.mergeTags;
+import static datadog.metrics.impl.DDSketchHistograms.*;
+import static datadog.metrics.impl.Utils.mergeTags;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
+import datadog.metrics.api.Histogram;
+import datadog.metrics.api.Recording;
 import datadog.metrics.statsd.StatsDClient;
 
 /**
diff --git a/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/Utils.java b/products/metrics/metrics-lib/src/main/java/datadog/metrics/impl/Utils.java
@@ -1,4 +1,4 @@
-package datadog.metrics.api;
+package datadog.metrics.impl;
 
 import java.util.Arrays;
 
diff --git a/products/metrics/metrics-lib/src/test/groovy/datadog/metrics/api/CounterTest.groovy b/products/metrics/metrics-lib/src/test/groovy/datadog/metrics/api/CounterTest.groovy
@@ -1,6 +1,6 @@
 package datadog.metrics.api
 
-
+import datadog.metrics.impl.MonitoringImpl
 import datadog.metrics.statsd.StatsDClient
 import spock.lang.Specification
 
diff --git a/products/metrics/metrics-lib/src/test/groovy/datadog/metrics/api/TimingTest.groovy b/products/metrics/metrics-lib/src/test/groovy/datadog/metrics/api/TimingTest.groovy
@@ -1,5 +1,7 @@
 package datadog.metrics.api
 
+import datadog.metrics.impl.MonitoringImpl
+import datadog.metrics.impl.ThreadLocalRecording
 import datadog.metrics.statsd.StatsDClient
 import org.junit.jupiter.api.Assertions
 import spock.lang.Specification
