Respond to PR feedback

Author: jack-berg

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Version 1.8.0 (unreleased):
 
+### SDK
+
+#### Logging (alpha)
+
+- This release includes a rework of the Log SDK to
+  implement [OTEP-0150](https://github.com/open-telemetry/oteps/blob/main/text/logs/0150-logging-library-sdk.md)
+  and to have more symmetry to the Trace SDK. `LogSink` is now `LogEmitter`. `LogEmitter` instances
+  are obtained from `SdkLogEmitterProvider`. Other additions include `MultiLogProcessor` (accessed
+  via `LogProcessor#composite(...)`), `SimpleLogProcessor`, and `InMemoryLogExporter`.
+
 ### Auto-configuration (alpha)
 
 - BREAKING CHANGE: Remove deprecated `otel.experimental.exporter.otlp.protocol`,

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

@@ -19,6 +19,7 @@
 import io.opentelemetry.sdk.logs.export.LogExporter;
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -42,7 +43,7 @@ class OtlpJsonLoggingLogExporterTest {
               .setSeverityText("INFO")
               .setSpanId("8765432112345876")
               .setTraceId("12345678876543211234567887654322")
-              .setEpochMillis(1631533710L)
+              .setEpoch(1631533710L, TimeUnit.MILLISECONDS)
               .setAttributes(Attributes.of(stringKey("animal"), "cat", longKey("lives"), 9L))
               .build());
 
@@ -58,7 +59,7 @@ class OtlpJsonLoggingLogExporterTest {
               .setSeverityText("INFO")
               .setSpanId("8765432112345875")
               .setTraceId("12345678876543211234567887654322")
-              .setEpochMillis(1631533710L)
+              .setEpoch(1631533710L, TimeUnit.MILLISECONDS)
               .setAttributes(Attributes.of(booleanKey("important"), true))
               .build());
 

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

@@ -23,6 +23,7 @@
 import java.time.LocalDateTime;
 import java.time.Month;
 import java.time.ZoneOffset;
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Test;
 
 class SystemOutLogExporterTest {
@@ -57,7 +58,7 @@ private static LogData sampleLog(long timestamp) {
             .setAttributes(Attributes.of(stringKey("cheese"), "cheddar", longKey("amount"), 1L))
             .setBody(Body.stringBody("message"))
             .setSeverity(Severity.ERROR3)
-            .setEpochMillis(timestamp)
+            .setEpoch(timestamp, TimeUnit.MILLISECONDS)
             .setTraceId(TraceId.fromLongs(1, 2))
             .setSpanId(SpanId.fromLong(3))
             .build());

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

@@ -330,7 +330,7 @@ private static LogData generateFakeLog() {
             .setSeverityText(Severity.INFO.name())
             .setTraceId(IdGenerator.random().generateTraceId())
             .setSpanId(IdGenerator.random().generateSpanId())
-            .setEpochNanos(TimeUnit.MILLISECONDS.toNanos(Instant.now().toEpochMilli()))
+            .setEpoch(Instant.now())
             .setFlags(0)
             .build());
   }

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

@@ -34,6 +34,7 @@
 import java.util.Base64;
 import java.util.Collections;
 import java.util.Locale;
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Test;
 
 class LogsRequestMarshalerTest {
@@ -61,7 +62,7 @@ void toProtoResourceLogs() {
                         .setTraceId(TRACE_ID)
                         .setSpanId(SPAN_ID)
                         .setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
-                        .setEpochNanos(12345)
+                        .setEpoch(12345, TimeUnit.NANOSECONDS)
                         .build())));
 
     assertThat(resourceLogsMarshalers).hasSize(1);
@@ -95,7 +96,7 @@ void toProtoLogRecord() {
                         .setTraceId(TRACE_ID)
                         .setSpanId(SPAN_ID)
                         .setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
-                        .setEpochNanos(12345)
+                        .setEpoch(12345, TimeUnit.NANOSECONDS)
                         .build())));
 
     assertThat(logRecord.getTraceId().toByteArray()).isEqualTo(TRACE_ID_BYTES);
@@ -125,7 +126,7 @@ void toProtoLogRecord_MinimalFields() {
                         .setBody(BODY)
                         .setSeverity(Severity.INFO)
                         .setAttributes(Attributes.of(AttributeKey.booleanKey("key"), true))
-                        .setEpochNanos(12345)
+                        .setEpoch(12345, TimeUnit.NANOSECONDS)
                         .build())));
 
     assertThat(logRecord.getTraceId().toByteArray()).isEmpty();

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

@@ -40,6 +40,7 @@
 import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -361,7 +362,7 @@ private static LogData generateFakeLog() {
         Resource.create(Attributes.builder().put("testKey", "testValue").build()),
         InstrumentationLibraryInfo.create("instrumentation", "1"),
         LogRecord.builder()
-            .setEpochMillis(System.currentTimeMillis())
+            .setEpoch(Instant.now())
             .setTraceId(TraceId.getInvalid())
             .setSpanId(SpanId.getInvalid())
             .setFlags(TraceFlags.getDefault().asByte())

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

@@ -28,6 +28,7 @@
 import io.opentelemetry.sdk.resources.Resource;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.time.Instant;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -43,7 +44,7 @@ class ExportTest {
               Resource.create(Attributes.builder().put("testKey", "testValue").build()),
               InstrumentationLibraryInfo.create("instrumentation", "1"),
               LogRecord.builder()
-                  .setEpochMillis(System.currentTimeMillis())
+                  .setEpoch(Instant.now())
                   .setTraceId(TraceId.getInvalid())
                   .setSpanId(SpanId.getInvalid())
                   .setFlags(TraceFlags.getDefault().asByte())

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

@@ -28,6 +28,7 @@
 import io.opentelemetry.sdk.resources.Resource;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.time.Instant;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -43,7 +44,7 @@ class ExportTest {
               Resource.create(Attributes.builder().put("testKey", "testValue").build()),
               InstrumentationLibraryInfo.create("instrumentation", "1"),
               LogRecord.builder()
-                  .setEpochMillis(System.currentTimeMillis())
+                  .setEpoch(Instant.now())
                   .setTraceId(TraceId.getInvalid())
                   .setSpanId(SpanId.getInvalid())
                   .setFlags(TraceFlags.getDefault().asByte())

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

@@ -28,6 +28,7 @@
 import io.opentelemetry.sdk.resources.Resource;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.time.Instant;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -43,7 +44,7 @@ class ExportTest {
               Resource.create(Attributes.builder().put("testKey", "testValue").build()),
               InstrumentationLibraryInfo.create("instrumentation", "1"),
               LogRecord.builder()
-                  .setEpochMillis(System.currentTimeMillis())
+                  .setEpoch(Instant.now())
                   .setTraceId(TraceId.getInvalid())
                   .setSpanId(SpanId.getInvalid())
                   .setFlags(TraceFlags.getDefault().asByte())

exporters/otlp/logs/src/testOkHttpOnly/java/io/opentelemetry/exporter/otlp/logs/OkHttpOnlyExportTest.java

@@ -26,6 +26,7 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -44,7 +45,7 @@ class OkHttpOnlyExportTest {
               Resource.create(Attributes.builder().put("testKey", "testValue").build()),
               InstrumentationLibraryInfo.create("instrumentation", "1"),
               LogRecord.builder()
-                  .setEpochMillis(System.currentTimeMillis())
+                  .setEpoch(Instant.now())
                   .setTraceId(TraceId.getInvalid())
                   .setSpanId(SpanId.getInvalid())
                   .setFlags(TraceFlags.getDefault().asByte())