From a17853889ba0fc60f7bb01acbfe76e9ec1476e03 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 2 Oct 2025 19:49:37 -0700 Subject: [PATCH] Fix custom check tests on Java 25 --- custom-checks/build.gradle.kts | 2 -- .../javaagent/customchecks/OtelInternalJavadoc.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/custom-checks/build.gradle.kts b/custom-checks/build.gradle.kts index 790a54a28f92..b8e2875067ee 100644 --- a/custom-checks/build.gradle.kts +++ b/custom-checks/build.gradle.kts @@ -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. diff --git a/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelInternalJavadoc.java b/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelInternalJavadoc.java index d3f0b4a79ad4..d98ce236ea2f 100644 --- a/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelInternalJavadoc.java +++ b/custom-checks/src/main/java/io/opentelemetry/javaagent/customchecks/OtelInternalJavadoc.java @@ -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+", " "); } }