Add logging utility module (#10879)

feat(logging): Create dedicated module for logging utils

feat(logging): Migrate unit tests to JUnit

feat(logging): Migrate to logging-utils module

feat(debugger): Order dependencies

feat(logging): Improve migrated tests

fix(logging): Fix duplicate classes

Co-authored-by: bruce.bujon <bruce.bujon@datadoghq.com>

Author: PerfectSlayer

dd-java-agent/agent-debugger/build.gradle

@@ -32,20 +32,21 @@ excludedClassesCoverage += [
 
 dependencies {
   // main dependencies
-  implementation project(':utils:container-utils')
-  implementation libs.slf4j
-  implementation libs.bundles.asm
-  implementation project(':internal-api')
-  implementation project(':communication')
-  implementation project(':products:metrics:metrics-lib')
-  compileOnly project(':dd-java-agent:agent-tooling')
   compileOnly project(':dd-java-agent:agent-builder')
+  compileOnly project(':dd-java-agent:agent-tooling')
   compileOnly project(':dd-trace-core')
-  implementation project(':dd-java-agent:agent-debugger:debugger-el')
+  implementation project(':communication')
   implementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
-  implementation libs.okhttp
+  implementation project(':dd-java-agent:agent-debugger:debugger-el')
+  implementation project(':internal-api')
+  implementation project(':products:metrics:metrics-lib')
+  implementation project(':utils:container-utils')
+  implementation project(':utils:logging-utils')
+  implementation libs.bundles.asm
   implementation libs.dogstatsd
   implementation libs.moshi
+  implementation libs.okhttp
+  implementation libs.slf4j
 
   testImplementation libs.asm.util
   testImplementation libs.bundles.junit5

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/ConfigurationUpdater.java

@@ -14,12 +14,12 @@
 import com.datadog.debugger.util.ExceptionHelper;
 import com.datadog.debugger.util.SpringHelper;
 import datadog.environment.JavaVirtualMachine;
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.api.Config;
 import datadog.trace.bootstrap.debugger.DebuggerContext;
 import datadog.trace.bootstrap.debugger.ProbeId;
 import datadog.trace.bootstrap.debugger.ProbeImplementation;
 import datadog.trace.bootstrap.debugger.ProbeRateLimiter;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import datadog.trace.util.TagsHelper;
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/ProbeStatusSink.java

@@ -10,9 +10,9 @@
 import com.datadog.debugger.util.ExceptionHelper;
 import com.datadog.debugger.util.MoshiHelper;
 import com.squareup.moshi.JsonAdapter;
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.api.Config;
 import datadog.trace.bootstrap.debugger.ProbeId;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/uploader/BatchUploader.java

@@ -5,8 +5,8 @@
 import com.datadog.debugger.util.DebuggerMetrics;
 import datadog.common.container.ContainerInfo;
 import datadog.communication.http.OkHttpUtils;
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.api.Config;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import datadog.trace.util.AgentThreadFactory;
 import java.io.IOException;
 import java.time.Duration;

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/ExceptionHelper.java

@@ -1,6 +1,6 @@
 package com.datadog.debugger.util;
 
-import datadog.trace.relocate.api.RatelimitedLogger;
+import datadog.logging.RatelimitedLogger;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.Writer;

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/uploader/BatchUploaderTest.java

@@ -12,8 +12,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.api.Config;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import java.io.IOException;
 import java.net.ConnectException;
 import java.net.ServerSocket;

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/util/ExceptionHelperTest.java

@@ -7,7 +7,7 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-import datadog.trace.relocate.api.RatelimitedLogger;
+import datadog.logging.RatelimitedLogger;
 import java.util.ArrayDeque;
 import java.util.Deque;
 import org.junit.jupiter.api.Test;

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

@@ -73,6 +73,8 @@ 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(':utils:logging-utils')
 }
 
 tasks.named("shadowJar", ShadowJar) {

dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/data/OtelMetricStorage.java

@@ -1,12 +1,12 @@
 package datadog.trace.bootstrap.otel.metrics.data;
 
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.api.Config;
 import datadog.trace.api.config.OtlpConfig;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.otel.metrics.OtelInstrumentDescriptor;
 import datadog.trace.bootstrap.otel.metrics.OtelInstrumentType;
 import datadog.trace.bootstrap.otel.metrics.export.OtelMetricVisitor;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import io.opentelemetry.api.common.Attributes;
 import java.util.List;
 import java.util.Map;

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

@@ -10,4 +10,5 @@ dependencies {
 
   implementation project(':products:metrics:metrics-api')
   implementation project(':internal-api')
+  implementation project(':utils:logging-utils')
 }