add declarative config

Author: laurit

instrumentation-api-incubator/javaagent-testing/build.gradle.kts

@@ -8,7 +8,22 @@ dependencies {
   testImplementation(project(":testing-common"))
 }
 
-tasks.withType<Test>().configureEach {
-  jvmArgs("-Dotel.instrumentation.http.client.emit-experimental-telemetry=true")
-  jvmArgs("-Dotel.instrumentation.http.client.url-template-rules=http://localhost:.*/hello/.*,/hello/*")
+tasks {
+  test {
+    jvmArgs("-Dotel.instrumentation.http.client.emit-experimental-telemetry=true")
+    jvmArgs("-Dotel.instrumentation.http.client.url-template-rules=http://localhost:.*/hello/.*,/hello/*")
+  }
+
+  val declarativeConfigTest by registering(Test::class) {
+    testClassesDirs = sourceSets.test.get().output.classesDirs
+    classpath = sourceSets.test.get().runtimeClasspath
+
+    jvmArgs(
+      "-Dotel.experimental.config.file=$projectDir/src/test/resources/declarative-config.yaml"
+    )
+  }
+
+  check {
+    dependsOn(declarativeConfigTest)
+  }
 }

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/instrumentation/http/RegexUrlTemplateCustomizerInitializer.java

@@ -5,13 +5,16 @@
 
 package io.opentelemetry.javaagent.tooling.instrumentation.http;
 
+import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
+import static java.util.Collections.emptyList;
 import static java.util.logging.Level.WARNING;
 
 import com.google.auto.service.AutoService;
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
+import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
 import io.opentelemetry.javaagent.tooling.BeforeAgentListener;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
-import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -23,19 +26,36 @@ public final class RegexUrlTemplateCustomizerInitializer implements BeforeAgentL
 
   @Override
   public void beforeAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
-    ConfigProperties config = AutoConfigureUtil.getConfig(autoConfiguredOpenTelemetrySdk);
-    if (config == null) {
-      return;
-    }
+    InstrumentationConfig config = AgentInstrumentationConfig.get();
     // url template is emitted only when http client experimental telemetry is enabled
     boolean urlTemplateEnabled =
         config.getBoolean("otel.instrumentation.http.client.emit-experimental-telemetry", false);
     if (!urlTemplateEnabled) {
       return;
     }
-    String rules = config.getString("otel.instrumentation.http.client.url-template-rules");
-    if (rules != null && !rules.isEmpty()) {
-      parse(rules);
+    if (config.isDeclarative()) {
+      DeclarativeConfigProperties configuration =
+          config.getDeclarativeConfig("http").getStructured("client", empty());
+      configuration
+          .getStructuredList("url_template_rules", emptyList())
+          .forEach(
+              rule -> {
+                String patternString = rule.getString("pattern", "");
+                String template = rule.getString("template", "");
+                if (patternString.isEmpty() || template.isEmpty()) {
+                  return;
+                }
+                boolean override = rule.getBoolean("override", false);
+                Pattern pattern = toPattern(patternString);
+                if (pattern != null) {
+                  UrlTemplateRules.addRule(pattern, template, override);
+                }
+              });
+    } else {
+      String rules = config.getString("otel.instrumentation.http.client.url-template-rules");
+      if (rules != null && !rules.isEmpty()) {
+        parse(rules);
+      }
     }
   }
 
@@ -54,28 +74,33 @@ static void parse(String rules) {
         continue;
       }
 
-      Pattern pattern;
-      try {
-        String patternString = parts[0].trim();
-        // ensure that pattern matches the whole url
-        if (!patternString.startsWith("^")) {
-          patternString = "^" + patternString;
-        }
-        if (!patternString.endsWith("$")) {
-          patternString = patternString + "$";
-        }
-        pattern = Pattern.compile(patternString);
-      } catch (PatternSyntaxException exception) {
-        logger.log(
-            WARNING,
-            "Invalid pattern in http client url template customization rule \""
-                + parts[0].trim()
-                + "\".",
-            exception);
+      Pattern pattern = toPattern(parts[0].trim());
+      if (pattern == null) {
         continue;
       }
       UrlTemplateRules.addRule(
           pattern, parts[1].trim(), parts.length == 3 && Boolean.parseBoolean(parts[2].trim()));
     }
   }
+
+  private static Pattern toPattern(String patternString) {
+    try {
+      // ensure that pattern matches the whole url
+      if (!patternString.startsWith("^")) {
+        patternString = "^" + patternString;
+      }
+      if (!patternString.endsWith("$")) {
+        patternString = patternString + "$";
+      }
+      return Pattern.compile(patternString);
+    } catch (PatternSyntaxException exception) {
+      logger.log(
+          WARNING,
+          "Invalid pattern in http client url template customization rule \""
+              + patternString
+              + "\".",
+          exception);
+      return null;
+    }
+  }
 }