Log Bridge API / SDK cleanup (#5420)

Author: jack-berg

integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java

@@ -56,10 +56,10 @@
 import io.opentelemetry.proto.trace.v1.ResourceSpans;
 import io.opentelemetry.proto.trace.v1.ScopeSpans;
 import io.opentelemetry.proto.trace.v1.Span.Link;
-import io.opentelemetry.sdk.logs.SdkEventEmitterProvider;
 import io.opentelemetry.sdk.logs.SdkLoggerProvider;
 import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor;
 import io.opentelemetry.sdk.logs.export.LogRecordExporter;
+import io.opentelemetry.sdk.logs.internal.SdkEventEmitterProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
 import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;

sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java

@@ -19,10 +19,10 @@
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
-import io.opentelemetry.sdk.logs.SdkEventEmitterProvider;
 import io.opentelemetry.sdk.logs.SdkLoggerProvider;
 import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder;
 import io.opentelemetry.sdk.logs.export.LogRecordExporter;
+import io.opentelemetry.sdk.logs.internal.SdkEventEmitterProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;

sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkTest.java

@@ -38,9 +38,9 @@
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.logs.LogRecordProcessor;
-import io.opentelemetry.sdk.logs.SdkEventEmitterProvider;
 import io.opentelemetry.sdk.logs.SdkLoggerProvider;
 import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder;
+import io.opentelemetry.sdk.logs.internal.SdkEventEmitterProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
 import io.opentelemetry.sdk.metrics.export.MetricReader;

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/InMemoryLogRecordExporter.java renamed to sdk/logs-testing/src/main/java/io/opentelemetry/sdk/testing/exporter/InMemoryLogRecordExporter.java

@@ -3,10 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logs.export;
+package io.opentelemetry.sdk.testing.exporter;
 
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
+import io.opentelemetry.sdk.logs.export.LogRecordExporter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -37,7 +38,7 @@ public static InMemoryLogRecordExporter create() {
    *
    * @return a {@code List} of the finished {@code Log}s.
    */
-  public List<LogRecordData> getFinishedLogItems() {
+  public List<LogRecordData> getFinishedLogRecordItems() {
     return Collections.unmodifiableList(new ArrayList<>(finishedLogItems));
   }
 

sdk/logs/src/test/java/io/opentelemetry/sdk/logs/export/InMemoryLogRecordExporterTest.java renamed to sdk/logs-testing/src/test/java/io/opentelemetry/sdk/testing/exporter/InMemoryLogRecordExporterTest.java

@@ -3,14 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logs.export;
+package io.opentelemetry.sdk.testing.exporter;
 
 import static io.opentelemetry.api.logs.Severity.DEBUG;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.logs.Logger;
 import io.opentelemetry.sdk.logs.SdkLoggerProvider;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
+import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor;
 import io.opentelemetry.sdk.testing.assertj.LogAssertions;
 import io.opentelemetry.sdk.testing.logs.TestLogRecordData;
 import java.util.Collections;
@@ -46,7 +47,7 @@ void getFinishedLogItems() {
     logger.logRecordBuilder().setSeverity(DEBUG).setBody("message 2").emit();
     logger.logRecordBuilder().setSeverity(DEBUG).setBody("message 3").emit();
 
-    List<LogRecordData> logItems = exporter.getFinishedLogItems();
+    List<LogRecordData> logItems = exporter.getFinishedLogRecordItems();
     assertThat(logItems).isNotNull();
     assertThat(logItems.size()).isEqualTo(3);
     LogAssertions.assertThat(logItems.get(0)).hasBody("message 1");
@@ -59,28 +60,28 @@ void reset() {
     logger.logRecordBuilder().setSeverity(DEBUG).setBody("message 1").emit();
     logger.logRecordBuilder().setSeverity(DEBUG).setBody("message 2").emit();
     logger.logRecordBuilder().setSeverity(DEBUG).setBody("message 3").emit();
-    List<LogRecordData> logItems = exporter.getFinishedLogItems();
+    List<LogRecordData> logItems = exporter.getFinishedLogRecordItems();
     assertThat(logItems).isNotNull();
     assertThat(logItems.size()).isEqualTo(3);
     // Reset then expect no items in memory.
     exporter.reset();
-    assertThat(exporter.getFinishedLogItems()).isEmpty();
+    assertThat(exporter.getFinishedLogRecordItems()).isEmpty();
   }
 
   @Test
   void shutdown() {
     logger.logRecordBuilder().setSeverity(DEBUG).setBody("message 1").emit();
     logger.logRecordBuilder().setSeverity(DEBUG).setBody("message 2").emit();
     logger.logRecordBuilder().setSeverity(DEBUG).setBody("message 3").emit();
-    List<LogRecordData> logItems = exporter.getFinishedLogItems();
+    List<LogRecordData> logItems = exporter.getFinishedLogRecordItems();
     assertThat(logItems).isNotNull();
     assertThat(logItems.size()).isEqualTo(3);
     // Shutdown then expect no items in memory.
     exporter.shutdown();
-    assertThat(exporter.getFinishedLogItems()).isEmpty();
+    assertThat(exporter.getFinishedLogRecordItems()).isEmpty();
     // Cannot add new elements after the shutdown.
     logger.logRecordBuilder().setSeverity(DEBUG).setBody("message 1").emit();
-    assertThat(exporter.getFinishedLogItems()).isEmpty();
+    assertThat(exporter.getFinishedLogRecordItems()).isEmpty();
   }
 
   @Test

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/SimpleLogRecordProcessor.java

@@ -54,7 +54,7 @@ public static LogRecordProcessor create(LogRecordExporter exporter) {
     return new SimpleLogRecordProcessor(exporter);
   }
 
-  SimpleLogRecordProcessor(LogRecordExporter logRecordExporter) {
+  private SimpleLogRecordProcessor(LogRecordExporter logRecordExporter) {
     this.logRecordExporter = requireNonNull(logRecordExporter, "logRecordExporter");
   }
 

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkEventEmitterProvider.java renamed to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/SdkEventEmitterProvider.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logs;
+package io.opentelemetry.sdk.logs.internal;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;

sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkEventEmitterProviderTest.java

@@ -12,6 +12,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.common.Clock;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
+import io.opentelemetry.sdk.logs.internal.SdkEventEmitterProvider;
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.concurrent.atomic.AtomicReference;
 import org.junit.jupiter.api.Test;