diff --git a/dd-java-agent/agent-jmxfetch/integrations-core b/dd-java-agent/agent-jmxfetch/integrations-core index 03aed80d105..bb8520bc2a8 160000 --- a/dd-java-agent/agent-jmxfetch/integrations-core +++ b/dd-java-agent/agent-jmxfetch/integrations-core @@ -1 +1 @@ -Subproject commit 03aed80d105aa81b047e74c6da086165cac5ff6f +Subproject commit bb8520bc2a877a2d1fbe640bd0526378ec20e8bc diff --git a/dd-java-agent/agent-profiling/profiling-auxiliary-ddprof/src/main/java/com/datadog/profiling/auxiliary/ddprof/AuxiliaryDatadogProfiler.java b/dd-java-agent/agent-profiling/profiling-auxiliary-ddprof/src/main/java/com/datadog/profiling/auxiliary/ddprof/AuxiliaryDatadogProfiler.java index bf3dc01fdc7..43cc0bdf0e5 100644 --- a/dd-java-agent/agent-profiling/profiling-auxiliary-ddprof/src/main/java/com/datadog/profiling/auxiliary/ddprof/AuxiliaryDatadogProfiler.java +++ b/dd-java-agent/agent-profiling/profiling-auxiliary-ddprof/src/main/java/com/datadog/profiling/auxiliary/ddprof/AuxiliaryDatadogProfiler.java @@ -2,10 +2,10 @@ import com.datadog.profiling.auxiliary.AuxiliaryImplementation; import com.datadog.profiling.controller.OngoingRecording; -import com.datadog.profiling.controller.RecordingData; import com.datadog.profiling.ddprof.DatadogProfiler; import com.datadog.profiling.utils.ProfilingMode; import com.google.auto.service.AutoService; +import datadog.trace.api.profiling.RecordingData; import datadog.trace.bootstrap.config.provider.ConfigProvider; import java.util.EnumSet; import java.util.Set; diff --git a/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryImplementation.java b/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryImplementation.java index b3d955167d1..0f28f087c37 100644 --- a/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryImplementation.java +++ b/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryImplementation.java @@ -1,8 +1,8 @@ package com.datadog.profiling.auxiliary; import com.datadog.profiling.controller.OngoingRecording; -import com.datadog.profiling.controller.RecordingData; import com.datadog.profiling.utils.ProfilingMode; +import datadog.trace.api.profiling.RecordingData; import datadog.trace.bootstrap.config.provider.ConfigProvider; import java.util.Collections; import java.util.Set; diff --git a/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingData.java b/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingData.java index 155775e054d..4de89e7c428 100644 --- a/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingData.java +++ b/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingData.java @@ -1,7 +1,7 @@ package com.datadog.profiling.auxiliary; -import com.datadog.profiling.controller.RecordingData; -import com.datadog.profiling.controller.RecordingInputStream; +import datadog.trace.api.profiling.RecordingData; +import datadog.trace.api.profiling.RecordingInputStream; import java.io.IOException; import java.time.Instant; import javax.annotation.Nonnull; diff --git a/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingStreams.java b/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingStreams.java index 3109a5b7e35..e7b9f56fa5f 100644 --- a/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingStreams.java +++ b/dd-java-agent/agent-profiling/profiling-auxiliary/src/main/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingStreams.java @@ -1,7 +1,7 @@ package com.datadog.profiling.auxiliary; -import com.datadog.profiling.controller.RecordingData; -import com.datadog.profiling.controller.RecordingInputStream; +import datadog.trace.api.profiling.RecordingData; +import datadog.trace.api.profiling.RecordingInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingDataTest.java b/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingDataTest.java index 319591cd749..fec7322970f 100644 --- a/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingDataTest.java +++ b/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/AuxiliaryRecordingDataTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.*; -import com.datadog.profiling.controller.RecordingData; -import com.datadog.profiling.controller.RecordingInputStream; import datadog.trace.api.profiling.ProfilingSnapshot; +import datadog.trace.api.profiling.RecordingData; +import datadog.trace.api.profiling.RecordingInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/TestAuxiliaryProfilerImplementation.java b/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/TestAuxiliaryProfilerImplementation.java index 764a2199940..aeb47f30b03 100644 --- a/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/TestAuxiliaryProfilerImplementation.java +++ b/dd-java-agent/agent-profiling/profiling-auxiliary/src/test/java/com/datadog/profiling/auxiliary/TestAuxiliaryProfilerImplementation.java @@ -1,9 +1,9 @@ package com.datadog.profiling.auxiliary; import com.datadog.profiling.controller.OngoingRecording; -import com.datadog.profiling.controller.RecordingData; import com.datadog.profiling.utils.ProfilingMode; import com.google.auto.service.AutoService; +import datadog.trace.api.profiling.RecordingData; import datadog.trace.bootstrap.config.provider.ConfigProvider; import java.util.EnumSet; import java.util.Set; diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecording.java b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecording.java index 00b44761bc6..1d61e984768 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecording.java +++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/main/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecording.java @@ -17,11 +17,11 @@ import com.datadog.profiling.controller.OngoingRecording; import com.datadog.profiling.controller.ProfilerSettingsSupport; -import com.datadog.profiling.controller.RecordingData; import com.datadog.profiling.controller.UnsupportedEnvironmentException; import com.datadog.profiling.ddprof.DatadogProfiler; import datadog.trace.api.Platform; import datadog.trace.api.profiling.ProfilingSnapshot; +import datadog.trace.api.profiling.RecordingData; import java.time.Instant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerControllerTest.java b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerControllerTest.java index 8f344543279..ca07b0d3229 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerControllerTest.java +++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerControllerTest.java @@ -1,9 +1,9 @@ package com.datadog.profiling.controller.ddprof; import static datadog.trace.api.config.ProfilingConfig.PROFILING_AUXILIARY_TYPE; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; -import com.datadog.profiling.controller.RecordingData; +import datadog.trace.api.profiling.RecordingData; import datadog.trace.bootstrap.config.provider.ConfigProvider; import java.util.Properties; import org.junit.jupiter.api.Test; diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecordingTest.java b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecordingTest.java index a40d67a9a8a..6ebe1f63029 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecordingTest.java +++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/src/test/java/com/datadog/profiling/controller/ddprof/DatadogProfilerOngoingRecordingTest.java @@ -2,9 +2,9 @@ import static org.junit.jupiter.api.Assertions.*; -import com.datadog.profiling.controller.RecordingData; import com.datadog.profiling.controller.UnsupportedEnvironmentException; import com.datadog.profiling.ddprof.DatadogProfiler; +import datadog.trace.api.profiling.RecordingData; import java.time.Instant; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecording.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecording.java index 9c0f4401b5a..e66f45556aa 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecording.java +++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecording.java @@ -3,10 +3,10 @@ import com.datadog.profiling.auxiliary.AuxiliaryProfiler; import com.datadog.profiling.auxiliary.AuxiliaryRecordingData; import com.datadog.profiling.controller.OngoingRecording; -import com.datadog.profiling.controller.RecordingData; import com.datadog.profiling.utils.ProfilingMode; import datadog.trace.api.profiling.ProfilingListenersRegistry; import datadog.trace.api.profiling.ProfilingSnapshot; +import datadog.trace.api.profiling.RecordingData; import java.time.Duration; import java.time.Instant; import java.util.Map; diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingData.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingData.java index 3c0b3a0d13b..6cedf96691b 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingData.java +++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/main/java/com/datadog/profiling/controller/openjdk/OpenJdkRecordingData.java @@ -15,8 +15,8 @@ */ package com.datadog.profiling.controller.openjdk; -import com.datadog.profiling.controller.RecordingData; -import com.datadog.profiling.controller.RecordingInputStream; +import datadog.trace.api.profiling.RecordingData; +import datadog.trace.api.profiling.RecordingInputStream; import java.io.IOException; import java.time.Instant; import javax.annotation.Nonnull; diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkControllerTest.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkControllerTest.java index d1a4ee5d9c2..f1d76dac7b0 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkControllerTest.java +++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkControllerTest.java @@ -6,8 +6,8 @@ import static datadog.trace.api.config.ProfilingConfig.PROFILING_TEMPLATE_OVERRIDE_FILE; import static org.junit.jupiter.api.Assertions.*; -import com.datadog.profiling.controller.RecordingData; import com.datadog.profiling.controller.jfr.JfpUtilsTest; +import datadog.trace.api.profiling.RecordingData; import datadog.trace.bootstrap.config.provider.ConfigProvider; import java.util.Properties; import jdk.jfr.Recording; diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecordingTest.java b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecordingTest.java index 226305b6469..7ce507aeef7 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecordingTest.java +++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/src/test/java/com/datadog/profiling/controller/openjdk/OpenJdkOngoingRecordingTest.java @@ -5,7 +5,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.datadog.profiling.controller.RecordingData; +import datadog.trace.api.profiling.RecordingData; import java.time.Instant; import jdk.jfr.Recording; import jdk.jfr.RecordingState; diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkRecordingData.java b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkRecordingData.java index e66d32dccb3..226e1b0f24d 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkRecordingData.java +++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/src/main/java/com/datadog/profiling/controller/oracle/OracleJdkRecordingData.java @@ -15,8 +15,8 @@ */ package com.datadog.profiling.controller.oracle; -import com.datadog.profiling.controller.RecordingData; -import com.datadog.profiling.controller.RecordingInputStream; +import datadog.trace.api.profiling.RecordingData; +import datadog.trace.api.profiling.RecordingInputStream; import java.io.IOException; import java.io.InputStream; import java.time.Instant; diff --git a/dd-java-agent/agent-profiling/profiling-controller/build.gradle b/dd-java-agent/agent-profiling/profiling-controller/build.gradle index 7d187960d1a..f5969daf024 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-controller/build.gradle @@ -12,6 +12,8 @@ excludedClassesCoverage += [ 'com.datadog.profiling.controller.ProfilingSystem.StopRecording', // This is almost fully abstract class so nothing to test 'com.datadog.profiling.controller.RecordingData', + // A plain enum + 'com.datadog.profiling.controller.RecordingType', // A simple data holder class, nothing to test 'com.datadog.profiling.controller.ProfilerSettingsSupport', 'com.datadog.profiling.controller.ProfilingSupport', diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/OngoingRecording.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/OngoingRecording.java index f2b0630ae6c..767957adf3a 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/OngoingRecording.java +++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/OngoingRecording.java @@ -1,6 +1,7 @@ package com.datadog.profiling.controller; import datadog.trace.api.profiling.ProfilingSnapshot; +import datadog.trace.api.profiling.RecordingData; import java.io.Closeable; import java.time.Instant; import javax.annotation.Nonnull; diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSystem.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSystem.java index d5ae0359da5..f1bf7757dae 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSystem.java +++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/ProfilingSystem.java @@ -18,6 +18,9 @@ import static datadog.trace.util.AgentThreadFactory.AgentThread.PROFILER_RECORDING_SCHEDULER; import datadog.trace.api.profiling.ProfilingSnapshot; +import datadog.trace.api.profiling.RecordingData; +import datadog.trace.api.profiling.RecordingDataListener; +import datadog.trace.api.profiling.RecordingType; import datadog.trace.bootstrap.config.provider.ConfigProvider; import datadog.trace.util.AgentTaskScheduler; import java.time.Duration; diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilingSystemTest.java b/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilingSystemTest.java index f3cb16ff88d..286790b315c 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilingSystemTest.java +++ b/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/ProfilingSystemTest.java @@ -15,7 +15,7 @@ */ package com.datadog.profiling.controller; -import static com.datadog.profiling.controller.RecordingType.CONTINUOUS; +import static datadog.trace.api.profiling.RecordingType.CONTINUOUS; import static datadog.trace.util.AgentThreadFactory.AgentThread.PROFILER_RECORDING_SCHEDULER; import static java.util.concurrent.TimeUnit.SECONDS; import static org.awaitility.Awaitility.await; @@ -36,6 +36,8 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Appender; +import datadog.trace.api.profiling.RecordingData; +import datadog.trace.api.profiling.RecordingDataListener; import datadog.trace.bootstrap.config.provider.ConfigProvider; import datadog.trace.util.AgentTaskScheduler; import java.time.Duration; diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java index bd8d4a37b24..f9b2cdefbad 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfiler.java @@ -28,12 +28,12 @@ import static datadog.trace.api.config.ProfilingConfig.PROFILING_QUEUEING_TIME_THRESHOLD_MILLIS_DEFAULT; import com.datadog.profiling.controller.OngoingRecording; -import com.datadog.profiling.controller.RecordingData; import com.datadog.profiling.controller.UnsupportedEnvironmentException; import com.datadog.profiling.utils.ProfilingMode; import com.datadoghq.profiler.ContextSetter; import com.datadoghq.profiler.JavaProfiler; import datadog.trace.api.config.ProfilingConfig; +import datadog.trace.api.profiling.RecordingData; import datadog.trace.bootstrap.config.provider.ConfigProvider; import java.io.IOException; import java.nio.file.Files; diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecording.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecording.java index d1e0781b964..8154a8a444e 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecording.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecording.java @@ -1,8 +1,8 @@ package com.datadog.profiling.ddprof; import com.datadog.profiling.controller.OngoingRecording; -import com.datadog.profiling.controller.RecordingData; import datadog.trace.api.profiling.ProfilingSnapshot; +import datadog.trace.api.profiling.RecordingData; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingData.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingData.java index e9cb4f03393..954e79834d2 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingData.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/main/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingData.java @@ -1,7 +1,7 @@ package com.datadog.profiling.ddprof; -import com.datadog.profiling.controller.RecordingData; -import com.datadog.profiling.controller.RecordingInputStream; +import datadog.trace.api.profiling.RecordingData; +import datadog.trace.api.profiling.RecordingInputStream; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingTest.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingTest.java index 6d9ab83f3e2..65bfac0e226 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingTest.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerRecordingTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.*; -import com.datadog.profiling.controller.RecordingData; +import datadog.trace.api.profiling.RecordingData; import datadog.trace.bootstrap.config.provider.ConfigProvider; import java.io.InputStream; import java.nio.file.Files; diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java index 67531996499..50e9051f3ab 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java +++ b/dd-java-agent/agent-profiling/profiling-ddprof/src/test/java/com/datadog/profiling/ddprof/DatadogProfilerTest.java @@ -6,11 +6,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.datadog.profiling.controller.OngoingRecording; -import com.datadog.profiling.controller.RecordingData; import com.datadog.profiling.controller.UnsupportedEnvironmentException; import com.datadog.profiling.utils.ProfilingMode; import datadog.trace.api.config.ProfilingConfig; import datadog.trace.api.profiling.ProfilingScope; +import datadog.trace.api.profiling.RecordingData; import datadog.trace.bootstrap.config.provider.ConfigProvider; import java.nio.file.Path; import java.nio.file.Paths; @@ -143,7 +143,7 @@ private static ConfigProvider configProvider( props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_WALL_ENABLED, Boolean.toString(wall)); props.put(ProfilingConfig.PROFILING_DATADOG_PROFILER_ALLOC_ENABLED, Boolean.toString(alloc)); props.put( - ProfilingConfig.PROFILING_DATADOG_PROFILER_MEMLEAK_ENABLED, Boolean.toString(memleak)); + ProfilingConfig.PROFILING_DATADOG_PROFILER_LIVEHEAP_ENABLED, Boolean.toString(memleak)); return ConfigProvider.withPropertiesOverride(props); } } diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressingRequestBody.java b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressingRequestBody.java index eadf3c998ec..7d77956557c 100644 --- a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressingRequestBody.java +++ b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/CompressingRequestBody.java @@ -1,6 +1,6 @@ package com.datadog.profiling.uploader; -import com.datadog.profiling.controller.RecordingInputStream; +import datadog.trace.api.profiling.RecordingInputStream; import java.io.BufferedOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ProfileUploader.java b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ProfileUploader.java index 19c4ae3d21f..159c16ecb9a 100644 --- a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ProfileUploader.java +++ b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/ProfileUploader.java @@ -17,8 +17,6 @@ import static datadog.trace.util.AgentThreadFactory.AgentThread.PROFILER_HTTP_DISPATCHER; -import com.datadog.profiling.controller.RecordingData; -import com.datadog.profiling.controller.RecordingType; import com.datadog.profiling.uploader.util.JfrCliHelper; import com.squareup.moshi.JsonAdapter; import com.squareup.moshi.JsonReader; @@ -29,6 +27,8 @@ import datadog.trace.api.DDTags; import datadog.trace.api.git.GitInfo; import datadog.trace.api.git.GitInfoProvider; +import datadog.trace.api.profiling.RecordingData; +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; diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/util/JfrCliHelper.java b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/util/JfrCliHelper.java index 68d8a0bab2d..9668dc61d72 100644 --- a/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/util/JfrCliHelper.java +++ b/dd-java-agent/agent-profiling/profiling-uploader/src/main/java/com/datadog/profiling/uploader/util/JfrCliHelper.java @@ -2,7 +2,7 @@ import static datadog.trace.util.AgentThreadFactory.AgentThread.PROFILER_HTTP_DISPATCHER; -import com.datadog.profiling.controller.RecordingData; +import datadog.trace.api.profiling.RecordingData; import datadog.trace.relocate.api.IOLogger; import datadog.trace.util.AgentThreadFactory; import java.io.ByteArrayOutputStream; diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressingRequestBodyTest.java b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressingRequestBodyTest.java index 5b2cf5bec79..9dd3a6e23ac 100644 --- a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressingRequestBodyTest.java +++ b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/CompressingRequestBodyTest.java @@ -5,7 +5,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.datadog.profiling.controller.RecordingInputStream; +import datadog.trace.api.profiling.RecordingInputStream; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java index cb6a2f284e3..fce3459ddec 100644 --- a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java +++ b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java @@ -33,9 +33,6 @@ import static org.mockito.Mockito.when; import static org.mockito.Mockito.withSettings; -import com.datadog.profiling.controller.RecordingData; -import com.datadog.profiling.controller.RecordingInputStream; -import com.datadog.profiling.controller.RecordingType; import com.datadog.profiling.testing.ProfilingTestUtils; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -45,6 +42,9 @@ import datadog.trace.api.Config; import datadog.trace.api.DDTags; import datadog.trace.api.profiling.ProfilingSnapshot; +import datadog.trace.api.profiling.RecordingData; +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.util.PidHelper; diff --git a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/util/JfrCliHelperTest.java b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/util/JfrCliHelperTest.java index 892d9ea96c0..a8d2c1fd7a1 100644 --- a/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/util/JfrCliHelperTest.java +++ b/dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/util/JfrCliHelperTest.java @@ -9,8 +9,8 @@ import static org.mockito.Mockito.when; import static org.mockito.Mockito.withSettings; -import com.datadog.profiling.controller.RecordingData; -import com.datadog.profiling.controller.RecordingInputStream; +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; diff --git a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java index 3a0832f5c8e..6bcddf20174 100644 --- a/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java +++ b/dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ProfilingAgent.java @@ -8,14 +8,14 @@ import com.datadog.profiling.controller.Controller; import com.datadog.profiling.controller.ControllerFactory; import com.datadog.profiling.controller.ProfilingSystem; -import com.datadog.profiling.controller.RecordingData; -import com.datadog.profiling.controller.RecordingDataListener; -import com.datadog.profiling.controller.RecordingType; import com.datadog.profiling.controller.UnsupportedEnvironmentException; import com.datadog.profiling.uploader.ProfileUploader; import datadog.trace.api.Config; import datadog.trace.api.Platform; import datadog.trace.api.config.ProfilingConfig; +import datadog.trace.api.profiling.RecordingData; +import datadog.trace.api.profiling.RecordingDataListener; +import datadog.trace.api.profiling.RecordingType; import datadog.trace.bootstrap.config.provider.ConfigProvider; import java.io.IOException; import java.lang.ref.WeakReference; diff --git a/internal-api/build.gradle b/internal-api/build.gradle index af270aeadb9..fe6c15dcc52 100644 --- a/internal-api/build.gradle +++ b/internal-api/build.gradle @@ -42,6 +42,8 @@ excludedClassesCoverage += [ "datadog.trace.api.EndpointCheckpointerHolder", "datadog.trace.api.iast.IastAdvice.Kind", "datadog.trace.api.UserEventTrackingMode", + // This is almost fully abstract class so nothing to test + 'datadog.trace.api.profiling.RecordingData', "datadog.trace.bootstrap.ActiveSubsystems", "datadog.trace.bootstrap.config.provider.ConfigProvider.Singleton", "datadog.trace.bootstrap.instrumentation.api.java.lang.ProcessImplInstrumentationHelpers", diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingData.java b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingData.java similarity index 96% rename from dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingData.java rename to internal-api/src/main/java/datadog/trace/api/profiling/RecordingData.java index 5b0836c4eec..c886ebcf81a 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingData.java +++ b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingData.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datadog.profiling.controller; +package datadog.trace.api.profiling; -import datadog.trace.api.profiling.ProfilingSnapshot; import java.io.IOException; import java.time.Instant; import javax.annotation.Nonnull; diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingDataListener.java b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingDataListener.java similarity index 96% rename from dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingDataListener.java rename to internal-api/src/main/java/datadog/trace/api/profiling/RecordingDataListener.java index f84f923d061..29a5e4951bf 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingDataListener.java +++ b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingDataListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.datadog.profiling.controller; +package datadog.trace.api.profiling; /** Listener for getting notified when new recording data is becoming available. */ public interface RecordingDataListener { diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingInputStream.java b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingInputStream.java similarity index 82% rename from dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingInputStream.java rename to internal-api/src/main/java/datadog/trace/api/profiling/RecordingInputStream.java index 5d584b73e09..0549635a027 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingInputStream.java +++ b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingInputStream.java @@ -1,11 +1,10 @@ -package com.datadog.profiling.controller; +package datadog.trace.api.profiling; import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; -/** A wrapper stream implementation for the recording data. */ -public final class RecordingInputStream extends BufferedInputStream { +public class RecordingInputStream extends BufferedInputStream { public RecordingInputStream(InputStream in) { super(in); } diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingType.java b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingType.java similarity index 82% rename from dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingType.java rename to internal-api/src/main/java/datadog/trace/api/profiling/RecordingType.java index b8f6280b64d..639ccc39557 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/RecordingType.java +++ b/internal-api/src/main/java/datadog/trace/api/profiling/RecordingType.java @@ -1,4 +1,4 @@ -package com.datadog.profiling.controller; +package datadog.trace.api.profiling; public enum RecordingType { CONTINUOUS("continuous"); diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/RecordingInputStreamTest.java b/internal-api/src/test/java/datadog/trace/api/profiling/RecordingInputStreamTest.java similarity index 94% rename from dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/RecordingInputStreamTest.java rename to internal-api/src/test/java/datadog/trace/api/profiling/RecordingInputStreamTest.java index 68570177211..9521e5ecb8a 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/RecordingInputStreamTest.java +++ b/internal-api/src/test/java/datadog/trace/api/profiling/RecordingInputStreamTest.java @@ -1,4 +1,4 @@ -package com.datadog.profiling.controller; +package datadog.trace.api.profiling; import static org.junit.jupiter.api.Assertions.*;