From 5fee9b7e95d721bfc0156b5bc8beb5a8ab6660c4 Mon Sep 17 00:00:00 2001 From: jack-berg <34418638+jack-berg@users.noreply.github.com> Date: Mon, 3 Oct 2022 11:13:01 -0500 Subject: [PATCH] Suppress logs in logger tests (#4806) --- .../io/opentelemetry/api/logs/DefaultLoggerProviderTest.java | 3 +++ .../test/java/io/opentelemetry/api/logs/DefaultLoggerTest.java | 2 ++ .../src/test/java/io/opentelemetry/sdk/logs/SdkLoggerTest.java | 2 ++ 3 files changed, 7 insertions(+) diff --git a/api/logs/src/test/java/io/opentelemetry/api/logs/DefaultLoggerProviderTest.java b/api/logs/src/test/java/io/opentelemetry/api/logs/DefaultLoggerProviderTest.java index 3f47843917..a8c3abff7a 100644 --- a/api/logs/src/test/java/io/opentelemetry/api/logs/DefaultLoggerProviderTest.java +++ b/api/logs/src/test/java/io/opentelemetry/api/logs/DefaultLoggerProviderTest.java @@ -5,14 +5,17 @@ package io.opentelemetry.api.logs; +import static io.opentelemetry.api.internal.ValidationUtil.API_USAGE_LOGGER_NAME; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; +import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import org.junit.jupiter.api.Test; class DefaultLoggerProviderTest { @Test + @SuppressLogger(loggerName = API_USAGE_LOGGER_NAME) void noopLoggerProvider_doesNotThrow() { LoggerProvider provider = LoggerProvider.noop(); diff --git a/api/logs/src/test/java/io/opentelemetry/api/logs/DefaultLoggerTest.java b/api/logs/src/test/java/io/opentelemetry/api/logs/DefaultLoggerTest.java index e27c5304e0..321a972bfc 100644 --- a/api/logs/src/test/java/io/opentelemetry/api/logs/DefaultLoggerTest.java +++ b/api/logs/src/test/java/io/opentelemetry/api/logs/DefaultLoggerTest.java @@ -13,6 +13,7 @@ import io.github.netmikey.logunit.api.LogCapturer; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.context.Context; +import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import java.time.Instant; import java.util.concurrent.TimeUnit; import org.junit.jupiter.api.Test; @@ -25,6 +26,7 @@ class DefaultLoggerTest { LogCapturer apiUsageLogs = LogCapturer.create().captureForLogger(API_USAGE_LOGGER_NAME); @Test + @SuppressLogger(loggerName = API_USAGE_LOGGER_NAME) void buildAndEmit() { // Logger with no event.domain assertThatCode( diff --git a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerTest.java index d6af99c66e..b35b6b926a 100644 --- a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerTest.java +++ b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerTest.java @@ -24,6 +24,7 @@ import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; import io.opentelemetry.api.internal.StringUtils; import io.opentelemetry.api.logs.LogRecordBuilder; +import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; @@ -143,6 +144,7 @@ class SdkLoggerTest { } @Test + @SuppressLogger(loggerName = API_USAGE_LOGGER_NAME) void eventBuilder() { AtomicReference seenLog = new AtomicReference<>(); SdkLoggerProvider loggerProvider =