Skip to content

Commit 8baa097

Browse files
otelbot[bot]otelbot[bot]
committed
./gradlew spotlessApply
1 parent 8a00ac8 commit 8baa097

File tree

4 files changed

+118
-126
lines changed

4 files changed

+118
-126
lines changed

‎disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/deserializers/LogRecordDataDeserializerTest.java‎

Lines changed: 44 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -7,60 +7,57 @@
77

88
import static org.junit.jupiter.api.Assertions.assertThrows;
99

10-
import org.junit.jupiter.api.Test;
11-
1210
import io.opentelemetry.api.common.Value;
1311
import io.opentelemetry.api.logs.Severity;
1412
import io.opentelemetry.contrib.disk.buffering.internal.serialization.mapping.logs.models.LogRecordDataImpl;
1513
import io.opentelemetry.contrib.disk.buffering.internal.serialization.serializers.SignalSerializer;
1614
import io.opentelemetry.contrib.disk.buffering.testutils.BaseSignalSerializerTest;
1715
import io.opentelemetry.contrib.disk.buffering.testutils.TestData;
1816
import io.opentelemetry.sdk.logs.data.LogRecordData;
17+
import org.junit.jupiter.api.Test;
1918

2019
class LogRecordDataDeserializerTest extends BaseSignalSerializerTest<LogRecordData> {
21-
private static final LogRecordData LOG_RECORD =
22-
LogRecordDataImpl.builder()
23-
.setResource(TestData.RESOURCE_FULL)
24-
.setSpanContext(TestData.SPAN_CONTEXT)
25-
.setInstrumentationScopeInfo(TestData.INSTRUMENTATION_SCOPE_INFO_FULL)
26-
.setAttributes(TestData.ATTRIBUTES)
27-
.setBodyValue(Value.of("Log body"))
28-
.setSeverity(Severity.DEBUG)
29-
.setSeverityText("Log severity text")
30-
.setTimestampEpochNanos(100L)
31-
.setObservedTimestampEpochNanos(200L)
32-
.setTotalAttributeCount(3)
33-
.setEventName("event")
34-
.build();
35-
36-
@Test
37-
void verifyDeserialization() {
38-
assertSerializeDeserialize(LOG_RECORD, LOG_RECORD);
39-
}
40-
41-
@Test
42-
void whenDecodingMalformedMessage_wrapIntoDeserializationException() {
43-
assertThrows(
44-
DeserializationException.class,
45-
() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary())
46-
);
47-
}
48-
49-
@Test
50-
void whenDecodingTooShortMessage_wrapIntoDeserializationException() {
51-
assertThrows(
52-
DeserializationException.class,
53-
() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary())
54-
);
55-
}
56-
57-
@Override
58-
protected SignalSerializer<LogRecordData> getSerializer() {
59-
return SignalSerializer.ofLogs();
60-
}
61-
62-
@Override
63-
protected SignalDeserializer<LogRecordData> getDeserializer() {
64-
return SignalDeserializer.ofLogs();
65-
}
20+
private static final LogRecordData LOG_RECORD =
21+
LogRecordDataImpl.builder()
22+
.setResource(TestData.RESOURCE_FULL)
23+
.setSpanContext(TestData.SPAN_CONTEXT)
24+
.setInstrumentationScopeInfo(TestData.INSTRUMENTATION_SCOPE_INFO_FULL)
25+
.setAttributes(TestData.ATTRIBUTES)
26+
.setBodyValue(Value.of("Log body"))
27+
.setSeverity(Severity.DEBUG)
28+
.setSeverityText("Log severity text")
29+
.setTimestampEpochNanos(100L)
30+
.setObservedTimestampEpochNanos(200L)
31+
.setTotalAttributeCount(3)
32+
.setEventName("event")
33+
.build();
34+
35+
@Test
36+
void verifyDeserialization() {
37+
assertSerializeDeserialize(LOG_RECORD, LOG_RECORD);
38+
}
39+
40+
@Test
41+
void whenDecodingMalformedMessage_wrapIntoDeserializationException() {
42+
assertThrows(
43+
DeserializationException.class,
44+
() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()));
45+
}
46+
47+
@Test
48+
void whenDecodingTooShortMessage_wrapIntoDeserializationException() {
49+
assertThrows(
50+
DeserializationException.class,
51+
() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()));
52+
}
53+
54+
@Override
55+
protected SignalSerializer<LogRecordData> getSerializer() {
56+
return SignalSerializer.ofLogs();
57+
}
58+
59+
@Override
60+
protected SignalDeserializer<LogRecordData> getDeserializer() {
61+
return SignalDeserializer.ofLogs();
62+
}
6663
}

