migrating config-utils tests

Author: mhlidd

internal-api/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollector.java renamed to internal-api/src/main/java/datadog/trace/api/telemetry/ConfigInversionMetricCollectorImpl.java

@@ -9,22 +9,25 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ConfigInversionMetricCollector
-    implements MetricCollector<ConfigInversionMetricCollector.ConfigInversionMetric> {
-  private static final Logger log = LoggerFactory.getLogger(ConfigInversionMetricCollector.class);
+public class ConfigInversionMetricCollectorImpl
+    implements MetricCollector<ConfigInversionMetricCollectorImpl.ConfigInversionMetric>,
+        ConfigInversionMetricCollector {
+  private static final Logger log =
+      LoggerFactory.getLogger(ConfigInversionMetricCollectorImpl.class);
   private static final String CONFIG_INVERSION_KEY_TAG = "config_name:";
   private static final String CONFIG_INVERSION_METRIC_NAME = "untracked.config.detected";
   private static final String NAMESPACE = "tracers";
-  private static final ConfigInversionMetricCollector INSTANCE =
-      new ConfigInversionMetricCollector();
+  private static final ConfigInversionMetricCollectorImpl INSTANCE =
+      new ConfigInversionMetricCollectorImpl();
 
-  private final BlockingQueue<ConfigInversionMetricCollector.ConfigInversionMetric> metricsQueue;
+  private final BlockingQueue<ConfigInversionMetricCollectorImpl.ConfigInversionMetric>
+      metricsQueue;
 
-  private ConfigInversionMetricCollector() {
+  private ConfigInversionMetricCollectorImpl() {
     this.metricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE);
   }
 
-  public static ConfigInversionMetricCollector getInstance() {
+  public static ConfigInversionMetricCollectorImpl getInstance() {
     return INSTANCE;
   }
 
@@ -34,7 +37,7 @@ public void setUndocumentedEnvVarMetric(String configName) {
 
   private void setMetricConfigInversionMetric(final String... tags) {
     if (!metricsQueue.offer(
-        new ConfigInversionMetricCollector.ConfigInversionMetric(
+        new ConfigInversionMetricCollectorImpl.ConfigInversionMetric(
             NAMESPACE, true, CONFIG_INVERSION_METRIC_NAME, "count", 1, tags))) {
       log.debug("Unable to add telemetry metric {} for {}", CONFIG_INVERSION_METRIC_NAME, tags[0]);
     }
@@ -46,11 +49,11 @@ public void prepareMetrics() {
   }
 
   @Override
-  public Collection<ConfigInversionMetricCollector.ConfigInversionMetric> drain() {
+  public Collection<ConfigInversionMetricCollectorImpl.ConfigInversionMetric> drain() {
     if (this.metricsQueue.isEmpty()) {
       return Collections.emptyList();
     }
-    List<ConfigInversionMetricCollector.ConfigInversionMetric> drained =
+    List<ConfigInversionMetricCollectorImpl.ConfigInversionMetric> drained =
         new ArrayList<>(this.metricsQueue.size());
     this.metricsQueue.drainTo(drained);
     return drained;

internal-api/src/test/groovy/datadog/trace/api/telemetry/ConfigInversionMetricCollectorTest.groovy renamed to internal-api/src/test/groovy/datadog/trace/api/telemetry/ConfigInversionMetricCollectorImplTest.groovy

@@ -2,13 +2,13 @@ package datadog.trace.api.telemetry
 
 import datadog.trace.test.util.DDSpecification
 
-import static datadog.trace.api.telemetry.ConfigInversionMetricCollector.CONFIG_INVERSION_METRIC_NAME
+import static ConfigInversionMetricCollectorImpl.CONFIG_INVERSION_METRIC_NAME
 
-class ConfigInversionMetricCollectorTest extends DDSpecification {
+class ConfigInversionMetricCollectorImplTest extends DDSpecification {
 
   def "should emit metric when unsupported env var is used"() {
     setup:
-    def collector = ConfigInversionMetricCollector.getInstance()
+    def collector = ConfigInversionMetricCollectorImpl.getInstance()
 
     when:
     ConfigInversionMetricCollectorTestHelper.checkAndEmitUnsupported("DD_UNKNOWN_FEATURE")
@@ -28,7 +28,7 @@ class ConfigInversionMetricCollectorTest extends DDSpecification {
 
   def "should not emit metric when supported env var is used"() {
     setup:
-    def collector = ConfigInversionMetricCollector.getInstance()
+    def collector = ConfigInversionMetricCollectorImpl.getInstance()
 
     when:
     ConfigInversionMetricCollectorTestHelper.checkAndEmitUnsupported("DD_ENV")

internal-api/src/test/groovy/datadog/trace/api/telemetry/ConfigInversionMetricCollectorTestHelper.java

@@ -10,8 +10,8 @@ public class ConfigInversionMetricCollectorTestHelper {
   private static final Set<String> SUPPORTED_ENV_VARS =
       new HashSet<>(Arrays.asList("DD_ENV", "DD_SERVICE"));
 
-  private static final ConfigInversionMetricCollector configInversionMetricCollector =
-      ConfigInversionMetricCollector.getInstance();
+  private static final ConfigInversionMetricCollectorImpl configInversionMetricCollector =
+      ConfigInversionMetricCollectorImpl.getInstance();
 
   public static void checkAndEmitUnsupported(String envVarName) {
     if (!SUPPORTED_ENV_VARS.contains(envVarName)) {

telemetry/src/main/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicAction.java

@@ -1,13 +1,13 @@
 package datadog.telemetry.metric;
 
-import datadog.trace.api.telemetry.ConfigInversionMetricCollector;
+import datadog.trace.api.telemetry.ConfigInversionMetricCollectorImpl;
 import datadog.trace.api.telemetry.MetricCollector;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
 public class ConfigInversionMetricPeriodicAction extends MetricPeriodicAction {
   @Override
   @NonNull
   public MetricCollector collector() {
-    return ConfigInversionMetricCollector.getInstance();
+    return ConfigInversionMetricCollectorImpl.getInstance();
   }
 }

utils/config-utils/build.gradle.kts

@@ -12,4 +12,5 @@ dependencies {
   implementation(libs.slf4j)
 
   testImplementation(project(":utils:test-utils"))
+  testImplementation("org.snakeyaml:snakeyaml-engine:2.9")
 }