Merge remote-tracking branch 'upstream/main' into remove-outdated-config

Author: trask

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

@@ -39,6 +39,11 @@ static Map<String, String> getProperties() {
     return configFileContents;
   }
 
+  // visible for tests
+  static void resetForTest() {
+    configFileContents = null;
+  }
+
   // visible for tests
   static Map<String, String> loadConfigFile() {
     // Reading from system property first and from env after

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java

@@ -106,6 +106,8 @@ public void configure(IgnoredTypesBuilder builder) {
         .allowClass("org.springframework.boot.web.servlet.")
         .allowClass("org.springframework.boot.web.embedded.netty.GracefulShutdown$$Lambda")
         .allowClass("org.springframework.boot.web.embedded.tomcat.GracefulShutdown$$Lambda")
+        .allowClass(
+            "org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory$$Lambda")
         .allowClass(
             "org.springframework.boot.actuate.metrics.web.reactive.server.MetricsWebFilter$$Lambda")
         .allowClass("org.springframework.boot.autoconfigure.BackgroundPreinitializer$")

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigurationPropertiesSupplierTest.java

@@ -32,6 +32,7 @@ class ConfigurationPropertiesSupplierTest {
   @AfterAll
   static void cleanUp() {
     GlobalOpenTelemetry.resetForTest();
+    ConfigurationFile.resetForTest();
   }
 
   // regression for https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6696