Add logging utility module

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

@@ -36,6 +36,7 @@ dependencies {
   implementation libs.slf4j
   implementation libs.bundles.asm
   implementation project(':internal-api')
+  implementation project(':utils:logging-utils')
   implementation project(':communication')
   implementation project(':products:metrics:metrics-lib')
   compileOnly project(':dd-java-agent:agent-tooling')

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')
 }

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleCounter.java

@@ -3,10 +3,10 @@
 import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder.ofDoubles;
 import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.COUNTER;
 
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.bootstrap.otel.metrics.OtelInstrument;
 import datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder;
 import datadog.trace.bootstrap.otel.metrics.data.OtelMetricStorage;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.metrics.DoubleCounter;
 import io.opentelemetry.api.metrics.DoubleCounterBuilder;

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleHistogram.java

@@ -6,10 +6,10 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.bootstrap.otel.metrics.OtelInstrument;
 import datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder;
 import datadog.trace.bootstrap.otel.metrics.data.OtelMetricStorage;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.metrics.DoubleHistogram;

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongCounter.java

@@ -3,10 +3,10 @@
 import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder.ofLongs;
 import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.COUNTER;
 
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.bootstrap.otel.metrics.OtelInstrument;
 import datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder;
 import datadog.trace.bootstrap.otel.metrics.data.OtelMetricStorage;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.metrics.DoubleCounterBuilder;
 import io.opentelemetry.api.metrics.LongCounter;

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongHistogram.java

@@ -6,10 +6,10 @@
 import static datadog.trace.bootstrap.otel.metrics.data.OtelMetricStorage.newHistogramStorage;
 import static java.util.stream.Collectors.toList;
 
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.bootstrap.otel.metrics.OtelInstrument;
 import datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder;
 import datadog.trace.bootstrap.otel.metrics.data.OtelMetricStorage;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.metrics.LongHistogram;

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelObservableCallback.java

@@ -1,7 +1,7 @@
 package datadog.opentelemetry.shim.metrics;
 
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.bootstrap.otel.metrics.data.OtelObservable;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import io.opentelemetry.api.metrics.BatchCallback;
 import io.opentelemetry.api.metrics.ObservableDoubleCounter;
 import io.opentelemetry.api.metrics.ObservableDoubleGauge;

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelObservableMeasurement.java

@@ -1,7 +1,7 @@
 package datadog.opentelemetry.shim.metrics;
 
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.bootstrap.otel.metrics.data.OtelMetricStorage;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.metrics.ObservableDoubleMeasurement;
 import io.opentelemetry.api.metrics.ObservableLongMeasurement;

dd-java-agent/agent-profiling/profiling-uploader/build.gradle

@@ -24,6 +24,7 @@ dependencies {
   implementation project(':communication')
   implementation project(':internal-api')
   implementation project(':utils:container-utils')
+  implementation project(':utils:logging-utils')
   implementation project(':utils:socket-utils')
   implementation project(':utils:version-utils')
 

dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ProfileUploader.java

@@ -24,6 +24,7 @@
 import datadog.common.container.ServerlessInfo;
 import datadog.common.version.VersionInfo;
 import datadog.communication.http.OkHttpUtils;
+import datadog.logging.IOLogger;
 import datadog.trace.api.Config;
 import datadog.trace.api.DDTags;
 import datadog.trace.api.Platform;
@@ -34,7 +35,6 @@
 import datadog.trace.api.profiling.RecordingType;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
 import datadog.trace.bootstrap.instrumentation.api.Tags;
-import datadog.trace.relocate.api.IOLogger;
 import datadog.trace.util.AgentThreadFactory;
 import datadog.trace.util.PidHelper;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/util/JfrCliHelper.java

@@ -4,8 +4,8 @@
 
 import datadog.environment.JavaVirtualMachine;
 import datadog.environment.SystemProperties;
+import datadog.logging.IOLogger;
 import datadog.trace.api.profiling.RecordingData;
-import datadog.trace.relocate.api.IOLogger;
 import datadog.trace.util.AgentThreadFactory;
 import java.io.ByteArrayOutputStream;
 import java.io.File;

dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java

@@ -41,6 +41,7 @@
 import com.google.common.io.ByteStreams;
 import datadog.common.version.VersionInfo;
 import datadog.environment.JavaVirtualMachine;
+import datadog.logging.IOLogger;
 import datadog.trace.api.Config;
 import datadog.trace.api.DDTags;
 import datadog.trace.api.ProcessTags;
@@ -49,7 +50,6 @@
 import datadog.trace.api.profiling.RecordingInputStream;
 import datadog.trace.api.profiling.RecordingType;
 import datadog.trace.bootstrap.config.provider.ConfigProvider;
-import datadog.trace.relocate.api.IOLogger;
 import datadog.trace.test.util.ControllableEnvironmentVariables;
 import datadog.trace.util.PidHelper;
 import delight.fileupload.FileUpload;

dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/util/JfrCliHelperTest.java

@@ -11,9 +11,9 @@
 
 import datadog.environment.JavaVirtualMachine;
 import datadog.environment.SystemProperties;
+import datadog.logging.IOLogger;
 import datadog.trace.api.profiling.RecordingData;
 import datadog.trace.api.profiling.RecordingInputStream;
-import datadog.trace.relocate.api.IOLogger;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

dd-java-agent/build.gradle

@@ -163,8 +163,8 @@ def generalShadowJarConfig(ShadowJar shadowJarTask) {
       relocate 'datadog.trace.common', 'datadog.trace.agent.common'
       relocate 'datadog.trace.core', 'datadog.trace.agent.core'
       relocate 'datadog.opentracing', 'datadog.trace.agent.ot'
-      // shadow things in internal API that has slf4j in the API and is accessed from core
-      relocate 'datadog.trace.relocate', 'datadog.trace.agent.relocate'
+      // shadow logging-utils that has slf4j in the API and is accessed from core
+      relocate 'datadog.logging', 'datadog.trace.agent.logging'
     }
   }
 }
