add more tests

Author: zeitlinger

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/DeclarativeConfigPropertiesBridge.java

@@ -12,11 +12,14 @@
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.time.Duration;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
@@ -57,6 +60,8 @@ public final class DeclarativeConfigPropertiesBridge implements ConfigProperties
 
   private static final Map<String, String> JAVA_MAPPING_RULES = new HashMap<>();
   private static final Map<String, String> GENERAL_MAPPING_RULES = new HashMap<>();
+  private static final Set<String> AGENT_LOGGING_OUTPUTS =
+      new HashSet<>(Arrays.asList("application", "simple"));
 
   // The node at .instrumentation.java
   private final DeclarativeConfigProperties instrumentationJavaNode;
@@ -242,18 +247,29 @@ private static String getJavaPath(String property) {
 
   private String agentLoggerName() {
     DeclarativeConfigProperties logOutput = getLogOutput();
-    DeclarativeConfigProperties application = logOutput.getStructured("application");
-    DeclarativeConfigProperties simple = logOutput.getStructured("simple");
-    if (application != null) {
-      if (simple != null) {
-        throw new DeclarativeConfigException(
-            "Both 'application' and 'simple' log output are configured. "
-                + "Please choose one of them.");
-      }
-      return "application";
+    Set<String> names = logOutput.getPropertyKeys();
+
+    if (names.isEmpty()) {
+      // no log output configured, use the default
+      return "simple";
+    }
+
+    if (names.size() > 1) {
+      throw new DeclarativeConfigException(
+          "Multiple log output formats are configured: "
+              + String.join(", ", names)
+              + ". Please choose one of them.");
+    }
+
+    String name = names.iterator().next();
+    if (!AGENT_LOGGING_OUTPUTS.contains(name)) {
+      throw new DeclarativeConfigException(
+          "Unsupported log output format: '"
+              + name
+              + "' . Supported formats are: "
+              + String.join(", ", AGENT_LOGGING_OUTPUTS));
     }
-    // simple is the default
-    return "simple";
+    return name;
   }
 
   private DeclarativeConfigProperties getLogOutput() {

javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/DeclarativeConfigPropertiesBridgeTest.java

@@ -6,8 +6,10 @@
 package io.opentelemetry.javaagent.extension;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.data.MapEntry.entry;
 
+import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
@@ -29,23 +31,24 @@ class DeclarativeConfigPropertiesBridgeTest {
 
   @BeforeEach
   void setup() {
-    OpenTelemetryConfigurationModel model =
-        DeclarativeConfiguration.parse(
-            DeclarativeConfigPropertiesBridgeTest.class
-                .getClassLoader()
-                .getResourceAsStream("config.yaml"));
-    SdkConfigProvider configProvider = SdkConfigProvider.create(model);
-    String logLevel = "DEBUG";
-    bridge =
-        new DeclarativeConfigPropertiesBridge(Objects.requireNonNull(configProvider), logLevel);
+    bridge = create("config.yaml");
 
     OpenTelemetryConfigurationModel emptyModel =
         new OpenTelemetryConfigurationModel()
             .withAdditionalProperty("instrumentation/development", new InstrumentationModel());
     SdkConfigProvider emptyConfigProvider = SdkConfigProvider.create(emptyModel);
     emptyBridge =
-        new DeclarativeConfigPropertiesBridge(
-            Objects.requireNonNull(emptyConfigProvider), logLevel);
+        new DeclarativeConfigPropertiesBridge(Objects.requireNonNull(emptyConfigProvider), "DEBUG");
+  }
+
+  private static DeclarativeConfigPropertiesBridge create(String name) {
+    OpenTelemetryConfigurationModel model =
+        DeclarativeConfiguration.parse(
+            DeclarativeConfigPropertiesBridgeTest.class.getClassLoader().getResourceAsStream(name));
+    SdkConfigProvider configProvider = SdkConfigProvider.create(model);
+    DeclarativeConfigPropertiesBridge configPropertiesBridge =
+        new DeclarativeConfigPropertiesBridge(Objects.requireNonNull(configProvider), "DEBUG");
+    return configPropertiesBridge;
   }
 
   @Test
@@ -142,8 +145,13 @@ void common() {
   void agent() {
     assertThat(bridge.getBoolean("otel.javaagent.debug")).isTrue();
     assertThat(bridge.getBoolean("otel.javaagent.experimental.indy")).isTrue();
+
     assertThat(bridge.getString("otel.javaagent.logging")).isEqualTo("application");
     assertThat(bridge.getInt("otel.javaagent.logging.application.logs-buffer-max-records"))
         .isEqualTo(1000);
+    assertThat(create("agent-logging-simple.yaml").getString("otel.javaagent.logging"))
+        .isEqualTo("simple");
+    assertThatThrownBy(() -> create("agent-logging-both.yaml").getString("otel.javaagent.logging"))
+        .isInstanceOf(DeclarativeConfigException.class);
   }
 }

javaagent-extension-api/src/test/resources/agent-logging-both.yaml

@@ -0,0 +1,10 @@
+file_format: 0.4
+disabled: true
+log_level: DEBUG
+instrumentation/development:
+  java:
+    agent:
+      logging:
+        output:
+          application:
+          simple:

javaagent-extension-api/src/test/resources/agent-logging-simple.yaml

@@ -0,0 +1,9 @@
+file_format: 0.4
+disabled: true
+log_level: DEBUG
+instrumentation/development:
+  java:
+    agent:
+      logging:
+        output:
+          simple: