fix rebase

Author: zeitlinger

javaagent-extension-api/build.gradle.kts

@@ -22,8 +22,3 @@ dependencies {
   // Used by byte-buddy but not brought in as a transitive dependency.
   compileOnly("com.google.code.findbugs:annotations")
 }
-
-// Needed by mockito
-configurations.testRuntimeClasspath {
-  exclude(group = "net.bytebuddy", module = "byte-buddy-dep")
-}

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

@@ -237,6 +237,6 @@ private static String getJavaPath(String property) {
     } else if (property.startsWith(OTEL_JAVA_AGENT_PREFIX)) {
       return "agent." + property.substring(OTEL_JAVA_AGENT_PREFIX.length()).replace('-', '_');
     }
-    return null;
+    return property;
   }
 }

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

@@ -114,7 +114,12 @@ void getProperties() {
         .isEqualTo(expectedMap);
   }
 
-  // tests for specific properties
+  @Test
+  void vendor() {
+    // verify vendor specific property names are preserved in unchanged form (prefix is not stripped
+    // as for otel.instrumentation.*)
+    assertThat(bridge.getBoolean("acme.full_name.preserved")).isTrue();
+  }
 
   @DisplayName("properties from the general instrumentation section in config.yaml")
   @Test

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

@@ -8,10 +8,10 @@ instrumentation/development:
         - peer: 2.3.4.5
           service: BarService
     http:
-#      known_methods:
-#        - GET
-#        - POST
-#        - PUT
+      #      known_methods:
+      #        - GET
+      #        - POST
+      #        - PUT
       client:
         request_captured_headers:
           - Content-Type
@@ -27,6 +27,9 @@ instrumentation/development:
           - Content-Type
           - Content-Encoding
   java:
+    acme:
+      full_name:
+        preserved: true
     agent:
       experimental:
         indy: true

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

@@ -30,7 +30,6 @@
 import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
 import io.opentelemetry.javaagent.bootstrap.internal.ConfiguredResourceAttributesHolder;
 import io.opentelemetry.javaagent.extension.AgentListener;
-import io.opentelemetry.javaagent.extension.ConfigPropertiesUtil;
 import io.opentelemetry.javaagent.extension.ignore.IgnoredTypesConfigurer;
 import io.opentelemetry.javaagent.extension.instrumentation.internal.EarlyInstrumentationModule;
 import io.opentelemetry.javaagent.tooling.asyncannotationsupport.WeakRefAsyncOperationEndStrategies;