lambda fix

open-telemetry · Oct 7, 2023 · 194cbd3 · 194cbd3
1 parent 4322f46
commit 194cbd3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...va/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java b/...va/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java
@@ -143,7 +143,7 @@ public void configure(IgnoredTypesBuilder builder) {
         // More runnables to deal with
         .allowClass("org.springframework.context.support.AbstractApplicationContext$")
         .allowClass("org.springframework.context.support.ContextTypeMatchClassLoader")
-        .allowClass("org.springframework.context.support.DefaultLifecycleProcessor$$Lambda$")
+        .allowClass("org.springframework.context.support.DefaultLifecycleProcessor$$Lambda")
         // Allow instrumenting ApplicationContext implementations - to inject beans
         .allowClass("org.springframework.context.annotation.AnnotationConfigApplicationContext")
         .allowClass("org.springframework.context.support.AbstractApplicationContext")
@@ -164,9 +164,9 @@ public void configure(IgnoredTypesBuilder builder) {
 
     builder
         .ignoreClass("org.springframework.http.")
-        .allowClass("org.springframework.http.client.reactive.AbstractClientHttpRequest$$Lambda$")
-        .allowClass("org.springframework.http.client.reactive.ReactorClientHttpConnector$$Lambda$")
-        .allowClass("org.springframework.http.codec.multipart.FileStorage$TempFileStorage$$Lambda$")
+        .allowClass("org.springframework.http.client.reactive.AbstractClientHttpRequest$$Lambda")
+        .allowClass("org.springframework.http.client.reactive.ReactorClientHttpConnector$$Lambda")
+        .allowClass("org.springframework.http.codec.multipart.FileStorage$TempFileStorage$$Lambda")
         // There are some Mono implementation that get instrumented
         .allowClass("org.springframework.http.server.reactive.");
 
@@ -240,7 +240,7 @@ public void configure(IgnoredTypesBuilder builder) {
         .ignoreClass("com.google.common.")
         .allowClass("com.google.common.util.concurrent.")
         .allowClass("com.google.common.base.internal.Finalizer")
-        .allowClass("com.google.common.base.Java8Usage$$Lambda$");
+        .allowClass("com.google.common.base.Java8Usage$$Lambda");
 
     builder
         .ignoreClass("com.google.inject.")

diff --git a/...-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/IgnoredTypesMatcher.java b/...-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/IgnoredTypesMatcher.java
@@ -29,7 +29,7 @@ public boolean matches(TypeDescription target) {
     }
 
     // bytecode proxies typically have $$ in their name
-    if (name.contains("$$") && !name.contains("$$Lambda$")) {
+    if (name.contains("$$") && !name.contains("$$Lambda$") && !name.endsWith("$$Lambda")) {
       // allow scala anonymous classes
       return !name.contains("$$anon$");
     }