From 5626e25bb167e7f46b1587b9bdddf51e93f8ad4b Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Thu, 27 Mar 2025 18:58:15 +0200
Subject: [PATCH] Ignore classes in java.lang.invoke in early instrumentations
 (#13602)

---
 .../opentelemetry/javaagent/tooling/AgentInstaller.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java
index 0b4dff0553..d842268065 100644
--- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java
+++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java
@@ -56,7 +56,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
@@ -227,8 +226,11 @@ public class AgentInstaller {
     AgentBuilder.Identified.Extendable extendableAgentBuilder =
         agentBuilder
             .ignore(
-                target -> instrumentationInstalled, // turn off after instrumentation is installed
-                Objects::nonNull)
+                target ->
+                    // turn off after instrumentation is installed, exclude classes in
+                    // java.lang.invoke to avoid circularity when bootstrapping indy instrumentation
+                    instrumentationInstalled
+                        || target.getTypeName().startsWith("java.lang.invoke."))
             .type(none())
             .transform(
                 (builder, typeDescription, classLoader, module, protectionDomain) -> builder);