Make LogRecord required parameters final. (#3648)
This commit is contained in:
parent
4a52485377
commit
a262a1eb2a
|
|
@ -36,7 +36,9 @@ class LogAdapterTest {
|
||||||
List<ResourceLogs> resourceLogs =
|
List<ResourceLogs> resourceLogs =
|
||||||
LogAdapter.toProtoResourceLogs(
|
LogAdapter.toProtoResourceLogs(
|
||||||
Collections.singleton(
|
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)
|
.setName(NAME)
|
||||||
.setBody(BODY)
|
.setBody(BODY)
|
||||||
.setSeverity(io.opentelemetry.sdk.logging.data.LogRecord.Severity.INFO)
|
.setSeverity(io.opentelemetry.sdk.logging.data.LogRecord.Severity.INFO)
|
||||||
|
|
@ -45,10 +47,6 @@ class LogAdapterTest {
|
||||||
.setSpanId(SPAN_ID)
|
.setSpanId(SPAN_ID)
|
||||||
.setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
|
.setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
|
||||||
.setUnixTimeNano(12345)
|
.setUnixTimeNano(12345)
|
||||||
.setResource(
|
|
||||||
Resource.builder().put("one", 1).setSchemaUrl("http://url").build())
|
|
||||||
.setInstrumentationLibraryInfo(
|
|
||||||
InstrumentationLibraryInfo.create("testLib", "1.0", "http://url"))
|
|
||||||
.build()));
|
.build()));
|
||||||
|
|
||||||
assertThat(resourceLogs).hasSize(1);
|
assertThat(resourceLogs).hasSize(1);
|
||||||
|
|
@ -67,7 +65,9 @@ class LogAdapterTest {
|
||||||
void toProtoLogRecord() {
|
void toProtoLogRecord() {
|
||||||
io.opentelemetry.proto.logs.v1.LogRecord logRecord =
|
io.opentelemetry.proto.logs.v1.LogRecord logRecord =
|
||||||
LogAdapter.toProtoLogRecord(
|
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)
|
.setName(NAME)
|
||||||
.setBody(BODY)
|
.setBody(BODY)
|
||||||
.setSeverity(io.opentelemetry.sdk.logging.data.LogRecord.Severity.INFO)
|
.setSeverity(io.opentelemetry.sdk.logging.data.LogRecord.Severity.INFO)
|
||||||
|
|
@ -76,10 +76,6 @@ class LogAdapterTest {
|
||||||
.setSpanId(SPAN_ID)
|
.setSpanId(SPAN_ID)
|
||||||
.setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
|
.setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
|
||||||
.setUnixTimeNano(12345)
|
.setUnixTimeNano(12345)
|
||||||
.setResource(
|
|
||||||
Resource.create(Attributes.builder().put("testKey", "testValue").build()))
|
|
||||||
.setInstrumentationLibraryInfo(
|
|
||||||
InstrumentationLibraryInfo.create("instrumentation", "1"))
|
|
||||||
.build());
|
.build());
|
||||||
|
|
||||||
assertThat(logRecord.getTraceId().toByteArray()).isEqualTo(TRACE_ID_BYTES);
|
assertThat(logRecord.getTraceId().toByteArray()).isEqualTo(TRACE_ID_BYTES);
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,9 @@ import javax.annotation.Nullable;
|
||||||
@AutoValue
|
@AutoValue
|
||||||
public abstract class LogRecord {
|
public abstract class LogRecord {
|
||||||
|
|
||||||
public static LogRecordBuilder builder() {
|
public static LogRecordBuilder builder(
|
||||||
return new LogRecordBuilder();
|
Resource resource, InstrumentationLibraryInfo instrumentationLibraryInfo) {
|
||||||
|
return new LogRecordBuilder(resource, instrumentationLibraryInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
static LogRecord create(
|
static LogRecord create(
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,9 @@ import io.opentelemetry.sdk.resources.Resource;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
public final class LogRecordBuilder {
|
public final class LogRecordBuilder {
|
||||||
private Resource resource;
|
private final Resource resource;
|
||||||
private InstrumentationLibraryInfo instrumentationLibraryInfo;
|
private final InstrumentationLibraryInfo instrumentationLibraryInfo;
|
||||||
|
|
||||||
private long timeUnixNano;
|
private long timeUnixNano;
|
||||||
private String traceId = "";
|
private String traceId = "";
|
||||||
private String spanId = "";
|
private String spanId = "";
|
||||||
|
|
@ -24,17 +25,9 @@ public final class LogRecordBuilder {
|
||||||
private Body body = Body.stringBody("");
|
private Body body = Body.stringBody("");
|
||||||
private final AttributesBuilder attributeBuilder = Attributes.builder();
|
private final AttributesBuilder attributeBuilder = Attributes.builder();
|
||||||
|
|
||||||
LogRecordBuilder() {}
|
LogRecordBuilder(Resource resource, InstrumentationLibraryInfo instrumentationLibraryInfo) {
|
||||||
|
|
||||||
public LogRecordBuilder setResource(Resource resource) {
|
|
||||||
this.resource = resource;
|
this.resource = resource;
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LogRecordBuilder setInstrumentationLibraryInfo(
|
|
||||||
InstrumentationLibraryInfo instrumentationLibraryInfo) {
|
|
||||||
this.instrumentationLibraryInfo = instrumentationLibraryInfo;
|
this.instrumentationLibraryInfo = instrumentationLibraryInfo;
|
||||||
return this;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public LogRecordBuilder setUnixTimeNano(long timestamp) {
|
public LogRecordBuilder setUnixTimeNano(long timestamp) {
|
||||||
|
|
|
||||||
|
|
@ -28,9 +28,9 @@ import org.junit.jupiter.api.Test;
|
||||||
class LogSinkSdkProviderTest {
|
class LogSinkSdkProviderTest {
|
||||||
|
|
||||||
private static LogRecord createLog(LogRecord.Severity severity, String message) {
|
private static LogRecord createLog(LogRecord.Severity severity, String message) {
|
||||||
return LogRecord.builder()
|
return LogRecord.builder(
|
||||||
.setResource(Resource.create(Attributes.builder().put("testKey", "testValue").build()))
|
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
|
||||||
.setInstrumentationLibraryInfo(InstrumentationLibraryInfo.create("instrumentation", "1"))
|
InstrumentationLibraryInfo.create("instrumentation", "1"))
|
||||||
.setUnixTimeMillis(System.currentTimeMillis())
|
.setUnixTimeMillis(System.currentTimeMillis())
|
||||||
.setTraceId(TraceId.getInvalid())
|
.setTraceId(TraceId.getInvalid())
|
||||||
.setSpanId(SpanId.getInvalid())
|
.setSpanId(SpanId.getInvalid())
|
||||||
|
|
|
||||||
|
|
@ -23,9 +23,9 @@ import org.junit.jupiter.api.Test;
|
||||||
class BatchLogProcessorTest {
|
class BatchLogProcessorTest {
|
||||||
|
|
||||||
private static LogRecord createLog(LogRecord.Severity severity, String message) {
|
private static LogRecord createLog(LogRecord.Severity severity, String message) {
|
||||||
return LogRecord.builder()
|
return LogRecord.builder(
|
||||||
.setResource(Resource.create(Attributes.builder().put("testKey", "testValue").build()))
|
Resource.create(Attributes.builder().put("testKey", "testValue").build()),
|
||||||
.setInstrumentationLibraryInfo(InstrumentationLibraryInfo.create("instrumentation", "1"))
|
InstrumentationLibraryInfo.create("instrumentation", "1"))
|
||||||
.setUnixTimeMillis(System.currentTimeMillis())
|
.setUnixTimeMillis(System.currentTimeMillis())
|
||||||
.setTraceId(TraceId.getInvalid())
|
.setTraceId(TraceId.getInvalid())
|
||||||
.setSpanId(SpanId.getInvalid())
|
.setSpanId(SpanId.getInvalid())
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue