Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use ConfigUtil internally #5048

Merged
merged 1 commit into from
Dec 17, 2022
Merged

Use ConfigUtil internally #5048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/all/src/main/java/io/opentelemetry/api/GlobalOpenTelemetry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ private static OpenTelemetry maybeAutoConfigureAndSetGlobal() {

// If autoconfigure module is present but global autoconfigure disabled log a warning and return
boolean globalAutoconfigureEnabled =
Boolean.parseBoolean(ConfigUtil.getString(GLOBAL_AUTOCONFIGURE_ENABLED_PROPERTY));
Boolean.parseBoolean(ConfigUtil.getString(GLOBAL_AUTOCONFIGURE_ENABLED_PROPERTY, "false"));
if (!globalAutoconfigureEnabled) {
logger.log(
Level.INFO,
Expand Down
8 changes: 4 additions & 4 deletions api/all/src/main/java/io/opentelemetry/api/internal/ConfigUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ private ConfigUtil() {}
* properties take priority over environment variables.
*
* @param key the property key
* @return the system property if not null, or the environment variable if not null, or null
* @return the system property if not null, or the environment variable if not null, or {@code
* defaultValue}
*/
@Nullable
public static String getString(String key) {
public static String getString(String key, String defaultValue) {
String normalizedKey = normalizePropertyKey(key);
String systemProperty =
System.getProperties().entrySet().stream()
Expand All @@ -46,7 +46,7 @@ public static String getString(String key) {
.filter(entry -> normalizedKey.equals(normalizeEnvironmentVariableKey(entry.getKey())))
.map(Map.Entry::getValue)
.findFirst()
.orElse(null);
.orElse(defaultValue);
}

/**
Expand Down
16 changes: 8 additions & 8 deletions api/all/src/test/java/io/opentelemetry/api/internal/ConfigUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@ class ConfigUtilTest {
@Test
@SetSystemProperty(key = "config.key", value = "system")
void getString_SystemPropertyPriority() {
assertThat(ConfigUtil.getString("config.key")).isEqualTo("system");
assertThat(ConfigUtil.getString("config-key")).isEqualTo("system");
assertThat(ConfigUtil.getString("other.config.key")).isEqualTo(null);
assertThat(ConfigUtil.getString("config.key", "default")).isEqualTo("system");
assertThat(ConfigUtil.getString("config-key", "default")).isEqualTo("system");
assertThat(ConfigUtil.getString("other.config.key", "default")).isEqualTo("default");
}

@Test
@SetSystemProperty(key = "CONFIG-KEY", value = "system")
void getString_SystemPropertyNormalized() {
assertThat(ConfigUtil.getString("config.key")).isEqualTo("system");
assertThat(ConfigUtil.getString("config-key")).isEqualTo("system");
assertThat(ConfigUtil.getString("other.config.key")).isEqualTo(null);
assertThat(ConfigUtil.getString("config.key", "default")).isEqualTo("system");
assertThat(ConfigUtil.getString("config-key", "default")).isEqualTo("system");
assertThat(ConfigUtil.getString("other.config.key", "default")).isEqualTo("default");
}

@Test
void getString_EnvironmentVariable() {
assertThat(ConfigUtil.getString("config.key")).isEqualTo("environment");
assertThat(ConfigUtil.getString("other.config.key")).isEqualTo(null);
assertThat(ConfigUtil.getString("config.key", "default")).isEqualTo("environment");
assertThat(ConfigUtil.getString("other.config.key", "default")).isEqualTo("default");
}

@Test
Expand Down
6 changes: 5 additions & 1 deletion ...rs/common/src/main/java/io/opentelemetry/exporter/internal/marshal/CodedOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import static io.opentelemetry.exporter.internal.marshal.WireFormat.MAX_VARINT32_SIZE;
import static io.opentelemetry.exporter.internal.marshal.WireFormat.MAX_VARINT_SIZE;

import io.opentelemetry.api.internal.ConfigUtil;
import java.io.IOException;
import java.io.OutputStream;

Expand Down Expand Up @@ -71,7 +72,10 @@ public abstract class CodedOutputStream {
static {
int bufferSize = 50 * 1024;
try {
bufferSize = Integer.parseInt(System.getProperty("otel.experimental.otlp.buffer-size"));
String bufferSizeConfig = ConfigUtil.getString("otel.experimental.otlp.buffer-size", "");
if (!bufferSizeConfig.isEmpty()) {
bufferSize = Integer.parseInt(bufferSizeConfig);
}
} catch (Throwable t) {
// Ignore.
}
Expand Down
10 changes: 2 additions & 8 deletions sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/debug/DebugConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.opentelemetry.sdk.metrics.internal.debug;

import java.util.Locale;
import io.opentelemetry.api.internal.ConfigUtil;

/**
* Determines if the SDK is in debugging mode (captures stack traces) or not.
Expand All @@ -20,13 +20,7 @@ public final class DebugConfig {
private DebugConfig() {}

static {
// Attempt to mirror the logic in DefaultConfigProperties here...
enabled =
"true".equalsIgnoreCase(System.getProperty(ENABLE_METRICS_DEBUG_PROPERTY))
|| "true"
.equalsIgnoreCase(
System.getenv(
ENABLE_METRICS_DEBUG_PROPERTY.toLowerCase(Locale.ROOT).replace('.', '_')));
enabled = Boolean.parseBoolean(ConfigUtil.getString(ENABLE_METRICS_DEBUG_PROPERTY, "false"));
}

/**
Expand Down