open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make LogRecord required parameters final. (#3648)

This commit is contained in:
Anuraag Agrawal 2021-09-23 00:34:52 +09:00 committed by GitHub
parent 4a52485377
commit a262a1eb2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
exporters/otlp/common/src/test/java/io/opentelemetry/exporter/otlp/internal/LogAdapterTest.java
View File

@ -36,7 +36,9 @@ class LogAdapterTest {
List<ResourceLogs> resourceLogs =
LogAdapter.toProtoResourceLogs(
Collections.singleton(
io.opentelemetry.sdk.logging.data.LogRecord.builder()
io.opentelemetry.sdk.logging.data.LogRecord.builder(
Resource.builder().put("one", 1).setSchemaUrl("http://url").build(),
InstrumentationLibraryInfo.create("testLib", "1.0", "http://url"))
.setName(NAME)
.setBody(BODY)
.setSeverity(io.opentelemetry.sdk.logging.data.LogRecord.Severity.INFO)
@ -45,10 +47,6 @@ class LogAdapterTest {
.setSpanId(SPAN_ID)
.setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
.setUnixTimeNano(12345)
.setResource(
Resource.builder().put("one", 1).setSchemaUrl("http://url").build())
.setInstrumentationLibraryInfo(
InstrumentationLibraryInfo.create("testLib", "1.0", "http://url"))
.build()));
assertThat(resourceLogs).hasSize(1);
@ -67,7 +65,9 @@ class LogAdapterTest {
void toProtoLogRecord() {
io.opentelemetry.proto.logs.v1.LogRecord logRecord =
LogAdapter.toProtoLogRecord(
io.opentelemetry.sdk.logging.data.LogRecord.builder()
io.opentelemetry.sdk.logging.data.LogRecord.builder(
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
InstrumentationLibraryInfo.create("instrumentation", "1"))
.setName(NAME)
.setBody(BODY)
.setSeverity(io.opentelemetry.sdk.logging.data.LogRecord.Severity.INFO)
@ -76,10 +76,6 @@ class LogAdapterTest {
.setSpanId(SPAN_ID)
.setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
.setUnixTimeNano(12345)
.setResource(
Resource.create(Attributes.builder().put("testKey", "testValue").build()))
.setInstrumentationLibraryInfo(
InstrumentationLibraryInfo.create("instrumentation", "1"))
.build());
assertThat(logRecord.getTraceId().toByteArray()).isEqualTo(TRACE_ID_BYTES);

5
sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/LogRecord.java
View File

@ -19,8 +19,9 @@ import javax.annotation.Nullable;
@AutoValue
public abstract class LogRecord {
public static LogRecordBuilder builder() {
return new LogRecordBuilder();
public static LogRecordBuilder builder(
Resource resource, InstrumentationLibraryInfo instrumentationLibraryInfo) {
return new LogRecordBuilder(resource, instrumentationLibraryInfo);
}
static LogRecord create(

15
sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/LogRecordBuilder.java
View File

@ -12,8 +12,9 @@ import io.opentelemetry.sdk.resources.Resource;
import java.util.concurrent.TimeUnit;
public final class LogRecordBuilder {
private Resource resource;
private InstrumentationLibraryInfo instrumentationLibraryInfo;
private final Resource resource;
private final InstrumentationLibraryInfo instrumentationLibraryInfo;
private long timeUnixNano;
private String traceId = "";
private String spanId = "";
@ -24,17 +25,9 @@ public final class LogRecordBuilder {
private Body body = Body.stringBody("");
private final AttributesBuilder attributeBuilder = Attributes.builder();
LogRecordBuilder() {}
public LogRecordBuilder setResource(Resource resource) {
LogRecordBuilder(Resource resource, InstrumentationLibraryInfo instrumentationLibraryInfo) {
this.resource = resource;
return this;
}
public LogRecordBuilder setInstrumentationLibraryInfo(
InstrumentationLibraryInfo instrumentationLibraryInfo) {
this.instrumentationLibraryInfo = instrumentationLibraryInfo;
return this;
}
public LogRecordBuilder setUnixTimeNano(long timestamp) {

6
sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/LogSinkSdkProviderTest.java
View File

@ -28,9 +28,9 @@ import org.junit.jupiter.api.Test;
class LogSinkSdkProviderTest {
private static LogRecord createLog(LogRecord.Severity severity, String message) {
return LogRecord.builder()
.setResource(Resource.create(Attributes.builder().put("testKey", "testValue").build()))
.setInstrumentationLibraryInfo(InstrumentationLibraryInfo.create("instrumentation", "1"))
return LogRecord.builder(
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
InstrumentationLibraryInfo.create("instrumentation", "1"))
.setUnixTimeMillis(System.currentTimeMillis())
.setTraceId(TraceId.getInvalid())
.setSpanId(SpanId.getInvalid())

6
sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/sdk/BatchLogProcessorTest.java
View File

@ -23,9 +23,9 @@ import org.junit.jupiter.api.Test;
class BatchLogProcessorTest {
private static LogRecord createLog(LogRecord.Severity severity, String message) {
return LogRecord.builder()
.setResource(Resource.create(Attributes.builder().put("testKey", "testValue").build()))
.setInstrumentationLibraryInfo(InstrumentationLibraryInfo.create("instrumentation", "1"))
return LogRecord.builder(
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
InstrumentationLibraryInfo.create("instrumentation", "1"))
.setUnixTimeMillis(System.currentTimeMillis())
.setTraceId(TraceId.getInvalid())
.setSpanId(SpanId.getInvalid())