Skip to content

Commit ca91bec

Browse files
jack-bergjack-berg
committed
Switch to LogEmitter.logBuilder().emit() pattern
1 parent 8d4785c commit ca91bec

26 files changed

Lines changed: 456 additions & 423 deletions

File tree

‎exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/OtlpJsonLoggingLogExporterTest.java‎

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import io.opentelemetry.api.common.Attributes;
1515
import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
1616
import io.opentelemetry.sdk.logs.data.LogData;
17-
import io.opentelemetry.sdk.logs.data.LogRecord;
1817
import io.opentelemetry.sdk.logs.data.Severity;
1918
import io.opentelemetry.sdk.logs.export.LogExporter;
2019
import io.opentelemetry.sdk.resources.Resource;
@@ -32,36 +31,30 @@ class OtlpJsonLoggingLogExporterTest {
3231
Resource.create(Attributes.builder().put("key", "value").build());
3332

3433
private static final LogData LOG1 =
35-
LogData.create(
36-
RESOURCE,
37-
InstrumentationLibraryInfo.create("instrumentation", "1"),
38-
LogRecord.builder()
39-
.setName("testLog1")
40-
.setBody("body1")
41-
.setFlags(0)
42-
.setSeverity(Severity.INFO)
43-
.setSeverityText("INFO")
44-
.setSpanId("8765432112345876")
45-
.setTraceId("12345678876543211234567887654322")
46-
.setEpoch(1631533710L, TimeUnit.MILLISECONDS)
47-
.setAttributes(Attributes.of(stringKey("animal"), "cat", longKey("lives"), 9L))
48-
.build());
34+
LogData.builder(RESOURCE, InstrumentationLibraryInfo.create("instrumentation", "1"))
35+
.setName("testLog1")
36+
.setBody("body1")
37+
.setFlags(0)
38+
.setSeverity(Severity.INFO)
39+
.setSeverityText("INFO")
40+
.setSpanId("8765432112345876")
41+
.setTraceId("12345678876543211234567887654322")
42+
.setEpoch(1631533710L, TimeUnit.MILLISECONDS)
43+
.setAttributes(Attributes.of(stringKey("animal"), "cat", longKey("lives"), 9L))
44+
.build();
4945

5046
private static final LogData LOG2 =
51-
LogData.create(
52-
RESOURCE,
53-
InstrumentationLibraryInfo.create("instrumentation2", "2"),
54-
LogRecord.builder()
55-
.setName("testLog2")
56-
.setBody("body2")
57-
.setFlags(0)
58-
.setSeverity(Severity.INFO)
59-
.setSeverityText("INFO")
60-
.setSpanId("8765432112345875")
61-
.setTraceId("12345678876543211234567887654322")
62-
.setEpoch(1631533710L, TimeUnit.MILLISECONDS)
63-
.setAttributes(Attributes.of(booleanKey("important"), true))
64-
.build());
47+
LogData.builder(RESOURCE, InstrumentationLibraryInfo.create("instrumentation2", "2"))
48+
.setName("testLog2")
49+
.setBody("body2")
50+
.setFlags(0)
51+
.setSeverity(Severity.INFO)
52+
.setSeverityText("INFO")
53+
.setSpanId("8765432112345875")
54+
.setTraceId("12345678876543211234567887654322")
55+
.setEpoch(1631533710L, TimeUnit.MILLISECONDS)
56+
.setAttributes(Attributes.of(booleanKey("important"), true))
57+
.build();
6558

6659
@RegisterExtension
6760
LogCapturer logs = LogCapturer.create().captureForType(OtlpJsonLoggingLogExporter.class);

‎exporters/logging/src/test/java/io/opentelemetry/exporter/logging/SystemOutLogExporterTest.java‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
1818
import io.opentelemetry.sdk.logs.data.Body;
1919
import io.opentelemetry.sdk.logs.data.LogData;
20-
import io.opentelemetry.sdk.logs.data.LogRecord;
2120
import io.opentelemetry.sdk.logs.data.Severity;
2221
import io.opentelemetry.sdk.resources.Resource;
2322
import java.time.LocalDateTime;
@@ -51,16 +50,13 @@ void format() {
5150
}
5251

5352
private static LogData sampleLog(long timestamp) {
54-
return LogData.create(
55-
Resource.empty(),
56-
InstrumentationLibraryInfo.create("logTest", "1.0"),
57-
LogRecord.builder()
58-
.setAttributes(Attributes.of(stringKey("cheese"), "cheddar", longKey("amount"), 1L))
59-
.setBody(Body.stringBody("message"))
60-
.setSeverity(Severity.ERROR3)
61-
.setEpoch(timestamp, TimeUnit.MILLISECONDS)
62-
.setTraceId(TraceId.fromLongs(1, 2))
63-
.setSpanId(SpanId.fromLong(3))
64-
.build());
53+
return LogData.builder(Resource.empty(), InstrumentationLibraryInfo.create("logTest", "1.0"))
54+
.setAttributes(Attributes.of(stringKey("cheese"), "cheddar", longKey("amount"), 1L))
55+
.setBody(Body.stringBody("message"))
56+
.setSeverity(Severity.ERROR3)
57+
.setEpoch(timestamp, TimeUnit.MILLISECONDS)
58+
.setTraceId(TraceId.fromLongs(1, 2))
59+
.setSpanId(SpanId.fromLong(3))
60+
.build();
6561
}
6662
}

