Skip to content

Commit e4235e2

Browse files
otelbot[bot]trask
andauthored
[release/v1.60.x] Fix warning always emitted (#8158)
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
1 parent 58a5590 commit e4235e2

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ private static AutoConfiguredOpenTelemetrySdk maybeConfigureFromFile(
582582
String configurationFile = config.getString("otel.config.file");
583583
if (configurationFile == null || configurationFile.isEmpty()) {
584584
configurationFile = config.getString("otel.experimental.config.file");
585-
if (configurationFile == null || configurationFile.isEmpty()) {
585+
if (configurationFile != null && !configurationFile.isEmpty()) {
586586
logger.warning(
587587
"otel.experimental.config.file is deprecated and will be removed after 1.62.0 release. Please use otel.config.file instead.");
588588
}

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55

66
package io.opentelemetry.sdk.autoconfigure;
77

8+
import static org.assertj.core.api.Assertions.assertThat;
89
import static org.assertj.core.api.Assertions.assertThatThrownBy;
910

11+
import io.github.netmikey.logunit.api.LogCapturer;
1012
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
1113
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
1214
import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
@@ -15,11 +17,18 @@
1517
import java.nio.file.Files;
1618
import java.nio.file.Path;
1719
import java.util.Collections;
20+
import java.util.HashMap;
21+
import java.util.Map;
1822
import org.junit.jupiter.api.Test;
23+
import org.junit.jupiter.api.extension.RegisterExtension;
1924
import org.junit.jupiter.api.io.TempDir;
2025

2126
class DeclarativeConfigurationTest {
2227

28+
@RegisterExtension
29+
LogCapturer logs =
30+
LogCapturer.create().captureForType(AutoConfiguredOpenTelemetrySdkBuilder.class);
31+
2332
@Test
2433
void configFile(@TempDir Path tempDir) throws IOException {
2534
String yaml =
@@ -44,4 +53,17 @@ void configFile(@TempDir Path tempDir) throws IOException {
4453
.hasMessage(
4554
"Cannot autoconfigure from config file without opentelemetry-sdk-extension-incubator on the classpath");
4655
}
56+
57+
@Test
58+
void noLogMessages_whenBuildingWithDefaults() {
59+
Map<String, String> props = new HashMap<>();
60+
props.put("otel.metrics.exporter", "none");
61+
props.put("otel.traces.exporter", "none");
62+
props.put("otel.logs.exporter", "none");
63+
AutoConfiguredOpenTelemetrySdk sdk =
64+
AutoConfiguredOpenTelemetrySdk.builder().addPropertiesSupplier(() -> props).build();
65+
sdk.getOpenTelemetrySdk().shutdown();
66+
67+
assertThat(logs.getEvents()).isEmpty();
68+
}
4769
}

0 commit comments

Comments
 (0)