diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/blocking/BlockingActionHelper.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/blocking/BlockingActionHelper.java
index cd210a4630b..fbe5e150367 100644
--- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/blocking/BlockingActionHelper.java
+++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/blocking/BlockingActionHelper.java
@@ -36,7 +36,7 @@ public class BlockingActionHelper {
 
   public enum TemplateType {
     JSON,
-    HTML;
+    HTML
   }
 
   public static int getHttpCode(int actionHttpCode) {
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java
index 0a40efa7fe1..70f1f8c0347 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java
@@ -67,7 +67,7 @@ public enum MetricKind {
     COUNT,
     GAUGE,
     HISTOGRAM,
-    DISTRIBUTION;
+    DISTRIBUTION
   }
 
   public interface MetricForwarder {
diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WellKnownClasses.java b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WellKnownClasses.java
index 852d043e72d..e80f9c0b836 100644
--- a/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WellKnownClasses.java
+++ b/dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/util/WellKnownClasses.java
@@ -141,7 +141,6 @@ public class WellKnownClasses {
     } catch (NoSuchMethodException e) {
       getModuleNameMethod = null;
     }
-    ;
   }
 
   private static final Map<String, Function<Object, CapturedContext.CapturedValue>>
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/DiagnosticMessage.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/DiagnosticMessage.java
index cd91a6e75ec..ec22df6b8bb 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/DiagnosticMessage.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/instrumentation/DiagnosticMessage.java
@@ -9,7 +9,7 @@ public final class DiagnosticMessage {
   public enum Kind {
     INFO,
     WARN,
-    ERROR;
+    ERROR
   }
 
   private final long timestamp;
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/Snapshot.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/Snapshot.java
index 1de96d27c34..7d5639a06b7 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/Snapshot.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/sink/Snapshot.java
@@ -212,7 +212,7 @@ public enum Kind {
     UNHANDLED_EXCEPTION,
     HANDLED_EXCEPTION,
     BEFORE,
-    AFTER;
+    AFTER
   }
 
   /** Stores all collected data at different location (method entry/exit, lines, exceptions) */
diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/WeakIdentityHashMap.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/WeakIdentityHashMap.java
index 5c77095831c..f2c4348aeff 100644
--- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/WeakIdentityHashMap.java
+++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/util/WeakIdentityHashMap.java
@@ -816,7 +816,6 @@ public void replaceAll(BiFunction<? super K, ? super V, ? extends V> function) {
     int expectedModCount = modCount;
 
     Entry<K, V>[] tab = getTable();
-    ;
     for (Entry<K, V> entry : tab) {
       while (entry != null) {
         Object key = entry.get();
diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SnapshotSerializationTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SnapshotSerializationTest.java
index d5d03b512da..cfc617e6b25 100644
--- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SnapshotSerializationTest.java
+++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/SnapshotSerializationTest.java
@@ -952,7 +952,7 @@ public void valueTimeout() throws IOException {
   enum MyEnum {
     ONE,
     TWO,
-    THREE;
+    THREE
   }
 
   @Test
diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/iastIntegrationTest/java/SsrfController.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/iastIntegrationTest/java/SsrfController.java
index 18d46309119..b5e19ab58fe 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/iastIntegrationTest/java/SsrfController.java
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/iastIntegrationTest/java/SsrfController.java
@@ -95,6 +95,6 @@ public enum ExecuteMethod {
     REQUEST_HANDLER_CONTEXT,
     HOST_REQUEST_HANDLER,
     HOST_REQUEST_HANDLER_CONTEXT,
-    HOST_REQUEST_CONTEXT;
+    HOST_REQUEST_CONTEXT
   }
 }
diff --git a/dd-java-agent/instrumentation/avro-1.11.3/src/main/java/datadog/trace/instrumentation/avro/SchemaExtractor.java b/dd-java-agent/instrumentation/avro-1.11.3/src/main/java/datadog/trace/instrumentation/avro/SchemaExtractor.java
index e88bd37cef7..ac0eeaaac7b 100644
--- a/dd-java-agent/instrumentation/avro-1.11.3/src/main/java/datadog/trace/instrumentation/avro/SchemaExtractor.java
+++ b/dd-java-agent/instrumentation/avro-1.11.3/src/main/java/datadog/trace/instrumentation/avro/SchemaExtractor.java
@@ -49,7 +49,6 @@ public static boolean extractProperty(
           if (!extractSchema(field.schema().getElementType(), builder, depth)) {
             return false;
           }
-          ;
         }
         break;
       case MAP:
@@ -61,7 +60,6 @@ public static boolean extractProperty(
           if (!extractSchema(field.schema().getValueType(), builder, depth)) {
             return false;
           }
-          ;
         }
         description = "Map type with " + keys + " keys and " + values + " values";
         break;
diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/PrioritizationStrategy.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/PrioritizationStrategy.java
index 5918015e3a9..9fe7fe24c25 100644
--- a/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/PrioritizationStrategy.java
+++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/ddagent/PrioritizationStrategy.java
@@ -11,7 +11,7 @@ enum PublishResult {
     ENQUEUED_FOR_SINGLE_SPAN_SAMPLING,
     DROPPED_BY_POLICY,
     DROPPED_BUFFER_OVERFLOW
-  };
+  }
 
   <T extends CoreSpan<T>> PublishResult publish(T root, int priority, List<T> trace);
 
diff --git a/internal-api/src/main/java/datadog/trace/api/StatsDClient.java b/internal-api/src/main/java/datadog/trace/api/StatsDClient.java
index f446e026e10..19fbb471248 100644
--- a/internal-api/src/main/java/datadog/trace/api/StatsDClient.java
+++ b/internal-api/src/main/java/datadog/trace/api/StatsDClient.java
@@ -38,7 +38,6 @@ public interface StatsDClient extends Closeable {
    */
   default void recordEvent(
       String type, String source, String eventName, String message, String... tags) {}
-  ;
 
   @Override
   void close();
diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/RequestContextSlot.java b/internal-api/src/main/java/datadog/trace/api/gateway/RequestContextSlot.java
index 9b1ebbf1066..94cfb50d2fa 100644
--- a/internal-api/src/main/java/datadog/trace/api/gateway/RequestContextSlot.java
+++ b/internal-api/src/main/java/datadog/trace/api/gateway/RequestContextSlot.java
@@ -3,5 +3,5 @@
 public enum RequestContextSlot {
   APPSEC,
   CI_VISIBILITY,
-  IAST;
+  IAST
 }
diff --git a/telemetry/src/main/java/datadog/telemetry/dependency/Dependency.java b/telemetry/src/main/java/datadog/telemetry/dependency/Dependency.java
index 6a0d3b9b1ab..fbf30ae7ffe 100644
--- a/telemetry/src/main/java/datadog/telemetry/dependency/Dependency.java
+++ b/telemetry/src/main/java/datadog/telemetry/dependency/Dependency.java
@@ -178,7 +178,7 @@ public static synchronized Dependency guessFallbackNoPom(
       groupId = parseGroupId(bundleSymbolicName, fileNameArtifact);
       if (!isValidGroupId(groupId)) {
         groupId = parseGroupId(bundleSymbolicName, bundleName);
-        ;
+
         if (!isValidGroupId(groupId)) {
           groupId = null;
         }