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

Log Bridge API / SDK cleanup (#5420)

This commit is contained in:
jack-berg 2023-05-05 13:37:55 -05:00 committed by GitHub
parent db8ade397f
commit 030d966c0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,10 +56,10 @@ import io.opentelemetry.proto.metrics.v1.Sum;
import io.opentelemetry.proto.trace.v1.ResourceSpans; import io.opentelemetry.proto.trace.v1.ResourceSpans;
import io.opentelemetry.proto.trace.v1.ScopeSpans; import io.opentelemetry.proto.trace.v1.ScopeSpans;
import io.opentelemetry.proto.trace.v1.Span.Link; 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.SdkLoggerProvider;
import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor; import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor;
import io.opentelemetry.sdk.logs.export.LogRecordExporter; 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.SdkMeterProvider;
import io.opentelemetry.sdk.metrics.export.MetricExporter; import io.opentelemetry.sdk.metrics.export.MetricExporter;
import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader; import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;

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

@ -19,10 +19,10 @@ import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvide
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException; import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; 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.SdkLoggerProvider;
import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder; import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder;
import io.opentelemetry.sdk.logs.export.LogRecordExporter; 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.SdkMeterProvider;
import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder; import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
import io.opentelemetry.sdk.metrics.export.MetricExporter; import io.opentelemetry.sdk.metrics.export.MetricExporter;

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

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

5
sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/InMemoryLogRecordExporter.java → sdk/logs-testing/src/main/java/io/opentelemetry/sdk/testing/exporter/InMemoryLogRecordExporter.java
View File

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

15
sdk/logs/src/test/java/io/opentelemetry/sdk/logs/export/InMemoryLogRecordExporterTest.java → sdk/logs-testing/src/test/java/io/opentelemetry/sdk/testing/exporter/InMemoryLogRecordExporterTest.java
View File

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

2
sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/SimpleLogRecordProcessor.java
View File

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

2
sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkEventEmitterProvider.java → sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/SdkEventEmitterProvider.java
View File

@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0 * 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.AttributeKey;
import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.Attributes;

1
sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkEventEmitterProviderTest.java
View File

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