Skip to content

Fix custom check tests on Java 25 #14873

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
Oct 3, 2025
+1 −3
Merged

Fix custom check tests on Java 25 #14873

Show file tree
Hide file tree
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
2 changes: 0 additions & 2 deletions custom-checks/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ dependencies {

otelJava {
minJavaVersionSupported.set(JavaVersion.VERSION_17)
// OtelInternalJavadocTest fails with 25-ea
maxJavaVersionForTests.set(JavaVersion.VERSION_24)
}

// We cannot use "--release" javac option here because that will forbid exporting com.sun.tools package.
Expand Down
2 changes: 1 addition & 1 deletion custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelInternalJavadoc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ private static String getJavadoc(VisitorState state) {
if (docCommentTree == null) {
return null;
}
return docCommentTree.toString().replace("\n", "");
return docCommentTree.toString().replace("\n", " ").replace(" * ", " ").replaceAll("\\s+", " ");
}
}