remove non-declarative configuration

Author: laurit

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

@@ -10,20 +10,8 @@ dependencies {
 
 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

@@ -30,33 +30,26 @@ public void beforeAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemet
     // 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) {
+    if (!urlTemplateEnabled || !config.isDeclarative()) {
       return;
     }
-    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);
-      }
-    }
+    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);
+              }
+            });
   }
 
   // visible for testing