‎exporters/otlp-http/logs/src/test/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporterTest.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
3232
import io.opentelemetry.sdk.logs.data.Body;
3333
import io.opentelemetry.sdk.logs.data.LogData;
34-
import io.opentelemetry.sdk.logs.data.LogRecord;
3534
import io.opentelemetry.sdk.logs.data.Severity;
3635
import io.opentelemetry.sdk.resources.Resource;
3736
import io.opentelemetry.sdk.trace.IdGenerator;
@@ -319,19 +318,18 @@ private static <T extends Message> HttpResponse buildResponse(HttpStatus httpSta
319318
}
320319

321320
private static LogData generateFakeLog() {
322-
return LogData.create(
323-
Resource.getDefault(),
324-
InstrumentationLibraryInfo.create("testLib", "1.0", "http://url"),
325-
LogRecord.builder()
326-
.setName("log-name")
327-
.setBody(Body.stringBody("log body"))
328-
.setAttributes(Attributes.builder().put("key", "value").build())
329-
.setSeverity(Severity.INFO)
330-
.setSeverityText(Severity.INFO.name())
331-
.setTraceId(IdGenerator.random().generateTraceId())
332-
.setSpanId(IdGenerator.random().generateSpanId())
333-
.setEpoch(Instant.now())
334-
.setFlags(0)
335-
.build());
321+
return LogData.builder(
322+
Resource.getDefault(),
323+
InstrumentationLibraryInfo.create("testLib", "1.0", "http://url"))
324+
.setName("log-name")
325+
.setBody(Body.stringBody("log body"))
326+
.setAttributes(Attributes.builder().put("key", "value").build())
327+
.setSeverity(Severity.INFO)
328+
.setSeverityText(Severity.INFO.name())
329+
.setTraceId(IdGenerator.random().generateTraceId())
330+
.setSpanId(IdGenerator.random().generateSpanId())
331+
.setEpoch(Instant.now())
332+
.setFlags(0)
333+
.build();
336334
}
337335
}

‎exporters/otlp/common/src/test/java/io/opentelemetry/exporter/otlp/internal/logs/LogsRequestMarshalerTest.java‎

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,18 @@ void toProtoResourceLogs() {
5151
ResourceLogsMarshaler[] resourceLogsMarshalers =
5252
ResourceLogsMarshaler.create(
5353
Collections.singleton(
54-
LogData.create(
55-
Resource.builder().put("one", 1).setSchemaUrl("http://url").build(),
56-
InstrumentationLibraryInfo.create("testLib", "1.0", "http://url"),
57-
io.opentelemetry.sdk.logs.data.LogRecord.builder()
58-
.setName(NAME)
59-
.setBody(BODY)
60-
.setSeverity(Severity.INFO)
61-
.setSeverityText("INFO")
62-
.setTraceId(TRACE_ID)
63-
.setSpanId(SPAN_ID)
64-
.setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
65-
.setEpoch(12345, TimeUnit.NANOSECONDS)
66-
.build())));
54+
LogData.builder(
55+
Resource.builder().put("one", 1).setSchemaUrl("http://url").build(),
56+
InstrumentationLibraryInfo.create("testLib", "1.0", "http://url"))
57+
.setName(NAME)
58+
.setBody(BODY)
59+
.setSeverity(Severity.INFO)
60+
.setSeverityText("INFO")
61+
.setTraceId(TRACE_ID)
62+
.setSpanId(SPAN_ID)
63+
.setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
64+
.setEpoch(12345, TimeUnit.NANOSECONDS)
65+
.build()));
6766

6867
assertThat(resourceLogsMarshalers).hasSize(1);
6968

