From 0d6d75f85f24c26e4a9ca4d5d51340eb681117c7 Mon Sep 17 00:00:00 2001 From: Jack Berg <34418638+jack-berg@users.noreply.github.com> Date: Thu, 25 Jun 2026 14:27:33 -0500 Subject: [PATCH] Suppress more test logs --- .../all/NoSharedInternalCodeTest.java | 2 ++ .../api/baggage/BaggageEntryMetadataTest.java | 2 ++ .../internal/AbstractDefaultTracerTest.java | 2 ++ .../kotlin/otel.java-conventions.gradle.kts | 2 ++ .../exporter/otlp/OkHttpVersionTest.java | 2 ++ .../prometheus/Otel2PrometheusConverter.java | 18 ++++++------ .../Otel2PrometheusConverterTest.java | 29 +++++++++++-------- .../PrometheusMetricReaderTest.java | 3 ++ .../TestDeclarativeConfigurationProvider.java | 2 +- .../sdk/autoconfigure/ConfigErrorTest.java | 1 + .../TracerProviderConfigurationTest.java | 27 ++++++++++------- .../DeclarativeConfigurationTest.java | 4 +-- .../FullDeclarativeConfigTest.java | 2 +- .../DeclarativeConfigurationCreateTest.java | 6 ++-- .../SpanExporterFactoryTest.java | 3 ++ .../JaegerRemoteSamplerProviderTest.java | 2 ++ .../logs/SdkLoggerProviderMetricsTest.java | 3 ++ .../sdk/trace/SdkSpanBuilderTest.java | 2 ++ .../trace/export/BatchSpanProcessorTest.java | 1 + 19 files changed, 74 insertions(+), 39 deletions(-) diff --git a/all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java b/all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java index 1029239b65a..764061b4834 100644 --- a/all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java +++ b/all/src/test/java/io/opentelemetry/all/NoSharedInternalCodeTest.java @@ -12,6 +12,7 @@ import com.tngtech.archunit.core.domain.JavaClasses; import com.tngtech.archunit.core.importer.ClassFileImporter; import com.tngtech.archunit.lang.syntax.elements.ClassesShouldConjunction; +import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -27,6 +28,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +@SuppressLogger(NoSharedInternalCodeTest.class) class NoSharedInternalCodeTest { private static final Set exemptions = diff --git a/api/all/src/test/java/io/opentelemetry/api/baggage/BaggageEntryMetadataTest.java b/api/all/src/test/java/io/opentelemetry/api/baggage/BaggageEntryMetadataTest.java index be5dc952c8c..581af33d921 100644 --- a/api/all/src/test/java/io/opentelemetry/api/baggage/BaggageEntryMetadataTest.java +++ b/api/all/src/test/java/io/opentelemetry/api/baggage/BaggageEntryMetadataTest.java @@ -8,6 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.google.common.testing.EqualsTester; +import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import org.junit.jupiter.api.Test; class BaggageEntryMetadataTest { @@ -19,6 +20,7 @@ void getValue() { } @Test + @SuppressLogger(loggerName = "io.opentelemetry.usage") void nullValue() { assertThat(BaggageEntryMetadata.create(null)).isEqualTo(BaggageEntryMetadata.empty()); } diff --git a/api/testing-internal/src/main/java/io/opentelemetry/api/testing/internal/AbstractDefaultTracerTest.java b/api/testing-internal/src/main/java/io/opentelemetry/api/testing/internal/AbstractDefaultTracerTest.java index 4a6f73f8793..41f80623d5e 100644 --- a/api/testing-internal/src/main/java/io/opentelemetry/api/testing/internal/AbstractDefaultTracerTest.java +++ b/api/testing-internal/src/main/java/io/opentelemetry/api/testing/internal/AbstractDefaultTracerTest.java @@ -20,6 +20,7 @@ import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.api.trace.TracerProvider; 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; @@ -124,6 +125,7 @@ void spanContextPropagation_fromContextThenNoParent() { @Test @SuppressWarnings("NullAway") + @SuppressLogger(loggerName = "io.opentelemetry.usage") void doNotCrash_NoopImplementation() { assertThatCode( () -> { diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index c45ca6a7d07..a4b0eb1801f 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -332,6 +332,8 @@ testing { all { testTask.configure { systemProperty("java.util.logging.config.class", "io.opentelemetry.internal.testing.slf4j.JulBridgeInitializer") + systemProperty("org.slf4j.simpleLogger.log.io.micrometer.core.instrument.MeterRegistry", "error") + systemProperty("org.slf4j.simpleLogger.log.tc", "error") // Starting in java 21, dynamically attaching agents triggers warnings. Mockito depends on // agents to redefine classes. Hence, on java 21+ we get warnings of the form: diff --git a/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/OkHttpVersionTest.java b/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/OkHttpVersionTest.java index 8798781bb3f..d3286ae9070 100644 --- a/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/OkHttpVersionTest.java +++ b/exporters/otlp/all/src/testDefaultSender/java/io/opentelemetry/exporter/otlp/OkHttpVersionTest.java @@ -8,6 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assumptions.assumeThat; +import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import java.util.logging.Level; import java.util.logging.Logger; import okhttp3.OkHttp; @@ -18,6 +19,7 @@ class OkHttpVersionTest { private static final Logger LOGGER = Logger.getLogger(OkHttpVersionTest.class.getName()); @Test + @SuppressLogger(OkHttpVersionTest.class) void expectedOkHttpVersion() { String expectedVersion = System.getProperty("expected.okhttp.version"); LOGGER.log(Level.WARNING, "Testing okhttp version " + expectedVersion); diff --git a/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverter.java b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverter.java index b7e1957a356..8053466923e 100644 --- a/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverter.java +++ b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverter.java @@ -71,7 +71,7 @@ final class Otel2PrometheusConverter { private static final Logger LOGGER = Logger.getLogger(Otel2PrometheusConverter.class.getName()); - private static final ThrottlingLogger THROTTLING_LOGGER = new ThrottlingLogger(LOGGER); + private final ThrottlingLogger throttlingLogger = new ThrottlingLogger(LOGGER); // Prometheus limits the total UTF-8 character count across all exemplar label names and values // to 128. See https://github.com/open-telemetry/opentelemetry-java/issues/6770 private static final int EXEMPLAR_MAX_LABEL_SET_LENGTH = 128; @@ -161,7 +161,7 @@ private MetricSnapshot convert(MetricData metricData) { try { return doConvert(metricData); } catch (IllegalArgumentException e) { - THROTTLING_LOGGER.log( + throttlingLogger.log( Level.WARNING, "Failed to convert metric " + metricData.getName() + ". Dropping metric.", e); @@ -338,7 +338,7 @@ private HistogramSnapshot convertExponentialHistogram( for (ExponentialHistogramPointData histogramData : dataPoints) { int scale = histogramData.getScale(); if (scale < -4) { - THROTTLING_LOGGER.log( + throttlingLogger.log( Level.WARNING, "Dropping histogram " + metadata.getName() @@ -461,7 +461,7 @@ private Exemplar convertExemplar(double value, ExemplarData exemplar) { if (labelSetLength(labels) > EXEMPLAR_MAX_LABEL_SET_LENGTH) { // Drop filtered attributes to stay within Prometheus 128-char exemplar label limit, // keeping trace_id and span_id which are the most valuable for correlation. - THROTTLING_LOGGER.log( + throttlingLogger.log( Level.WARNING, "Exemplar attributes exceeded Prometheus limit of " + EXEMPLAR_MAX_LABEL_SET_LENGTH @@ -484,7 +484,7 @@ private Exemplar convertExemplar(double value, ExemplarData exemplar) { null, // scope attributes are only needed for point's attributes exemplar.getFilteredAttributes()); if (labelSetLength(labels) > EXEMPLAR_MAX_LABEL_SET_LENGTH) { - THROTTLING_LOGGER.log( + throttlingLogger.log( Level.WARNING, "Exemplar attributes exceeded Prometheus limit of " + EXEMPLAR_MAX_LABEL_SET_LENGTH @@ -822,7 +822,7 @@ private static void validateNormalizedMetricName(String originalName, String nor * type. If the type differs, we log a message and drop one of them. */ @Nullable - private static MetricSnapshot merge(MetricSnapshot a, MetricSnapshot b) { + private MetricSnapshot merge(MetricSnapshot a, MetricSnapshot b) { MetricMetadata metadata = mergeMetadata(a.getMetadata(), b.getMetadata()); if (metadata == null) { return null; @@ -854,7 +854,7 @@ private static MetricSnapshot merge(MetricSnapshot a, MetricSnapshot b) { dataPoints.addAll(((InfoSnapshot) b).getDataPoints()); return new InfoSnapshot(metadata, dataPoints); } else { - THROTTLING_LOGGER.log( + throttlingLogger.log( Level.WARNING, "Conflicting metric name " + a.getMetadata().getPrometheusName() @@ -870,7 +870,7 @@ private static MetricSnapshot merge(MetricSnapshot a, MetricSnapshot b) { } @Nullable - private static MetricMetadata mergeMetadata(MetricMetadata a, MetricMetadata b) { + private MetricMetadata mergeMetadata(MetricMetadata a, MetricMetadata b) { String name = a.getPrometheusName(); if (a.getName().equals(b.getName())) { name = a.getName(); @@ -881,7 +881,7 @@ private static MetricMetadata mergeMetadata(MetricMetadata a, MetricMetadata b) } Unit unit = a.getUnit(); if (unit != null && !unit.equals(b.getUnit())) { - THROTTLING_LOGGER.log( + throttlingLogger.log( Level.WARNING, "Conflicting metrics: Multiple metrics with name " + name diff --git a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverterTest.java b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverterTest.java index 891967111b9..b408b080095 100644 --- a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverterTest.java +++ b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverterTest.java @@ -24,6 +24,7 @@ import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.api.trace.TraceFlags; import io.opentelemetry.api.trace.TraceState; +import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.metrics.data.AggregationTemporality; import io.opentelemetry.sdk.metrics.data.ExponentialHistogramBuckets; @@ -61,6 +62,7 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; @@ -78,6 +80,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +@SuppressLogger(Otel2PrometheusConverter.class) class Otel2PrometheusConverterTest { private static final Pattern PATTERN = @@ -1062,7 +1065,7 @@ void validateCacheIsBounded() { void mergeInfoSnapshotsWithSameName() throws Exception { InfoSnapshot merged = (InfoSnapshot) - invokePrivateStatic( + invokePrivate( "merge", new Class[] {MetricSnapshot.class, MetricSnapshot.class}, makeInfoSnapshot("a"), @@ -1074,7 +1077,7 @@ void mergeInfoSnapshotsWithSameName() throws Exception { @Test void mergeConflictingTypesReturnsNull() throws Exception { Object merged = - invokePrivateStatic( + invokePrivate( "merge", new Class[] {MetricSnapshot.class, MetricSnapshot.class}, makeInfoSnapshot("a"), @@ -1088,7 +1091,7 @@ void mergeConflictingTypesReturnsNull() throws Exception { @Test void mergeMetadataReturnsNullForDifferentUnits() throws Exception { Object merged = - invokePrivateStatic( + invokePrivate( "mergeMetadata", new Class[] {MetricMetadata.class, MetricMetadata.class}, MetricMetadata.builder().name("sample").unit(new Unit("seconds")).build(), @@ -1100,7 +1103,7 @@ void mergeMetadataReturnsNullForDifferentUnits() throws Exception { @Test void convertLegacyLabelNameRejectsEmptyName() { assertThatThrownBy( - () -> invokePrivateStatic("convertLegacyLabelName", new Class[] {String.class}, "")) + () -> invokePrivate("convertLegacyLabelName", new Class[] {String.class}, "")) .hasCauseInstanceOf(IllegalArgumentException.class) .hasRootCauseMessage("label name is empty"); } @@ -1108,8 +1111,7 @@ void convertLegacyLabelNameRejectsEmptyName() { @Test void stripReservedMetricSuffixesHandlesReservedNameOnly() throws Exception { assertThat( - invokePrivateStatic( - "stripReservedMetricSuffixes", new Class[] {String.class}, "_total")) + invokePrivate("stripReservedMetricSuffixes", new Class[] {String.class}, "_total")) .isEqualTo("total"); } @@ -1117,7 +1119,7 @@ void stripReservedMetricSuffixesHandlesReservedNameOnly() throws Exception { void validateNormalizedMetricNameRejectsEmptyName() { assertThatThrownBy( () -> - invokePrivateStatic( + invokePrivate( "validateNormalizedMetricName", new Class[] {String.class, String.class}, "orig", @@ -1130,7 +1132,7 @@ void validateNormalizedMetricNameRejectsEmptyName() { void convertExponentialHistogramBucketsReturnsEmptyForNoBuckets() throws Exception { NativeHistogramBuckets buckets = (NativeHistogramBuckets) - invokePrivateStatic( + invokePrivate( "convertExponentialHistogramBuckets", new Class[] {ExponentialHistogramBuckets.class, int.class}, ImmutableExponentialHistogramBuckets.create(0, 0, Collections.emptyList()), @@ -1142,7 +1144,7 @@ void convertExponentialHistogramBucketsReturnsEmptyForNoBuckets() throws Excepti @Test void typeStringUsesLowerCaseClassName() throws Exception { assertThat( - invokePrivateStatic( + invokePrivate( "typeString", new Class[] {MetricSnapshot.class}, makeInfoSnapshot("a"))) .isEqualTo("info"); } @@ -1233,12 +1235,15 @@ private static InfoSnapshot makeInfoSnapshot(String id) { Labels.of(new String[] {"id"}, new String[] {id})))); } - private static Object invokePrivateStatic( - String methodName, Class[] parameterTypes, Object... args) throws Exception { + private Object invokePrivate(String methodName, Class[] parameterTypes, Object... args) + throws Exception { Method method = Otel2PrometheusConverter.class.getDeclaredMethod(methodName, parameterTypes); method.setAccessible(true); + // Support both static and instance methods: static methods receive null, instance methods + // receive the converter instance so that instance fields (e.g. throttlingLogger) are available. + Object instance = Modifier.isStatic(method.getModifiers()) ? null : converter; try { - return method.invoke(null, args); + return method.invoke(instance, args); } catch (InvocationTargetException e) { throw e; } diff --git a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusMetricReaderTest.java b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusMetricReaderTest.java index c2474922b7c..0890a4c2bb8 100644 --- a/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusMetricReaderTest.java +++ b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusMetricReaderTest.java @@ -18,6 +18,7 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Scope; +import io.opentelemetry.sdk.common.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.Aggregation; import io.opentelemetry.sdk.metrics.Base2ExponentialHistogramOptions; import io.opentelemetry.sdk.metrics.InstrumentSelector; @@ -1073,6 +1074,7 @@ void deprecatedConstructor() { // when otelScopeLabelsEnabled=true (which is also the default for the builder) assertThat(new PrometheusMetricReader(/* otelScopeEnabled= */ false, null)) .usingRecursiveComparison() + .ignoringFieldsOfTypes(ThrottlingLogger.class) .isEqualTo(new PrometheusMetricReader(null)); // The 4-arg constructor should behave the same as the 2-arg deprecated constructor assertThat( @@ -1082,6 +1084,7 @@ void deprecatedConstructor() { /* targetInfoMetricEnabled */ true, TranslationStrategy.UNDERSCORE_ESCAPING_WITH_SUFFIXES)) .usingRecursiveComparison() + .ignoringFieldsOfTypes(ThrottlingLogger.class) .isEqualTo(new PrometheusMetricReader(null)); } diff --git a/sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/TestDeclarativeConfigurationProvider.java b/sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/TestDeclarativeConfigurationProvider.java index 2864c2ff080..f457af3da03 100644 --- a/sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/TestDeclarativeConfigurationProvider.java +++ b/sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/TestDeclarativeConfigurationProvider.java @@ -15,7 +15,7 @@ public class TestDeclarativeConfigurationProvider implements DeclarativeConfigur @Override public OpenTelemetryConfigurationModel getConfigurationModel() { String yaml = - "file_format: \"1.0\"\n" + "file_format: \"1.1\"\n" + "resource:\n" + " detection/development:\n" + " detectors:\n" diff --git a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigErrorTest.java b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigErrorTest.java index a1bf8dc10b2..e0c66b5e2ad 100644 --- a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigErrorTest.java +++ b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/ConfigErrorTest.java @@ -23,6 +23,7 @@ // All tests fail due to config errors so never register a global. We can test everything here // without separating test sets. +@SuppressLogger(loggerName = "io.opentelemetry.sdk.metrics.export.PeriodicMetricReader") class ConfigErrorTest { @RegisterExtension diff --git a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/TracerProviderConfigurationTest.java b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/TracerProviderConfigurationTest.java index fe2c993f667..8e574bb559e 100644 --- a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/TracerProviderConfigurationTest.java +++ b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/TracerProviderConfigurationTest.java @@ -9,6 +9,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.google.common.collect.ImmutableMap; +import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper; import io.opentelemetry.sdk.autoconfigure.provider.TestConfigurableSamplerProvider; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; @@ -16,6 +17,8 @@ import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties; import io.opentelemetry.sdk.extension.trace.jaeger.sampler.JaegerRemoteSampler; import io.opentelemetry.sdk.trace.samplers.Sampler; +import java.io.Closeable; +import java.lang.reflect.Field; import java.net.URL; import java.net.URLClassLoader; import java.util.Collections; @@ -64,16 +67,18 @@ void samplerNotFound() { } @Test - void configureSampler_JaegerRemoteSampler() { - assertThat( - TracerProviderConfiguration.configureSampler( - "parentbased_jaeger_remote", - DefaultConfigProperties.createFromMap(Collections.emptyMap()), - spiHelper)) - .satisfies( - sampler -> { - assertThat(sampler.getClass().getSimpleName()).isEqualTo("ParentBasedSampler"); - assertThat(sampler).extracting("root").isInstanceOf(JaegerRemoteSampler.class); - }); + @SuppressLogger(JaegerRemoteSampler.class) + void configureSampler_JaegerRemoteSampler() throws Exception { + Sampler sampler = + TracerProviderConfiguration.configureSampler( + "parentbased_jaeger_remote", + DefaultConfigProperties.createFromMap(Collections.emptyMap()), + spiHelper); + assertThat(sampler.getClass().getSimpleName()).isEqualTo("ParentBasedSampler"); + assertThat(sampler).extracting("root").isInstanceOf(JaegerRemoteSampler.class); + // Close the inner JaegerRemoteSampler to shut down its background thread. + Field rootField = sampler.getClass().getDeclaredField("root"); + rootField.setAccessible(true); + ((Closeable) rootField.get(sampler)).close(); } } diff --git a/sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java b/sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java index 64d3b68ef15..3f85464b2eb 100644 --- a/sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java +++ b/sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/DeclarativeConfigurationTest.java @@ -63,7 +63,7 @@ class DeclarativeConfigurationTest { @BeforeEach void setup() throws IOException { String yaml = - "file_format: \"1.0\"\n" + "file_format: \"1.1\"\n" + "resource:\n" + " attributes:\n" + " - name: service.name\n" @@ -189,7 +189,7 @@ void configFile_NoShutdownHook() { @Test void configFile_Error(@TempDir Path tempDir) throws IOException { String yaml = - "file_format: \"1.0\"\n" + "file_format: \"1.1\"\n" + "resource:\n" + " attributes:\n" + " - name: service.name\n" diff --git a/sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/FullDeclarativeConfigTest.java b/sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/FullDeclarativeConfigTest.java index 5d536db4b0d..3308522c6e7 100644 --- a/sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/FullDeclarativeConfigTest.java +++ b/sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/FullDeclarativeConfigTest.java @@ -129,7 +129,7 @@ void setUp(@TempDir Path tempDir) throws IOException { String endpoint = "http://localhost:" + server.httpPort(); String yaml = - "file_format: \"1.0\"\n" + "file_format: \"1.1\"\n" + "resource:\n" + " attributes:\n" + " - name: service.name\n" diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationCreateTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationCreateTest.java index 89674fd798d..053953a5a94 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationCreateTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/DeclarativeConfigurationCreateTest.java @@ -125,7 +125,7 @@ void parseAndCreate_Exception_CleansUpPartials() { // exporter with OTLP exporter, following by invalid batch exporter which references invalid // exporter "foo". String yaml = - "file_format: \"1.0\"\n" + "file_format: \"1.1\"\n" + "logger_provider:\n" + " processors:\n" + " - batch:\n" @@ -152,7 +152,7 @@ void parseAndCreate_Exception_CleansUpPartials() { @Test void parseAndCreate_EmptyComponentProviderConfig() { String yaml = - "file_format: \"1.0\"\n" + "file_format: \"1.1\"\n" + "logger_provider:\n" + " processors:\n" + " - test:\n" @@ -170,7 +170,7 @@ void parseAndCreate_EmptyComponentProviderConfig() { @Test void create_ModelCustomizer() { OpenTelemetryConfigurationModel model = new OpenTelemetryConfigurationModel(); - model.withFileFormat("1.0"); + model.withFileFormat("1.1"); model.withTracerProvider( new TracerProviderModel() .withProcessors( diff --git a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanExporterFactoryTest.java b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanExporterFactoryTest.java index e08550e6161..95f17d10aee 100644 --- a/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanExporterFactoryTest.java +++ b/sdk-extensions/declarative-config/src/test/java/io/opentelemetry/sdk/autoconfigure/declarativeconfig/SpanExporterFactoryTest.java @@ -17,6 +17,7 @@ import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter; import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter; import io.opentelemetry.internal.testing.CleanupExtension; +import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.component.SpanExporterComponentProvider; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ConsoleExporterModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalOtlpFileExporterModel; @@ -27,6 +28,7 @@ import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpExporterModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterModel; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterPropertyModel; +import io.opentelemetry.sdk.extension.trace.jaeger.sampler.JaegerRemoteSampler; import io.opentelemetry.sdk.trace.export.SpanExporter; import java.io.IOException; import java.nio.file.Path; @@ -46,6 +48,7 @@ import org.junit.jupiter.params.provider.MethodSource; @TestInstance(TestInstance.Lifecycle.PER_CLASS) +@SuppressLogger(JaegerRemoteSampler.class) class SpanExporterFactoryTest { @RegisterExtension diff --git a/sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerProviderTest.java b/sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerProviderTest.java index c70d5b8a1ed..c5e033a3904 100644 --- a/sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerProviderTest.java +++ b/sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerProviderTest.java @@ -10,6 +10,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties; import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider; import io.opentelemetry.sdk.trace.samplers.Sampler; @@ -17,6 +18,7 @@ import java.util.ServiceLoader; import org.junit.jupiter.api.Test; +@SuppressLogger(JaegerRemoteSampler.class) public class JaegerRemoteSamplerProviderTest { @Test diff --git a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderMetricsTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderMetricsTest.java index a9e811b5478..f7a07acab84 100644 --- a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderMetricsTest.java +++ b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerProviderMetricsTest.java @@ -17,9 +17,11 @@ import io.opentelemetry.api.logs.Logger; import io.opentelemetry.api.logs.LoggerProvider; import io.opentelemetry.api.metrics.MeterProvider; +import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InternalTelemetryVersion; import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor; +import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessorBuilder; import io.opentelemetry.sdk.logs.export.LogRecordExporter; import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor; import io.opentelemetry.sdk.metrics.SdkMeterProvider; @@ -103,6 +105,7 @@ void simple() { } @Test + @SuppressLogger(BatchLogRecordProcessorBuilder.class) void batch() throws Exception { InMemoryMetricReader metricReader = InMemoryMetricReader.create(); MeterProvider meterProvider = diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanBuilderTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanBuilderTest.java index 83697d45e37..2a69ade6702 100644 --- a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanBuilderTest.java +++ b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanBuilderTest.java @@ -34,6 +34,7 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.ContextKey; import io.opentelemetry.context.Scope; +import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.trace.data.LinkData; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.samplers.Sampler; @@ -1129,6 +1130,7 @@ void spanDataToString() { } @Test + @SuppressLogger(loggerName = "io.opentelemetry.usage") void doNotCrash() { assertThatCode( () -> { diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorTest.java index 0ba9812ec86..0a578581621 100644 --- a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorTest.java +++ b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessorTest.java @@ -241,6 +241,7 @@ void exportMoreSpansThanTheBufferSize() { @Test @SuppressLogger(BatchSpanProcessor.class) + @SuppressLogger(BatchSpanProcessorBuilder.class) void droppedSpanIsLogged() { sdkTracerProvider = SdkTracerProvider.builder()