unrevert

Author: fandreuz

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

@@ -8,6 +8,8 @@
 import static io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder.nameEquals;
 import static io.opentelemetry.sdk.internal.ScopeConfiguratorBuilder.nameMatchesGlob;
 import static io.opentelemetry.sdk.logs.internal.LoggerConfig.defaultConfig;
+import static io.opentelemetry.sdk.logs.internal.LoggerConfig.disabled;
+import static io.opentelemetry.sdk.logs.internal.LoggerConfig.enabled;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 
 import io.opentelemetry.api.incubator.logs.ExtendedLogger;
@@ -36,7 +38,7 @@ void disableScopes() {
         SdkLoggerProvider.builder()
             // Disable loggerB. Since loggers are enabled by default, loggerA and loggerC are
             // enabled.
-            .addLoggerConfiguratorCondition(nameEquals("loggerB"), LoggerConfig.disabled())
+            .addLoggerConfiguratorCondition(nameEquals("loggerB"), disabled())
             .addLogRecordProcessor(SimpleLogRecordProcessor.create(exporter))
             .build();
 
@@ -85,25 +87,23 @@ private static Stream<Arguments> loggerConfiguratorArgs() {
         LoggerConfig.configuratorBuilder().build();
     ScopeConfigurator<LoggerConfig> disableCat =
         LoggerConfig.configuratorBuilder()
-            .addCondition(nameEquals("cat"), LoggerConfig.disabled())
+            .addCondition(nameEquals("cat"), disabled())
             // Second matching rule for cat should be ignored
-            .addCondition(nameEquals("cat"), LoggerConfig.enabled())
+            .addCondition(nameEquals("cat"), enabled())
             .build();
     ScopeConfigurator<LoggerConfig> disableStartsWithD =
-        LoggerConfig.configuratorBuilder()
-            .addCondition(nameMatchesGlob("d*"), LoggerConfig.disabled())
-            .build();
+        LoggerConfig.configuratorBuilder().addCondition(nameMatchesGlob("d*"), disabled()).build();
     ScopeConfigurator<LoggerConfig> enableCat =
         LoggerConfig.configuratorBuilder()
-            .setDefault(LoggerConfig.disabled())
-            .addCondition(nameEquals("cat"), LoggerConfig.enabled())
+            .setDefault(disabled())
+            .addCondition(nameEquals("cat"), enabled())
             // Second matching rule for cat should be ignored
-            .addCondition(nameEquals("cat"), LoggerConfig.disabled())
+            .addCondition(nameEquals("cat"), disabled())
             .build();
     ScopeConfigurator<LoggerConfig> enableStartsWithD =
         LoggerConfig.configuratorBuilder()
-            .setDefault(LoggerConfig.disabled())
-            .addCondition(nameMatchesGlob("d*"), LoggerConfig.enabled())
+            .setDefault(disabled())
+            .addCondition(nameMatchesGlob("d*"), enabled())
             .build();
 
     return Stream.of(
@@ -112,21 +112,21 @@ private static Stream<Arguments> loggerConfiguratorArgs() {
         Arguments.of(defaultConfigurator, scopeDog, defaultConfig()),
         Arguments.of(defaultConfigurator, scopeDuck, defaultConfig()),
         // default enabled, disable cat
-        Arguments.of(disableCat, scopeCat, LoggerConfig.disabled()),
-        Arguments.of(disableCat, scopeDog, LoggerConfig.enabled()),
-        Arguments.of(disableCat, scopeDuck, LoggerConfig.enabled()),
+        Arguments.of(disableCat, scopeCat, disabled()),
+        Arguments.of(disableCat, scopeDog, enabled()),
+        Arguments.of(disableCat, scopeDuck, enabled()),
         // default enabled, disable pattern
-        Arguments.of(disableStartsWithD, scopeCat, LoggerConfig.enabled()),
-        Arguments.of(disableStartsWithD, scopeDog, LoggerConfig.disabled()),
-        Arguments.of(disableStartsWithD, scopeDuck, LoggerConfig.disabled()),
+        Arguments.of(disableStartsWithD, scopeCat, enabled()),
+        Arguments.of(disableStartsWithD, scopeDog, disabled()),
+        Arguments.of(disableStartsWithD, scopeDuck, disabled()),
         // default disabled, enable cat
-        Arguments.of(enableCat, scopeCat, LoggerConfig.enabled()),
-        Arguments.of(enableCat, scopeDog, LoggerConfig.disabled()),
-        Arguments.of(enableCat, scopeDuck, LoggerConfig.disabled()),
+        Arguments.of(enableCat, scopeCat, enabled()),
+        Arguments.of(enableCat, scopeDog, disabled()),
+        Arguments.of(enableCat, scopeDuck, disabled()),
         // default disabled, enable pattern
-        Arguments.of(enableStartsWithD, scopeCat, LoggerConfig.disabled()),
-        Arguments.of(enableStartsWithD, scopeDog, LoggerConfig.enabled()),
-        Arguments.of(enableStartsWithD, scopeDuck, LoggerConfig.enabled()));
+        Arguments.of(enableStartsWithD, scopeCat, disabled()),
+        Arguments.of(enableStartsWithD, scopeDog, enabled()),
+        Arguments.of(enableStartsWithD, scopeDuck, enabled()));
   }
 
   @Test
@@ -135,7 +135,7 @@ void setScopeConfigurator() {
     InMemoryLogRecordExporter exporter = InMemoryLogRecordExporter.create();
     SdkLoggerProvider loggerProvider =
         SdkLoggerProvider.builder()
-            .addLoggerConfiguratorCondition(nameEquals("loggerB"), LoggerConfig.disabled())
+            .addLoggerConfiguratorCondition(nameEquals("loggerB"), disabled())
             .addLogRecordProcessor(SimpleLogRecordProcessor.create(exporter))
             .build();
 
@@ -159,7 +159,7 @@ void setScopeConfigurator() {
 
     // 2. Update config to disable all loggers
     loggerProvider.setLoggerConfigurator(
-        ScopeConfigurator.<LoggerConfig>builder().setDefault(LoggerConfig.disabled()).build());
+        ScopeConfigurator.<LoggerConfig>builder().setDefault(disabled()).build());
 
     // verify isEnabled()
     assertThat(loggerA.isEnabled()).isFalse();
@@ -175,7 +175,7 @@ void setScopeConfigurator() {
     // 3. Update config to restore original
     loggerProvider.setLoggerConfigurator(
         ScopeConfigurator.<LoggerConfig>builder()
-            .addCondition(nameEquals("loggerB"), LoggerConfig.disabled())
+            .addCondition(nameEquals("loggerB"), disabled())
             .build());
 
     // verify isEnabled()