Skip to content

Commit 2e14064

Browse files
committed
Merge branch 'copilot/fix-b4bbec02-3ae8-4c30-a284-9ad37c38213c' of https://github.com/trask/opentelemetry-java-contrib into copilot/fix-b4bbec02-3ae8-4c30-a284-9ad37c38213c
2 parents 7321719 + 5842344 commit 2e14064

File tree

5 files changed

+3
-179
lines changed

5 files changed

+3
-179
lines changed

disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/storage/files/utils/FileStreamTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void truncateTop() throws IOException {
6161

6262
// Truncate all available data
6363
stream.truncateTop(3);
64-
assertThat(stream.size()).isEqualTo(0);
64+
assertThat(stream).isEmpty();
6565
assertThat(readString(temporaryFile)).isEqualTo("");
6666

6767
stream.close();

jfr-connection/src/test/java/io/opentelemetry/contrib/jfr/connection/FlightRecorderDiagnosticCommandConnectionTest.java.bak

Lines changed: 0 additions & 122 deletions
This file was deleted.

jfr-connection/src/test/java/io/opentelemetry/contrib/jfr/connection/OpenDataUtilsTest.java.bak

Lines changed: 0 additions & 54 deletions
This file was deleted.

jfr-connection/src/test/java/io/opentelemetry/contrib/jfr/connection/RecordingConfigurationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void mapConfiguration() {
6969
RecordingConfiguration recordingConfiguration = new MapConfiguration(recordingConfigAsMap);
7070

7171
IItemCollection recordingContent = excecuteRecordingWithConfig(recordingConfiguration);
72-
assertThat(recordingContent).as("excecuteRecordingWithConfig returned null").isNotNull();
72+
assertThat(recordingContent).isNotNull();
7373
assertThat(containsEvent(recordingContent, "jdk.ObjectAllocationInNewTLAB")).isTrue();
7474
assertThat(containsEvent(recordingContent, "jdk.ObjectAllocationOutsideTLAB")).isTrue();
7575
}

kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/SpanDataSerializerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void serialize() {
3434
void serializeEmptyData() {
3535
byte[] actual = testSubject.serialize("test-topic", Collections.emptySet());
3636

37-
assertThat(actual.length).isEqualTo(0);
37+
assertThat(actual).isEmpty();
3838
}
3939

4040
@Test

0 commit comments

Comments
 (0)