fix

Author: zeitlinger

instrumentation/methods/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/methods/MethodsConfig.java

@@ -7,7 +7,6 @@
 
 import static java.util.Collections.emptyList;
 
-import com.google.common.base.Strings;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.HashSet;
@@ -33,7 +32,7 @@ static List<TypeInstrumentation> parseDeclarativeConfig(DeclarativeConfigPropert
   private static Stream<MethodInstrumentation> parseMethodInstrumentation(
       DeclarativeConfigProperties config) {
     String clazz = config.getString("class");
-    if (Strings.isNullOrEmpty(clazz)) {
+    if (isNullOrEmpty(clazz)) {
       logger.log(Level.WARNING, "Invalid methods configuration - class name missing: {0}", config);
       return Stream.empty();
     }
@@ -44,7 +43,7 @@ private static Stream<MethodInstrumentation> parseMethodInstrumentation(
     List<DeclarativeConfigProperties> methods = config.getStructuredList("methods", emptyList());
     for (DeclarativeConfigProperties method : methods) {
       String methodName = method.getString("name");
-      if (Strings.isNullOrEmpty(methodName)) {
+      if (isNullOrEmpty(methodName)) {
         logger.log(
             Level.WARNING, "Invalid methods configuration - method name missing: {0}", method);
         continue;
@@ -68,4 +67,8 @@ private static Stream<MethodInstrumentation> parseMethodInstrumentation(
 
     return Stream.of(new MethodInstrumentation(clazz, internal, server, client));
   }
+
+  private static boolean isNullOrEmpty(String s) {
+    return s == null || s.isEmpty();
+  }
 }

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/ConfigPropertiesBridge.java

@@ -7,6 +7,7 @@
 
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.api.incubator.config.InstrumentationConfigUtil;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
@@ -18,13 +19,12 @@
 public final class ConfigPropertiesBridge implements InstrumentationConfig {
 
   private final ConfigProperties configProperties;
-  @Nullable private final DeclarativeConfigProperties instrumentationConfig;
+  @Nullable private final ConfigProvider configProvider;
 
   public ConfigPropertiesBridge(
       ConfigProperties configProperties, @Nullable ConfigProvider configProvider) {
     this.configProperties = configProperties;
-    this.instrumentationConfig =
-        configProvider != null ? configProvider.getInstrumentationConfig() : null;
+    this.configProvider = configProvider;
   }
 
   @Nullable
@@ -112,9 +112,8 @@ public Map<String, String> getMap(String name, Map<String, String> defaultValue)
   @Nullable
   @Override
   public DeclarativeConfigProperties getDeclarativeConfig(String instrumentationName) {
-    if (instrumentationConfig != null) {
-      return instrumentationConfig.getStructured(instrumentationName);
-    }
-    return null;
+    return configProvider != null
+        ? InstrumentationConfigUtil.javaInstrumentationConfig(configProvider, instrumentationName)
+        : null;
   }
 }