‎disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/deserializers/MetricDataDeserializerTest.java‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,27 @@
1515

1616
class MetricDataDeserializerTest extends BaseSignalSerializerTest<MetricData> {
1717

18-
@Test
19-
void whenDecodingMalformedMessage_wrapIntoDeserializationException() {
20-
assertThrows(
21-
DeserializationException.class,
22-
() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary())
23-
);
24-
}
25-
26-
@Test
27-
void whenDecodingTooShortMessage_wrapIntoDeserializationException() {
28-
assertThrows(
29-
DeserializationException.class,
30-
() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary())
31-
);
32-
}
33-
34-
@Override
35-
protected SignalSerializer<MetricData> getSerializer() {
36-
return SignalSerializer.ofMetrics();
37-
}
38-
39-
@Override
40-
protected SignalDeserializer<MetricData> getDeserializer() {
41-
return SignalDeserializer.ofMetrics();
42-
}
18+
@Test
19+
void whenDecodingMalformedMessage_wrapIntoDeserializationException() {
20+
assertThrows(
21+
DeserializationException.class,
22+
() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()));
23+
}
24+
25+
@Test
26+
void whenDecodingTooShortMessage_wrapIntoDeserializationException() {
27+
assertThrows(
28+
DeserializationException.class,
29+
() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()));
30+
}
31+
32+
@Override
33+
protected SignalSerializer<MetricData> getSerializer() {
34+
return SignalSerializer.ofMetrics();
35+
}
36+
37+
@Override
38+
protected SignalDeserializer<MetricData> getDeserializer() {
39+
return SignalDeserializer.ofMetrics();
40+
}
4341
}

‎disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/internal/serialization/deserializers/SpanDataDeserializerTest.java‎

Lines changed: 43 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -14,58 +14,55 @@
1414
import io.opentelemetry.contrib.disk.buffering.testutils.TestData;
1515
import io.opentelemetry.sdk.trace.data.SpanData;
1616
import io.opentelemetry.sdk.trace.data.StatusData;
17-
18-
import org.junit.jupiter.api.Test;
19-
2017
import java.util.Collections;
18+
import org.junit.jupiter.api.Test;
2119