@@ -85,19 +84,18 @@ void toProtoLogRecord() {
8584
parse(
8685
LogRecord.getDefaultInstance(),
8786
LogMarshaler.create(
88-
LogData.create(
89-
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
90-
InstrumentationLibraryInfo.create("instrumentation", "1"),
91-
io.opentelemetry.sdk.logs.data.LogRecord.builder()
92-
.setName(NAME)
93-
.setBody(BODY)
94-
.setSeverity(Severity.INFO)
95-
.setSeverityText("INFO")
96-
.setTraceId(TRACE_ID)
97-
.setSpanId(SPAN_ID)
98-
.setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
99-
.setEpoch(12345, TimeUnit.NANOSECONDS)
100-
.build())));
87+
LogData.builder(
88+
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
89+
InstrumentationLibraryInfo.create("instrumentation", "1"))
90+
.setName(NAME)
91+
.setBody(BODY)
92+
.setSeverity(Severity.INFO)
93+
.setSeverityText("INFO")
94+
.setTraceId(TRACE_ID)
95+
.setSpanId(SPAN_ID)
96+
.setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
97+
.setEpoch(12345, TimeUnit.NANOSECONDS)
98+
.build()));
10199

102100
assertThat(logRecord.getTraceId().toByteArray()).isEqualTo(TRACE_ID_BYTES);
103101
assertThat(logRecord.getSpanId().toByteArray()).isEqualTo(SPAN_ID_BYTES);
@@ -119,15 +117,14 @@ void toProtoLogRecord_MinimalFields() {
119117
parse(
120118
LogRecord.getDefaultInstance(),
121119
LogMarshaler.create(
122-
LogData.create(
123-
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
124-
InstrumentationLibraryInfo.create("instrumentation", "1"),
125-
io.opentelemetry.sdk.logs.data.LogRecord.builder()
126-
.setBody(BODY)
127-
.setSeverity(Severity.INFO)
128-
.setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
129-
.setEpoch(12345, TimeUnit.NANOSECONDS)
130-
.build())));
120+
LogData.builder(
121+
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
122+
InstrumentationLibraryInfo.create("instrumentation", "1"))
123+
.setBody(BODY)
124+
.setSeverity(Severity.INFO)
125+
.setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
126+
.setEpoch(12345, TimeUnit.NANOSECONDS)
127+
.build()));
131128

132129
assertThat(logRecord.getTraceId().toByteArray()).isEmpty();
133130
assertThat(logRecord.getSpanId().toByteArray()).isEmpty();

‎exporters/otlp/logs/src/test/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogsExporterTest.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import io.opentelemetry.sdk.common.CompletableResultCode;
3333
import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
3434
import io.opentelemetry.sdk.logs.data.LogData;
35-
import io.opentelemetry.sdk.logs.data.LogRecord;
3635
import io.opentelemetry.sdk.logs.data.Severity;
3736
import io.opentelemetry.sdk.resources.Resource;
3837
import java.io.ByteArrayOutputStream;
@@ -358,20 +357,19 @@ void usingGrpc() {
358357
}
359358

360359
private static LogData generateFakeLog() {
361-
return LogData.create(
362-
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
363-
InstrumentationLibraryInfo.create("instrumentation", "1"),
364-
LogRecord.builder()
365-
.setEpoch(Instant.now())
366-
.setTraceId(TraceId.getInvalid())
367-
.setSpanId(SpanId.getInvalid())
368-
.setFlags(TraceFlags.getDefault().asByte())
369-
.setSeverity(Severity.ERROR)
370-
.setSeverityText("really severe")
371-
.setName("log1")
372-
.setBody("message")
373-
.setAttributes(Attributes.builder().put("animal", "cat").build())
374-
.build());
360+
return LogData.builder(
361+
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
362+
InstrumentationLibraryInfo.create("instrumentation", "1"))
363+
.setEpoch(Instant.now())
364+
.setTraceId(TraceId.getInvalid())
365+
.setSpanId(SpanId.getInvalid())
366+
.setFlags(TraceFlags.getDefault().asByte())
367+
.setSeverity(Severity.ERROR)
368+
.setSeverityText("really severe")
369+
.setName("log1")
370+
.setBody("message")
371+
.setAttributes(Attributes.builder().put("animal", "cat").build())
372+
.build();
375373
}
376374

