From d2a257159c4f67609a3d008c6428eee15b3764ec Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Fri, 30 Oct 2026 08:22:29 -0400 Subject: [PATCH 1/2] Update disk buffering benchmark to use new path --- .../utils/FileTransferUtilBenchmark.java | 57 ------------------ .../files/utils/FileStreamBenchmark.java | 59 +++++++++++++++++++ 2 files changed, 59 insertions(+), 57 deletions(-) delete mode 100644 disk-buffering/src/jmh/java/io/opentelemetry/contrib/disk/buffering/internal/files/utils/FileTransferUtilBenchmark.java create mode 100644 disk-buffering/src/jmh/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/utils/FileStreamBenchmark.java diff --git a/disk-buffering/src/jmh/java/io/opentelemetry/contrib/disk/buffering/internal/files/utils/FileTransferUtilBenchmark.java b/disk-buffering/src/jmh/java/io/opentelemetry/contrib/disk/buffering/internal/files/utils/FileTransferUtilBenchmark.java deleted file mode 100644 index a9fb7ad5e2..0000000000 --- a/disk-buffering/src/jmh/java/io/opentelemetry/contrib/disk/buffering/internal/files/utils/FileTransferUtilBenchmark.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.contrib.disk.buffering.internal.files.utils; - -import io.opentelemetry.contrib.disk.buffering.internal.storage.files.utils.FileTransferUtil; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.StandardOpenOption; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.BenchmarkMode; -import org.openjdk.jmh.annotations.Mode; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; - -public class FileTransferUtilBenchmark { - - @Benchmark - @BenchmarkMode(Mode.AverageTime) - public void fileTransfer(FileTransferState state) throws IOException { - state.fileTransferUtil.transferBytes(state.offset, state.amountOfBytesToTransfer); - } - - @State(Scope.Benchmark) - public static class FileTransferState { - public FileTransferUtil fileTransferUtil; - public int offset; - public int amountOfBytesToTransfer; - private File inputFile; - private File outputFile; - - @Setup - public void setUp() throws IOException { - outputFile = File.createTempFile("output", ".txt"); - inputFile = File.createTempFile("input", ".txt"); - int totalDataSize = 1024 * 1024; // 1MB - byte[] data = new byte[totalDataSize]; - Files.write(inputFile.toPath(), data, StandardOpenOption.CREATE); - fileTransferUtil = new FileTransferUtil(new FileInputStream(inputFile), outputFile); - offset = 512; - amountOfBytesToTransfer = totalDataSize - offset; - } - - @TearDown - public void tearDown() throws IOException { - fileTransferUtil.close(); - inputFile.delete(); - outputFile.delete(); - } - } -} diff --git a/disk-buffering/src/jmh/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/utils/FileStreamBenchmark.java b/disk-buffering/src/jmh/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/utils/FileStreamBenchmark.java new file mode 100644 index 0000000000..f66748afd9 --- /dev/null +++ b/disk-buffering/src/jmh/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/utils/FileStreamBenchmark.java @@ -0,0 +1,59 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + +package io.opentelemetry.contrib.disk.buffering.internal.storage.files.utils; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Level; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; + +public class FileStreamBenchmark { + + @Benchmark + @BenchmarkMode(Mode.AverageTime) + public void truncateTop(FileStreamState state) throws IOException { + state.fileStream.truncateTop(state.offset); + } + + @State(Scope.Benchmark) + public static class FileStreamState { + public FileStream fileStream; + public int offset; + private byte[] data; + private File file; + + @Setup(Level.Trial) + public void setUp() throws IOException { + file = File.createTempFile("input", ".txt"); + data = new byte[1024 * 1024]; // 1MB + offset = 512; + } + + // truncateTop modifies the file, so each invocation needs a fresh copy. + @Setup(Level.Invocation) + public void resetFile() throws IOException { + Files.write(file.toPath(), data); + fileStream = FileStream.create(file); + } + + @TearDown(Level.Invocation) + public void closeStream() throws IOException { + fileStream.close(); + } + + @TearDown(Level.Trial) + public void tearDown() { + file.delete(); + } + } +} From e82e62e423c8c1a17785aa15223ec05487c3f04c Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Fri, 30 Oct 2026 09:00:13 -0400 Subject: [PATCH 2/2] remove benchmark --- disk-buffering/build.gradle.kts | 9 --- .../files/utils/FileStreamBenchmark.java | 59 ------------------- 2 files changed, 68 deletions(-) delete mode 100644 disk-buffering/src/jmh/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/utils/FileStreamBenchmark.java diff --git a/disk-buffering/build.gradle.kts b/disk-buffering/build.gradle.kts index 04cf6505d5..cb08ea90a6 100644 --- a/disk-buffering/build.gradle.kts +++ b/disk-buffering/build.gradle.kts @@ -5,7 +5,6 @@ plugins { id("otel.publish-conventions") id("otel.animalsniffer-conventions") id("com.gradleup.shadow") - id("me.champeau.jmh") version "0.7.3" id("com.squareup.wire") version "7.1.0" } @@ -25,14 +24,6 @@ dependencies { protos("io.opentelemetry.proto:opentelemetry-proto:1.11.1-alpha@jar") } -jmh { - warmupIterations.set(0) - fork.set(2) - iterations.set(5) - timeOnIteration.set("5s") - timeUnit.set("ms") -} - val setupProtos = tasks.register("setupProtos") { inputs.files(protos) from(zipTree(protos.singleFile)) diff --git a/disk-buffering/src/jmh/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/utils/FileStreamBenchmark.java b/disk-buffering/src/jmh/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/utils/FileStreamBenchmark.java deleted file mode 100644 index f66748afd9..0000000000 --- a/disk-buffering/src/jmh/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/utils/FileStreamBenchmark.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.contrib.disk.buffering.internal.storage.files.utils; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.BenchmarkMode; -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Mode; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; - -public class FileStreamBenchmark { - - @Benchmark - @BenchmarkMode(Mode.AverageTime) - public void truncateTop(FileStreamState state) throws IOException { - state.fileStream.truncateTop(state.offset); - } - - @State(Scope.Benchmark) - public static class FileStreamState { - public FileStream fileStream; - public int offset; - private byte[] data; - private File file; - - @Setup(Level.Trial) - public void setUp() throws IOException { - file = File.createTempFile("input", ".txt"); - data = new byte[1024 * 1024]; // 1MB - offset = 512; - } - - // truncateTop modifies the file, so each invocation needs a fresh copy. - @Setup(Level.Invocation) - public void resetFile() throws IOException { - Files.write(file.toPath(), data); - fileStream = FileStream.create(file); - } - - @TearDown(Level.Invocation) - public void closeStream() throws IOException { - fileStream.close(); - } - - @TearDown(Level.Trial) - public void tearDown() { - file.delete(); - } - } -}