Add TestLogData, remove public LogDataImpl and LogDataBuilder from lo…

…g SDK (#4635) * Add TestLogData, remove public LogDataImpl and LogDataBuilder from log sdk * pr comment
open-telemetry · Jul 27, 2022 · a808649 · a808649
1 parent aa35582
commit a808649
Show file tree

Hide file tree

Showing 31 changed files with 302 additions and 325 deletions.
diff --git a/exporters/logging-otlp/build.gradle.kts b/exporters/logging-otlp/build.gradle.kts
@@ -18,6 +18,7 @@ dependencies {
  implementation("com.fasterxml.jackson.core:jackson-core")
 
  testImplementation(project(":sdk:testing"))
+ testImplementation(project(":sdk:logs-testing"))
  testImplementation(project(":sdk:logs"))
  testImplementation(project(":sdk:metrics"))
  testImplementation(project(":sdk:trace"))

diff --git a/.../src/test/java/io/opentelemetry/exporter/logging/otlp/OtlpJsonLoggingLogExporterTest.java b/.../src/test/java/io/opentelemetry/exporter/logging/otlp/OtlpJsonLoggingLogExporterTest.java
@@ -18,10 +18,10 @@
 import io.opentelemetry.internal.testing.slf4j.SuppressLogger;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.logs.data.LogData;
-import io.opentelemetry.sdk.logs.data.LogDataBuilder;
 import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.logs.export.LogExporter;
 import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.testing.logs.TestLogData;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.BeforeEach;
@@ -37,7 +37,10 @@ class OtlpJsonLoggingLogExporterTest {
  Resource.create(Attributes.builder().put("key", "value").build());
 
  private static final LogData LOG1 =
- LogDataBuilder.create(RESOURCE, InstrumentationScopeInfo.create("instrumentation", "1", null))
+ TestLogData.builder()
+ .setResource(RESOURCE)
+ .setInstrumentationScopeInfo(
+ InstrumentationScopeInfo.create("instrumentation", "1", null))
  .setBody("body1")
  .setSeverity(Severity.INFO)
  .setSeverityText("INFO")
@@ -52,8 +55,10 @@ class OtlpJsonLoggingLogExporterTest {
  .build();
 
  private static final LogData LOG2 =
- LogDataBuilder.create(
- RESOURCE, InstrumentationScopeInfo.create("instrumentation2", "2", null))
+ TestLogData.builder()
+ .setResource(RESOURCE)
+ .setInstrumentationScopeInfo(
+ InstrumentationScopeInfo.create("instrumentation2", "2", null))
  .setBody("body2")
  .setSeverity(Severity.INFO)
  .setSeverityText("INFO")

diff --git a/exporters/logging/build.gradle.kts b/exporters/logging/build.gradle.kts
@@ -14,4 +14,5 @@ dependencies {
  api(project(":sdk:logs"))
 
  testImplementation(project(":sdk:testing"))
+ testImplementation(project(":sdk:logs-testing"))
 }
diff --git a/...ers/logging/src/test/java/io/opentelemetry/exporter/logging/SystemOutLogExporterTest.java b/...ers/logging/src/test/java/io/opentelemetry/exporter/logging/SystemOutLogExporterTest.java
@@ -17,9 +17,9 @@
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.logs.data.LogData;
-import io.opentelemetry.sdk.logs.data.LogDataBuilder;
 import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.testing.logs.TestLogData;
 import java.time.LocalDateTime;
 import java.time.Month;
 import java.time.ZoneOffset;
@@ -51,8 +51,9 @@ void format() {
  }
 
  private static LogData sampleLog(long timestamp) {
- return LogDataBuilder.create(
- Resource.empty(), InstrumentationScopeInfo.create("logTest", "1.0", null))
+ return TestLogData.builder()
+ .setResource(Resource.empty())
+ .setInstrumentationScopeInfo(InstrumentationScopeInfo.create("logTest", "1.0", null))
  .setAttributes(Attributes.of(stringKey("cheese"), "cheddar", longKey("amount"), 1L))
  .setBody("message")
  .setSeverity(Severity.ERROR3)

diff --git a/exporters/otlp/common/build.gradle.kts b/exporters/otlp/common/build.gradle.kts
@@ -39,6 +39,7 @@ dependencies {
  testImplementation(project(":sdk:trace"))
  testImplementation(project(":sdk:logs"))
  testImplementation(project(":sdk:testing"))
+ testImplementation(project(":sdk:logs-testing"))
 
  testImplementation("com.fasterxml.jackson.core:jackson-databind")
  testImplementation("com.google.protobuf:protobuf-java-util")

diff --git a/.../src/test/java/io/opentelemetry/exporter/internal/otlp/logs/LogsRequestMarshalerTest.java b/.../src/test/java/io/opentelemetry/exporter/internal/otlp/logs/LogsRequestMarshalerTest.java
@@ -27,9 +27,9 @@
 import io.opentelemetry.proto.logs.v1.ResourceLogs;
 import io.opentelemetry.proto.logs.v1.ScopeLogs;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
-import io.opentelemetry.sdk.logs.data.LogDataBuilder;
 import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.testing.logs.TestLogData;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -53,8 +53,10 @@ void toProtoResourceLogs() {
  ResourceLogsMarshaler[] resourceLogsMarshalers =
  ResourceLogsMarshaler.create(
  Collections.singleton(
- LogDataBuilder.create(
- Resource.builder().put("one", 1).setSchemaUrl("http://url").build(),
+ TestLogData.builder()
+ .setResource(
+ Resource.builder().put("one", 1).setSchemaUrl("http://url").build())
+ .setInstrumentationScopeInfo(
  InstrumentationScopeInfo.create("testLib", "1.0", "http://url"))
  .setBody(BODY)
  .setSeverity(Severity.INFO)
@@ -84,8 +86,10 @@ void toProtoLogRecord() {
  parse(
  LogRecord.getDefaultInstance(),
  LogMarshaler.create(
- LogDataBuilder.create(
- Resource.create(Attributes.builder().put("testKey", "testValue").build()),
+ TestLogData.builder()
+ .setResource(
+ Resource.create(Attributes.builder().put("testKey", "testValue").build()))
+ .setInstrumentationScopeInfo(
  InstrumentationScopeInfo.create("instrumentation", "1", null))
  .setBody(BODY)
  .setSeverity(Severity.INFO)
@@ -116,8 +120,10 @@ void toProtoLogRecord_MinimalFields() {
  parse(
  LogRecord.getDefaultInstance(),
  LogMarshaler.create(
- LogDataBuilder.create(
- Resource.create(Attributes.builder().put("testKey", "testValue").build()),
+ TestLogData.builder()
+ .setResource(
+ Resource.create(Attributes.builder().put("testKey", "testValue").build()))
+ .setInstrumentationScopeInfo(
  InstrumentationScopeInfo.create("instrumentation", "1", null))
  .setEpoch(12345, TimeUnit.NANOSECONDS)
  .build()));

diff --git a/exporters/otlp/logs/build.gradle.kts b/exporters/otlp/logs/build.gradle.kts
@@ -16,6 +16,7 @@ dependencies {
  compileOnly("io.grpc:grpc-stub")
 
  testImplementation(project(":exporters:otlp:testing-internal"))
+ testImplementation(project(":sdk:logs-testing"))
 
  testImplementation("com.linecorp.armeria:armeria-junit5")
  testImplementation("com.google.api.grpc:proto-google-common-protos")
@@ -27,6 +28,7 @@ testing {
  val testGrpcNetty by registering(JvmTestSuite::class) {
  dependencies {
  implementation(project(":exporters:otlp:testing-internal"))
+ implementation(project(":sdk:logs-testing"))
 
  implementation("io.grpc:grpc-netty")
  implementation("io.grpc:grpc-stub")
@@ -35,6 +37,7 @@ testing {
  val testGrpcNettyShaded by registering(JvmTestSuite::class) {
  dependencies {
  implementation(project(":exporters:otlp:testing-internal"))
+ implementation(project(":sdk:logs-testing"))
 
  implementation("io.grpc:grpc-netty-shaded")
  implementation("io.grpc:grpc-stub")
@@ -43,6 +46,7 @@ testing {
  val testGrpcOkhttp by registering(JvmTestSuite::class) {
  dependencies {
  implementation(project(":exporters:otlp:testing-internal"))
+ implementation(project(":sdk:logs-testing"))
 
  implementation("io.grpc:grpc-okhttp")
  implementation("io.grpc:grpc-stub")

diff --git a/.../logs/src/test/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporterTest.java b/.../logs/src/test/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporterTest.java
@@ -33,9 +33,9 @@
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.logs.data.LogData;
-import io.opentelemetry.sdk.logs.data.LogDataBuilder;
 import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.testing.logs.TestLogData;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -339,8 +339,10 @@ private static <T extends Message> HttpResponse buildResponse(HttpStatus httpSta
  }
 
  private static LogData generateFakeLog() {
- return LogDataBuilder.create(
- Resource.getDefault(), InstrumentationScopeInfo.create("testLib", "1.0", "http://url"))
+ return TestLogData.builder()
+ .setResource(Resource.getDefault())
+ .setInstrumentationScopeInfo(
+ InstrumentationScopeInfo.create("testLib", "1.0", "http://url"))
  .setBody("log body")
  .setAttributes(Attributes.builder().put("key", "value").build())
  .setSeverity(Severity.INFO)

diff --git a/.../otlp/logs/src/test/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogExporterTest.java b/.../otlp/logs/src/test/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogExporterTest.java
@@ -19,9 +19,9 @@
 import io.opentelemetry.proto.logs.v1.ResourceLogs;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.logs.data.LogData;
-import io.opentelemetry.sdk.logs.data.LogDataBuilder;
 import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.testing.logs.TestLogData;
 import java.io.Closeable;
 import java.time.Instant;
 import java.util.List;
@@ -56,9 +56,9 @@ protected TelemetryExporterBuilder<LogData> exporterBuilder() {
 
  @Override
  protected LogData generateFakeTelemetry() {
- return LogDataBuilder.create(
-  Resource.create(Attributes.builder().put("testKey", "testValue").build()),
-  InstrumentationScopeInfo.create("instrumentation", "1", null))
+ return TestLogData.builder()
+ .setResource(Resource.create(Attributes.builder().put("testKey", "testValue").build()))
+ .setInstrumentationScopeInfo(InstrumentationScopeInfo.create("instrumentation", "1", null))
  .setEpoch(Instant.now())
  .setSeverity(Severity.ERROR)
  .setSeverityText("really severe")

diff --git a/.../testGrpcNetty/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyLogExporterTest.java b/.../testGrpcNetty/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyLogExporterTest.java
@@ -21,9 +21,9 @@
 import io.opentelemetry.proto.logs.v1.ResourceLogs;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.logs.data.LogData;
-import io.opentelemetry.sdk.logs.data.LogDataBuilder;
 import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.testing.logs.TestLogData;
 import java.io.Closeable;
 import java.time.Instant;
 import java.util.List;
@@ -64,9 +64,9 @@ protected TelemetryExporterBuilder<LogData> exporterBuilder() {
 
  @Override
  protected LogData generateFakeTelemetry() {
- return LogDataBuilder.create(
-  Resource.create(Attributes.builder().put("testKey", "testValue").build()),
-  InstrumentationScopeInfo.create("instrumentation", "1", null))
+ return TestLogData.builder()
+ .setResource(Resource.create(Attributes.builder().put("testKey", "testValue").build()))
+ .setInstrumentationScopeInfo(InstrumentationScopeInfo.create("instrumentation", "1", null))
  .setEpoch(Instant.now())
  .setSeverity(Severity.ERROR)
  .setSeverityText("really severe")

diff --git a/...tyShaded/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyShadedLogExporterTest.java b/...tyShaded/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyShadedLogExporterTest.java
@@ -18,9 +18,9 @@
 import io.opentelemetry.proto.logs.v1.ResourceLogs;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.logs.data.LogData;
-import io.opentelemetry.sdk.logs.data.LogDataBuilder;
 import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.testing.logs.TestLogData;
 import java.io.Closeable;
 import java.time.Instant;
 import java.util.List;
@@ -52,9 +52,9 @@ protected TelemetryExporterBuilder<LogData> exporterBuilder() {
 
  @Override
  protected LogData generateFakeTelemetry() {
- return LogDataBuilder.create(
-  Resource.create(Attributes.builder().put("testKey", "testValue").build()),
-  InstrumentationScopeInfo.create("instrumentation", "1", null))
+ return TestLogData.builder()
+ .setResource(Resource.create(Attributes.builder().put("testKey", "testValue").build()))
+ .setInstrumentationScopeInfo(InstrumentationScopeInfo.create("instrumentation", "1", null))
  .setEpoch(Instant.now())
  .setSeverity(Severity.ERROR)
  .setSeverityText("really severe")

diff --git a/...pcOkhttp/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyOkHttpLogExporterTest.java b/...pcOkhttp/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcNettyOkHttpLogExporterTest.java
@@ -18,9 +18,9 @@
 import io.opentelemetry.proto.logs.v1.ResourceLogs;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.logs.data.LogData;
-import io.opentelemetry.sdk.logs.data.LogDataBuilder;
 import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.testing.logs.TestLogData;
 import java.io.Closeable;
 import java.time.Instant;
 import java.util.List;
@@ -52,9 +52,9 @@ protected TelemetryExporterBuilder<LogData> exporterBuilder() {
 
  @Override
  protected LogData generateFakeTelemetry() {
- return LogDataBuilder.create(
-  Resource.create(Attributes.builder().put("testKey", "testValue").build()),
-  InstrumentationScopeInfo.create("instrumentation", "1", null))
+ return TestLogData.builder()
+ .setResource(Resource.create(Attributes.builder().put("testKey", "testValue").build()))
+ .setInstrumentationScopeInfo(InstrumentationScopeInfo.create("instrumentation", "1", null))
  .setEpoch(Instant.now())
  .setSeverity(Severity.ERROR)
  .setSeverityText("really severe")

diff --git a/sdk-extensions/autoconfigure/build.gradle.kts b/sdk-extensions/autoconfigure/build.gradle.kts
@@ -121,6 +121,7 @@ testing {
  implementation(project(":exporters:otlp:logs"))
  implementation(project(":exporters:otlp:common"))
  implementation(project(":sdk:testing"))
+ implementation(project(":sdk:logs-testing"))
 
  implementation("io.opentelemetry.proto:opentelemetry-proto")
  implementation("com.linecorp.armeria:armeria-junit5")

diff --git a/...nfigure/src/testOtlp/java/io/opentelemetry/sdk/autoconfigure/OtlpGrpcServerExtension.java b/...nfigure/src/testOtlp/java/io/opentelemetry/sdk/autoconfigure/OtlpGrpcServerExtension.java
@@ -28,13 +28,13 @@
 import io.opentelemetry.proto.collector.trace.v1.TraceServiceGrpc;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.logs.data.LogData;
-import io.opentelemetry.sdk.logs.data.LogDataBuilder;
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongPointData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData;
 import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.testing.logs.TestLogData;
 import io.opentelemetry.sdk.testing.trace.TestSpanData;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.data.StatusData;
@@ -164,7 +164,9 @@ static MetricData generateFakeMetric() {
  }
 
  static LogData generateFakeLog() {
- return LogDataBuilder.create(Resource.empty(), InstrumentationScopeInfo.empty())
+ return TestLogData.builder()
+ .setResource(Resource.empty())
+ .setInstrumentationScopeInfo(InstrumentationScopeInfo.empty())
  .setEpoch(Instant.now())
  .setBody("log body")
  .build();

diff --git a/...nfigure/src/testOtlp/java/io/opentelemetry/sdk/autoconfigure/OtlpHttpServerExtension.java b/...nfigure/src/testOtlp/java/io/opentelemetry/sdk/autoconfigure/OtlpHttpServerExtension.java
@@ -23,13 +23,13 @@
 import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.logs.data.LogData;
-import io.opentelemetry.sdk.logs.data.LogDataBuilder;
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongPointData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData;
 import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.testing.logs.TestLogData;
 import io.opentelemetry.sdk.testing.trace.TestSpanData;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.data.StatusData;
@@ -147,7 +147,9 @@ static MetricData generateFakeMetric() {
  }
 
  static LogData generateFakeLog() {
- return LogDataBuilder.create(Resource.empty(), InstrumentationScopeInfo.empty())
+ return TestLogData.builder()
+ .setResource(Resource.empty())
+ .setInstrumentationScopeInfo(InstrumentationScopeInfo.empty())
  .setEpoch(Instant.now())
  .setBody("log body")
  .build();

diff --git a/sdk/logs-testing/build.gradle.kts b/sdk/logs-testing/build.gradle.kts
@@ -18,5 +18,7 @@ dependencies {
 
  annotationProcessor("com.google.auto.value:auto-value")
 
+ testImplementation(project(":sdk:logs-testing"))
+
  testImplementation("junit:junit")
 }