int to Severity

Author: trask

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogger.java

@@ -36,7 +36,7 @@ class SdkLogger implements Logger {
   private final InstrumentationScopeInfo instrumentationScopeInfo;
 
   protected volatile boolean loggerEnabled;
-  protected volatile int minimumSeverity;
+  protected volatile Severity minimumSeverity;
   protected volatile boolean traceBased;
 
   SdkLogger(
@@ -82,7 +82,7 @@ public boolean isEnabled(Severity severity, Context context) {
     }
 
     if (severity != Severity.UNDEFINED_SEVERITY_NUMBER
-        && severity.getSeverityNumber() < minimumSeverity) {
+        && severity.getSeverityNumber() < minimumSeverity.getSeverityNumber()) {
       return false;
     }
 

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/LoggerConfig.java

@@ -7,6 +7,7 @@
 
 import com.google.auto.value.AutoValue;
 import io.opentelemetry.api.logs.Logger;
+import io.opentelemetry.api.logs.Severity;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.internal.ScopeConfigurator;
 import io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder;
@@ -31,10 +32,14 @@ public abstract class LoggerConfig {
 
   private static final LoggerConfig DEFAULT_CONFIG =
       new AutoValue_LoggerConfig(
-          /* enabled= */ true, /* minimumSeverity= */ 0, /* traceBased= */ false);
+          /* enabled= */ true,
+          /* minimumSeverity= */ Severity.UNDEFINED_SEVERITY_NUMBER,
+          /* traceBased= */ false);
   private static final LoggerConfig DISABLED_CONFIG =
       new AutoValue_LoggerConfig(
-          /* enabled= */ false, /* minimumSeverity= */ 0, /* traceBased= */ false);
+          /* enabled= */ false,
+          /* minimumSeverity= */ Severity.UNDEFINED_SEVERITY_NUMBER,
+          /* traceBased= */ false);
 
   /** Returns a disabled {@link LoggerConfig}. */
   public static LoggerConfig disabled() {
@@ -69,6 +74,10 @@ public static ScopeConfiguratorBuilder<LoggerConfig> configuratorBuilder() {
 
   LoggerConfig() {}
 
+  static LoggerConfig create(boolean enabled, Severity minimumSeverity, boolean traceBased) {
+    return new AutoValue_LoggerConfig(enabled, minimumSeverity, traceBased);
+  }
+
   /** Returns {@code true} if this logger is enabled. Defaults to {@code true}. */
   public abstract boolean isEnabled();
 
@@ -78,9 +87,9 @@ public static ScopeConfiguratorBuilder<LoggerConfig> configuratorBuilder() {
    * <p>Log records with a severity number less than this value will be dropped. Log records without
    * a specified severity are not affected by this setting.
    *
-   * <p>Defaults to {@code 0}.
+   * <p>Defaults to {@link Severity#UNDEFINED_SEVERITY_NUMBER}.
    */
-  public abstract int getMinimumSeverity();
+  public abstract Severity getMinimumSeverity();
 
   /**
    * Returns {@code true} if this logger should only process log records from traces when the trace

sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLoggerTest.java

@@ -149,20 +149,20 @@ void updateLoggerConfig() {
 
     // Start with default config
     assertThat(logger.loggerEnabled).isTrue();
-    assertThat(logger.minimumSeverity).isEqualTo(0);
+    assertThat(logger.minimumSeverity).isEqualTo(Severity.UNDEFINED_SEVERITY_NUMBER);
     assertThat(logger.traceBased).isFalse();
 
     // Update to custom config
     LoggerConfig config =
         LoggerConfig.builder()
             .setEnabled(false)
-            .setMinimumSeverity(Severity.WARN.getSeverityNumber())
+            .setMinimumSeverity(Severity.WARN)
             .setTraceBased(true)
             .build();
     logger.updateLoggerConfig(config);
 
     assertThat(logger.loggerEnabled).isFalse();
-    assertThat(logger.minimumSeverity).isEqualTo(Severity.WARN.getSeverityNumber());
+    assertThat(logger.minimumSeverity).isEqualTo(Severity.WARN);
     assertThat(logger.traceBased).isTrue();
   }
 
@@ -174,7 +174,7 @@ void isEnabled_MinimumSeverity() {
     SdkLogger logger = (SdkLogger) loggerProvider.get("test");
 
     LoggerConfig config =
-        LoggerConfig.builder().setMinimumSeverity(Severity.WARN.getSeverityNumber()).build();
+        LoggerConfig.builder().setMinimumSeverity(Severity.WARN).build();
     logger.updateLoggerConfig(config);
 
     // Below minimum severity - should be disabled

sdk/logs/src/testIncubating/java/io/opentelemetry/sdk/logs/LoggerConfigTest.java

@@ -38,12 +38,12 @@ void builder_AllFields() {
     LoggerConfig config =
         LoggerConfig.builder()
             .setEnabled(false)
-            .setMinimumSeverity(Severity.WARN.getSeverityNumber())
+            .setMinimumSeverity(Severity.WARN)
             .setTraceBased(true)
             .build();
 
     assertThat(config.isEnabled()).isFalse();
-    assertThat(config.getMinimumSeverity()).isEqualTo(Severity.WARN.getSeverityNumber());
+    assertThat(config.getMinimumSeverity()).isEqualTo(Severity.WARN);
     assertThat(config.isTraceBased()).isTrue();
   }
 
@@ -52,7 +52,7 @@ void builder_Defaults() {
     LoggerConfig config = LoggerConfig.builder().build();
 
     assertThat(config.isEnabled()).isTrue();
-    assertThat(config.getMinimumSeverity()).isEqualTo(0);
+    assertThat(config.getMinimumSeverity()).isEqualTo(Severity.UNDEFINED_SEVERITY_NUMBER);
     assertThat(config.isTraceBased()).isFalse();
   }