@@ -411,6 +411,9 @@ dependencies {
   sharedShadowInclude project(':utils:version-utils'), {
     transitive = false
   }
+  sharedShadowInclude project(':utils:logging-utils'), {
+    transitive = false
+  }
   sharedShadowInclude project(':dd-java-agent:agent-crashtracking'), {
     transitive = false
   }

dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/BootstrapClasspathSetupListener.java

@@ -87,7 +87,7 @@ public void launcherSessionOpened(LauncherSession session) {
   static {
     TEST_BOOTSTRAP_PREFIXES =
         Arrays.copyOf(BOOTSTRAP_PACKAGE_PREFIXES_COPY, BOOTSTRAP_PACKAGE_PREFIXES_COPY.length + 3);
-    TEST_BOOTSTRAP_PREFIXES[BOOTSTRAP_PACKAGE_PREFIXES_COPY.length] = "datadog.trace.relocate.api";
+    TEST_BOOTSTRAP_PREFIXES[BOOTSTRAP_PACKAGE_PREFIXES_COPY.length] = "datadog.logging";
     TEST_BOOTSTRAP_PREFIXES[BOOTSTRAP_PACKAGE_PREFIXES_COPY.length + 1] = "org.slf4j";
     TEST_BOOTSTRAP_PREFIXES[BOOTSTRAP_PACKAGE_PREFIXES_COPY.length + 2] = "ch.qos.logback";
 

dd-trace-core/build.gradle

@@ -73,6 +73,7 @@ dependencies {
   implementation project(':components:json')
   implementation project(':utils:container-utils')
   implementation project(':utils:socket-utils')
+  implementation project(':utils:logging-utils')
   implementation project(':utils:queue-utils')
   // for span exception debugging
   compileOnly project(':dd-java-agent:agent-debugger:debugger-bootstrap')

dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteApi.java

@@ -1,6 +1,6 @@
 package datadog.trace.common.writer;
 
-import datadog.trace.relocate.api.IOLogger;
+import datadog.logging.IOLogger;
 import java.io.IOException;
 import java.util.Optional;
 import java.util.OptionalInt;

dd-trace-core/src/main/java/datadog/trace/common/writer/RemoteWriter.java

@@ -3,9 +3,9 @@
 import static datadog.trace.api.sampling.PrioritySampling.UNSET;
 import static java.util.concurrent.TimeUnit.MINUTES;
 
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.core.DDSpan;
 import datadog.trace.core.monitor.HealthMetrics;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;

dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java

@@ -24,6 +24,7 @@
 import datadog.communication.ddagent.SharedCommunicationObjects;
 import datadog.context.propagation.Propagators;
 import datadog.environment.ThreadSupport;
+import datadog.logging.RatelimitedLogger;
 import datadog.metrics.agent.AgentMeter;
 import datadog.metrics.api.Monitoring;
 import datadog.metrics.api.Recording;
@@ -104,7 +105,6 @@
 import datadog.trace.core.taginterceptor.TagInterceptor;
 import datadog.trace.core.traceinterceptor.LatencyTraceInterceptor;
 import datadog.trace.lambda.LambdaHandler;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import datadog.trace.util.AgentTaskScheduler;
 import java.io.IOException;
 import java.lang.ref.WeakReference;

dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/DatadogPTagsCodec.java

@@ -1,10 +1,10 @@
 package datadog.trace.core.propagation.ptags;
 
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.api.ProductTraceSource;
 import datadog.trace.core.propagation.PropagationTags;
 import datadog.trace.core.propagation.ptags.PTagsFactory.PTags;
 import datadog.trace.core.propagation.ptags.TagElement.Encoding;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;

dd-trace-core/src/main/java/datadog/trace/core/propagation/ptags/W3CPTagsCodec.java

@@ -2,12 +2,12 @@
 
 import static datadog.trace.api.internal.util.LongStringUtils.toHexStringPadded;
 
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.api.ProductTraceSource;
 import datadog.trace.api.sampling.PrioritySampling;
 import datadog.trace.core.propagation.PropagationTags;
 import datadog.trace.core.propagation.ptags.PTagsFactory.PTags;
 import datadog.trace.core.propagation.ptags.TagElement.Encoding;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;

dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java

@@ -15,6 +15,7 @@
 import datadog.context.Context;
 import datadog.context.ContextManager;
 import datadog.context.ContextScope;
+import datadog.logging.RatelimitedLogger;
 import datadog.trace.api.Config;
 import datadog.trace.api.Stateful;
 import datadog.trace.api.scopemanager.ExtendedScopeListener;
@@ -26,7 +27,6 @@
 import datadog.trace.bootstrap.instrumentation.api.ProfilerContext;
 import datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration;
 import datadog.trace.core.monitor.HealthMetrics;
-import datadog.trace.relocate.api.RatelimitedLogger;
 import datadog.trace.util.AgentTaskScheduler;
 import java.util.Iterator;
 import java.util.List;

gradle/dependencies.gradle

@@ -32,6 +32,7 @@ final class CachedData {
       exclude(project(':utils:queue-utils'))
       exclude(project(':utils:socket-utils'))
       exclude(project(':utils:time-utils'))
+      exclude(project(':utils:logging-utils'))
       exclude(project(':utils:version-utils'))
       exclude(project(':dd-java-agent:agent-crashtracking'))
       exclude(project(':dd-java-agent:ddprof-lib'))