Skip to content

Ignore classes in java.lang.invoke in early instrumentations #13602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2025
Merged

Ignore classes in java.lang.invoke in early instrumentations #13602

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
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;
Expand Down Expand Up @@ -227,8 +226,11 @@ private static void installEarlyInstrumentation(
AgentBuilder.Identified.Extendable extendableAgentBuilder =
agentBuilder
.ignore(
target -> instrumentationInstalled, // turn off after instrumentation is installed
Objects::nonNull)
Copy link
Contributor Author

@laurit laurit Mar 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the Objects::nonNull(checks that instrumentation applies only in boot loader) because it doesn't work as intended. When both type and class loader matcher are given both must match for the type to be ignored, as far as I understand here the intent was to ignore when either matches. If we want we can add the class loader check with .or(Objects::nonNull) but it shouldn't be necessary.

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);
Expand Down
Loading