Skip to content

Fix forbiddenApiFilters #9800

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
mcculls merged 5 commits into from
Oct 21, 2025
Merged

Fix forbiddenApiFilters #9800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d22372
Fix forbiddenApiFilters (should be a # between the class and method, …
mcculls Oct 17, 2025
9cc0667
Prefer RandomUtils.randomUUID() as it avoids triggering early initial…
mcculls Oct 17, 2025
fdfbe33
Ignore use of UUID.randomUUID() in test/benchmark code
mcculls Oct 18, 2025
68e3d96
Merge branch 'master' into mcculls/fix-forbiddenApiFilters
mcculls Oct 21, 2025
7518e55
Merge branch 'master' into mcculls/fix-forbiddenApiFilters
mcculls Oct 21, 2025
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
4 changes: 4 additions & 0 deletions dd-java-agent/agent-iast/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ jmh {
duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
}

tasks.named("forbiddenApisJmh") {
ignoreFailures = true
}

sourceSets {
test {
java {
Expand Down
1 change: 1 addition & 0 deletions dd-java-agent/agent-tooling/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ tasks.named("forbiddenApisTest_java11") {
// it will fail due to missing JDK >= 9 classes
// java.lang.ClassNotFoundException: java.lang.invoke.StringConcatFactory
failOnMissingClasses = false
ignoreFailures = true
}

tasks.named("compileTestJava") {
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/datadog/trace/instrumentation/netty40/server/HttpServerResponseTracingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext;
import datadog.trace.util.RandomUtils;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelOutboundHandlerAdapter;
import io.netty.channel.ChannelPromise;
import io.netty.handler.codec.http.HttpResponse;
import io.netty.handler.codec.http.HttpResponseStatus;
import java.util.UUID;

@ChannelHandler.Sharable
public class HttpServerResponseTracingHandler extends ChannelOutboundHandlerAdapter {
Expand Down Expand Up @@ -49,7 +49,7 @@ public void write(final ChannelHandlerContext ctx, final Object msg, final Chann
String channelId =
ctx.channel()
.attr(CHANNEL_ID)
.setIfAbsent(UUID.randomUUID().toString().substring(0, 8));
.setIfAbsent(RandomUtils.randomUUID().toString().substring(0, 8));
ctx.channel()
.attr(WEBSOCKET_SENDER_HANDLER_CONTEXT)
.set(new HandlerContext.Sender(span, channelId));
Expand Down
3 changes: 3 additions & 0 deletions dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/ClasspathUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static datadog.trace.util.Strings.getResourceName;

import de.thetaphi.forbiddenapis.SuppressForbidden;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
Expand Down Expand Up @@ -45,6 +46,7 @@ public static byte[] convertToByteArray(final Class<?> clazz) throws IOException
* @return the location of the newly created jar.
* @throws IOException if the jar file cannot be created.
*/
@SuppressForbidden
public static URL createJarWithClasses(final ClassLoader loader, final String... resourceNames)
throws IOException {
final File tmpJar = File.createTempFile(UUID.randomUUID().toString(), ".jar");
Expand Down Expand Up @@ -75,6 +77,7 @@ public static URL createJarWithClasses(final ClassLoader loader, final String...
* @return the location of the newly created jar.
* @throws IOException
*/
@SuppressForbidden
public static URL createJarWithClasses(final Class<?>... classes) throws IOException {
final File tmpJar = File.createTempFile(UUID.randomUUID().toString(), ".jar");
tmpJar.deleteOnExit();
Expand Down
2 changes: 1 addition & 1 deletion gradle/forbiddenApiFilters/main.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ java.lang.String#replaceAll(java.lang.String,java.lang.String)
java.lang.String#replaceFirst(java.lang.String,java.lang.String)

# can initialize java.util.logging when ACCP is installed, prefer RandomUtils instead
java.util.UUID.randomUUID()
java.util.UUID#randomUUID()

# prefer the NameMatchers/HierarchyMatchers equivalent instead
net.bytebuddy.matcher.ElementMatchers#named(java.lang.String)
Expand Down