fix

Author: zeitlinger

gcp-auth-extension/src/main/java/io/opentelemetry/contrib/gcp/auth/ConfigurableOption.java

@@ -8,9 +8,8 @@
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
 import java.util.Locale;
-import java.util.Optional;
 import java.util.function.BiFunction;
-import java.util.function.Supplier;
+import javax.annotation.Nullable;
 
 /**
  * An enum representing configurable options for a GCP Authentication Extension. Each option has a
@@ -100,60 +99,36 @@ String getUserReadableName() {
    * @throws ConfigurationException if neither the environment variable nor the system property is
    *     set.
    */
-  <T> T getConfiguredValue(
+  <T> T getRequiredConfiguredValue(
       ConfigProperties configProperties, BiFunction<ConfigProperties, String, T> extractor) {
-    T configuredValue = extractor.apply(configProperties, this.getSystemProperty());
-    if (configuredValue instanceof String) {
-      String value = (String) configuredValue;
-      if (value.isEmpty()) {
-        configuredValue = null; // Treat empty string as not configured
-      }
-    }
-
-    if (configuredValue != null) {
-      return configuredValue;
-    } else {
+    T configuredValue = getConfiguredValue(configProperties, extractor);
+    if (configuredValue == null) {
       throw new ConfigurationException(
           String.format(
-              "GCP Authentication Extension not configured properly: %s not configured. Configure it by exporting environment variable %s or system property %s",
+              "GCP Authentication Extension not configured properly: %s not configured. "
+                  + "Configure it by exporting environment variable %s or system property %s",
               this.userReadableName, this.getEnvironmentVariable(), this.getSystemProperty()));
     }
+    return configuredValue;
   }
 
   /**
-   * Retrieves the value for this option, prioritizing environment variables and system properties.
-   * If neither an environment variable nor a system property is set for this option, the provided
-   * fallback function is used to determine the value.
+   * Retrieves the configured value for this option. This method checks the environment variable
+   * first and then the system property.
    *
-   * @param fallback A {@link Supplier} that provides the default value for the option when it is
-   *     not explicitly configured via an environment variable or system property.
-   * @return The configured value for the option, obtained from the environment variable, system
-   *     property, or the fallback function, in that order of precedence.
+   * @return The configured value as a string, or throws an exception if not configured.
    */
-  <T> T getConfiguredValueWithFallback(
-      ConfigProperties configProperties,
-      Supplier<T> fallback,
-      BiFunction<ConfigProperties, String, T> extractor) {
-    try {
-      return this.getConfiguredValue(configProperties, extractor);
-    } catch (ConfigurationException e) {
-      return fallback.get();
+  @Nullable
+  <T> T getConfiguredValue(
+      ConfigProperties configProperties, BiFunction<ConfigProperties, String, T> extractor) {
+    T configuredValue = extractor.apply(configProperties, this.getSystemProperty());
+    if (configuredValue instanceof String) {
+      String value = (String) configuredValue;
+      if (value.isEmpty()) {
+        configuredValue = null; // Treat empty string as not configured
+      }
     }
-  }
 
-  /**
-   * Retrieves the value for this option, prioritizing environment variables before system
-   * properties. If neither an environment variable nor a system property is set for this option,
-   * then an empty {@link Optional} is returned.
-   *
-   * @return The configured value for the option, if set, obtained from the environment variable,
-   *     system property, or empty {@link Optional}, in that order of precedence.
-   */
-  Optional<String> getConfiguredValueAsOptional(ConfigProperties configProperties) {
-    try {
-      return Optional.of(this.getConfiguredValue(configProperties, ConfigProperties::getString));
-    } catch (ConfigurationException e) {
-      return Optional.empty();
-    }
+    return configuredValue;
   }
 }

gcp-auth-extension/src/main/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProvider.java

@@ -162,10 +162,11 @@ private static boolean isSignalTargeted(String checkSignal, ConfigProperties con
   }
 
   static List<String> targetSignals(ConfigProperties configProperties) {
-    return ConfigurableOption.GOOGLE_OTEL_AUTH_TARGET_SIGNALS.getConfiguredValueWithFallback(
-        configProperties,
-        () -> Collections.singletonList(SIGNAL_TYPE_ALL),
-        ConfigProperties::getList);
+    return Objects.requireNonNull(
+        ConfigurableOption.GOOGLE_OTEL_AUTH_TARGET_SIGNALS.getConfiguredValue(
+            configProperties,
+            (properties, name) ->
+                properties.getList(name, Collections.singletonList(SIGNAL_TYPE_ALL))));
   }
 
   // Adds authorization headers to the calls made by the OtlpGrpcSpanExporter and
@@ -236,8 +237,9 @@ static Map<String, String> getRequiredHeaderMap(
   }
 
   static Optional<String> getQuotaProjectId(ConfigProperties configProperties) {
-    return ConfigurableOption.GOOGLE_CLOUD_QUOTA_PROJECT.getConfiguredValueAsOptional(
-        configProperties);
+    return Optional.ofNullable(
+        ConfigurableOption.GOOGLE_CLOUD_QUOTA_PROJECT.getConfiguredValue(
+            configProperties, ConfigProperties::getString));
   }
 
   // Updates the current resource with the attributes required for ingesting OTLP data on GCP.
@@ -250,7 +252,7 @@ private static Resource customizeResource(Resource resource, ConfigProperties co
   }
 
   static String getProjectId(ConfigProperties configProperties) {
-    return ConfigurableOption.GOOGLE_CLOUD_PROJECT.getConfiguredValue(
+    return ConfigurableOption.GOOGLE_CLOUD_PROJECT.getRequiredConfiguredValue(
         configProperties, ConfigProperties::getString);
   }
 }