Skip to content

Commit 340ae63

Browse files
jbachorikclaude
andcommitted
Adapt to master: fix API breaks from rebase
- IOLogger: datadog.trace.relocate.api → datadog.logging - getFile() → getPath() in OtlpProfileUploader and JfrToOtlpConverter - ScrubbedRecordingData: override doRelease() instead of final release() - libs.versions.toml: restore jafar-tools entry for profiling-scrubber Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent c835f93 commit 340ae63

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

dd-java-agent/agent-profiling/profiling-controller/src/test/java/com/datadog/profiling/controller/RecordingDataRefCountingTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,7 @@ public void testReleaseBeforeRetain() {
139139

140140
// Cannot release before any retain
141141
assertThrows(
142-
IllegalStateException.class,
143-
data::release,
144-
"Should throw when releasing with refcount=0");
142+
IllegalStateException.class, data::release, "Should throw when releasing with refcount=0");
145143
}
146144

147145
@Test
@@ -154,9 +152,7 @@ public void testRetainAfterFullRelease() throws InterruptedException {
154152

155153
// Cannot retain after full release
156154
assertThrows(
157-
IllegalStateException.class,
158-
data::retain,
159-
"Should throw when retaining after release");
155+
IllegalStateException.class, data::retain, "Should throw when retaining after release");
160156
}
161157

162158
@Test

dd-java-agent/agent-profiling/profiling-otel/build.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,11 @@ tasks.register<Exec>("validateOtlp") {
157157

158158
// Run profcheck in Docker with volume mount
159159
commandLine(
160-
"docker", "run", "--rm",
161-
"-v", "$parentDir:/data:ro",
160+
"docker",
161+
"run",
162+
"--rm",
163+
"-v",
164+
"$parentDir:/data:ro",
162165
"profcheck:latest",
163166
"/data/$fileName"
164167
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
import com.datadog.profiling.otel.JfrToOtlpConverter;
2828
import datadog.common.version.VersionInfo;
2929
import datadog.communication.http.OkHttpUtils;
30+
import datadog.logging.IOLogger;
3031
import datadog.trace.api.Config;
3132
import datadog.trace.api.profiling.RecordingData;
3233
import datadog.trace.api.profiling.RecordingDataListener;
3334
import datadog.trace.api.profiling.RecordingType;
3435
import datadog.trace.bootstrap.config.provider.ConfigProvider;
35-
import datadog.trace.relocate.api.IOLogger;
3636
import datadog.trace.util.AgentThreadFactory;
3737
import datadog.trace.util.TempLocationManager;
3838
import java.io.ByteArrayOutputStream;
@@ -217,7 +217,7 @@ private byte[] convertToOtlp(RecordingData data) throws IOException {
217217
converter.reset();
218218

219219
// Prefer file-based parsing if available (more efficient)
220-
Path jfrFile = data.getFile();
220+
Path jfrFile = data.getPath();
221221
if (jfrFile != null) {
222222
converter.addFile(jfrFile, data.getStart(), data.getEnd());
223223
} else {

dd-java-agent/agent-profiling/src/main/java/com/datadog/profiling/agent/ScrubRecordingDataListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public RecordingInputStream getStream() throws IOException {
138138
}
139139

140140
@Override
141-
public void release() {
141+
protected void doRelease() {
142142
try {
143143
Files.deleteIfExists(scrubbedFile);
144144
} catch (IOException e) {

gradle/libs.versions.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ jmc-common = { module = "org.openjdk.jmc:common", version.ref = "jmc" }
120120
jmc-flightrecorder = { module = "org.openjdk.jmc:flightrecorder", version.ref = "jmc" }
121121
jmc-flightrecorder-writer = { module = "org.openjdk.jmc:flightrecorder.writer", version.ref = "jmc" }
122122
jafar-parser = { module = "io.btrace:jafar-parser", version.ref = "jafar" }
123+
jafar-tools = { module = "io.btrace:jafar-tools", version.ref = "jafar" }
123124

124125
# Web & Network
125126
okio = { module = "com.datadoghq.okio:okio", version.ref = "okio" }

0 commit comments

Comments
 (0)