377375
private static final class FakeCollector extends LogsServiceGrpc.LogsServiceImplBase {

‎exporters/otlp/logs/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import io.opentelemetry.proto.collector.logs.v1.LogsServiceGrpc;
2424
import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
2525
import io.opentelemetry.sdk.logs.data.LogData;
26-
import io.opentelemetry.sdk.logs.data.LogRecord;
2726
import io.opentelemetry.sdk.logs.data.Severity;
2827
import io.opentelemetry.sdk.resources.Resource;
2928
import java.nio.charset.StandardCharsets;
@@ -40,20 +39,19 @@ class ExportTest {
4039

4140
private static final List<LogData> LOGS =
4241
Collections.singletonList(
43-
LogData.create(
44-
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
45-
InstrumentationLibraryInfo.create("instrumentation", "1"),
46-
LogRecord.builder()
47-
.setEpoch(Instant.now())
48-
.setTraceId(TraceId.getInvalid())
49-
.setSpanId(SpanId.getInvalid())
50-
.setFlags(TraceFlags.getDefault().asByte())
51-
.setSeverity(Severity.ERROR)
52-
.setSeverityText("really severe")
53-
.setName("log1")
54-
.setBody("message")
55-
.setAttributes(Attributes.builder().put("animal", "cat").build())
56-
.build()));
42+
LogData.builder(
43+
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
44+
InstrumentationLibraryInfo.create("instrumentation", "1"))
45+
.setEpoch(Instant.now())
46+
.setTraceId(TraceId.getInvalid())
47+
.setSpanId(SpanId.getInvalid())
48+
.setFlags(TraceFlags.getDefault().asByte())
49+
.setSeverity(Severity.ERROR)
50+
.setSeverityText("really severe")
51+
.setName("log1")
52+
.setBody("message")
53+
.setAttributes(Attributes.builder().put("animal", "cat").build())
54+
.build());
5755

5856
@RegisterExtension
5957
@Order(1)

‎exporters/otlp/logs/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import io.opentelemetry.proto.collector.logs.v1.LogsServiceGrpc;
2424
import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
2525
import io.opentelemetry.sdk.logs.data.LogData;
26-
import io.opentelemetry.sdk.logs.data.LogRecord;
2726
import io.opentelemetry.sdk.logs.data.Severity;
2827
import io.opentelemetry.sdk.resources.Resource;
2928
import java.nio.charset.StandardCharsets;
@@ -40,20 +39,19 @@ class ExportTest {
4039

4140
private static final List<LogData> LOGS =
4241
Collections.singletonList(
43-
LogData.create(
44-
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
45-
InstrumentationLibraryInfo.create("instrumentation", "1"),
46-
LogRecord.builder()
47-
.setEpoch(Instant.now())
48-
.setTraceId(TraceId.getInvalid())
49-
.setSpanId(SpanId.getInvalid())
50-
.setFlags(TraceFlags.getDefault().asByte())
51-
.setSeverity(Severity.ERROR)
52-
.setSeverityText("really severe")
53-
.setName("log1")
54-
.setBody("message")
55-
.setAttributes(Attributes.builder().put("animal", "cat").build())
56-
.build()));
42+
LogData.builder(
43+
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
44+
InstrumentationLibraryInfo.create("instrumentation", "1"))
45+
.setEpoch(Instant.now())
46+
.setTraceId(TraceId.getInvalid())
47+
.setSpanId(SpanId.getInvalid())
48+
.setFlags(TraceFlags.getDefault().asByte())
49+
.setSeverity(Severity.ERROR)
50+
.setSeverityText("really severe")
51+
.setName("log1")
52+
.setBody("message")
53+
.setAttributes(Attributes.builder().put("animal", "cat").build())
54+
.build());
5755

5856
@RegisterExtension
5957
@Order(1)

‎exporters/otlp/logs/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import io.opentelemetry.proto.collector.logs.v1.LogsServiceGrpc;
2424
import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
2525
import io.opentelemetry.sdk.logs.data.LogData;
26-
import io.opentelemetry.sdk.logs.data.LogRecord;
2726
import io.opentelemetry.sdk.logs.data.Severity;
2827
import io.opentelemetry.sdk.resources.Resource;
2928
import java.nio.charset.StandardCharsets;
@@ -40,20 +39,19 @@ class ExportTest {
4039

4140
private static final List<LogData> LOGS =
4241
Collections.singletonList(
43-
LogData.create(
44-
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
45-
InstrumentationLibraryInfo.create("instrumentation", "1"),
46-
LogRecord.builder()
47-
.setEpoch(Instant.now())
48-
.setTraceId(TraceId.getInvalid())
49-
.setSpanId(SpanId.getInvalid())
50-
.setFlags(TraceFlags.getDefault().asByte())
51-
.setSeverity(Severity.ERROR)
52-
.setSeverityText("really severe")
53-
.setName("log1")
54-
.setBody("message")
55-
.setAttributes(Attributes.builder().put("animal", "cat").build())
56-
.build()));
42+
LogData.builder(
43+
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
44+
InstrumentationLibraryInfo.create("instrumentation", "1"))
45+
.setEpoch(Instant.now())
46+
.setTraceId(TraceId.getInvalid())
47+
.setSpanId(SpanId.getInvalid())
48+
.setFlags(TraceFlags.getDefault().asByte())
49+
.setSeverity(Severity.ERROR)
50+
.setSeverityText("really severe")
51+
.setName("log1")
52+
.setBody("message")
53+
.setAttributes(Attributes.builder().put("animal", "cat").build())
54+
.build());
5755

5856
@RegisterExtension
5957
@Order(1)

0 commit comments

Comments
 (0)
⚡