2220
class SpanDataDeserializerTest extends BaseSignalSerializerTest<SpanData> {
23-
private static final SpanData SPAN_DATA = SpanDataImpl.builder()
24-
.setSpanContext(TestData.SPAN_CONTEXT)
25-
.setParentSpanContext(TestData.PARENT_SPAN_CONTEXT)
26-
.setName("Test span")
27-
.setKind(SpanKind.SERVER)
28-
.setStartEpochNanos(100L)
29-
.setEndEpochNanos(200L)
30-
.setStatus(StatusData.ok())
31-
.setAttributes(TestData.ATTRIBUTES)
32-
.setResource(TestData.RESOURCE_FULL)
33-
.setInstrumentationScopeInfo(TestData.INSTRUMENTATION_SCOPE_INFO_FULL)
34-
.setTotalRecordedLinks(0)
35-
.setTotalRecordedEvents(0)
36-
.setTotalAttributeCount(0)
37-
.setEvents(Collections.emptyList())
38-
.setLinks(Collections.emptyList())
39-
.build();
21+
private static final SpanData SPAN_DATA =
22+
SpanDataImpl.builder()
23+
.setSpanContext(TestData.SPAN_CONTEXT)
24+
.setParentSpanContext(TestData.PARENT_SPAN_CONTEXT)
25+
.setName("Test span")
26+
.setKind(SpanKind.SERVER)
27+
.setStartEpochNanos(100L)
28+
.setEndEpochNanos(200L)
29+
.setStatus(StatusData.ok())
30+
.setAttributes(TestData.ATTRIBUTES)
31+
.setResource(TestData.RESOURCE_FULL)
32+
.setInstrumentationScopeInfo(TestData.INSTRUMENTATION_SCOPE_INFO_FULL)
33+
.setTotalRecordedLinks(0)
34+
.setTotalRecordedEvents(0)
35+
.setTotalAttributeCount(0)
36+
.setEvents(Collections.emptyList())
37+
.setLinks(Collections.emptyList())
38+
.build();
4039

41-
@Test
42-
void verifyDeserialization() {
43-
assertSerializeDeserialize(SPAN_DATA, SPAN_DATA);
44-
}
40+
@Test
41+
void verifyDeserialization() {
42+
assertSerializeDeserialize(SPAN_DATA, SPAN_DATA);
43+
}
4544

46-
@Test
47-
void whenDecodingMalformedMessage_wrapIntoDeserializationException() {
48-
assertThrows(
49-
DeserializationException.class,
50-
() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary())
51-
);
52-
}
45+
@Test
46+
void whenDecodingMalformedMessage_wrapIntoDeserializationException() {
47+
assertThrows(
48+
DeserializationException.class,
49+
() -> getDeserializer().deserialize(TestData.makeMalformedSignalBinary()));
50+
}
5351

54-
@Test
55-
void whenDecodingTooShortMessage_wrapIntoDeserializationException() {
56-
assertThrows(
57-
DeserializationException.class,
58-
() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary())
59-
);
60-
}
52+
@Test
53+
void whenDecodingTooShortMessage_wrapIntoDeserializationException() {
54+
assertThrows(
55+
DeserializationException.class,
56+
() -> getDeserializer().deserialize(TestData.makeTooShortSignalBinary()));
57+
}
6158

62-
@Override
63-
protected SignalSerializer<SpanData> getSerializer() {
64-
return SignalSerializer.ofSpans();
65-
}
59+
@Override
60+
protected SignalSerializer<SpanData> getSerializer() {
61+
return SignalSerializer.ofSpans();
62+
}
6663

67-
@Override
68-
protected SignalDeserializer<SpanData> getDeserializer() {
69-
return SignalDeserializer.ofSpans();
70-
}
64+
@Override
65+
protected SignalDeserializer<SpanData> getDeserializer() {
66+
return SignalDeserializer.ofSpans();
67+
}
7168
}

‎disk-buffering/src/test/java/io/opentelemetry/contrib/disk/buffering/testutils/TestData.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,20 +133,20 @@ private static LongExemplarData makeLongExemplarData(TraceFlags flags) {
133133

134134
@NotNull
135135
public static byte[] makeTooShortSignalBinary() {
136-
return new byte[]{
137-
(byte) 0x0A, // type
138-
(byte) 0xFF, // defining length 255, but message is shorter
139-
(byte) 0x01 // content
136+
return new byte[] {
137+
(byte) 0x0A, // type
138+
(byte) 0xFF, // defining length 255, but message is shorter
139+
(byte) 0x01 // content
140140
};
141141
}
142142

143143
@NotNull
144144
public static byte[] makeMalformedSignalBinary() {
145145
return new byte[] {
146-
(byte) 0x0A, // type
147-
(byte) 0x02, // length
148-
(byte) 0x08, // field 1, wire type 0 (varint) - this should be a nested message but isn't
149-
(byte) 0x01 // content
146+
(byte) 0x0A, // type
147+
(byte) 0x02, // length
148+
(byte) 0x08, // field 1, wire type 0 (varint) - this should be a nested message but isn't
149+
(byte) 0x01 // content
150150
};
151151
}
152152

0 commit comments

Comments
 (0)