Prefer RandomUtils.randomUUID() as it avoids triggering early initialization of JUL

Author: mcculls

dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/StringBuilderBatchBenchmark.java

@@ -7,10 +7,10 @@
 import com.datadog.iast.model.Range;
 import datadog.trace.api.iast.IastContext;
 import datadog.trace.instrumentation.java.lang.StringBuilderCallSite;
+import datadog.trace.util.RandomUtils;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.UUID;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -36,9 +36,12 @@ protected StringBuilderBatchBenchmark.Context initializeContext() {
       final String value;
       if (current < limit) {
         value =
-            tainted(context, UUID.randomUUID().toString(), new Range(3, 6, source(), NOT_MARKED));
+            tainted(
+                context,
+                RandomUtils.randomUUID().toString(),
+                new Range(3, 6, source(), NOT_MARKED));
       } else {
-        value = notTainted(UUID.randomUUID().toString());
+        value = notTainted(RandomUtils.randomUUID().toString());
       }
       values.add(value);
     }

dd-java-agent/agent-tooling/src/test/java11/datadog/trace/agent/tooling/csi/UnknownArityExample.java

@@ -1,13 +1,13 @@
 package datadog.trace.agent.tooling.csi;
 
-import java.util.UUID;
+import datadog.trace.util.RandomUtils;
 import java.util.function.Supplier;
 
 public class UnknownArityExample implements Supplier<String> {
 
   @Override
   public String get() {
-    final String name = UUID.randomUUID().toString();
+    final String name = RandomUtils.randomUUID().toString();
     final long height = Math.round(Math.random() * 200);
     final double weight = Math.random() * 100;
     final int age = (int) Math.round(Math.random() * 100);

dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/server/HttpServerResponseTracingHandler.java

@@ -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 {
@@ -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));

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/ClasspathUtils.java

@@ -2,6 +2,7 @@
 
 import static datadog.trace.util.Strings.getResourceName;
 
+import datadog.trace.util.RandomUtils;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -10,7 +11,6 @@
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.nio.file.Files;
-import java.util.UUID;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
@@ -47,7 +47,7 @@ public static byte[] convertToByteArray(final Class<?> clazz) throws IOException
    */
   public static URL createJarWithClasses(final ClassLoader loader, final String... resourceNames)
       throws IOException {
-    final File tmpJar = File.createTempFile(UUID.randomUUID().toString(), ".jar");
+    final File tmpJar = File.createTempFile(RandomUtils.randomUUID().toString(), ".jar");
     tmpJar.deleteOnExit();
 
     final Manifest manifest = new Manifest();
@@ -76,7 +76,7 @@ public static URL createJarWithClasses(final ClassLoader loader, final String...
    * @throws IOException
    */
   public static URL createJarWithClasses(final Class<?>... classes) throws IOException {
-    final File tmpJar = File.createTempFile(UUID.randomUUID().toString(), ".jar");
+    final File tmpJar = File.createTempFile(RandomUtils.randomUUID().toString(), ".jar");
     tmpJar.deleteOnExit();
 
     final Manifest manifest = new Manifest();